]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
Update from BR_V5_DEV 13Feb2009
authorjfa <jfa@opencascade.com>
Fri, 13 Feb 2009 12:16:39 +0000 (12:16 +0000)
committerjfa <jfa@opencascade.com>
Fri, 13 Feb 2009 12:16:39 +0000 (12:16 +0000)
2463 files changed:
GEOM_version.h.in
Makefile.am
adm_local/Makefile.am
adm_local/unix/Makefile.am
adm_local/unix/config_files/Makefile.am
adm_local/unix/config_files/README [deleted file]
adm_local/unix/config_files/check_GEOM.m4
adm_local/unix/make_common_starter.am
bin/Makefile.am
build_cmake [new file with mode: 0755]
build_cmake.bat [new file with mode: 0644]
build_configure
clean_configure [new file with mode: 0755]
configure.ac
doc/Makefile.am
doc/salome/Makefile.am
doc/salome/gui/GEOM/Makefile.am [new file with mode: 0755]
doc/salome/gui/GEOM/doxyfile.in
doc/salome/gui/GEOM/doxyfile_py.in
doc/salome/gui/GEOM/doxyfile_tui.in [new file with mode: 0755]
doc/salome/gui/GEOM/files/introduction_to_geom.htm [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image27.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image29.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image30.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image31.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image32.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image33.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image34.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions.htm [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image1.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image2.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image3.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image4.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image56.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image57.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image58.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image59.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image71.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image72.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image73.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image74.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image75.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image76.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image77.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image78.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image87.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image88.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image89.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image90.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image100.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image101.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image102.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image103.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image99.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image119.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image121.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image122.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image128.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image129.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image131.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image132.gif [deleted file]
doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image133.gif [deleted file]
doc/salome/gui/GEOM/geompy_doc/classgeompyDC_1_1geompyDC.html [deleted file]
doc/salome/gui/GEOM/geompy_doc/classgeompyDC_1_1geompyDC__inherit__graph.jpg [deleted file]
doc/salome/gui/GEOM/geompy_doc/classgeompyDC_1_1info.html [deleted file]
doc/salome/gui/GEOM/geompy_doc/doxygen.css [deleted file]
doc/salome/gui/GEOM/geompy_doc/namespacegeompy.html [deleted file]
doc/salome/gui/GEOM/geompy_doc/namespacegeompyDC.html [deleted file]
doc/salome/gui/GEOM/images/3dsketch1.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/3dsketch2.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/3dsketch3.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/angle.png
doc/salome/gui/GEOM/images/arc.png
doc/salome/gui/GEOM/images/arc2.png
doc/salome/gui/GEOM/images/archimede.png
doc/salome/gui/GEOM/images/arcofellipse1.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/arcofellipse2.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/block1.png
doc/salome/gui/GEOM/images/block2.png
doc/salome/gui/GEOM/images/block3.png
doc/salome/gui/GEOM/images/block4.png
doc/salome/gui/GEOM/images/block5.png
doc/salome/gui/GEOM/images/bool1.png
doc/salome/gui/GEOM/images/bool2.png
doc/salome/gui/GEOM/images/bool3.png
doc/salome/gui/GEOM/images/box1.png
doc/salome/gui/GEOM/images/box2.png
doc/salome/gui/GEOM/images/box3.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/chamfer1.png
doc/salome/gui/GEOM/images/chamfer2.png
doc/salome/gui/GEOM/images/chamfer3.png
doc/salome/gui/GEOM/images/chamfer4.png
doc/salome/gui/GEOM/images/changeorientation.png
doc/salome/gui/GEOM/images/circle1.png
doc/salome/gui/GEOM/images/circle2.png
doc/salome/gui/GEOM/images/circle3.png
doc/salome/gui/GEOM/images/cone1.png
doc/salome/gui/GEOM/images/cone2.png
doc/salome/gui/GEOM/images/creategroup.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/curve.png
doc/salome/gui/GEOM/images/cylinder1.png
doc/salome/gui/GEOM/images/cylinder2.png
doc/salome/gui/GEOM/images/dialog.png
doc/salome/gui/GEOM/images/disk1.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/disk2.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/disk3.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/disks.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/distance.png
doc/salome/gui/GEOM/images/editgroup.png
doc/salome/gui/GEOM/images/ellipse.png
doc/salome/gui/GEOM/images/explode.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/extrusion1.png
doc/salome/gui/GEOM/images/extrusion2.png
doc/salome/gui/GEOM/images/extrusion3.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/face1.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/face2.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/faces.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/fillet1.png
doc/salome/gui/GEOM/images/fillet2.png
doc/salome/gui/GEOM/images/fillet2d_1.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/fillet2d_2.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/fillet3.png
doc/salome/gui/GEOM/images/filling.png
doc/salome/gui/GEOM/images/geomcreategroup.png
doc/salome/gui/GEOM/images/geomeimport.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/geomexport.png
doc/salome/gui/GEOM/images/geomimport.png
doc/salome/gui/GEOM/images/geomimport_reopen.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/geomscreen.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/glue1.png
doc/salome/gui/GEOM/images/glue2.png
doc/salome/gui/GEOM/images/glue3.png
doc/salome/gui/GEOM/images/image18.gif [deleted file]
doc/salome/gui/GEOM/images/image18.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/image2.jpg
doc/salome/gui/GEOM/images/image2.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/image26.gif [deleted file]
doc/salome/gui/GEOM/images/image26.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/image33.gif [deleted file]
doc/salome/gui/GEOM/images/image33.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/image56.gif [deleted file]
doc/salome/gui/GEOM/images/image56.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/image57.gif [deleted file]
doc/salome/gui/GEOM/images/image57.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/line1.png
doc/salome/gui/GEOM/images/line2.png
doc/salome/gui/GEOM/images/measures1.png
doc/salome/gui/GEOM/images/measures10.png
doc/salome/gui/GEOM/images/measures3.png
doc/salome/gui/GEOM/images/measures4.png
doc/salome/gui/GEOM/images/measures5.png
doc/salome/gui/GEOM/images/measures8.png
doc/salome/gui/GEOM/images/measures8a.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/measures9.png
doc/salome/gui/GEOM/images/mtrans1.png
doc/salome/gui/GEOM/images/mtrans2.png
doc/salome/gui/GEOM/images/mtransf1.png
doc/salome/gui/GEOM/images/mtransf2.png
doc/salome/gui/GEOM/images/mtransf3.png
doc/salome/gui/GEOM/images/mtransf4.png
doc/salome/gui/GEOM/images/neo-basicprop.png
doc/salome/gui/GEOM/images/neo-detect2.png
doc/salome/gui/GEOM/images/neo-isos.png
doc/salome/gui/GEOM/images/neo-localcs1.png
doc/salome/gui/GEOM/images/neo-localcs2.png
doc/salome/gui/GEOM/images/neo-localcs3.png
doc/salome/gui/GEOM/images/neo-mrot1.png
doc/salome/gui/GEOM/images/neo-mrot2.png
doc/salome/gui/GEOM/images/neo-obj1.png
doc/salome/gui/GEOM/images/neo-obj2.png
doc/salome/gui/GEOM/images/neo-obj3.png
doc/salome/gui/GEOM/images/neo-obj4.png
doc/salome/gui/GEOM/images/neo-obj5.png
doc/salome/gui/GEOM/images/neo-obj6.png
doc/salome/gui/GEOM/images/neo-obj7.png
doc/salome/gui/GEOM/images/neo-point2.png
doc/salome/gui/GEOM/images/neo-scetcher1.png
doc/salome/gui/GEOM/images/neo-scetcher2.png
doc/salome/gui/GEOM/images/neo-section.png
doc/salome/gui/GEOM/images/neo-tolerance.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/neo-transparency.png
doc/salome/gui/GEOM/images/new-tolerance.png
doc/salome/gui/GEOM/images/normaletoface.png
doc/salome/gui/GEOM/images/partition1.png
doc/salome/gui/GEOM/images/partition2.png
doc/salome/gui/GEOM/images/pipe.png
doc/salome/gui/GEOM/images/pipe2.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/pipe_wire_edgesn.png
doc/salome/gui/GEOM/images/pipebinormalsn.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/pipesn.png [deleted file]
doc/salome/gui/GEOM/images/plane1.png
doc/salome/gui/GEOM/images/plane2.png
doc/salome/gui/GEOM/images/plane3.png
doc/salome/gui/GEOM/images/point1.png
doc/salome/gui/GEOM/images/point2.png
doc/salome/gui/GEOM/images/point3.png
doc/salome/gui/GEOM/images/point4.png
doc/salome/gui/GEOM/images/point5.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/remove_extra_edges.png
doc/salome/gui/GEOM/images/repair1.png
doc/salome/gui/GEOM/images/repair10.png
doc/salome/gui/GEOM/images/repair2.png
doc/salome/gui/GEOM/images/repair3.png
doc/salome/gui/GEOM/images/repair4.png
doc/salome/gui/GEOM/images/repair5.png
doc/salome/gui/GEOM/images/repair6.png
doc/salome/gui/GEOM/images/repair7.png
doc/salome/gui/GEOM/images/repair8.png
doc/salome/gui/GEOM/images/repair9.png
doc/salome/gui/GEOM/images/restore-ss-OB-cut.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/restore-ss-OB.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/restore-ss-cut.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/restore-ss-dialog.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/restore-ss-viewer-after.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/restore-ss-viewer-before.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/restore-ss-viewer-cut.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/revolution.png
doc/salome/gui/GEOM/images/scale_transformsn3.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/scale_transformsn4.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/selectcolor.png
doc/salome/gui/GEOM/images/shapesonshape.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/shonshex1.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/shonshex2.png [new file with mode: 0755]
doc/salome/gui/GEOM/images/sphere1.png
doc/salome/gui/GEOM/images/sphere2.png
doc/salome/gui/GEOM/images/torus1.png
doc/salome/gui/GEOM/images/torus2.png
doc/salome/gui/GEOM/images/transformation1.png
doc/salome/gui/GEOM/images/transformation10.png
doc/salome/gui/GEOM/images/transformation10a.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/transformation11.png
doc/salome/gui/GEOM/images/transformation12.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/transformation13.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/transformation14.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/transformation2.png
doc/salome/gui/GEOM/images/transformation3.png
doc/salome/gui/GEOM/images/transformation4.png
doc/salome/gui/GEOM/images/transformation4a.png
doc/salome/gui/GEOM/images/transformation5.png
doc/salome/gui/GEOM/images/transformation6.png
doc/salome/gui/GEOM/images/transformation7.png
doc/salome/gui/GEOM/images/transformation8.png
doc/salome/gui/GEOM/images/transformation9.png
doc/salome/gui/GEOM/images/translation3.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/vector1.png
doc/salome/gui/GEOM/images/vector2.png
doc/salome/gui/GEOM/images/workplane4.png
doc/salome/gui/GEOM/images/workplane5.png
doc/salome/gui/GEOM/images/workplane6.png
doc/salome/gui/GEOM/input/add_point_on_edge_operation.doc
doc/salome/gui/GEOM/input/archimede.doc
doc/salome/gui/GEOM/input/basic_operations.doc [deleted file]
doc/salome/gui/GEOM/input/blocks_operations.doc
doc/salome/gui/GEOM/input/boolean_operations.doc [deleted file]
doc/salome/gui/GEOM/input/building_by_blocks.doc
doc/salome/gui/GEOM/input/chamfer_operation.doc
doc/salome/gui/GEOM/input/check_free_boundaries_operation.doc [deleted file]
doc/salome/gui/GEOM/input/check_free_faces_operation.doc [deleted file]
doc/salome/gui/GEOM/input/common_operation.doc
doc/salome/gui/GEOM/input/creating_3dsketcher.doc [new file with mode: 0755]
doc/salome/gui/GEOM/input/creating_adv_obj.doc
doc/salome/gui/GEOM/input/creating_arc.doc
doc/salome/gui/GEOM/input/creating_basic_go.doc
doc/salome/gui/GEOM/input/creating_box.doc
doc/salome/gui/GEOM/input/creating_circle.doc
doc/salome/gui/GEOM/input/creating_complex_obj.doc
doc/salome/gui/GEOM/input/creating_compound.doc
doc/salome/gui/GEOM/input/creating_cone.doc
doc/salome/gui/GEOM/input/creating_cylinder.doc
doc/salome/gui/GEOM/input/creating_disk.doc [new file with mode: 0755]
doc/salome/gui/GEOM/input/creating_edge.doc
doc/salome/gui/GEOM/input/creating_ellipse.doc
doc/salome/gui/GEOM/input/creating_explode.doc
doc/salome/gui/GEOM/input/creating_extrusion.doc
doc/salome/gui/GEOM/input/creating_extrusion_alongpath.doc
doc/salome/gui/GEOM/input/creating_face.doc
doc/salome/gui/GEOM/input/creating_filling.doc
doc/salome/gui/GEOM/input/creating_geom_objects.doc
doc/salome/gui/GEOM/input/creating_lcs.doc
doc/salome/gui/GEOM/input/creating_line.doc
doc/salome/gui/GEOM/input/creating_plane.doc
doc/salome/gui/GEOM/input/creating_point.doc
doc/salome/gui/GEOM/input/creating_primitives.doc
doc/salome/gui/GEOM/input/creating_revolution.doc
doc/salome/gui/GEOM/input/creating_shell.doc
doc/salome/gui/GEOM/input/creating_sketcher.doc
doc/salome/gui/GEOM/input/creating_solid.doc
doc/salome/gui/GEOM/input/creating_sphere.doc
doc/salome/gui/GEOM/input/creating_squareface.doc [new file with mode: 0755]
doc/salome/gui/GEOM/input/creating_torus.doc
doc/salome/gui/GEOM/input/creating_vector.doc
doc/salome/gui/GEOM/input/creating_wire.doc
doc/salome/gui/GEOM/input/cut_operation.doc
doc/salome/gui/GEOM/input/explode_on_blocks_operation.doc
doc/salome/gui/GEOM/input/fillet2d_operation.doc [new file with mode: 0755]
doc/salome/gui/GEOM/input/fuse_operation.doc
doc/salome/gui/GEOM/input/geompy.doc
doc/salome/gui/GEOM/input/glue_faces_operation.doc
doc/salome/gui/GEOM/input/import_export.doc
doc/salome/gui/GEOM/input/index.doc
doc/salome/gui/GEOM/input/introduction.doc [deleted file]
doc/salome/gui/GEOM/input/mirror_operation.doc
doc/salome/gui/GEOM/input/modify_location_operation.doc
doc/salome/gui/GEOM/input/multi_rotation_operation.doc
doc/salome/gui/GEOM/input/multi_transformation_operation.doc
doc/salome/gui/GEOM/input/multi_translation_operation.doc
doc/salome/gui/GEOM/input/offset_operation.doc
doc/salome/gui/GEOM/input/partition.doc
doc/salome/gui/GEOM/input/propagate_operation.doc
doc/salome/gui/GEOM/input/remove_extra_edges_operation.doc
doc/salome/gui/GEOM/input/repairing_operations.doc
doc/salome/gui/GEOM/input/restore_presentation_parameters.doc [new file with mode: 0644]
doc/salome/gui/GEOM/input/rotation_operation.doc
doc/salome/gui/GEOM/input/scale_operation.doc
doc/salome/gui/GEOM/input/section_operation.doc
doc/salome/gui/GEOM/input/sewing_operation.doc
doc/salome/gui/GEOM/input/shapesonshape.doc [new file with mode: 0755]
doc/salome/gui/GEOM/input/suppress_faces_operation.doc
doc/salome/gui/GEOM/input/suppress_holes_operation.doc
doc/salome/gui/GEOM/input/suppress_internal_wires_operation.doc
doc/salome/gui/GEOM/input/transformation_operations.doc
doc/salome/gui/GEOM/input/transforming_geom_objs.doc
doc/salome/gui/GEOM/input/translation_operation.doc
doc/salome/gui/GEOM/input/transparency.doc
doc/salome/gui/GEOM/input/tui_3dsketcher.doc [new file with mode: 0755]
doc/salome/gui/GEOM/input/tui_basic_geom_objs.doc
doc/salome/gui/GEOM/input/tui_basic_operations.doc
doc/salome/gui/GEOM/input/tui_boolean_operations.doc
doc/salome/gui/GEOM/input/tui_complex_objs.doc
doc/salome/gui/GEOM/input/tui_measurement_tools.doc
doc/salome/gui/GEOM/input/tui_primitives.doc
doc/salome/gui/GEOM/input/tui_scripts.doc [deleted file]
doc/salome/gui/GEOM/input/tui_swig_examples.doc [new file with mode: 0644]
doc/salome/gui/GEOM/input/tui_test_all.doc [new file with mode: 0644]
doc/salome/gui/GEOM/input/tui_test_others.doc [new file with mode: 0644]
doc/salome/gui/GEOM/input/tui_test_spanner.doc [new file with mode: 0644]
doc/salome/gui/GEOM/input/tui_transformation_operations.doc
doc/salome/gui/GEOM/input/using_boolean_operations.doc
doc/salome/gui/GEOM/input/using_measurement_tools.doc
doc/salome/gui/GEOM/input/using_notebook_geom_page.doc [new file with mode: 0644]
doc/salome/gui/GEOM/input/viewing_geom_obj.doc
doc/salome/gui/GEOM/input/viewing_geom_obj_chapter.doc [deleted file]
doc/salome/gui/GEOM/input/working_with_groups.doc
doc/salome/gui/GEOM/pics/angle.png [deleted file]
doc/salome/gui/GEOM/pics/arc.png [deleted file]
doc/salome/gui/GEOM/pics/arc2.png [deleted file]
doc/salome/gui/GEOM/pics/archimede.png [deleted file]
doc/salome/gui/GEOM/pics/archimedesn1.png [deleted file]
doc/salome/gui/GEOM/pics/archimedesn2.png [deleted file]
doc/salome/gui/GEOM/pics/archimedesn3.png [deleted file]
doc/salome/gui/GEOM/pics/arcsn.png [deleted file]
doc/salome/gui/GEOM/pics/arcsn1.png [deleted file]
doc/salome/gui/GEOM/pics/arcsn2.png [deleted file]
doc/salome/gui/GEOM/pics/bezier.png [deleted file]
doc/salome/gui/GEOM/pics/block1.png [deleted file]
doc/salome/gui/GEOM/pics/block2.png [deleted file]
doc/salome/gui/GEOM/pics/block3.png [deleted file]
doc/salome/gui/GEOM/pics/block4.png [deleted file]
doc/salome/gui/GEOM/pics/block5.png [deleted file]
doc/salome/gui/GEOM/pics/block_explodesn.png [deleted file]
doc/salome/gui/GEOM/pics/bool1.png [deleted file]
doc/salome/gui/GEOM/pics/bool2.png [deleted file]
doc/salome/gui/GEOM/pics/bool3.png [deleted file]
doc/salome/gui/GEOM/pics/box1.png [deleted file]
doc/salome/gui/GEOM/pics/box2.png [deleted file]
doc/salome/gui/GEOM/pics/boxes.png [deleted file]
doc/salome/gui/GEOM/pics/chamfer1.png [deleted file]
doc/salome/gui/GEOM/pics/chamfer2.png [deleted file]
doc/salome/gui/GEOM/pics/chamfer3.png [deleted file]
doc/salome/gui/GEOM/pics/chamfer4.png [deleted file]
doc/salome/gui/GEOM/pics/chamfer_all.png [deleted file]
doc/salome/gui/GEOM/pics/chamfer_edge.png [deleted file]
doc/salome/gui/GEOM/pics/chamfer_faces.png [deleted file]
doc/salome/gui/GEOM/pics/changeorientation.png [deleted file]
doc/salome/gui/GEOM/pics/circle1.png [deleted file]
doc/salome/gui/GEOM/pics/circle2.png [deleted file]
doc/salome/gui/GEOM/pics/circle3.png [deleted file]
doc/salome/gui/GEOM/pics/circles.png [deleted file]
doc/salome/gui/GEOM/pics/colorsn.png [deleted file]
doc/salome/gui/GEOM/pics/commonsn.png [deleted file]
doc/salome/gui/GEOM/pics/compoundsn.png [deleted file]
doc/salome/gui/GEOM/pics/cone1.png [deleted file]
doc/salome/gui/GEOM/pics/cone2.png [deleted file]
doc/salome/gui/GEOM/pics/cones.png [deleted file]
doc/salome/gui/GEOM/pics/curve.png [deleted file]
doc/salome/gui/GEOM/pics/cutsn.png [deleted file]
doc/salome/gui/GEOM/pics/cylinder1.png [deleted file]
doc/salome/gui/GEOM/pics/cylinder2.png [deleted file]
doc/salome/gui/GEOM/pics/cylinders.png [deleted file]
doc/salome/gui/GEOM/pics/dialog.png [deleted file]
doc/salome/gui/GEOM/pics/disp_mode1sn.png [deleted file]
doc/salome/gui/GEOM/pics/disp_mode2sn.png [deleted file]
doc/salome/gui/GEOM/pics/distance.png [deleted file]
doc/salome/gui/GEOM/pics/edgesn.png [deleted file]
doc/salome/gui/GEOM/pics/editgroup.png [deleted file]
doc/salome/gui/GEOM/pics/ellipse.png [deleted file]
doc/salome/gui/GEOM/pics/ellipsesn.png [deleted file]
doc/salome/gui/GEOM/pics/extrusion1.png [deleted file]
doc/salome/gui/GEOM/pics/extrusion2.png [deleted file]
doc/salome/gui/GEOM/pics/facesn1.png [deleted file]
doc/salome/gui/GEOM/pics/facesn2.png [deleted file]
doc/salome/gui/GEOM/pics/facesn3.png [deleted file]
doc/salome/gui/GEOM/pics/fillet1.png [deleted file]
doc/salome/gui/GEOM/pics/fillet2.png [deleted file]
doc/salome/gui/GEOM/pics/fillet3.png [deleted file]
doc/salome/gui/GEOM/pics/fillet_all.png [deleted file]
doc/salome/gui/GEOM/pics/fillet_edge.png [deleted file]
doc/salome/gui/GEOM/pics/fillet_prism.png [deleted file]
doc/salome/gui/GEOM/pics/filling.png [deleted file]
doc/salome/gui/GEOM/pics/filling_compoundsn.png [deleted file]
doc/salome/gui/GEOM/pics/fillingsn.png [deleted file]
doc/salome/gui/GEOM/pics/free_boudaries1.png [deleted file]
doc/salome/gui/GEOM/pics/free_boudaries2.png [deleted file]
doc/salome/gui/GEOM/pics/free_faces1.png [deleted file]
doc/salome/gui/GEOM/pics/free_faces2.png [deleted file]
doc/salome/gui/GEOM/pics/fusesn1.png [deleted file]
doc/salome/gui/GEOM/pics/fusesn2.png [deleted file]
doc/salome/gui/GEOM/pics/geomcreategroup.png [deleted file]
doc/salome/gui/GEOM/pics/geomexport.png [deleted file]
doc/salome/gui/GEOM/pics/geomimport.png [deleted file]
doc/salome/gui/GEOM/pics/glue_faces1.png [deleted file]
doc/salome/gui/GEOM/pics/glue_faces2.png [deleted file]
doc/salome/gui/GEOM/pics/interpol.png [deleted file]
doc/salome/gui/GEOM/pics/isos_u12_v12sn.png [deleted file]
doc/salome/gui/GEOM/pics/line.png [deleted file]
doc/salome/gui/GEOM/pics/lines.png [deleted file]
doc/salome/gui/GEOM/pics/measures1.png [deleted file]
doc/salome/gui/GEOM/pics/measures10.png [deleted file]
doc/salome/gui/GEOM/pics/measures3.png [deleted file]
doc/salome/gui/GEOM/pics/measures4.png [deleted file]
doc/salome/gui/GEOM/pics/measures5.png [deleted file]
doc/salome/gui/GEOM/pics/measures8.png [deleted file]
doc/salome/gui/GEOM/pics/measures9.png [deleted file]
doc/salome/gui/GEOM/pics/mirror_axissn1.png [deleted file]
doc/salome/gui/GEOM/pics/mirror_axissn2.png [deleted file]
doc/salome/gui/GEOM/pics/mirror_planesn1.png [deleted file]
doc/salome/gui/GEOM/pics/mirror_planesn2.png [deleted file]
doc/salome/gui/GEOM/pics/mirror_pointsn1.png [deleted file]
doc/salome/gui/GEOM/pics/mirror_pointsn2.png [deleted file]
doc/salome/gui/GEOM/pics/mtrans1.png [deleted file]
doc/salome/gui/GEOM/pics/mtrans2.png [deleted file]
doc/salome/gui/GEOM/pics/mtransf1.png [deleted file]
doc/salome/gui/GEOM/pics/mtransf2.png [deleted file]
doc/salome/gui/GEOM/pics/mtransf3.png [deleted file]
doc/salome/gui/GEOM/pics/mtransf4.png [deleted file]
doc/salome/gui/GEOM/pics/multi_rotation1d1.png [deleted file]
doc/salome/gui/GEOM/pics/multi_rotation1d2.png [deleted file]
doc/salome/gui/GEOM/pics/multi_rotation2d1.png [deleted file]
doc/salome/gui/GEOM/pics/multi_rotation2d2.png [deleted file]
doc/salome/gui/GEOM/pics/multi_transformationsn1d.png [deleted file]
doc/salome/gui/GEOM/pics/multi_transformationsn2d.png [deleted file]
doc/salome/gui/GEOM/pics/multi_translation1dsn.png [deleted file]
doc/salome/gui/GEOM/pics/multi_translation2dsn.png [deleted file]
doc/salome/gui/GEOM/pics/multi_translation_initialsn.png [deleted file]
doc/salome/gui/GEOM/pics/neo-basicprop.png [deleted file]
doc/salome/gui/GEOM/pics/neo-detect2.png [deleted file]
doc/salome/gui/GEOM/pics/neo-isos.png [deleted file]
doc/salome/gui/GEOM/pics/neo-localcs1.png [deleted file]
doc/salome/gui/GEOM/pics/neo-localcs2.png [deleted file]
doc/salome/gui/GEOM/pics/neo-localcs3.png [deleted file]
doc/salome/gui/GEOM/pics/neo-materials.png [deleted file]
doc/salome/gui/GEOM/pics/neo-mrot1.png [deleted file]
doc/salome/gui/GEOM/pics/neo-mrot2.png [deleted file]
doc/salome/gui/GEOM/pics/neo-obj1.png [deleted file]
doc/salome/gui/GEOM/pics/neo-obj2.png [deleted file]
doc/salome/gui/GEOM/pics/neo-obj3.png [deleted file]
doc/salome/gui/GEOM/pics/neo-obj4.png [deleted file]
doc/salome/gui/GEOM/pics/neo-obj5.png [deleted file]
doc/salome/gui/GEOM/pics/neo-obj6.png [deleted file]
doc/salome/gui/GEOM/pics/neo-obj7.png [deleted file]
doc/salome/gui/GEOM/pics/neo-point2.png [deleted file]
doc/salome/gui/GEOM/pics/neo-scetcher1.png [deleted file]
doc/salome/gui/GEOM/pics/neo-scetcher2.png [deleted file]
doc/salome/gui/GEOM/pics/neo-section.png [deleted file]
doc/salome/gui/GEOM/pics/neo-transparency.png [deleted file]
doc/salome/gui/GEOM/pics/new-tolerance.png [deleted file]
doc/salome/gui/GEOM/pics/normaletoface.png [deleted file]
doc/salome/gui/GEOM/pics/offsetsn.png [deleted file]
doc/salome/gui/GEOM/pics/partition1.png [deleted file]
doc/salome/gui/GEOM/pics/partition2.png [deleted file]
doc/salome/gui/GEOM/pics/partitionsn1.png [deleted file]
doc/salome/gui/GEOM/pics/partitionsn2.png [deleted file]
doc/salome/gui/GEOM/pics/pipe.png [deleted file]
doc/salome/gui/GEOM/pics/pipe_wire_edgesn.png [deleted file]
doc/salome/gui/GEOM/pics/pipesn.png [deleted file]
doc/salome/gui/GEOM/pics/plane1.png [deleted file]
doc/salome/gui/GEOM/pics/plane2.png [deleted file]
doc/salome/gui/GEOM/pics/plane3.png [deleted file]
doc/salome/gui/GEOM/pics/plane_on_face.png [deleted file]
doc/salome/gui/GEOM/pics/planes1.png [deleted file]
doc/salome/gui/GEOM/pics/point1.png [deleted file]
doc/salome/gui/GEOM/pics/point3.png [deleted file]
doc/salome/gui/GEOM/pics/points.png [deleted file]
doc/salome/gui/GEOM/pics/polyline.png [deleted file]
doc/salome/gui/GEOM/pics/prisms_basessn.png [deleted file]
doc/salome/gui/GEOM/pics/prismssn.png [deleted file]
doc/salome/gui/GEOM/pics/repair1.png [deleted file]
doc/salome/gui/GEOM/pics/repair10.png [deleted file]
doc/salome/gui/GEOM/pics/repair2.png [deleted file]
doc/salome/gui/GEOM/pics/repair3.png [deleted file]
doc/salome/gui/GEOM/pics/repair4.png [deleted file]
doc/salome/gui/GEOM/pics/repair5.png [deleted file]
doc/salome/gui/GEOM/pics/repair6.png [deleted file]
doc/salome/gui/GEOM/pics/repair7.png [deleted file]
doc/salome/gui/GEOM/pics/repair8.png [deleted file]
doc/salome/gui/GEOM/pics/repair9.png [deleted file]
doc/salome/gui/GEOM/pics/revolution.png [deleted file]
doc/salome/gui/GEOM/pics/revolutionsn.png [deleted file]
doc/salome/gui/GEOM/pics/rotationsn1.png [deleted file]
doc/salome/gui/GEOM/pics/rotationsn2.png [deleted file]
doc/salome/gui/GEOM/pics/scale_transformsn1.png [deleted file]
doc/salome/gui/GEOM/pics/scale_transformsn2.png [deleted file]
doc/salome/gui/GEOM/pics/sectionsn.png [deleted file]
doc/salome/gui/GEOM/pics/shellsn.png [deleted file]
doc/salome/gui/GEOM/pics/solidsn.png [deleted file]
doc/salome/gui/GEOM/pics/sphere1.png [deleted file]
doc/salome/gui/GEOM/pics/sphere2.png [deleted file]
doc/salome/gui/GEOM/pics/spheres.png [deleted file]
doc/salome/gui/GEOM/pics/supp_int_wires1.png [deleted file]
doc/salome/gui/GEOM/pics/supp_int_wires2.png [deleted file]
doc/salome/gui/GEOM/pics/suppress_faces1.png [deleted file]
doc/salome/gui/GEOM/pics/suppress_faces2.png [deleted file]
doc/salome/gui/GEOM/pics/torus1.png [deleted file]
doc/salome/gui/GEOM/pics/torus2.png [deleted file]
doc/salome/gui/GEOM/pics/toruses.png [deleted file]
doc/salome/gui/GEOM/pics/transformation1.png [deleted file]
doc/salome/gui/GEOM/pics/transformation10.png [deleted file]
doc/salome/gui/GEOM/pics/transformation11.png [deleted file]
doc/salome/gui/GEOM/pics/transformation2.png [deleted file]
doc/salome/gui/GEOM/pics/transformation3.png [deleted file]
doc/salome/gui/GEOM/pics/transformation4.png [deleted file]
doc/salome/gui/GEOM/pics/transformation4a.png [deleted file]
doc/salome/gui/GEOM/pics/transformation5.png [deleted file]
doc/salome/gui/GEOM/pics/transformation6.png [deleted file]
doc/salome/gui/GEOM/pics/transformation7.png [deleted file]
doc/salome/gui/GEOM/pics/transformation8.png [deleted file]
doc/salome/gui/GEOM/pics/transformation9.png [deleted file]
doc/salome/gui/GEOM/pics/translationsn1.png [deleted file]
doc/salome/gui/GEOM/pics/translationsn2.png [deleted file]
doc/salome/gui/GEOM/pics/transparencysn.png [deleted file]
doc/salome/gui/GEOM/pics/vector1.png [deleted file]
doc/salome/gui/GEOM/pics/vector2.png [deleted file]
doc/salome/gui/GEOM/pics/vectors.png [deleted file]
doc/salome/gui/GEOM/pics/wiresn.png [deleted file]
doc/salome/gui/GEOM/pics/workplane4.png [deleted file]
doc/salome/gui/GEOM/pics/workplane5.png [deleted file]
doc/salome/gui/GEOM/pics/workplane6.png [deleted file]
doc/salome/gui/GEOM/static/footer.html
doc/salome/gui/GEOM/whdata/whftdata.js [deleted file]
doc/salome/gui/GEOM/whdata/whftdata0.htm [deleted file]
doc/salome/gui/GEOM/whdata/whfts.htm [deleted file]
doc/salome/gui/GEOM/whdata/whfts.js [deleted file]
doc/salome/gui/GEOM/whdata/whfwdata.js [deleted file]
doc/salome/gui/GEOM/whdata/whfwdata0.htm [deleted file]
doc/salome/gui/GEOM/whdata/whgdata.js [deleted file]
doc/salome/gui/GEOM/whdata/whgdata0.htm [deleted file]
doc/salome/gui/GEOM/whdata/whglo.htm [deleted file]
doc/salome/gui/GEOM/whdata/whglo.js [deleted file]
doc/salome/gui/GEOM/whdata/whidata.js [deleted file]
doc/salome/gui/GEOM/whdata/whidx.htm [deleted file]
doc/salome/gui/GEOM/whdata/whidx.js [deleted file]
doc/salome/gui/GEOM/whdata/whtdata.js [deleted file]
doc/salome/gui/GEOM/whdata/whtdata0.htm [deleted file]
doc/salome/gui/GEOM/whdata/whtoc.htm [deleted file]
doc/salome/gui/GEOM/whdata/whtoc.js [deleted file]
doc/salome/gui/GEOM/whgdata/whexpbar.gif [deleted file]
doc/salome/gui/GEOM/whgdata/whlstf0.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstf1.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstf10.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstf11.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstf12.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstf13.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstf2.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstf3.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstf4.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstf5.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstf6.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstf7.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstf8.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstf9.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl0.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl1.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl10.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl11.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl12.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl13.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl14.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl15.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl16.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl17.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl18.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl19.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl2.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl20.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl21.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl22.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl23.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl24.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl25.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl26.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl3.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl4.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl5.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl6.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl7.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl8.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstfl9.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstg0.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlsti0.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt0.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt1.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt10.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt11.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt12.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt13.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt14.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt15.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt16.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt2.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt3.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt4.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt5.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt6.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt7.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt8.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whlstt9.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvf30.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvf31.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvf32.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvf33.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvl31.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvl32.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvl33.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvp30.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvp31.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvp32.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvp33.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvt30.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvt31.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvt32.htm [deleted file]
doc/salome/gui/GEOM/whgdata/whnvt33.htm [deleted file]
doc/salome/gui/GEOM/whxdata/whftdata0.xml [deleted file]
doc/salome/gui/GEOM/whxdata/whfts.xml [deleted file]
doc/salome/gui/GEOM/whxdata/whfwdata0.xml [deleted file]
doc/salome/gui/GEOM/whxdata/whgdata0.xml [deleted file]
doc/salome/gui/GEOM/whxdata/whglo.xml [deleted file]
doc/salome/gui/GEOM/whxdata/whidx.xml [deleted file]
doc/salome/gui/GEOM/whxdata/whtdata0.xml [deleted file]
doc/salome/gui/GEOM/whxdata/whtoc.xml [deleted file]
doc/salome/gui/Makefile.am
doc/salome/tui/GEOM/HTML/GEOM_Gen.html [deleted file]
doc/salome/tui/GEOM/HTML/GEOM_Shape.html [deleted file]
doc/salome/tui/GEOM/doxyfile.in [deleted file]
doc/salome/tui/GEOM/doxyfile_py.in [deleted file]
doc/salome/tui/GEOM/sources/Application-About.png [deleted file]
doc/salome/tui/GEOM/sources/Application-About1.jpg [deleted file]
doc/salome/tui/GEOM/sources/application.gif [deleted file]
doc/salome/tui/GEOM/sources/application.jpg [deleted file]
doc/salome/tui/GEOM/sources/bg_salome.gif [deleted file]
doc/salome/tui/GEOM/sources/footer.html [deleted file]
doc/salome/tui/GEOM/sources/logocorp.gif [deleted file]
doc/salome/tui/GEOM/sources/myheader.html [deleted file]
doc/salome/tui/GEOM/sources/myheader_py2.html [deleted file]
doc/salome/tui/GEOM/sources/occ.gif [deleted file]
doc/salome/tui/GEOM/sources/static/doxygen.css [deleted file]
doc/salome/tui/GEOM/sources/static/page2.html [deleted file]
doc/salome/tui/GEOM/sources/static/tree.js.in [deleted file]
doc/salome/tui/GEOM/sources/static/treeview.js [deleted file]
doc/salome/tui/Makefile.am
doc/salome/tui/doxyfile.in [new file with mode: 0755]
doc/salome/tui/images/occ.gif [new file with mode: 0755]
doc/salome/tui/static/doxygen.css [new file with mode: 0755]
doc/salome/tui/static/footer.html [new file with mode: 0755]
doc/salome/tui/static/myheader.html [new file with mode: 0755]
idl/GEOM_Gen.idl
idl/GEOM_Superv.idl
idl/Makefile.am
resources/3dsketch.png [new file with mode: 0755]
resources/GEOMCatalog.xml.in
resources/GEOM_en.xml
resources/GEOM_fr.xml
resources/Makefile.am
resources/ModuleGeom.png
resources/SalomeApp.xml
resources/angle.png
resources/arc.png
resources/arccenter.png
resources/archimede.png
resources/arcofellipse.png [new file with mode: 0755]
resources/axisinertia.png
resources/basicproperties.png
resources/bezier.png
resources/block_2f.png
resources/block_6f.png
resources/block_face_2e.png
resources/block_face_4e.png
resources/block_face_4v.png
resources/block_multitrsf_double.png
resources/block_multitrsf_simple.png
resources/bounding.png
resources/box.png
resources/box2points.png
resources/boxdxyz.png
resources/build_compound.png
resources/build_edge.png
resources/build_face.png
resources/build_shell.png
resources/build_solid.png
resources/build_wire.png
resources/centergravity.png
resources/chamfer.png
resources/chamferall.png
resources/chamferedge.png
resources/chamferedgefromface.png
resources/chamferface.png
resources/change_orientation.png
resources/check.png
resources/check_blocks_compound.png
resources/circle.png
resources/circle3points.png
resources/circlecenter2pnts.png
resources/circlepointvector.png
resources/closecontour.png
resources/common.png
resources/cone.png
resources/conedxyz.png
resources/conepointvector.png
resources/coordsys.png
resources/cut.png
resources/cylinder.png
resources/cylinderdxyz.png
resources/cylinderpointvector.png
resources/delete.png
resources/disk.png [new file with mode: 0644]
resources/disk3points.png [new file with mode: 0644]
resources/disk_pntvecr.png [new file with mode: 0644]
resources/disk_r.png [new file with mode: 0644]
resources/display.png
resources/displayall.png
resources/displayonly.png
resources/ellipse.png
resources/ellipsepointvector.png
resources/erase.png
resources/eraseall.png
resources/face_hw.png [new file with mode: 0644]
resources/face_vechw.png [new file with mode: 0644]
resources/fillet.png
resources/fillet2d.png [new file with mode: 0755]
resources/filletall.png
resources/filletedge.png
resources/filletface.png
resources/filling.png
resources/free_bound.png
resources/free_faces.png
resources/fuse.png
resources/geometry.png
resources/glue.png
resources/glue2.png
resources/group_edit.png
resources/group_new.png
resources/interpol.png
resources/line.png
resources/line2points.png
resources/lineedge.png [deleted file]
resources/linepointvector.png [deleted file]
resources/marker.png
resources/marker2.png
resources/marker3.png
resources/mindist.png
resources/mirrorAxe.png
resources/mirrorPlane.png
resources/mirrorPoint.png
resources/multirotation.png
resources/multirotationdouble.png
resources/multirotationsimple.png
resources/multitranslation.png
resources/multitranslationdouble.png
resources/multitranslationsimple.png
resources/normale.png
resources/offset.png
resources/orientation.png [deleted file]
resources/partition.png
resources/partitionkeep.png
resources/partitionplane.png
resources/pipe.png
resources/pipebinormal.png [new file with mode: 0644]
resources/plane.png
resources/plane3points.png
resources/planeWorking.png
resources/planedxyz.png [deleted file]
resources/planeface.png
resources/planepointvector.png
resources/planeworkingface.png
resources/planeworkingorigin.png
resources/planeworkingvector.png
resources/point2.png
resources/point3.png
resources/point_coord.png
resources/point_line_intersection.png
resources/pointonedge.png
resources/pointonface.png [new file with mode: 0755]
resources/polyline.png
resources/position.png
resources/position2.png
resources/position3.png [new file with mode: 0644]
resources/prism.png
resources/prism2.png
resources/prism3.png [new file with mode: 0644]
resources/propagate.png
resources/redo.png
resources/remove_extra_edges.png
resources/revol.png
resources/rotate.png
resources/rotatepnt.png
resources/scale.png
resources/scale_along_axes.png [new file with mode: 0644]
resources/section.png
resources/select1.png
resources/sewing.png
resources/shading.png
resources/shapeprocess.png
resources/shapesonshape.png [new file with mode: 0755]
resources/sketch.png
resources/sphere.png
resources/spheredxyz.png
resources/spherepoint.png
resources/spline.png
resources/subblock.png
resources/subshape.png
resources/suppressintwires.png
resources/supressHolesOnFaceShell.png
resources/supressface.png
resources/supresshole.png
resources/tolerance.png
resources/torus.png
resources/torusdxyz.png
resources/toruspointvector.png
resources/translation.png
resources/translationDxyz.png
resources/translationPoints.png
resources/translationVector.png
resources/tree_block.png
resources/tree_compound.png
resources/tree_compsolid.png
resources/tree_edge.png
resources/tree_face.png
resources/tree_group_edge.png
resources/tree_group_face.png
resources/tree_group_solid.png
resources/tree_group_vertex.png
resources/tree_lcs.png
resources/tree_shape.png
resources/tree_shell.png
resources/tree_solid.png
resources/tree_vertex.png
resources/tree_wire.png
resources/undo.png
resources/vector.png
resources/vector2points.png
resources/vectordxyz.png
resources/whatis.png
src/ARCHIMEDE/ARCHIMEDE.pro [new file with mode: 0644]
src/ARCHIMEDE/Archimede_VolumeSection.cxx
src/ARCHIMEDE/Archimede_VolumeSection.hxx
src/ARCHIMEDE/Makefile.am
src/BREPExport/BREPExport.cxx
src/BREPExport/BREPExport.pro [new file with mode: 0644]
src/BREPExport/Makefile.am
src/BREPImport/BREPImport.cxx
src/BREPImport/BREPImport.pro [new file with mode: 0644]
src/BREPImport/Makefile.am
src/BasicGUI/BasicGUI.cxx
src/BasicGUI/BasicGUI.h
src/BasicGUI/BasicGUI.pro [new file with mode: 0644]
src/BasicGUI/BasicGUI_ArcDlg.cxx
src/BasicGUI/BasicGUI_ArcDlg.h
src/BasicGUI/BasicGUI_CircleDlg.cxx
src/BasicGUI/BasicGUI_CircleDlg.h
src/BasicGUI/BasicGUI_CurveDlg.cxx
src/BasicGUI/BasicGUI_CurveDlg.h
src/BasicGUI/BasicGUI_EllipseDlg.cxx
src/BasicGUI/BasicGUI_EllipseDlg.h
src/BasicGUI/BasicGUI_LineDlg.cxx
src/BasicGUI/BasicGUI_LineDlg.h
src/BasicGUI/BasicGUI_MarkerDlg.cxx
src/BasicGUI/BasicGUI_MarkerDlg.h
src/BasicGUI/BasicGUI_PlaneDlg.cxx
src/BasicGUI/BasicGUI_PlaneDlg.h
src/BasicGUI/BasicGUI_PointDlg.cxx
src/BasicGUI/BasicGUI_PointDlg.h
src/BasicGUI/BasicGUI_VectorDlg.cxx
src/BasicGUI/BasicGUI_VectorDlg.h
src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
src/BasicGUI/GEOM_BasicGUI.hxx [deleted file]
src/BasicGUI/Makefile.am
src/BlocksGUI/BlocksGUI.cxx
src/BlocksGUI/BlocksGUI.h
src/BlocksGUI/BlocksGUI_BlockDlg.cxx
src/BlocksGUI/BlocksGUI_BlockDlg.h
src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
src/BlocksGUI/BlocksGUI_ExplodeDlg.h
src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
src/BlocksGUI/BlocksGUI_PropagateDlg.h
src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
src/BlocksGUI/BlocksGUI_TrsfDlg.h
src/BlocksGUI/GEOM_BlocksGUI.hxx [deleted file]
src/BlocksGUI/Makefile.am
src/BooleanGUI/BooleanGUI.cxx
src/BooleanGUI/BooleanGUI.h
src/BooleanGUI/BooleanGUI.pro [new file with mode: 0644]
src/BooleanGUI/BooleanGUI_Dialog.cxx
src/BooleanGUI/BooleanGUI_Dialog.h
src/BooleanGUI/Makefile.am
src/BuildGUI/BuildGUI.cxx
src/BuildGUI/BuildGUI.h
src/BuildGUI/BuildGUI.pro [new file with mode: 0644]
src/BuildGUI/BuildGUI_CompoundDlg.cxx
src/BuildGUI/BuildGUI_CompoundDlg.h
src/BuildGUI/BuildGUI_EdgeDlg.cxx
src/BuildGUI/BuildGUI_EdgeDlg.h
src/BuildGUI/BuildGUI_FaceDlg.cxx
src/BuildGUI/BuildGUI_FaceDlg.h
src/BuildGUI/BuildGUI_ShellDlg.cxx
src/BuildGUI/BuildGUI_ShellDlg.h
src/BuildGUI/BuildGUI_SolidDlg.cxx
src/BuildGUI/BuildGUI_SolidDlg.h
src/BuildGUI/BuildGUI_WireDlg.cxx
src/BuildGUI/BuildGUI_WireDlg.h
src/BuildGUI/GEOM_BuildGUI.hxx [deleted file]
src/BuildGUI/Makefile.am
src/DisplayGUI/DisplayGUI.cxx
src/DisplayGUI/DisplayGUI.h
src/DisplayGUI/DisplayGUI.pro [new file with mode: 0644]
src/DisplayGUI/Makefile.am
src/DlgRef/DlgRef.cxx [new file with mode: 0644]
src/DlgRef/DlgRef.h [new file with mode: 0644]
src/DlgRef/DlgRef.pro [new file with mode: 0644]
src/DlgRef/DlgRef_1List1Spin1Btn_QTD.cxx [deleted file]
src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h [deleted file]
src/DlgRef/DlgRef_1List1Spin1Btn_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel1Check1List_QTD.cxx [deleted file]
src/DlgRef/DlgRef_1Sel1Check1List_QTD.h [deleted file]
src/DlgRef/DlgRef_1Sel1Check1List_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel1Check1Sel_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel1Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_1Sel1Check_QTD.h [deleted file]
src/DlgRef/DlgRef_1Sel1Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel1Spin.cxx [deleted file]
src/DlgRef/DlgRef_1Sel1Spin.h [deleted file]
src/DlgRef/DlgRef_1Sel1Spin1Check.cxx [deleted file]
src/DlgRef/DlgRef_1Sel1Spin1Check.h [deleted file]
src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.h [deleted file]
src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel1Spin_QTD.cxx [deleted file]
src/DlgRef/DlgRef_1Sel1Spin_QTD.h [deleted file]
src/DlgRef/DlgRef_1Sel1Spin_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel2Spin.cxx [deleted file]
src/DlgRef/DlgRef_1Sel2Spin.h [deleted file]
src/DlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel2Spin_QTD.cxx [deleted file]
src/DlgRef/DlgRef_1Sel2Spin_QTD.h [deleted file]
src/DlgRef/DlgRef_1Sel2Spin_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel3Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_1Sel3Check_QTD.h [deleted file]
src/DlgRef/DlgRef_1Sel3Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel3Spin.cxx [deleted file]
src/DlgRef/DlgRef_1Sel3Spin.h [deleted file]
src/DlgRef/DlgRef_1Sel3Spin1Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel3Spin_QTD.cxx [deleted file]
src/DlgRef/DlgRef_1Sel3Spin_QTD.h [deleted file]
src/DlgRef/DlgRef_1Sel3Spin_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel4Spin.cxx [deleted file]
src/DlgRef/DlgRef_1Sel4Spin.h [deleted file]
src/DlgRef/DlgRef_1Sel4Spin_QTD.cxx [deleted file]
src/DlgRef/DlgRef_1Sel4Spin_QTD.h [deleted file]
src/DlgRef/DlgRef_1Sel4Spin_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel5Spin.cxx [deleted file]
src/DlgRef/DlgRef_1Sel5Spin.h [deleted file]
src/DlgRef/DlgRef_1Sel5Spin1Check.cxx [deleted file]
src/DlgRef/DlgRef_1Sel5Spin1Check.h [deleted file]
src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.h [deleted file]
src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel5Spin_QTD.cxx [deleted file]
src/DlgRef/DlgRef_1Sel5Spin_QTD.h [deleted file]
src/DlgRef/DlgRef_1Sel5Spin_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1SelExt_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Sel_Ext.h [deleted file]
src/DlgRef/DlgRef_1Sel_QTD.cxx [deleted file]
src/DlgRef/DlgRef_1Sel_QTD.h [deleted file]
src/DlgRef/DlgRef_1Sel_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_1Spin.cxx [deleted file]
src/DlgRef/DlgRef_1Spin.h [deleted file]
src/DlgRef/DlgRef_1Spin_QTD.cxx [deleted file]
src/DlgRef/DlgRef_1Spin_QTD.h [deleted file]
src/DlgRef/DlgRef_1Spin_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_2Sel1List1Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_2Sel1List1Check_QTD.h [deleted file]
src/DlgRef/DlgRef_2Sel1List1Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_2Sel1List_QTD.cxx [deleted file]
src/DlgRef/DlgRef_2Sel1List_QTD.h [deleted file]
src/DlgRef/DlgRef_2Sel1List_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_2Sel1Spin.cxx [deleted file]
src/DlgRef/DlgRef_2Sel1Spin.h [deleted file]
src/DlgRef/DlgRef_2Sel1Spin2Check.cxx [deleted file]
src/DlgRef/DlgRef_2Sel1Spin2Check.h [deleted file]
src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.h [deleted file]
src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_2Sel1Spin_QTD.cxx [deleted file]
src/DlgRef/DlgRef_2Sel1Spin_QTD.h [deleted file]
src/DlgRef/DlgRef_2Sel1Spin_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_2Sel2List_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_2Sel2Spin.cxx [deleted file]
src/DlgRef/DlgRef_2Sel2Spin.h [deleted file]
src/DlgRef/DlgRef_2Sel2Spin1Check.cxx [deleted file]
src/DlgRef/DlgRef_2Sel2Spin1Check.h [deleted file]
src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.h [deleted file]
src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_2Sel2Spin_QTD.cxx [deleted file]
src/DlgRef/DlgRef_2Sel2Spin_QTD.h [deleted file]
src/DlgRef/DlgRef_2Sel2Spin_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_2Sel3Spin.cxx [deleted file]
src/DlgRef/DlgRef_2Sel3Spin.h [deleted file]
src/DlgRef/DlgRef_2Sel3Spin2Rb.cxx [deleted file]
src/DlgRef/DlgRef_2Sel3Spin2Rb.h [deleted file]
src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.cxx [deleted file]
src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.h [deleted file]
src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_2Sel3Spin_QTD.cxx [deleted file]
src/DlgRef/DlgRef_2Sel3Spin_QTD.h [deleted file]
src/DlgRef/DlgRef_2Sel3Spin_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_2Sel4Spin1Check.cxx [deleted file]
src/DlgRef/DlgRef_2Sel4Spin1Check.h [deleted file]
src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.h [deleted file]
src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_2SelExt_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_2Sel_QTD.cxx [deleted file]
src/DlgRef/DlgRef_2Sel_QTD.h [deleted file]
src/DlgRef/DlgRef_2Sel_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_2Spin.cxx [deleted file]
src/DlgRef/DlgRef_2Spin.h [deleted file]
src/DlgRef/DlgRef_2Spin_QTD.cxx [deleted file]
src/DlgRef/DlgRef_2Spin_QTD.h [deleted file]
src/DlgRef/DlgRef_2Spin_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_3Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_3Check_QTD.h [deleted file]
src/DlgRef/DlgRef_3Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_3Radio_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_3Sel1Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_3Sel1Check_QTD.h [deleted file]
src/DlgRef/DlgRef_3Sel1Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_3Sel1Spin.cxx [deleted file]
src/DlgRef/DlgRef_3Sel1Spin.h [deleted file]
src/DlgRef/DlgRef_3Sel1Spin_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_3Sel3Spin1Check.cxx [deleted file]
src/DlgRef/DlgRef_3Sel3Spin1Check.h [deleted file]
src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.h [deleted file]
src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_3Sel4Spin2Check.cxx [deleted file]
src/DlgRef/DlgRef_3Sel4Spin2Check.h [deleted file]
src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.h [deleted file]
src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_3Sel_QTD.cxx [deleted file]
src/DlgRef/DlgRef_3Sel_QTD.h [deleted file]
src/DlgRef/DlgRef_3Sel_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_3Spin.cxx [deleted file]
src/DlgRef/DlgRef_3Spin.h [deleted file]
src/DlgRef/DlgRef_3Spin1Check.cxx [deleted file]
src/DlgRef/DlgRef_3Spin1Check.h [deleted file]
src/DlgRef/DlgRef_3Spin1Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_3Spin1Check_QTD.h [deleted file]
src/DlgRef/DlgRef_3Spin1Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_3Spin_QTD.cxx [deleted file]
src/DlgRef/DlgRef_3Spin_QTD.h [deleted file]
src/DlgRef/DlgRef_3Spin_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_4Sel1List1Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_4Sel1List1Check_QTD.h [deleted file]
src/DlgRef/DlgRef_4Sel1List1Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_4Sel1List_QTD.cxx [deleted file]
src/DlgRef/DlgRef_4Sel1List_QTD.h [deleted file]
src/DlgRef/DlgRef_4Sel1List_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_4Sel1Spin2Check.cxx [deleted file]
src/DlgRef/DlgRef_4Sel1Spin2Check.h [deleted file]
src/DlgRef/DlgRef_4Sel1Spin2Check_QTD.cxx [deleted file]
src/DlgRef/DlgRef_4Sel1Spin2Check_QTD.h [deleted file]
src/DlgRef/DlgRef_4Sel1Spin2Check_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_4Sel1Spin3Check_QTD.ui [new file with mode: 0755]
src/DlgRef/DlgRef_6Sel_QTD.cxx [deleted file]
src/DlgRef/DlgRef_6Sel_QTD.h [deleted file]
src/DlgRef/DlgRef_6Sel_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_Skeleton_QTD.cxx [deleted file]
src/DlgRef/DlgRef_Skeleton_QTD.h [deleted file]
src/DlgRef/DlgRef_Skeleton_QTD.ui [new file with mode: 0644]
src/DlgRef/DlgRef_SpinBox.cxx [deleted file]
src/DlgRef/DlgRef_SpinBox.h [deleted file]
src/DlgRef/GEOM_DlgRef.hxx [deleted file]
src/DlgRef/Makefile.am
src/DlgRef/UIFiles/DlgRef_1List1Spin1Btn_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_1Sel1Check1List_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_1Sel1Check_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_1Sel1Spin1Check_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_1Sel1Spin_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_1Sel2Spin_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_1Sel3Check_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_1Sel3Spin_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_1Sel4Spin_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_1Sel5Spin1Check_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_1Sel5Spin_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_1Sel_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_1Spin_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_2Sel1Spin2Check_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_2Sel1Spin_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_2Sel2Spin1Check_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_2Sel2Spin_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_2Sel3Spin2Rb_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_2Sel3Spin_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_2Sel4Spin1Check_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_2Sel_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_2Spin_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_3Check_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_3Sel1Check_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_3Sel3Spin1Check_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_3Sel4Spin2Check_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_3Sel_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_3Spin1Check_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_3Spin_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_4Sel1List_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_4Sel1Spin2Check_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_6Sel_QTD.ui [deleted file]
src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui [deleted file]
src/DlgRef/UIFiles/ui_to_cxx [deleted file]
src/EntityGUI/EntityGUI.cxx
src/EntityGUI/EntityGUI.h
src/EntityGUI/EntityGUI.pro [new file with mode: 0644]
src/EntityGUI/EntityGUI_1Sel_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_1Sel_QTD.h [deleted file]
src/EntityGUI/EntityGUI_1Sel_QTD.ui [new file with mode: 0644]
src/EntityGUI/EntityGUI_1Spin.cxx [deleted file]
src/EntityGUI/EntityGUI_1Spin.h [deleted file]
src/EntityGUI/EntityGUI_1Spin_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_1Spin_QTD.h [deleted file]
src/EntityGUI/EntityGUI_1Spin_QTD.ui [new file with mode: 0644]
src/EntityGUI/EntityGUI_2Spin.cxx [deleted file]
src/EntityGUI/EntityGUI_2Spin.h [deleted file]
src/EntityGUI/EntityGUI_2Spin_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_2Spin_QTD.h [deleted file]
src/EntityGUI/EntityGUI_2Spin_QTD.ui [new file with mode: 0644]
src/EntityGUI/EntityGUI_3DSketcherDlg.cxx [new file with mode: 0755]
src/EntityGUI/EntityGUI_3DSketcherDlg.h [new file with mode: 0755]
src/EntityGUI/EntityGUI_3Spin.cxx [deleted file]
src/EntityGUI/EntityGUI_3Spin.h [deleted file]
src/EntityGUI/EntityGUI_3Spin_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_3Spin_QTD.h [deleted file]
src/EntityGUI/EntityGUI_3Spin_QTD.ui [new file with mode: 0644]
src/EntityGUI/EntityGUI_4Spin.cxx [deleted file]
src/EntityGUI/EntityGUI_4Spin.h [deleted file]
src/EntityGUI/EntityGUI_4Spin_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_4Spin_QTD.h [deleted file]
src/EntityGUI/EntityGUI_4Spin_QTD.ui [new file with mode: 0644]
src/EntityGUI/EntityGUI_Dir1_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_Dir1_QTD.h [deleted file]
src/EntityGUI/EntityGUI_Dir1_QTD.ui [new file with mode: 0644]
src/EntityGUI/EntityGUI_Dir2_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_Dir2_QTD.h [deleted file]
src/EntityGUI/EntityGUI_Dir2_QTD.ui [new file with mode: 0644]
src/EntityGUI/EntityGUI_Point_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_Point_QTD.h [deleted file]
src/EntityGUI/EntityGUI_Point_QTD.ui [new file with mode: 0644]
src/EntityGUI/EntityGUI_Skeleton_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_Skeleton_QTD.h [deleted file]
src/EntityGUI/EntityGUI_Skeleton_QTD.ui [new file with mode: 0644]
src/EntityGUI/EntityGUI_SketcherDlg.cxx
src/EntityGUI/EntityGUI_SketcherDlg.h
src/EntityGUI/EntityGUI_SubShapeDlg.cxx
src/EntityGUI/EntityGUI_SubShapeDlg.h
src/EntityGUI/EntityGUI_Widgets.cxx [new file with mode: 0644]
src/EntityGUI/EntityGUI_Widgets.h [new file with mode: 0644]
src/EntityGUI/GEOM_EntityGUI.hxx [deleted file]
src/EntityGUI/Makefile.am
src/EntityGUI/UIFiles/EntityGUI_1Sel_QTD.ui [deleted file]
src/EntityGUI/UIFiles/EntityGUI_1Spin_QTD.ui [deleted file]
src/EntityGUI/UIFiles/EntityGUI_2Spin_QTD.ui [deleted file]
src/EntityGUI/UIFiles/EntityGUI_3Spin_QTD.ui [deleted file]
src/EntityGUI/UIFiles/EntityGUI_4Spin_QTD.ui [deleted file]
src/EntityGUI/UIFiles/EntityGUI_Dir1_QTD.ui [deleted file]
src/EntityGUI/UIFiles/EntityGUI_Dir2_QTD.ui [deleted file]
src/EntityGUI/UIFiles/EntityGUI_Point_QTD.ui [deleted file]
src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui [deleted file]
src/EntityGUI/UIFiles/ui_to_cxx [deleted file]
src/GEOM/GEOM.pro [new file with mode: 0644]
src/GEOM/GEOM_Application.cxx
src/GEOM/GEOM_Application.hxx
src/GEOM/GEOM_Application.ixx
src/GEOM/GEOM_Application.jxx
src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx
src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx
src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx
src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx
src/GEOM/GEOM_DataMapOfAsciiStringTransient_0.cxx
src/GEOM/GEOM_Engine.cxx
src/GEOM/GEOM_Engine.hxx
src/GEOM/GEOM_Function.cxx
src/GEOM/GEOM_Function.hxx
src/GEOM/GEOM_Gen_i.cc [deleted file]
src/GEOM/GEOM_IOperations.cxx
src/GEOM/GEOM_IOperations.hxx
src/GEOM/GEOM_ISubShape.hxx
src/GEOM/GEOM_Object.cxx
src/GEOM/GEOM_Object.hxx
src/GEOM/GEOM_PythonDump.cxx
src/GEOM/GEOM_PythonDump.hxx
src/GEOM/GEOM_Solver.cxx
src/GEOM/GEOM_Solver.hxx
src/GEOM/GEOM_SubShapeDriver.cxx
src/GEOM/GEOM_SubShapeDriver.hxx
src/GEOM/Handle_GEOM_Application.hxx
src/GEOM/Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
src/GEOM/Makefile.am
src/GEOM/geom.cxx [deleted file]
src/GEOMAlgo/BlockFix.cdl
src/GEOMAlgo/BlockFix.cxx
src/GEOMAlgo/BlockFix.hxx
src/GEOMAlgo/BlockFix.ixx
src/GEOMAlgo/BlockFix.jxx
src/GEOMAlgo/BlockFix_BlockFixAPI.cdl
src/GEOMAlgo/BlockFix_BlockFixAPI.cxx
src/GEOMAlgo/BlockFix_BlockFixAPI.hxx
src/GEOMAlgo/BlockFix_BlockFixAPI.ixx
src/GEOMAlgo/BlockFix_BlockFixAPI.jxx
src/GEOMAlgo/BlockFix_BlockFixAPI.lxx
src/GEOMAlgo/BlockFix_CheckTool.cdl
src/GEOMAlgo/BlockFix_CheckTool.cxx
src/GEOMAlgo/BlockFix_CheckTool.hxx
src/GEOMAlgo/BlockFix_CheckTool.ixx
src/GEOMAlgo/BlockFix_CheckTool.jxx
src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cdl
src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cxx
src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.hxx
src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.ixx
src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.jxx
src/GEOMAlgo/BlockFix_SphereSpaceModifier.cdl
src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx
src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx
src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx
src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx
src/GEOMAlgo/BlockFix_UnionEdges.cdl
src/GEOMAlgo/BlockFix_UnionEdges.cxx
src/GEOMAlgo/BlockFix_UnionEdges.hxx
src/GEOMAlgo/BlockFix_UnionEdges.ixx
src/GEOMAlgo/BlockFix_UnionEdges.jxx
src/GEOMAlgo/BlockFix_UnionFaces.cdl
src/GEOMAlgo/BlockFix_UnionFaces.cxx
src/GEOMAlgo/BlockFix_UnionFaces.hxx
src/GEOMAlgo/BlockFix_UnionFaces.ixx
src/GEOMAlgo/BlockFix_UnionFaces.jxx
src/GEOMAlgo/GEOMAlgo.cdl
src/GEOMAlgo/GEOMAlgo.pro [new file with mode: 0644]
src/GEOMAlgo/GEOMAlgo_Algo.cdl
src/GEOMAlgo/GEOMAlgo_Algo.cxx
src/GEOMAlgo/GEOMAlgo_Algo.hxx
src/GEOMAlgo/GEOMAlgo_Algo.ixx
src/GEOMAlgo/GEOMAlgo_Algo.jxx
src/GEOMAlgo/GEOMAlgo_Builder.cdl
src/GEOMAlgo/GEOMAlgo_Builder.cxx
src/GEOMAlgo/GEOMAlgo_Builder.hxx
src/GEOMAlgo/GEOMAlgo_Builder.ixx
src/GEOMAlgo/GEOMAlgo_Builder.jxx
src/GEOMAlgo/GEOMAlgo_BuilderArea.cdl
src/GEOMAlgo/GEOMAlgo_BuilderArea.cxx
src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx
src/GEOMAlgo/GEOMAlgo_BuilderArea.ixx
src/GEOMAlgo/GEOMAlgo_BuilderArea.jxx
src/GEOMAlgo/GEOMAlgo_BuilderFace.cdl
src/GEOMAlgo/GEOMAlgo_BuilderFace.cxx
src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx
src/GEOMAlgo/GEOMAlgo_BuilderFace.ixx
src/GEOMAlgo/GEOMAlgo_BuilderFace.jxx
src/GEOMAlgo/GEOMAlgo_BuilderShape.cdl
src/GEOMAlgo/GEOMAlgo_BuilderShape.cxx
src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx
src/GEOMAlgo/GEOMAlgo_BuilderShape.ixx
src/GEOMAlgo/GEOMAlgo_BuilderShape.jxx
src/GEOMAlgo/GEOMAlgo_BuilderSolid.cdl
src/GEOMAlgo/GEOMAlgo_BuilderSolid.cxx
src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx
src/GEOMAlgo/GEOMAlgo_BuilderSolid.ixx
src/GEOMAlgo/GEOMAlgo_BuilderSolid.jxx
src/GEOMAlgo/GEOMAlgo_BuilderTools.cdl
src/GEOMAlgo/GEOMAlgo_BuilderTools.cxx
src/GEOMAlgo/GEOMAlgo_BuilderTools.hxx
src/GEOMAlgo/GEOMAlgo_BuilderTools.ixx
src/GEOMAlgo/GEOMAlgo_BuilderTools.jxx
src/GEOMAlgo/GEOMAlgo_Builder_0.cxx
src/GEOMAlgo/GEOMAlgo_Builder_1.cxx
src/GEOMAlgo/GEOMAlgo_Builder_2.cxx
src/GEOMAlgo/GEOMAlgo_Builder_3.cxx
src/GEOMAlgo/GEOMAlgo_Builder_4.cxx
src/GEOMAlgo/GEOMAlgo_Clsf.cdl
src/GEOMAlgo/GEOMAlgo_Clsf.cxx
src/GEOMAlgo/GEOMAlgo_Clsf.hxx
src/GEOMAlgo/GEOMAlgo_Clsf.ixx
src/GEOMAlgo/GEOMAlgo_Clsf.jxx
src/GEOMAlgo/GEOMAlgo_ClsfBox.cdl
src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx
src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx
src/GEOMAlgo/GEOMAlgo_ClsfBox.ixx
src/GEOMAlgo/GEOMAlgo_ClsfBox.jxx
src/GEOMAlgo/GEOMAlgo_ClsfSolid.cdl
src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx
src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx
src/GEOMAlgo/GEOMAlgo_ClsfSolid.ixx
src/GEOMAlgo/GEOMAlgo_ClsfSolid.jxx
src/GEOMAlgo/GEOMAlgo_ClsfSurf.cdl
src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx
src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx
src/GEOMAlgo/GEOMAlgo_ClsfSurf.ixx
src/GEOMAlgo/GEOMAlgo_ClsfSurf.jxx
src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cdl
src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx
src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx
src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx
src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_0.cxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_0.cxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_0.cxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_0.cxx
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx
src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx
src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx
src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger_0.cxx
src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape_0.cxx
src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx
src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape_0.cxx
src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx
src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal_0.cxx
src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx
src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet_0.cxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cdl
src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cdl
src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cdl
src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.ixx
src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.jxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx
src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx
src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cdl
src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx
src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx
src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx
src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx
src/GEOMAlgo/GEOMAlgo_Gluer.cdl
src/GEOMAlgo/GEOMAlgo_Gluer.cxx
src/GEOMAlgo/GEOMAlgo_Gluer.hxx
src/GEOMAlgo/GEOMAlgo_Gluer.ixx
src/GEOMAlgo/GEOMAlgo_Gluer.jxx
src/GEOMAlgo/GEOMAlgo_Gluer1.cdl
src/GEOMAlgo/GEOMAlgo_Gluer1.cxx
src/GEOMAlgo/GEOMAlgo_Gluer1.hxx
src/GEOMAlgo/GEOMAlgo_Gluer1.ixx
src/GEOMAlgo/GEOMAlgo_Gluer1.jxx
src/GEOMAlgo/GEOMAlgo_HAlgo.cdl
src/GEOMAlgo/GEOMAlgo_HAlgo.cxx
src/GEOMAlgo/GEOMAlgo_HAlgo.hxx
src/GEOMAlgo/GEOMAlgo_HAlgo.ixx
src/GEOMAlgo/GEOMAlgo_HAlgo.jxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_0.cxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo_0.cxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState_0.cxx
src/GEOMAlgo/GEOMAlgo_KindOfBounds.hxx
src/GEOMAlgo/GEOMAlgo_KindOfClosed.hxx
src/GEOMAlgo/GEOMAlgo_KindOfName.hxx
src/GEOMAlgo/GEOMAlgo_KindOfShape.hxx
src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx
src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx
src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx
src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt_0.cxx
src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx
src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx
src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx
src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt_0.cxx
src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx
src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes_0.cxx
src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx
src/GEOMAlgo/GEOMAlgo_ListOfPnt_0.cxx
src/GEOMAlgo/GEOMAlgo_PWireEdgeSet.hxx
src/GEOMAlgo/GEOMAlgo_PassKey.cdl
src/GEOMAlgo/GEOMAlgo_PassKey.cxx
src/GEOMAlgo/GEOMAlgo_PassKey.hxx
src/GEOMAlgo/GEOMAlgo_PassKey.ixx
src/GEOMAlgo/GEOMAlgo_PassKey.jxx
src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cdl
src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx
src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx
src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx
src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx
src/GEOMAlgo/GEOMAlgo_PassKeyShape.cdl
src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx
src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx
src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx
src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx
src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.cdl
src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.cxx
src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.hxx
src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.ixx
src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.jxx
src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cdl
src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx
src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx
src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx
src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx
src/GEOMAlgo/GEOMAlgo_ShapeInfo.cdl
src/GEOMAlgo/GEOMAlgo_ShapeInfo.cxx
src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx
src/GEOMAlgo/GEOMAlgo_ShapeInfo.ixx
src/GEOMAlgo/GEOMAlgo_ShapeInfo.jxx
src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cdl
src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.cxx
src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx
src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.ixx
src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.jxx
src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx
src/GEOMAlgo/GEOMAlgo_ShapeSet.cdl
src/GEOMAlgo/GEOMAlgo_ShapeSet.cxx
src/GEOMAlgo/GEOMAlgo_ShapeSet.hxx
src/GEOMAlgo/GEOMAlgo_ShapeSet.ixx
src/GEOMAlgo/GEOMAlgo_ShapeSet.jxx
src/GEOMAlgo/GEOMAlgo_ShapeSolid.cdl
src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx
src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx
src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx
src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx
src/GEOMAlgo/GEOMAlgo_ShellSolid.cdl
src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx
src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx
src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx
src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx
src/GEOMAlgo/GEOMAlgo_SolidSolid.cdl
src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx
src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx
src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx
src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx
src/GEOMAlgo/GEOMAlgo_Splitter.cdl
src/GEOMAlgo/GEOMAlgo_Splitter.cxx
src/GEOMAlgo/GEOMAlgo_Splitter.hxx
src/GEOMAlgo/GEOMAlgo_Splitter.ixx
src/GEOMAlgo/GEOMAlgo_Splitter.jxx
src/GEOMAlgo/GEOMAlgo_State.hxx
src/GEOMAlgo/GEOMAlgo_StateCollector.cdl
src/GEOMAlgo/GEOMAlgo_StateCollector.cxx
src/GEOMAlgo/GEOMAlgo_StateCollector.hxx
src/GEOMAlgo/GEOMAlgo_StateCollector.ixx
src/GEOMAlgo/GEOMAlgo_StateCollector.jxx
src/GEOMAlgo/GEOMAlgo_SurfaceTools.cdl
src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx
src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx
src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx
src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx
src/GEOMAlgo/GEOMAlgo_Tools.cdl
src/GEOMAlgo/GEOMAlgo_Tools.cxx
src/GEOMAlgo/GEOMAlgo_Tools.hxx
src/GEOMAlgo/GEOMAlgo_Tools.ixx
src/GEOMAlgo/GEOMAlgo_Tools.jxx
src/GEOMAlgo/GEOMAlgo_Tools3D.cdl
src/GEOMAlgo/GEOMAlgo_Tools3D.cxx
src/GEOMAlgo/GEOMAlgo_Tools3D.hxx
src/GEOMAlgo/GEOMAlgo_Tools3D.ixx
src/GEOMAlgo/GEOMAlgo_Tools3D.jxx
src/GEOMAlgo/GEOMAlgo_VertexSolid.cdl
src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx
src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx
src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx
src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx
src/GEOMAlgo/GEOMAlgo_WESCorrector.cdl
src/GEOMAlgo/GEOMAlgo_WESCorrector.cxx
src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx
src/GEOMAlgo/GEOMAlgo_WESCorrector.ixx
src/GEOMAlgo/GEOMAlgo_WESCorrector.jxx
src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cdl
src/GEOMAlgo/GEOMAlgo_WireEdgeSet.cxx
src/GEOMAlgo/GEOMAlgo_WireEdgeSet.hxx
src/GEOMAlgo/GEOMAlgo_WireEdgeSet.ixx
src/GEOMAlgo/GEOMAlgo_WireEdgeSet.jxx
src/GEOMAlgo/GEOMAlgo_WireSolid.cdl
src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
src/GEOMAlgo/GEOMAlgo_WireSolid.hxx
src/GEOMAlgo/GEOMAlgo_WireSolid.ixx
src/GEOMAlgo/GEOMAlgo_WireSolid.jxx
src/GEOMAlgo/GEOMAlgo_WireSplitter.cdl
src/GEOMAlgo/GEOMAlgo_WireSplitter.cxx
src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx
src/GEOMAlgo/GEOMAlgo_WireSplitter.ixx
src/GEOMAlgo/GEOMAlgo_WireSplitter.jxx
src/GEOMAlgo/Handle_BlockFix_BlockFixAPI.hxx
src/GEOMAlgo/Handle_BlockFix_PeriodicSurfaceModifier.hxx
src/GEOMAlgo/Handle_BlockFix_SphereSpaceModifier.hxx
src/GEOMAlgo/Handle_GEOMAlgo_Clsf.hxx
src/GEOMAlgo/Handle_GEOMAlgo_ClsfBox.hxx
src/GEOMAlgo/Handle_GEOMAlgo_ClsfSolid.hxx
src/GEOMAlgo/Handle_GEOMAlgo_ClsfSurf.hxx
src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx
src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx
src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx
src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx
src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx
src/GEOMAlgo/Handle_GEOMAlgo_HAlgo.hxx
src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx
src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx
src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx
src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx
src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx
src/GEOMAlgo/Makefile.am
src/GEOMBase/GEOMBase.cxx
src/GEOMBase/GEOMBase.h
src/GEOMBase/GEOMBase.pro [new file with mode: 0644]
src/GEOMBase/GEOMBase_Helper.cxx
src/GEOMBase/GEOMBase_Helper.h
src/GEOMBase/GEOMBase_Skeleton.cxx
src/GEOMBase/GEOMBase_Skeleton.h
src/GEOMBase/GEOMBase_aParameterDlg.cxx [deleted file]
src/GEOMBase/GEOMBase_aParameterDlg.h [deleted file]
src/GEOMBase/GEOMBase_aWarningDlg.cxx [deleted file]
src/GEOMBase/GEOMBase_aWarningDlg.h [deleted file]
src/GEOMBase/GEOM_GEOMBase.hxx
src/GEOMBase/GEOM_Operation.cxx
src/GEOMBase/GEOM_Operation.h
src/GEOMBase/Makefile.am
src/GEOMClient/GEOMClient.pro [new file with mode: 0644]
src/GEOMClient/GEOM_Client.cxx
src/GEOMClient/GEOM_Client.hxx
src/GEOMClient/Makefile.am
src/GEOMDS/GEOMDS_Commands.cxx
src/GEOMDS/GEOMDS_Commands.jxx
src/GEOMFiltersSelection/GEOMFiltersSelection.pro [new file with mode: 0644]
src/GEOMFiltersSelection/GEOM_CompoundFilter.cxx [new file with mode: 0644]
src/GEOMFiltersSelection/GEOM_CompoundFilter.h [new file with mode: 0644]
src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx
src/GEOMFiltersSelection/GEOM_EdgeFilter.h
src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx [deleted file]
src/GEOMFiltersSelection/GEOM_EdgeFilter.ixx [deleted file]
src/GEOMFiltersSelection/GEOM_EdgeFilter.jxx [deleted file]
src/GEOMFiltersSelection/GEOM_FaceFilter.cxx
src/GEOMFiltersSelection/GEOM_FaceFilter.h
src/GEOMFiltersSelection/GEOM_FaceFilter.hxx [deleted file]
src/GEOMFiltersSelection/GEOM_FaceFilter.ixx [deleted file]
src/GEOMFiltersSelection/GEOM_FaceFilter.jxx [deleted file]
src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx
src/GEOMFiltersSelection/GEOM_LogicalFilter.h
src/GEOMFiltersSelection/GEOM_LogicalFilter.hxx [deleted file]
src/GEOMFiltersSelection/GEOM_OCCFilter.cxx
src/GEOMFiltersSelection/GEOM_OCCFilter.h
src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx
src/GEOMFiltersSelection/GEOM_PreviewFilter.h
src/GEOMFiltersSelection/GEOM_PreviewFilter.hxx [deleted file]
src/GEOMFiltersSelection/GEOM_PreviewFilter.ixx [deleted file]
src/GEOMFiltersSelection/GEOM_PreviewFilter.jxx [deleted file]
src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
src/GEOMFiltersSelection/GEOM_SelectionFilter.h
src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx [deleted file]
src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.hxx [deleted file]
src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.ixx [deleted file]
src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.jxx [deleted file]
src/GEOMFiltersSelection/GEOM_TypeFilter.cxx
src/GEOMFiltersSelection/GEOM_TypeFilter.h
src/GEOMFiltersSelection/GEOM_TypeFilter.hxx [deleted file]
src/GEOMFiltersSelection/Handle_GEOM_EdgeFilter.hxx [deleted file]
src/GEOMFiltersSelection/Handle_GEOM_FaceFilter.hxx [deleted file]
src/GEOMFiltersSelection/Handle_GEOM_PreviewFilter.hxx [deleted file]
src/GEOMFiltersSelection/Handle_GEOM_ShapeTypeFilter.hxx [deleted file]
src/GEOMFiltersSelection/Makefile.am
src/GEOMGUI/GEOMGUI.cxx
src/GEOMGUI/GEOMGUI.h
src/GEOMGUI/GEOMGUI.pro [new file with mode: 0644]
src/GEOMGUI/GEOMGUI_OCCSelector.cxx
src/GEOMGUI/GEOMGUI_OCCSelector.h
src/GEOMGUI/GEOMGUI_Selection.cxx
src/GEOMGUI/GEOMGUI_Selection.h
src/GEOMGUI/GEOM_Displayer.cxx
src/GEOMGUI/GEOM_Displayer.h
src/GEOMGUI/GEOM_GEOMGUI.hxx
src/GEOMGUI/GEOM_images.po
src/GEOMGUI/GEOM_images.ts [new file with mode: 0644]
src/GEOMGUI/GEOM_msg_en.po
src/GEOMGUI/GEOM_msg_en.ts [new file with mode: 0644]
src/GEOMGUI/GEOM_msg_fr.po
src/GEOMGUI/GEOM_msg_fr.ts [new file with mode: 0644]
src/GEOMGUI/GeometryGUI.cxx
src/GEOMGUI/GeometryGUI.h
src/GEOMGUI/GeometryGUI_Swig.cxx
src/GEOMGUI/GeometryGUI_Swig.hxx
src/GEOMGUI/GeometryGUI_Swig.i
src/GEOMGUI/Makefile.am
src/GEOMImpl/GEOMImpl.pro [new file with mode: 0644]
src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx [new file with mode: 0755]
src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx [new file with mode: 0755]
src/GEOMImpl/GEOMImpl_ArcDriver.cxx
src/GEOMImpl/GEOMImpl_ArcDriver.hxx
src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx
src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx
src/GEOMImpl/GEOMImpl_Block6Explorer.cxx
src/GEOMImpl/GEOMImpl_Block6Explorer.hxx
src/GEOMImpl/GEOMImpl_BlockDriver.cxx
src/GEOMImpl/GEOMImpl_BlockDriver.hxx
src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
src/GEOMImpl/GEOMImpl_BooleanDriver.hxx
src/GEOMImpl/GEOMImpl_BoxDriver.cxx
src/GEOMImpl/GEOMImpl_BoxDriver.hxx
src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
src/GEOMImpl/GEOMImpl_ChamferDriver.hxx
src/GEOMImpl/GEOMImpl_CircleDriver.cxx
src/GEOMImpl/GEOMImpl_CircleDriver.hxx
src/GEOMImpl/GEOMImpl_ConeDriver.cxx
src/GEOMImpl/GEOMImpl_ConeDriver.hxx
src/GEOMImpl/GEOMImpl_CopyDriver.cxx
src/GEOMImpl/GEOMImpl_CopyDriver.hxx
src/GEOMImpl/GEOMImpl_CylinderDriver.cxx
src/GEOMImpl/GEOMImpl_CylinderDriver.hxx
src/GEOMImpl/GEOMImpl_DiskDriver.cxx [new file with mode: 0755]
src/GEOMImpl/GEOMImpl_DiskDriver.hxx [new file with mode: 0755]
src/GEOMImpl/GEOMImpl_EllipseDriver.cxx
src/GEOMImpl/GEOMImpl_EllipseDriver.hxx
src/GEOMImpl/GEOMImpl_ExportDriver.cxx
src/GEOMImpl/GEOMImpl_ExportDriver.hxx
src/GEOMImpl/GEOMImpl_FaceDriver.cxx [new file with mode: 0755]
src/GEOMImpl/GEOMImpl_FaceDriver.hxx [new file with mode: 0755]
src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx [new file with mode: 0755]
src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx [new file with mode: 0755]
src/GEOMImpl/GEOMImpl_FilletDriver.cxx
src/GEOMImpl/GEOMImpl_FilletDriver.hxx
src/GEOMImpl/GEOMImpl_FillingDriver.cxx
src/GEOMImpl/GEOMImpl_FillingDriver.hxx
src/GEOMImpl/GEOMImpl_Gen.cxx
src/GEOMImpl/GEOMImpl_Gen.hxx
src/GEOMImpl/GEOMImpl_GlueDriver.cxx
src/GEOMImpl/GEOMImpl_GlueDriver.hxx
src/GEOMImpl/GEOMImpl_HealingDriver.cxx
src/GEOMImpl/GEOMImpl_HealingDriver.hxx
src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx
src/GEOMImpl/GEOMImpl_I3DSketcher.hxx [new file with mode: 0755]
src/GEOMImpl/GEOMImpl_IArc.hxx
src/GEOMImpl/GEOMImpl_IArchimede.hxx
src/GEOMImpl/GEOMImpl_IBasicOperations.cxx
src/GEOMImpl/GEOMImpl_IBasicOperations.hxx
src/GEOMImpl/GEOMImpl_IBlockTrsf.hxx
src/GEOMImpl/GEOMImpl_IBlocks.hxx
src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx
src/GEOMImpl/GEOMImpl_IBoolean.hxx
src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx
src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx
src/GEOMImpl/GEOMImpl_IBox.hxx
src/GEOMImpl/GEOMImpl_IChamfer.hxx
src/GEOMImpl/GEOMImpl_ICircle.hxx
src/GEOMImpl/GEOMImpl_ICone.hxx
src/GEOMImpl/GEOMImpl_ICopy.hxx
src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx
src/GEOMImpl/GEOMImpl_ICylinder.hxx
src/GEOMImpl/GEOMImpl_IDisk.hxx [new file with mode: 0755]
src/GEOMImpl/GEOMImpl_IEllipse.hxx
src/GEOMImpl/GEOMImpl_IFace.hxx [new file with mode: 0755]
src/GEOMImpl/GEOMImpl_IFillet.hxx
src/GEOMImpl/GEOMImpl_IFillet2d.hxx [new file with mode: 0755]
src/GEOMImpl/GEOMImpl_IFilling.hxx
src/GEOMImpl/GEOMImpl_IGlue.hxx
src/GEOMImpl/GEOMImpl_IGroupOperations.cxx
src/GEOMImpl/GEOMImpl_IGroupOperations.hxx
src/GEOMImpl/GEOMImpl_IHealing.hxx
src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
src/GEOMImpl/GEOMImpl_IHealingOperations.hxx
src/GEOMImpl/GEOMImpl_IImportExport.hxx
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
src/GEOMImpl/GEOMImpl_ILine.hxx
src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
src/GEOMImpl/GEOMImpl_IMarker.hxx
src/GEOMImpl/GEOMImpl_IMeasure.hxx
src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx
src/GEOMImpl/GEOMImpl_IMirror.hxx
src/GEOMImpl/GEOMImpl_IOffset.hxx
src/GEOMImpl/GEOMImpl_IPartition.hxx
src/GEOMImpl/GEOMImpl_IPipe.hxx
src/GEOMImpl/GEOMImpl_IPipeBiNormal.hxx [new file with mode: 0644]
src/GEOMImpl/GEOMImpl_IPipeDiffSect.hxx
src/GEOMImpl/GEOMImpl_IPipeShellSect.hxx
src/GEOMImpl/GEOMImpl_IPlane.hxx
src/GEOMImpl/GEOMImpl_IPoint.hxx
src/GEOMImpl/GEOMImpl_IPolyline.hxx
src/GEOMImpl/GEOMImpl_IPosition.hxx
src/GEOMImpl/GEOMImpl_IPrism.hxx
src/GEOMImpl/GEOMImpl_IRevolution.hxx
src/GEOMImpl/GEOMImpl_IRotate.hxx
src/GEOMImpl/GEOMImpl_IScale.hxx
src/GEOMImpl/GEOMImpl_IShapes.hxx
src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
src/GEOMImpl/GEOMImpl_ISketcher.hxx
src/GEOMImpl/GEOMImpl_ISphere.hxx
src/GEOMImpl/GEOMImpl_ISpline.hxx
src/GEOMImpl/GEOMImpl_IThruSections.hxx
src/GEOMImpl/GEOMImpl_ITorus.hxx
src/GEOMImpl/GEOMImpl_ITransformOperations.cxx
src/GEOMImpl/GEOMImpl_ITransformOperations.hxx
src/GEOMImpl/GEOMImpl_ITranslate.hxx
src/GEOMImpl/GEOMImpl_IVector.hxx
src/GEOMImpl/GEOMImpl_ImportDriver.cxx
src/GEOMImpl/GEOMImpl_ImportDriver.hxx
src/GEOMImpl/GEOMImpl_LineDriver.cxx
src/GEOMImpl/GEOMImpl_LineDriver.hxx
src/GEOMImpl/GEOMImpl_MarkerDriver.cxx
src/GEOMImpl/GEOMImpl_MarkerDriver.hxx
src/GEOMImpl/GEOMImpl_MeasureDriver.cxx
src/GEOMImpl/GEOMImpl_MeasureDriver.hxx
src/GEOMImpl/GEOMImpl_MirrorDriver.cxx
src/GEOMImpl/GEOMImpl_MirrorDriver.hxx
src/GEOMImpl/GEOMImpl_OffsetDriver.cxx
src/GEOMImpl/GEOMImpl_OffsetDriver.hxx
src/GEOMImpl/GEOMImpl_PartitionDriver.cxx
src/GEOMImpl/GEOMImpl_PartitionDriver.hxx
src/GEOMImpl/GEOMImpl_PipeDriver.cxx
src/GEOMImpl/GEOMImpl_PipeDriver.hxx
src/GEOMImpl/GEOMImpl_PlaneDriver.cxx
src/GEOMImpl/GEOMImpl_PlaneDriver.hxx
src/GEOMImpl/GEOMImpl_PointDriver.cxx
src/GEOMImpl/GEOMImpl_PointDriver.hxx
src/GEOMImpl/GEOMImpl_PolylineDriver.cxx
src/GEOMImpl/GEOMImpl_PolylineDriver.hxx
src/GEOMImpl/GEOMImpl_PositionDriver.cxx
src/GEOMImpl/GEOMImpl_PositionDriver.hxx
src/GEOMImpl/GEOMImpl_PrismDriver.cxx
src/GEOMImpl/GEOMImpl_PrismDriver.hxx
src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx
src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx
src/GEOMImpl/GEOMImpl_RotateDriver.cxx
src/GEOMImpl/GEOMImpl_RotateDriver.hxx
src/GEOMImpl/GEOMImpl_ScaleDriver.cxx
src/GEOMImpl/GEOMImpl_ScaleDriver.hxx
src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
src/GEOMImpl/GEOMImpl_ShapeDriver.hxx
src/GEOMImpl/GEOMImpl_SketcherDriver.cxx
src/GEOMImpl/GEOMImpl_SketcherDriver.hxx
src/GEOMImpl/GEOMImpl_SphereDriver.cxx
src/GEOMImpl/GEOMImpl_SphereDriver.hxx
src/GEOMImpl/GEOMImpl_SplineDriver.cxx
src/GEOMImpl/GEOMImpl_SplineDriver.hxx
src/GEOMImpl/GEOMImpl_Template.cxx [deleted file]
src/GEOMImpl/GEOMImpl_Template.hxx [deleted file]
src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx
src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx
src/GEOMImpl/GEOMImpl_TorusDriver.cxx
src/GEOMImpl/GEOMImpl_TorusDriver.hxx
src/GEOMImpl/GEOMImpl_TranslateDriver.cxx
src/GEOMImpl/GEOMImpl_TranslateDriver.hxx
src/GEOMImpl/GEOMImpl_Types.hxx
src/GEOMImpl/GEOMImpl_VectorDriver.cxx
src/GEOMImpl/GEOMImpl_VectorDriver.hxx
src/GEOMImpl/GEOM_GEOMImpl.hxx
src/GEOMImpl/Makefile.am
src/GEOMToolsGUI/GEOMToolsGUI.cxx
src/GEOMToolsGUI/GEOMToolsGUI.h
src/GEOMToolsGUI/GEOMToolsGUI.pro [new file with mode: 0644]
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx [new file with mode: 0644]
src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.h [new file with mode: 0644]
src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.h [deleted file]
src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h
src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h
src/GEOMToolsGUI/GEOM_ToolsGUI.hxx
src/GEOMToolsGUI/Makefile.am
src/GEOM_I/GEOM_DumpPython.cc
src/GEOM_I/GEOM_GEOM_I.hxx
src/GEOM_I/GEOM_Gen_i.cc
src/GEOM_I/GEOM_Gen_i.hh
src/GEOM_I/GEOM_I.pro [new file with mode: 0644]
src/GEOM_I/GEOM_I3DPrimOperations_i.cc
src/GEOM_I/GEOM_I3DPrimOperations_i.hh
src/GEOM_I/GEOM_IBasicOperations_i.cc
src/GEOM_I/GEOM_IBasicOperations_i.hh
src/GEOM_I/GEOM_IBlocksOperations_i.cc
src/GEOM_I/GEOM_IBlocksOperations_i.hh
src/GEOM_I/GEOM_IBooleanOperations_i.cc
src/GEOM_I/GEOM_IBooleanOperations_i.hh
src/GEOM_I/GEOM_ICurvesOperations_i.cc
src/GEOM_I/GEOM_ICurvesOperations_i.hh
src/GEOM_I/GEOM_IGroupOperations_i.cc
src/GEOM_I/GEOM_IGroupOperations_i.hh
src/GEOM_I/GEOM_IHealingOperations_i.cc
src/GEOM_I/GEOM_IHealingOperations_i.hh
src/GEOM_I/GEOM_IInsertOperations_i.cc
src/GEOM_I/GEOM_IInsertOperations_i.hh
src/GEOM_I/GEOM_ILocalOperations_i.cc
src/GEOM_I/GEOM_ILocalOperations_i.hh
src/GEOM_I/GEOM_IMeasureOperations_i.cc
src/GEOM_I/GEOM_IMeasureOperations_i.hh
src/GEOM_I/GEOM_IOperations_i.cc
src/GEOM_I/GEOM_IOperations_i.hh
src/GEOM_I/GEOM_IShapesOperations_i.cc
src/GEOM_I/GEOM_IShapesOperations_i.hh
src/GEOM_I/GEOM_ITransformOperations_i.cc
src/GEOM_I/GEOM_ITransformOperations_i.hh
src/GEOM_I/GEOM_Object_i.cc
src/GEOM_I/GEOM_Object_i.hh
src/GEOM_I/Makefile.am
src/GEOM_I_Superv/GEOM_List_i.hh
src/GEOM_I_Superv/GEOM_Superv_i.cc
src/GEOM_I_Superv/GEOM_Superv_i.hh
src/GEOM_I_Superv/Makefile.am
src/GEOM_SWIG/GEOM_Nut.py
src/GEOM_SWIG/GEOM_ObjectInfo.py [new file with mode: 0644]
src/GEOM_SWIG/GEOM_Partition1.py
src/GEOM_SWIG/GEOM_Partition2.py
src/GEOM_SWIG/GEOM_Partition3.py
src/GEOM_SWIG/GEOM_Partition4.py
src/GEOM_SWIG/GEOM_Partition5.py
src/GEOM_SWIG/GEOM_Sketcher.py
src/GEOM_SWIG/GEOM_Spanner.py
src/GEOM_SWIG/GEOM_TestAll.py
src/GEOM_SWIG/GEOM_TestHealing.py
src/GEOM_SWIG/GEOM_TestMeasures.py
src/GEOM_SWIG/GEOM_TestOthers.py
src/GEOM_SWIG/GEOM_blocks.py
src/GEOM_SWIG/GEOM_cyl2complementary.py
src/GEOM_SWIG/GEOM_example.py
src/GEOM_SWIG/GEOM_example2.py
src/GEOM_SWIG/GEOM_example3.py
src/GEOM_SWIG/GEOM_example4.py
src/GEOM_SWIG/GEOM_example5.py
src/GEOM_SWIG/GEOM_example6.py
src/GEOM_SWIG/GEOM_moteur.py
src/GEOM_SWIG/GEOM_shared_modules.py
src/GEOM_SWIG/GEOM_shellSolid.py
src/GEOM_SWIG/GEOM_tube_geom.py
src/GEOM_SWIG/GEOM_tube_geom_gg2.py
src/GEOM_SWIG/GEOM_usinggeom.py
src/GEOM_SWIG/Makefile.am
src/GEOM_SWIG/PAL_MESH_019_020_geometry.py
src/GEOM_SWIG/PAL_MESH_028_geometry.py
src/GEOM_SWIG/PAL_MESH_030_geometry.py
src/GEOM_SWIG/PAL_MESH_033_geometry.py
src/GEOM_SWIG/PAL_MESH_035_geometry.py
src/GEOM_SWIG/batchmode_geompy.py
src/GEOM_SWIG/geompy.py
src/GEOM_SWIG/geompyDC.py
src/GEOM_SWIG_WITHIHM/Makefile.am
src/GEOM_SWIG_WITHIHM/libGEOM_Swig.i
src/GenerationGUI/GenerationGUI.cxx
src/GenerationGUI/GenerationGUI.h
src/GenerationGUI/GenerationGUI.pro [new file with mode: 0644]
src/GenerationGUI/GenerationGUI_FillingDlg.cxx
src/GenerationGUI/GenerationGUI_FillingDlg.h
src/GenerationGUI/GenerationGUI_PipeDlg.cxx
src/GenerationGUI/GenerationGUI_PipeDlg.h
src/GenerationGUI/GenerationGUI_PrismDlg.cxx
src/GenerationGUI/GenerationGUI_PrismDlg.h
src/GenerationGUI/GenerationGUI_RevolDlg.cxx
src/GenerationGUI/GenerationGUI_RevolDlg.h
src/GenerationGUI/Makefile.am
src/GroupGUI/GroupGUI.cxx
src/GroupGUI/GroupGUI.h
src/GroupGUI/GroupGUI_GroupDlg.cxx
src/GroupGUI/GroupGUI_GroupDlg.h
src/GroupGUI/Makefile.am
src/IGESExport/IGESExport.cxx
src/IGESExport/IGESExport.pro [new file with mode: 0644]
src/IGESExport/Makefile.am
src/IGESImport/IGESImport.cxx
src/IGESImport/IGESImport.pro [new file with mode: 0644]
src/IGESImport/Makefile.am
src/Makefile.am
src/MeasureGUI/GEOM_MeasureGUI.hxx [deleted file]
src/MeasureGUI/Makefile.am
src/MeasureGUI/MeasureGUI.cxx
src/MeasureGUI/MeasureGUI.h
src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.cxx [deleted file]
src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.h [deleted file]
src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.ui [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_1Sel1TextView1Check_QTD.ui [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_1Sel1TextView2ListBox_QTD.ui [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.cxx [deleted file]
src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.h [deleted file]
src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.ui [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.cxx [deleted file]
src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.h [deleted file]
src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.ui [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.cxx [deleted file]
src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.h [deleted file]
src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.ui [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.cxx [deleted file]
src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.h [deleted file]
src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.ui [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_2Sel4LineEdit_QTD.cxx [deleted file]
src/MeasureGUI/MeasureGUI_2Sel4LineEdit_QTD.h [deleted file]
src/MeasureGUI/MeasureGUI_2Sel4LineEdit_QTD.ui [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_AngleDlg.cxx
src/MeasureGUI/MeasureGUI_AngleDlg.h
src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx
src/MeasureGUI/MeasureGUI_BndBoxDlg.h
src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx
src/MeasureGUI/MeasureGUI_CenterMassDlg.h
src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx
src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h
src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx
src/MeasureGUI/MeasureGUI_CheckShapeDlg.h
src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
src/MeasureGUI/MeasureGUI_DistanceDlg.h
src/MeasureGUI/MeasureGUI_InertiaDlg.cxx
src/MeasureGUI/MeasureGUI_InertiaDlg.h
src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx
src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h
src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
src/MeasureGUI/MeasureGUI_NormaleDlg.h
src/MeasureGUI/MeasureGUI_PointDlg.cxx
src/MeasureGUI/MeasureGUI_PointDlg.h
src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx
src/MeasureGUI/MeasureGUI_PropertiesDlg.h
src/MeasureGUI/MeasureGUI_Skeleton.cxx
src/MeasureGUI/MeasureGUI_Skeleton.h
src/MeasureGUI/MeasureGUI_SkeletonBox_QTD.ui [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_Skeleton_QTD.cxx [deleted file]
src/MeasureGUI/MeasureGUI_Skeleton_QTD.h [deleted file]
src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
src/MeasureGUI/MeasureGUI_WhatisDlg.h
src/MeasureGUI/MeasureGUI_Widgets.cxx [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_Widgets.h [new file with mode: 0644]
src/MeasureGUI/UIFiles/MeasureGUI_1Sel12LineEdit_QTD.ui [deleted file]
src/MeasureGUI/UIFiles/MeasureGUI_1Sel1TextView_QTD.ui [deleted file]
src/MeasureGUI/UIFiles/MeasureGUI_1Sel3LineEdit_QTD.ui [deleted file]
src/MeasureGUI/UIFiles/MeasureGUI_1Sel6LineEdit_QTD.ui [deleted file]
src/MeasureGUI/UIFiles/MeasureGUI_2Sel1LineEdit_QTD.ui [deleted file]
src/MeasureGUI/UIFiles/MeasureGUI_2Sel4LineEdit_QTD.ui [deleted file]
src/MeasureGUI/UIFiles/MeasureGUI_Skeleton_QTD.ui [deleted file]
src/MeasureGUI/UIFiles/ui_to_cxx [deleted file]
src/NMTAlgo/Makefile.am
src/NMTAlgo/NMTAlgo.cdl
src/NMTAlgo/NMTAlgo.pro [new file with mode: 0644]
src/NMTAlgo/NMTAlgo_Algo.cdl
src/NMTAlgo/NMTAlgo_Algo.cxx
src/NMTAlgo/NMTAlgo_Algo.hxx
src/NMTAlgo/NMTAlgo_Algo.ixx
src/NMTAlgo/NMTAlgo_Algo.jxx
src/NMTAlgo/NMTAlgo_Builder.cdl
src/NMTAlgo/NMTAlgo_Builder.cxx
src/NMTAlgo/NMTAlgo_Builder.hxx
src/NMTAlgo/NMTAlgo_Builder.ixx
src/NMTAlgo/NMTAlgo_Builder.jxx
src/NMTAlgo/NMTAlgo_Loop3d.cdl
src/NMTAlgo/NMTAlgo_Loop3d.cxx
src/NMTAlgo/NMTAlgo_Loop3d.hxx
src/NMTAlgo/NMTAlgo_Loop3d.ixx
src/NMTAlgo/NMTAlgo_Loop3d.jxx
src/NMTAlgo/NMTAlgo_Splitter.cdl
src/NMTAlgo/NMTAlgo_Splitter.cxx
src/NMTAlgo/NMTAlgo_Splitter.hxx
src/NMTAlgo/NMTAlgo_Splitter.ixx
src/NMTAlgo/NMTAlgo_Splitter.jxx
src/NMTAlgo/NMTAlgo_Splitter1.cdl
src/NMTAlgo/NMTAlgo_Splitter1.cxx
src/NMTAlgo/NMTAlgo_Splitter1.hxx
src/NMTAlgo/NMTAlgo_Splitter1.ixx
src/NMTAlgo/NMTAlgo_Splitter1.jxx
src/NMTAlgo/NMTAlgo_Splitter_1.cxx
src/NMTAlgo/NMTAlgo_Splitter_2.cxx
src/NMTAlgo/NMTAlgo_Tools.cdl
src/NMTAlgo/NMTAlgo_Tools.cxx
src/NMTAlgo/NMTAlgo_Tools.hxx
src/NMTAlgo/NMTAlgo_Tools.ixx
src/NMTAlgo/NMTAlgo_Tools.jxx
src/NMTDS/Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx
src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
src/NMTDS/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
src/NMTDS/Handle_NMTDS_ListNodeOfListOfPassKey.hxx
src/NMTDS/Handle_NMTDS_ListNodeOfListOfPassKeyBoolean.hxx
src/NMTDS/Handle_NMTDS_StdMapNodeOfMapOfPassKey.hxx
src/NMTDS/Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
src/NMTDS/Makefile.am
src/NMTDS/NMTDS.cdl
src/NMTDS/NMTDS.pro [new file with mode: 0644]
src/NMTDS/NMTDS_BoxBndTree.cxx
src/NMTDS/NMTDS_BoxBndTree.hxx
src/NMTDS/NMTDS_CArray1OfIndexRange.hxx
src/NMTDS/NMTDS_CArray1OfIndexRange_0.cxx
src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger_0.cxx
src/NMTDS/NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx
src/NMTDS/NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger_0.cxx
src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx
src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger_0.cxx
src/NMTDS/NMTDS_IndexRange.cdl
src/NMTDS/NMTDS_IndexRange.cxx
src/NMTDS/NMTDS_IndexRange.hxx
src/NMTDS/NMTDS_IndexRange.ixx
src/NMTDS/NMTDS_IndexRange.jxx
src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx
src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx
src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx
src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx
src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx
src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape_0.cxx
src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx
src/NMTDS/NMTDS_IndexedDataMapOfShapeBox_0.cxx
src/NMTDS/NMTDS_InterfPool.cdl
src/NMTDS/NMTDS_InterfPool.cxx
src/NMTDS/NMTDS_InterfPool.hxx
src/NMTDS/NMTDS_InterfPool.ixx
src/NMTDS/NMTDS_InterfPool.jxx
src/NMTDS/NMTDS_InterfType.hxx
src/NMTDS/NMTDS_Iterator.cdl
src/NMTDS/NMTDS_Iterator.cxx
src/NMTDS/NMTDS_Iterator.hxx
src/NMTDS/NMTDS_Iterator.ixx
src/NMTDS/NMTDS_Iterator.jxx
src/NMTDS/NMTDS_IteratorCheckerSI.cdl
src/NMTDS/NMTDS_IteratorCheckerSI.cxx
src/NMTDS/NMTDS_IteratorCheckerSI.hxx
src/NMTDS/NMTDS_IteratorCheckerSI.ixx
src/NMTDS/NMTDS_IteratorCheckerSI.jxx
src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
src/NMTDS/NMTDS_ListIteratorOfListOfPassKey.hxx
src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean_0.cxx
src/NMTDS/NMTDS_ListIteratorOfListOfPassKey_0.cxx
src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
src/NMTDS/NMTDS_ListNodeOfListOfPassKey.hxx
src/NMTDS/NMTDS_ListNodeOfListOfPassKeyBoolean.hxx
src/NMTDS/NMTDS_ListNodeOfListOfPassKeyBoolean_0.cxx
src/NMTDS/NMTDS_ListNodeOfListOfPassKey_0.cxx
src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
src/NMTDS/NMTDS_ListOfPassKey.hxx
src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx
src/NMTDS/NMTDS_ListOfPassKeyBoolean_0.cxx
src/NMTDS/NMTDS_ListOfPassKey_0.cxx
src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx
src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx
src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean_0.cxx
src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey_0.cxx
src/NMTDS/NMTDS_MapOfPassKey.hxx
src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx
src/NMTDS/NMTDS_MapOfPassKeyBoolean_0.cxx
src/NMTDS/NMTDS_MapOfPassKey_0.cxx
src/NMTDS/NMTDS_PInterfPool.hxx
src/NMTDS/NMTDS_PIterator.hxx
src/NMTDS/NMTDS_PShapesDataStructure.hxx
src/NMTDS/NMTDS_PassKey.cdl
src/NMTDS/NMTDS_PassKey.cxx
src/NMTDS/NMTDS_PassKey.hxx
src/NMTDS/NMTDS_PassKey.ixx
src/NMTDS/NMTDS_PassKey.jxx
src/NMTDS/NMTDS_PassKeyBoolean.cdl
src/NMTDS/NMTDS_PassKeyBoolean.cxx
src/NMTDS/NMTDS_PassKeyBoolean.hxx
src/NMTDS/NMTDS_PassKeyBoolean.ixx
src/NMTDS/NMTDS_PassKeyBoolean.jxx
src/NMTDS/NMTDS_PassKeyMapHasher.cdl
src/NMTDS/NMTDS_PassKeyMapHasher.cxx
src/NMTDS/NMTDS_PassKeyMapHasher.hxx
src/NMTDS/NMTDS_PassKeyMapHasher.ixx
src/NMTDS/NMTDS_PassKeyMapHasher.jxx
src/NMTDS/NMTDS_PassKeyShape.cdl
src/NMTDS/NMTDS_PassKeyShape.cxx
src/NMTDS/NMTDS_PassKeyShape.hxx
src/NMTDS/NMTDS_PassKeyShape.ixx
src/NMTDS/NMTDS_PassKeyShape.jxx
src/NMTDS/NMTDS_PassKeyShapeMapHasher.cdl
src/NMTDS/NMTDS_PassKeyShapeMapHasher.cxx
src/NMTDS/NMTDS_PassKeyShapeMapHasher.hxx
src/NMTDS/NMTDS_PassKeyShapeMapHasher.ixx
src/NMTDS/NMTDS_PassKeyShapeMapHasher.jxx
src/NMTDS/NMTDS_ShapesDataStructure.cdl
src/NMTDS/NMTDS_ShapesDataStructure.cxx
src/NMTDS/NMTDS_ShapesDataStructure.hxx
src/NMTDS/NMTDS_ShapesDataStructure.ixx
src/NMTDS/NMTDS_ShapesDataStructure.jxx
src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey.hxx
src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean_0.cxx
src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey_0.cxx
src/NMTDS/NMTDS_Tools.cdl
src/NMTDS/NMTDS_Tools.cxx
src/NMTDS/NMTDS_Tools.hxx
src/NMTDS/NMTDS_Tools.ixx
src/NMTDS/NMTDS_Tools.jxx
src/NMTTools/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
src/NMTTools/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
src/NMTTools/Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx
src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx
src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx
src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx
src/NMTTools/Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx
src/NMTTools/Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx
src/NMTTools/Handle_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx
src/NMTTools/Makefile.am
src/NMTTools/NMTTools.cdl
src/NMTTools/NMTTools.pro [new file with mode: 0644]
src/NMTTools/NMTTools_CheckerSI.cdl
src/NMTTools/NMTTools_CheckerSI.cxx
src/NMTTools/NMTTools_CheckerSI.hxx
src/NMTTools/NMTTools_CheckerSI.ixx
src/NMTTools/NMTTools_CheckerSI.jxx
src/NMTTools/NMTTools_CheckerSI_1.cxx
src/NMTTools/NMTTools_CommonBlock.cdl
src/NMTTools/NMTTools_CommonBlock.cxx
src/NMTTools/NMTTools_CommonBlock.hxx
src/NMTTools/NMTTools_CommonBlock.ixx
src/NMTTools/NMTTools_CommonBlock.jxx
src/NMTTools/NMTTools_CommonBlockAPI.cdl
src/NMTTools/NMTTools_CommonBlockAPI.cxx
src/NMTTools/NMTTools_CommonBlockAPI.hxx
src/NMTTools/NMTTools_CommonBlockAPI.ixx
src/NMTTools/NMTTools_CommonBlockAPI.jxx
src/NMTTools/NMTTools_CommonBlockPool.hxx
src/NMTTools/NMTTools_CommonBlockPool_0.cxx
src/NMTTools/NMTTools_CoupleOfShape.cdl
src/NMTTools/NMTTools_CoupleOfShape.cxx
src/NMTTools/NMTTools_CoupleOfShape.hxx
src/NMTTools/NMTTools_CoupleOfShape.ixx
src/NMTTools/NMTTools_CoupleOfShape.jxx
src/NMTTools/NMTTools_DEProcessor.cdl
src/NMTTools/NMTTools_DEProcessor.cxx
src/NMTTools/NMTTools_DEProcessor.hxx
src/NMTTools/NMTTools_DEProcessor.ixx
src/NMTTools/NMTTools_DEProcessor.jxx
src/NMTTools/NMTTools_DSFiller.cdl
src/NMTTools/NMTTools_DSFiller.cxx
src/NMTTools/NMTTools_DSFiller.hxx
src/NMTTools/NMTTools_DSFiller.ixx
src/NMTTools/NMTTools_DSFiller.jxx
src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx
src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_0.cxx
src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx
src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_0.cxx
src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock_0.cxx
src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx
src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_0.cxx
src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx
src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_0.cxx
src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx
src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_0.cxx
src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger_0.cxx
src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_0.cxx
src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx
src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock_0.cxx
src/NMTTools/NMTTools_IteratorOfCoupleOfShape.cdl
src/NMTTools/NMTTools_IteratorOfCoupleOfShape.cxx
src/NMTTools/NMTTools_IteratorOfCoupleOfShape.hxx
src/NMTTools/NMTTools_IteratorOfCoupleOfShape.ixx
src/NMTTools/NMTTools_IteratorOfCoupleOfShape.jxx
src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx
src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock_0.cxx
src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx
src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape_0.cxx
src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock.hxx
src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock_0.cxx
src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape.hxx
src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape_0.cxx
src/NMTTools/NMTTools_ListOfCommonBlock.hxx
src/NMTTools/NMTTools_ListOfCommonBlock_0.cxx
src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx
src/NMTTools/NMTTools_ListOfCoupleOfShape_0.cxx
src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock.hxx
src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock_0.cxx
src/NMTTools/NMTTools_MapOfPaveBlock.hxx
src/NMTTools/NMTTools_MapOfPaveBlock_0.cxx
src/NMTTools/NMTTools_PCurveMaker.cdl
src/NMTTools/NMTTools_PCurveMaker.cxx
src/NMTTools/NMTTools_PCurveMaker.hxx
src/NMTTools/NMTTools_PCurveMaker.ixx
src/NMTTools/NMTTools_PCurveMaker.jxx
src/NMTTools/NMTTools_PDSFiller.hxx
src/NMTTools/NMTTools_PPaveFiller.hxx
src/NMTTools/NMTTools_PaveFiller.cdl
src/NMTTools/NMTTools_PaveFiller.cxx
src/NMTTools/NMTTools_PaveFiller.hxx
src/NMTTools/NMTTools_PaveFiller.ixx
src/NMTTools/NMTTools_PaveFiller.jxx
src/NMTTools/NMTTools_PaveFiller_0.cxx
src/NMTTools/NMTTools_PaveFiller_1.cxx
src/NMTTools/NMTTools_PaveFiller_2.cxx
src/NMTTools/NMTTools_PaveFiller_3.cxx
src/NMTTools/NMTTools_PaveFiller_4.cxx
src/NMTTools/NMTTools_PaveFiller_5.cxx
src/NMTTools/NMTTools_PaveFiller_6.cxx
src/NMTTools/NMTTools_PaveFiller_7.cxx
src/NMTTools/NMTTools_PaveFiller_8.cxx
src/NMTTools/NMTTools_PaveFiller_9.cxx
src/NMTTools/NMTTools_StdMapNodeOfMapOfPaveBlock.hxx
src/NMTTools/NMTTools_StdMapNodeOfMapOfPaveBlock_0.cxx
src/NMTTools/NMTTools_Tools.cdl
src/NMTTools/NMTTools_Tools.cxx
src/NMTTools/NMTTools_Tools.hxx
src/NMTTools/NMTTools_Tools.ixx
src/NMTTools/NMTTools_Tools.jxx
src/OBJECT/GEOM_AISShape.cxx
src/OBJECT/GEOM_AISShape.hxx
src/OBJECT/GEOM_AISShape.ixx
src/OBJECT/GEOM_AISShape.jxx
src/OBJECT/GEOM_AISTrihedron.cxx
src/OBJECT/GEOM_AISTrihedron.hxx
src/OBJECT/GEOM_AISVector.cxx
src/OBJECT/GEOM_AISVector.hxx
src/OBJECT/GEOM_Actor.cxx
src/OBJECT/GEOM_Actor.h
src/OBJECT/GEOM_AssemblyBuilder.cxx
src/OBJECT/GEOM_AssemblyBuilder.h
src/OBJECT/GEOM_DeviceActor.cxx
src/OBJECT/GEOM_DeviceActor.h
src/OBJECT/GEOM_EdgeSource.cxx
src/OBJECT/GEOM_EdgeSource.h
src/OBJECT/GEOM_FaceSource.cxx
src/OBJECT/GEOM_FaceSource.h
src/OBJECT/GEOM_InteractiveObject.cxx
src/OBJECT/GEOM_InteractiveObject.hxx
src/OBJECT/GEOM_InteractiveObject.ixx
src/OBJECT/GEOM_InteractiveObject.jxx
src/OBJECT/GEOM_OBJECT_defs.hxx
src/OBJECT/GEOM_OCCReader.cxx
src/OBJECT/GEOM_OCCReader.h
src/OBJECT/GEOM_ShadingFace.cxx
src/OBJECT/GEOM_ShadingFace.h
src/OBJECT/GEOM_SmartPtr.h
src/OBJECT/GEOM_VTKTrihedron.cxx
src/OBJECT/GEOM_VTKTrihedron.hxx
src/OBJECT/GEOM_VertexSource.cxx
src/OBJECT/GEOM_VertexSource.h
src/OBJECT/GEOM_WireframeFace.cxx
src/OBJECT/GEOM_WireframeFace.h
src/OBJECT/Handle_GEOM_AISShape.hxx
src/OBJECT/Handle_GEOM_InteractiveObject.hxx
src/OBJECT/Makefile.am
src/OBJECT/OBJECT.pro [new file with mode: 0644]
src/OperationGUI/Makefile.am
src/OperationGUI/OperationGUI.cxx
src/OperationGUI/OperationGUI.h
src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
src/OperationGUI/OperationGUI_ArchimedeDlg.h
src/OperationGUI/OperationGUI_ChamferDlg.cxx
src/OperationGUI/OperationGUI_ChamferDlg.h
src/OperationGUI/OperationGUI_ClippingDlg.cxx
src/OperationGUI/OperationGUI_ClippingDlg.h
src/OperationGUI/OperationGUI_Fillet2dDlg.cxx [new file with mode: 0755]
src/OperationGUI/OperationGUI_Fillet2dDlg.h [new file with mode: 0755]
src/OperationGUI/OperationGUI_FilletDlg.cxx
src/OperationGUI/OperationGUI_FilletDlg.h
src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx [new file with mode: 0644]
src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h [new file with mode: 0644]
src/OperationGUI/OperationGUI_MaterialDlg.cxx
src/OperationGUI/OperationGUI_MaterialDlg.h
src/OperationGUI/OperationGUI_PartitionDlg.cxx
src/OperationGUI/OperationGUI_PartitionDlg.h
src/PARTITION/Makefile.in
src/PARTITION/Partition.cdl
src/PARTITION/Partition_Inter2d.cdl
src/PARTITION/Partition_Inter2d.cxx
src/PARTITION/Partition_Inter2d.hxx
src/PARTITION/Partition_Inter2d.ixx
src/PARTITION/Partition_Inter2d.jxx
src/PARTITION/Partition_Inter3d.cdl
src/PARTITION/Partition_Inter3d.cxx
src/PARTITION/Partition_Inter3d.hxx
src/PARTITION/Partition_Inter3d.ixx
src/PARTITION/Partition_Inter3d.jxx
src/PARTITION/Partition_Loop.cdl
src/PARTITION/Partition_Loop.cxx
src/PARTITION/Partition_Loop.hxx
src/PARTITION/Partition_Loop.ixx
src/PARTITION/Partition_Loop.jxx
src/PARTITION/Partition_Loop2d.cdl
src/PARTITION/Partition_Loop2d.cxx
src/PARTITION/Partition_Loop2d.hxx
src/PARTITION/Partition_Loop2d.ixx
src/PARTITION/Partition_Loop2d.jxx
src/PARTITION/Partition_Loop3d.cdl
src/PARTITION/Partition_Loop3d.cxx
src/PARTITION/Partition_Loop3d.hxx
src/PARTITION/Partition_Loop3d.ixx
src/PARTITION/Partition_Loop3d.jxx
src/PARTITION/Partition_Spliter.cdl
src/PARTITION/Partition_Spliter.cxx
src/PARTITION/Partition_Spliter.hxx
src/PARTITION/Partition_Spliter.ixx
src/PARTITION/Partition_Spliter.jxx
src/PrimitiveGUI/Makefile.am
src/PrimitiveGUI/PrimitiveGUI.cxx
src/PrimitiveGUI/PrimitiveGUI.h
src/PrimitiveGUI/PrimitiveGUI.pro [new file with mode: 0644]
src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h
src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h
src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h
src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx [new file with mode: 0755]
src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h [new file with mode: 0755]
src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx [new file with mode: 0755]
src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h [new file with mode: 0755]
src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h
src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
src/RepairGUI/Makefile.am
src/RepairGUI/RepairGUI.cxx
src/RepairGUI/RepairGUI.h
src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx
src/RepairGUI/RepairGUI_ChangeOrientationDlg.h
src/RepairGUI/RepairGUI_CloseContourDlg.cxx
src/RepairGUI/RepairGUI_CloseContourDlg.h
src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
src/RepairGUI/RepairGUI_DivideEdgeDlg.h
src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
src/RepairGUI/RepairGUI_FreeBoundDlg.h
src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
src/RepairGUI/RepairGUI_FreeFacesDlg.h
src/RepairGUI/RepairGUI_GlueDlg.cxx
src/RepairGUI/RepairGUI_GlueDlg.h
src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx
src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h
src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
src/RepairGUI/RepairGUI_RemoveHolesDlg.h
src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h
src/RepairGUI/RepairGUI_SewingDlg.cxx
src/RepairGUI/RepairGUI_SewingDlg.h
src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
src/RepairGUI/RepairGUI_ShapeProcessDlg.h
src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
src/RepairGUI/RepairGUI_SuppressFacesDlg.h
src/SKETCHER/Makefile.am
src/SKETCHER/SKETCHER.pro [new file with mode: 0644]
src/SKETCHER/Sketcher_Profile.cxx
src/SKETCHER/Sketcher_Profile.hxx
src/STEPExport/Makefile.am
src/STEPExport/STEPExport.cxx
src/STEPExport/STEPExport.pro [new file with mode: 0644]
src/STEPImport/Makefile.am
src/STEPImport/STEPImport.cxx
src/STEPImport/STEPImport.pro [new file with mode: 0644]
src/STLExport/Makefile.am
src/STLExport/STLExport.cxx
src/STLExport/STLExport.pro [new file with mode: 0644]
src/ShHealOper/Makefile.am
src/ShHealOper/ShHealOper.pro [new file with mode: 0644]
src/ShHealOper/ShHealOper_ChangeOrientation.cxx
src/ShHealOper/ShHealOper_ChangeOrientation.hxx
src/ShHealOper/ShHealOper_CloseContour.cxx
src/ShHealOper/ShHealOper_CloseContour.hxx
src/ShHealOper/ShHealOper_EdgeDivide.cxx
src/ShHealOper/ShHealOper_EdgeDivide.hxx
src/ShHealOper/ShHealOper_FillHoles.cxx
src/ShHealOper/ShHealOper_FillHoles.hxx
src/ShHealOper/ShHealOper_RemoveFace.cxx
src/ShHealOper/ShHealOper_RemoveFace.hxx
src/ShHealOper/ShHealOper_RemoveInternalWires.cxx
src/ShHealOper/ShHealOper_RemoveInternalWires.hxx
src/ShHealOper/ShHealOper_Sewing.cxx
src/ShHealOper/ShHealOper_Sewing.hxx
src/ShHealOper/ShHealOper_ShapeProcess.cxx
src/ShHealOper/ShHealOper_ShapeProcess.hxx
src/ShHealOper/ShHealOper_SpiltCurve2d.hxx
src/ShHealOper/ShHealOper_SplitCurve2d.cxx
src/ShHealOper/ShHealOper_SplitCurve2d.hxx
src/ShHealOper/ShHealOper_SplitCurve3d.cxx
src/ShHealOper/ShHealOper_SplitCurve3d.hxx
src/ShHealOper/ShHealOper_Tool.cxx
src/ShHealOper/ShHealOper_Tool.hxx
src/TransformationGUI/Makefile.am
src/TransformationGUI/TransformationGUI.cxx
src/TransformationGUI/TransformationGUI.h
src/TransformationGUI/TransformationGUI.pro [new file with mode: 0644]
src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
src/TransformationGUI/TransformationGUI_MirrorDlg.h
src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
src/TransformationGUI/TransformationGUI_MultiRotationDlg.h
src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h
src/TransformationGUI/TransformationGUI_OffsetDlg.cxx
src/TransformationGUI/TransformationGUI_OffsetDlg.h
src/TransformationGUI/TransformationGUI_PositionDlg.cxx
src/TransformationGUI/TransformationGUI_PositionDlg.h
src/TransformationGUI/TransformationGUI_RotationDlg.cxx
src/TransformationGUI/TransformationGUI_RotationDlg.h
src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
src/TransformationGUI/TransformationGUI_ScaleDlg.h
src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
src/TransformationGUI/TransformationGUI_TranslationDlg.h
src/src.pro [new file with mode: 0644]

index 4be8dc3e8a85c2790f746a03217202294e77b212..e511ffbbabb1a3c59c00b73906145b77e92ab3f0 100644 (file)
@@ -1,26 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/
+//  This library is free software; you can redistribute it and/or
+//  modify it 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_version.h
 //  Author : Vadim SANDLER
 //  Module : SALOME
-
+//
 #if !defined(__GEOM_VERSION_H__)
 #define __GEOM_VERSION_H__
 
index b92e7ddb0f226007f07b0c2a5da10cb7e2b17afa..5242cf83febd4f347fb2b44339e1e92197a96f37 100644 (file)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 # -* Makefile *- 
-#
 # Author : Patrick GOLDBRONN (CEA)
 # Date : 28/06/2001
 # Modified by : Alexander BORODIN (OCN) - autotools usage
 #
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
+if GEOM_ENABLE_GUI
+  ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
+                    -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+                    -I ${GUI_ROOT_DIR}/adm_local/unix/config_files
+else !GEOM_ENABLE_GUI
+  ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
+                    -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+endif
+
 SUBDIRS = idl adm_local resources src doc bin
 
 DIST_SUBDIRS = idl adm_local resources src doc bin 
 
 DISTCLEANFILES = a.out aclocal.m4 configure
 
-salomeinclude_DATA=GEOM_version.h
+salomeinclude_DATA = GEOM_version.h
 
-EXTRA_DIST+= \
-       build_configure \
-       clean_configure \
+EXTRA_DIST +=          \
+       build_configure \
+       clean_configure \
        LICENCE
 
 dist-hook:
@@ -45,7 +54,7 @@ dist-hook:
 usr_docs:
        (cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
 
-docs:usr_docs
+docs: usr_docs
 
 dev_docs:
        (cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs)
index 7ae83a6fc82f9b81116b259ad29f7610ead06353..f35273fac7de52921e587cdc5f9641c7f3116fc3 100644 (file)
@@ -1,19 +1,24 @@
-# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
-#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
-# This library is free software; you can redistribute it and/or
-# modify it 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
-# 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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 $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 SUBDIRS = unix
index facd4e6f4afcae75a48956b85ab2e4687876c2aa..5f6d5f7536c72fc43090c511c2a26518cb92af5d 100644 (file)
@@ -1,22 +1,24 @@
-# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
-#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
-# This library is free software; you can redistribute it and/or
-# modify it 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
-# 
-
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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 $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 SUBDIRS = config_files
index 5dd0b63ae9c2cf71566f3fa8f69526569aadb0ed..706857c8856cab5c028225c9ad3b7472dadf5ea2 100644 (file)
@@ -1,23 +1,25 @@
-# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
-#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
-# This library is free software; you can redistribute it and/or
-# modify it 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
-# 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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 $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-dist_admlocalm4_DATA=\
-check_GEOM.m4\
-README
+dist_admlocalm4_DATA = \
+check_GEOM.m4
diff --git a/adm_local/unix/config_files/README b/adm_local/unix/config_files/README
deleted file mode 100644 (file)
index feb997b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-This file is only here for CVS:
-CVS does not always create empty directory, and adm_local/unix/config_file
-is needed by build_configure.
index 1c4b2df9338f8895bcf41dbd098c4aaa05b77cbc..dd30f1b07b94aeffcae0902b4d342c1bebd9ee44 100644 (file)
@@ -1,3 +1,24 @@
+dnl  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+dnl
+dnl  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl  This library is free software; you can redistribute it and/or
+dnl  modify it under the terms of the GNU Lesser General Public
+dnl  License as published by the Free Software Foundation; either
+dnl  version 2.1 of the License.
+dnl
+dnl  This library is distributed in the hope that it will be useful,
+dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl  Lesser General Public License for more details.
+dnl
+dnl  You should have received a copy of the GNU Lesser General Public
+dnl  License along with this library; if not, write to the Free Software
+dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+dnl
+dnl  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+dnl
 # Check availability of Geom binary distribution
 #
 # Author : Nicolas REJNERI (OPEN CASCADE, 2003)
index 533941331b2636b75b0d3b38a7d52983775ec4c9..36ad8c3a7c7e37c3da0591452c8cc09f24250858 100644 (file)
@@ -1,49 +1,83 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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 file defines the common definitions used in several
 # Makefile. This file must be included, if needed, by the file
 # Makefile.am.
 # ============================================================
-#
-
 # Standard directory for installation
-salomeincludedir   = $(includedir)/@PACKAGE@
-libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@
-bindir             = $(prefix)/bin/@PACKAGE@
+#
+salomeincludedir   = $(includedir)/salome
+libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
+bindir             = $(prefix)/bin/salome
 salomescriptdir    = $(bindir)
+salomepythondir    = $(pythondir)/salome
+salomepyexecdir    = $(pyexecdir)/salome
 
 # Directory for installing idl files
-salomeidldir       = $(prefix)/idl/@PACKAGE@
+salomeidldir       = $(prefix)/idl/salome
 
 # Directory for installing resource files
-salomeresdir       = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@
+salomeresdir       = $(prefix)/share/salome/resources/@MODULE_NAME@
 
 # Directories for installing admin files
-admlocaldir       = $(prefix)/adm_local
-admlocalunixdir     = $(admlocaldir)/unix
-admlocalm4dir        = $(admlocaldir)/unix/config_files
+admlocaldir        = $(prefix)/adm_local
+admlocalunixdir    = $(admlocaldir)/unix
+admlocalm4dir      = $(admlocaldir)/unix/config_files
 
 # Shared modules installation directory
-sharedpkgpythondir =$(pkgpythondir)/shared_modules
+sharedpkgpythondir = $(salomepythondir)/shared_modules
 
 # Documentation directory
-docdir             = $(datadir)/doc/@PACKAGE@
+docdir             = $(datadir)/doc/salome
 
 # common rules
 
-# moc-files generation
+# meta object implementation files generation (moc)
 %_moc.cxx: %.h
        $(MOC) $< -o $@
 
-# qm-files generation
-%.qm: %.po
-       $(MSG2QM) $< $@
+# translation (*.qm) files generation (lrelease)
+%.qm: %.ts
+       $(LRELEASE) $< -qm $@
+
+# resource files generation (qrcc)
+qrc_%.cxx: %.qrc
+       $(QRCC) $< -o $@ -name $(*F)
+
+# qt forms files generation (uic)
+ui_%.h: %.ui
+       $(UIC) -o $@ $<
 
-EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.po)
+# extra distributed files
+EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \
+             $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts)
 
+# customize clean operation
 mostlyclean-local:
        rm -f @builddir@/*_moc.cxx
        rm -f @builddir@/*.qm
+       rm -f @builddir@/ui_*.h
+       rm -f @builddir@/qrc_*.cxx
 
 # tests
 tests: unittest
index e7f7da1ce272a907cb5bb798ca85b98107277d9e..5cc39861ea0b208a8e44f19821323bb8189d727f 100644 (file)
@@ -1,35 +1,32 @@
-# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
-#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
-# This library is free software; you can redistribute it and/or
-# modify it 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
-# -* Makefile *- 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #
+# -* Makefile *- 
 # Author : Guillaume Boulant (CSSI)
 # Module : GEOM
 #
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-#
-# ===============================================================
-# Files to be installed
-# ===============================================================
-#
-
-# These files are data, module or lib files
-nodist_salomescript_DATA= VERSION
+# non-distributed files 
+nodist_salomescript_DATA = VERSION
 
-EXTRA_DIST+= VERSION.in
+# distributed files
+dist_salomescript_SCRIPTS =
diff --git a/build_cmake b/build_cmake
new file mode 100755 (executable)
index 0000000..e2f5b16
--- /dev/null
@@ -0,0 +1,31 @@
+#!/bin/sh
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+
+
+CURRENT_DIR=`pwd`
+CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
+cd ${CONF_DIR}
+python $KERNEL_ROOT_DIR/salome_adm/cmake_files/am2cmake.py --geom
+status=$?
+cd ${CURRENT_DIR}
+exit $status
diff --git a/build_cmake.bat b/build_cmake.bat
new file mode 100644 (file)
index 0000000..772c3da
--- /dev/null
@@ -0,0 +1,2 @@
+\r
+%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --geom\r
index 27672f14d2aefc040d79e53a68feee6eb75ce848..d8b893183c39712872cca0ea3d54f6b8f900f682 100755 (executable)
@@ -1,17 +1,34 @@
 #!/bin/bash
-
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #
 # Tool for updating list of .in file for the SALOME project 
 # and regenerating configure script
-#
 # Author : Marc Tajchman - CEA
 # Date : 10/10/2002
 # Modified by : Alexander BORODIN (OCN) - autotools usage
 # $Header$
-#
 # 13/03/2007: Alexander BORODIN - OCN
 # Reorganization for usage of autotools
-
+#
 ORIG_DIR=`pwd`
 CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
 GEOM_WITH_GUI="yes"
@@ -33,10 +50,10 @@ fi
 for option
 do
   case $option in
-      -with-ihm | --with-ihm)
+      -with-gui | --with-gui)
           GEOM_WITH_GUI="yes"
           break;;
-      -without-ihm | --without-ihm | -with-ihm=no | --with-ihm=no)
+      -without-gui | --without-gui | -with-gui=no | --with-gui=no)
           GEOM_WITH_GUI="no"
           break;;
   esac
diff --git a/clean_configure b/clean_configure
new file mode 100755 (executable)
index 0000000..f57f7b3
--- /dev/null
@@ -0,0 +1,35 @@
+#!/bin/sh
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+rm -rf autom4te.cache aclocal.m4 configure make_config
+find . -name "*~" -print -exec rm {} \;
+find . -name "*.pyc" -print -exec rm {} \;
+#exit
+# ==================== ON SORT AVANT
+
+find bin -name Makefile.in | xargs rm -f
+find doc -name Makefile.in | xargs rm -f
+find idl -name Makefile.in | xargs rm -f
+find resources -name Makefile.in | xargs rm -f
+find salome_adm -name Makefile.in | xargs rm -f
+find src -name Makefile.in | xargs rm -f
+rm -f Makefile.in
index 45f01b5c808dd2c4b15dc27079be9f851fda7fa7..9df51f5f8ac763b6a95e0fe059a517bcd9c4eaab 100644 (file)
@@ -1,19 +1,37 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #
 # Author : Marc Tajchman (CEA)
 # Date : 28/06/2001
 # Modified by : Patrick GOLDBRONN (CEA)
 # Modified by : Marc Tajchman (CEA)
 # Modified by : Alexander BORODIN (OCN) - autotools usage
-#
 # Created from configure.in.base
 #
-
-
-AC_INIT([Salome2 Project GEOM module], [4.1.1], [webmaster.salome@opencascade.com], [salome])
+AC_INIT([Salome2 Project GEOM module], [5.1.0], [webmaster.salome@opencascade.com], [SalomeGEOM])
 AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([tar-pax])
+
 
 XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
 AC_SUBST(XVERSION)
@@ -69,7 +87,7 @@ dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairie
 
 echo
 echo ---------------------------------------------
-echo Coniguring production
+echo Configuring production
 echo ---------------------------------------------
 echo
 AC_ENABLE_DEBUG(yes)
@@ -219,14 +237,6 @@ GEOM_WITH_GUI=yes
 AM_CONDITIONAL(GEOM_ENABLE_GUI, [test "${GEOM_WITH_GUI}" = "yes"])
 
 if test "${GEOM_WITH_GUI}" = "yes"; then
-    echo
-    echo ---------------------------------------------
-    echo testing msg2qm
-    echo ---------------------------------------------
-    echo
-
-    CHECK_MSG2QM
-
     echo
     echo ---------------------------------------------
     echo testing openGL
@@ -321,7 +331,7 @@ echo
 echo Configure
 
 if test "${GEOM_WITH_GUI}" = "yes"; then
-variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
+variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok SalomeGUI_ok"
 fi
 if test "${GEOM_WITH_GUI}" = "no"; then
 variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
@@ -338,27 +348,22 @@ echo "Default ORB   : $DEFAULT_ORB"
 echo
 
 dnl We don t need to say when we re entering directories if we re using
-dnl GNU make becuase make does it for us.
+dnl GNU make because make does it for us.
 if test "X$GMAKE" = "Xyes"; then
    AC_SUBST(SETX) SETX=":"
 else
    AC_SUBST(SETX) SETX="set -x"
 fi
 
-dnl copy shells and utilities contained in the bin directory
-dnl excluding .in files (treated in AC-OUTPUT below) and CVS
-dnl directory
-
-
 echo
 echo ---------------------------------------------
 echo generating Makefiles and configure files
 echo ---------------------------------------------
 echo
 
-AC_OUTPUT_COMMANDS([ \
-  chmod +x ./bin/*; \
-])
+#AC_OUTPUT_COMMANDS([ \
+#  chmod +x ./bin/*; \
+#])
 
 # This list is initiated using autoscan and must be updated manually
 # when adding a new file <filename>.in to manage. When you execute
@@ -375,11 +380,12 @@ AC_OUTPUT([ \
   ./doc/Makefile \
   ./doc/salome/Makefile \
   ./doc/salome/gui/Makefile \
+  ./doc/salome/gui/GEOM/Makefile \
   ./doc/salome/gui/GEOM/doxyfile \
   ./doc/salome/gui/GEOM/doxyfile_py \
+  ./doc/salome/gui/GEOM/doxyfile_tui \
   ./doc/salome/tui/Makefile \
-  ./doc/salome/tui/GEOM/doxyfile \
-  ./doc/salome/tui/GEOM/sources/static/tree.js \
+  ./doc/salome/tui/doxyfile \
   ./src/Makefile \
   ./src/ARCHIMEDE/Makefile \
   ./src/BREPExport/Makefile \
@@ -408,7 +414,6 @@ AC_OUTPUT([ \
   ./src/IGESExport/Makefile \
   ./src/IGESImport/Makefile \
   ./src/MeasureGUI/Makefile \
-  ./src/NMTAlgo/Makefile \
   ./src/NMTDS/Makefile \
   ./src/NMTTools/Makefile \
   ./src/OBJECT/Makefile \
index dcbc00f24cc5f3d04cd577d82a5765bec4d3872c..1902d9d21933c19777904ac59742905c3fd400d5 100644 (file)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-
 # -* Makefile *- 
-#
 # Author : Patrick GOLDBRONN (CEA)
 # Date : 30/11/2001
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
+# Modified by : Alexander BORODIN (OCN) - autotools usage
 # $Header$
-#
 # source path
+#
+SUBDIRS = salome
+
+usr_docs:
+       (cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
+
+docs: usr_docs
 
-SUBDIRS= salome
+dev_docs:
+       (cd salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs)
index 43c97dd62455dd71426a5397c73f9bbb60caaa14..5a92861e53f2f5283ae565dbba7668f682714577 100644 (file)
@@ -1,4 +1,7 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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 along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-
 # -* Makefile *- 
-#
 # Author : Patrick GOLDBRONN (CEA)
 # Date : 30/11/2001
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 # $Header:
 #
-
-SUBDIRS= tui gui
-SUBDIRSTUI= tui
-SUBDIRSGUI= gui
+SUBDIRS = tui gui
+SUBDIRSTUI = tui
+SUBDIRSGUI = gui
 
 usr_docs:
        @@SETX@; for d in $(SUBDIRSGUI); do     \
diff --git a/doc/salome/gui/GEOM/Makefile.am b/doc/salome/gui/GEOM/Makefile.am
new file mode 100755 (executable)
index 0000000..88bb971
--- /dev/null
@@ -0,0 +1,75 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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)
+#  Modified by : Alexander BORODIN (OCN) - autotools usage
+#  Module : doc
+#
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+EXTRA_DIST += images input static
+
+usr_docs: doxyfile_tui doxyfile_py doxyfile 
+       echo "===========================================" ;                    \
+       echo "Replacing geompyDC by geompy" ;                                   \
+       echo "===========================================" ;                    \
+       sed -e "/class geompyDC/d" -e "s/^ *#/#/g" -e "s/^ *def /def /g"        \
+         -e "s/geompyDC/geompy/g" $(top_srcdir)/src/GEOM_SWIG/geompyDC.py >    \
+         $(top_builddir)/src/GEOM_SWIG/geompy.py ;                             \
+       echo "===========================================" ;                    \
+       echo "Generating examples documentation" ;                              \
+       echo "===========================================" ;                    \
+       $(DOXYGEN) doxyfile_tui ;                                               \
+       echo "===========================================" ;                    \
+       echo "Generating Python interface documentation";                       \
+       echo "===========================================" ;                    \
+       $(DOXYGEN) doxyfile_py ;                                                \
+       echo "===========================================" ;                    \
+       echo "Generating GUI documentation" ;                                   \
+       echo "===========================================" ;                    \
+       $(DOXYGEN) doxyfile ; \
+       rm -f $(top_builddir)/src/GEOM_SWIG/geompy.py
+
+docs: usr_docs
+
+clean-local:
+       @for filen in `find . -maxdepth 1` ; do                                         \
+         case $${filen} in                                                     \
+           ./Makefile | ./doxyfile | ./doxyfile_py | ./doxyfile_tui ) ;;       \
+           . | .. ) ;;                                                         \
+           *) echo "Removing $${filen}" ; rm -rf $${filen} ;;                  \
+         esac ;                                                                \
+       done ;
+
+install-data-local: usr_docs
+       $(INSTALL) -d $(DESTDIR)$(docdir)/gui/GEOM
+       @for filen in `find . -maxdepth 1` ; do                                                         \
+         case $${filen} in                                                                     \
+           ./Makefile | ./doxyfile | ./doxyfile_py | ./doxyfile_tui ) ;;                       \
+           ./doxyfile.bak | ./doxyfile_py.bak | ./doxyfile_tui.bak ) ;;                        \
+           . | .. ) ;;                                                                         \
+           *) echo "Installing $${filen}" ; cp -rp $${filen} $(DESTDIR)$(docdir)/gui/GEOM ;;   \
+         esac ;                                                                                \
+       done ;
+
+uninstall-local:
+       rm -rf $(DESTDIR)$(docdir)/gui/GEOM
index 75b0c99aaf23a94c2b38ecd2090c90c97defbed2..cc7de8625fd838301b09a086cd4130b96a0e664e 100755 (executable)
@@ -1,8 +1,30 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME      = "Geometry Module Reference Manual v.@VERSION@"
-OUTPUT_DIRECTORY  = ./
+OUTPUT_DIRECTORY  = .
 CREATE_SUBDIRS   = NO
 OUTPUT_LANGUAGE   = English
 TAB_SIZE          = 5
@@ -18,13 +40,15 @@ WARNINGS          = YES
 #---------------------------------------------------------------------------
 INPUT             = @srcdir@/input               
 FILE_PATTERNS     = *.doc
+EXCLUDE           = 
 IMAGE_PATH        = @srcdir@/images
+EXAMPLE_PATH      = @top_srcdir@/src/GEOM_SWIG
 
 #---------------------------------------------------------------------------
 #HTML related options
 #---------------------------------------------------------------------------
 GENERATE_HTML     = YES
-HTML_OUTPUT       = ./
+HTML_OUTPUT       = .
 HTML_HEADER       = @srcdir@/static/header.html
 HTML_FOOTER       = @srcdir@/static/footer.html
 #HTML_STYLESHEET  = @srcdir@/static/doxygen.css
@@ -46,4 +70,5 @@ GENERATE_RTF      = NO
 #---------------------------------------------------------------------------
 #External reference options
 #---------------------------------------------------------------------------
-TAGFILES = geompy_doc.tag=./geompy_doc
\ No newline at end of file
+TAGFILES          = geompy_doc.tag=geompy_doc
+ALLEXTERNALS      = NO
index 88df45eb83304907dfe4bfc1368361e83dc51fbc..efa355dfcdc6b2050fc15067f4748e8e71406e20 100755 (executable)
@@ -1,10 +1,32 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME      = "Geometry Module Reference Manual v.@VERSION@"
-OUTPUT_DIRECTORY  = ./
-CREATE_SUBDIRS   = NO
-OUTPUT_LANGUAGE   = English
+PROJECT_NAME           = "Geometry Module Reference Manual v.@VERSION@"
+OUTPUT_DIRECTORY       = .
+CREATE_SUBDIRS        = NO
+OUTPUT_LANGUAGE        = English
 USE_WINDOWS_ENCODING   = NO
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = NO
@@ -66,8 +88,8 @@ VERBATIM_HEADERS       = YES
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
-QUIET             = NO
-WARNINGS          = YES
+QUIET                  = NO
+WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
@@ -77,16 +99,17 @@ EXAMPLE_RECURSIVE      = NO
 #---------------------------------------------------------------------------
 #Input related options
 #---------------------------------------------------------------------------
-INPUT             = @top_srcdir@/src/GEOM_SWIG
-FILE_PATTERNS     = geompyDC.py
+INPUT             = @top_builddir@/src/GEOM_SWIG
+FILE_PATTERNS     = geompy.py
 IMAGE_PATH        = @srcdir@/images
+EXAMPLE_PATH      = @top_srcdir@/src/GEOM_SWIG
 RECURSIVE         = NO
 
 #---------------------------------------------------------------------------
 #HTML related options
 #---------------------------------------------------------------------------
 GENERATE_HTML     = YES
-HTML_OUTPUT       = ./geompy_doc
+HTML_OUTPUT       = geompy_doc
 HTML_HEADER       = @srcdir@/static/header.html
 HTML_FOOTER       = @srcdir@/static/footer.html
 #HTML_STYLESHEET  = @srcdir@/static/doxygen.css
@@ -107,24 +130,17 @@ GENERATE_RTF      = NO
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool   
 #---------------------------------------------------------------------------
-#CLASS_DIAGRAMS         = YES
 CLASS_DIAGRAMS         = NO
 HIDE_UNDOC_RELATIONS   = NO
-#HAVE_DOT               = YES
 HAVE_DOT               = NO
-#CLASS_GRAPH            = YES
 CLASS_GRAPH            = NO
 COLLABORATION_GRAPH    = NO
 GROUP_GRAPHS           = NO
 UML_LOOK               = NO
-#TEMPLATE_RELATIONS     = YES
-#INCLUDE_GRAPH          = YES
 TEMPLATE_RELATIONS     = NO
 INCLUDE_GRAPH          = NO
 INCLUDED_BY_GRAPH      = NO
 CALL_GRAPH             = NO
-#GRAPHICAL_HIERARCHY    = YES
-#DIRECTORY_GRAPH        = YES
 GRAPHICAL_HIERARCHY    = NO
 DIRECTORY_GRAPH        = NO
 DOT_IMAGE_FORMAT       = jpg
@@ -142,3 +158,4 @@ DOT_CLEANUP            = YES
 #External reference options
 #---------------------------------------------------------------------------
 GENERATE_TAGFILE  = geompy_doc.tag
+TAGFILES          = tui_examples.tag=..
diff --git a/doc/salome/gui/GEOM/doxyfile_tui.in b/doc/salome/gui/GEOM/doxyfile_tui.in
new file mode 100755 (executable)
index 0000000..e324105
--- /dev/null
@@ -0,0 +1,72 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME      = "Geometry Module Reference Manual v.@VERSION@"
+OUTPUT_DIRECTORY  = .
+CREATE_SUBDIRS   = NO
+OUTPUT_LANGUAGE   = English
+TAB_SIZE          = 5
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET             = NO
+WARNINGS          = YES
+
+#---------------------------------------------------------------------------
+#Input related options
+#---------------------------------------------------------------------------
+INPUT             = @srcdir@/input               
+FILE_PATTERNS     = tui_*.doc
+IMAGE_PATH        = @srcdir@/images
+EXAMPLE_PATH      = @top_srcdir@/src/GEOM_SWIG
+
+#---------------------------------------------------------------------------
+#HTML related options
+#---------------------------------------------------------------------------
+GENERATE_HTML     = YES
+HTML_OUTPUT       = .
+HTML_HEADER       = @srcdir@/static/header.html
+HTML_FOOTER       = @srcdir@/static/footer.html
+#HTML_STYLESHEET  = @srcdir@/static/doxygen.css
+TOC_EXPAND        = YES
+DISABLE_INDEX     = NO
+GENERATE_TREEVIEW = YES
+TREEVIEW_WIDTH    = 300
+
+#---------------------------------------------------------------------------
+#LaTeX related option
+#---------------------------------------------------------------------------
+GENERATE_LATEX    = NO
+
+#---------------------------------------------------------------------------
+#RTF related options
+#---------------------------------------------------------------------------
+GENERATE_RTF      = NO
+
+#---------------------------------------------------------------------------
+#External reference options
+#---------------------------------------------------------------------------
+GENERATE_TAGFILE  = tui_examples.tag
diff --git a/doc/salome/gui/GEOM/files/introduction_to_geom.htm b/doc/salome/gui/GEOM/files/introduction_to_geom.htm
deleted file mode 100755 (executable)
index d39bc39..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-<!doctype HTML public "-//W3C//DTD HTML 4.0 Frameset//EN">
-
-<html>
-
-<head>
-<title>Introduction to GEOM</title>
-<meta http-equiv="content-type" content="text/html; charset=windows-1252">
-<meta name="generator" content="RoboHelp by eHelp Corporation www.ehelp.com">
-<link rel="stylesheet" href="../default_ns.css"><script type="text/javascript" language="JavaScript" title="WebHelpSplitCss">
-<!--
-if (navigator.appName !="Netscape")
-{   document.write("<link rel='stylesheet' href='../default.css'>");}
-//-->
-</script>
-<style type="text/css">
-<!--
-img_whs1 { border:none; width:30px; height:30px; float:none; border-style:none; }
-ul.whs2 { list-style:disc; }
-table.whs3 { x-cell-content-align:top; width:100%; border-spacing:0px; }
-col.whs4 { width:50%; }
-tr.whs5 { x-cell-content-align:top; }
-td.whs6 { width:50%; padding-right:10px; padding-left:10px; border-right-style:none; border-left-style:none; border-top-style:none; border-bottom-style:none; }
-td.whs7 { width:50%; padding-right:10px; padding-left:10px; border-top-style:none; border-bottom-style:none; border-right-style:none; }
-img_whs8 { border:none; width:400px; height:292px; border-style:none; }
--->
-</style><script type="text/javascript" language="JavaScript" title="WebHelpInlineScript">
-<!--
-function reDo() {
-  if (innerWidth != origWidth || innerHeight != origHeight)
-     location.reload();
-}
-if ((parseInt(navigator.appVersion) == 4) && (navigator.appName == "Netscape")) {
-       origWidth = innerWidth;
-       origHeight = innerHeight;
-       onresize = reDo;
-}
-onerror = null; 
-//-->
-</script>
-<style type="text/css">
-<!--
-div.WebHelpPopupMenu { position:absolute; left:0px; top:0px; z-index:4; visibility:hidden; }
-p.WebHelpNavBar { text-align:right; }
--->
-</style><script type="text/javascript" language="javascript1.2" src="../whmsg.js"></script>
-<script type="text/javascript" language="javascript" src="../whver.js"></script>
-<script type="text/javascript" language="javascript1.2" src="../whproxy.js"></script>
-<script type="text/javascript" language="javascript1.2" src="../whutils.js"></script>
-<script type="text/javascript" language="javascript1.2" src="../whtopic.js"></script>
-<script type="text/javascript" language="javascript1.2">
-<!--
-if (window.gbWhTopic)
-{
-       if (window.setRelStartPage)
-       {
-       addButton("show",BTN_IMG,"Show","","","","",0,0,"../whd_show0.gif","../whd_show2.gif","../whd_show1.gif");
-addButton("hide",BTN_IMG,"Hide","","","","",0,0,"../whd_hide0.gif","../whd_hide2.gif","../whd_hide1.gif");
-
-       }
-
-
-       if (window.setRelStartPage)
-       {
-       setRelStartPage("../index.htm");
-
-               autoSync(1);
-               sendSyncInfo();
-               sendAveInfoOut();
-       }
-
-}
-else
-       if (window.gbIE4)
-               document.location.reload();
-//-->
-</script>
-</head>
-<body><script type="text/javascript" language="javascript1.2">
-<!--
-if (window.writeIntopicBar)
-       writeIntopicBar(4);
-//-->
-</script>
-<h1>Introduction to Geometry</h1>
-
-<p><img src="../i_blue.jpg" x-maintain-ratio="TRUE" width="30px" height="30px" border="0" class="img_whs1"><span style="font-weight: bold;"><B>Geometry </B></span>module 
- of SALOME is destined for: </p>
-
-<p>&nbsp;</p>
-
-<ul type="disc" class="whs2">
-       
-       <li class=kadov-p><p>Import and export of geometrical models in IGES, 
- BREP and STEP formats.</p></li>
-       
-       <li class=kadov-p><p>Construction and optimization of geometrical models 
- using a wide range of &nbsp;CAD 
- functions:</p></li>
-</ul>
-
-<p>&nbsp;</p>
-
-<table x-use-null-cells cellspacing="0" width="100%" class="whs3">
-<col class="whs4">
-<col class="whs4">
-
-<tr valign="top" class="whs5">
-<td width="50%" class="whs6">
-<ul type="disc" class="whs2">
-       
-       <li class=kadov-p><p>Creation of basic geometrical objects</p></li>
-       
-       <li class=kadov-p><p>Construction of primitives</p></li>
-       
-       <li class=kadov-p><p>Building shapes</p></li>
-       
-       <li class=kadov-p><p>Generation of complex shapes</p></li>
-       
-       <li class=kadov-p><p>Working with groups</p></li>
-       
-       <li class=kadov-p><p>Geometrical repairing of objects</p></li>
-       
-       <li class=kadov-p><p>Geometrical boolean operations</p></li>
-       
-       <li class=kadov-p><p>Geometrical transformations</p></li>
-       
-       <li class=kadov-p><p>Building by blocks</p></li>
-</ul>
-<p>&nbsp;</td>
-<td width="50%" class="whs7">
-<p><img src="../image3.jpg" width="400px" height="292px" border="0" class="img_whs8"></td></tr>
-</table>
-
-<p>&nbsp;</p>
-
-<script type="text/javascript" language="javascript1.2">
-<!--
-if (window.writeIntopicBar)
-       writeIntopicBar(0);
-//-->
-</script>
-</body>
-</html>
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image27.gif b/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image27.gif
deleted file mode 100755 (executable)
index 216da75..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image27.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image29.gif b/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image29.gif
deleted file mode 100755 (executable)
index 5ee22f3..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image29.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image30.gif b/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image30.gif
deleted file mode 100755 (executable)
index a83d6d1..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image30.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image31.gif b/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image31.gif
deleted file mode 100755 (executable)
index 82a6968..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image31.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image32.gif b/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image32.gif
deleted file mode 100755 (executable)
index f74b5f0..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image32.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image33.gif b/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image33.gif
deleted file mode 100755 (executable)
index 72dd5f5..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image33.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image34.gif b/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image34.gif
deleted file mode 100755 (executable)
index ed0f452..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image34.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions.htm
deleted file mode 100755 (executable)
index ff110b0..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-<!doctype HTML public "-//W3C//DTD HTML 4.0 Frameset//EN">
-
-<html>
-
-<head>
-<title>Using Boolean Operations</title>
-<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=windows-1252">
-<meta name="generator" content="RoboHelp by eHelp Corporation www.ehelp.com">
-<link rel="stylesheet" href="../default_ns.css"><script type="text/javascript" language="JavaScript" title="WebHelpSplitCss">
-<!--
-if (navigator.appName !="Netscape")
-{   document.write("<link rel='stylesheet' href='../default.css'>");}
-//-->
-</script>
-<style type="text/css">
-<!--
-h1.whs1 { margin-left:0in; margin-right:0in; margin-top:0px; margin-bottom:0px; }
-p.whs2 { font-size:12pt; text-indent:2px; margin-left:0in; margin-right:0in; margin-top:0px; margin-bottom:0px; }
-p.whs3 { font-size:12pt; font-weight:normal; }
-img_whs4 { border:none; float:none; width:30px; height:30px; border-style:none; }
-p.whs5 { font-size:12pt; text-indent:2px; margin-right:0in; margin-top:0px; margin-bottom:0px; margin-left:48px; }
-p.whs6 { text-indent:2px; margin-right:0in; margin-top:0px; margin-bottom:0px; font-size:12pt; margin-left:48px; }
-p.whs7 { font-size:12pt; text-indent:2px; margin-left:0in; margin-right:0in; margin-top:0px; margin-bottom:0px; font-weight:normal; }
-p.whs8 { margin-left:48px; }
-p.whs9 { font-size:12pt; }
--->
-</style><script type="text/javascript" language="JavaScript">
-<!--
-if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
-{
-  var strNSS = "<style type='text/css'>";
-  strNSS += "h1.whs1 {margin-left:1pt;margin-right:1pt;margin-top:1pt;margin-bottom:1pt; }";
-  strNSS += "p.whs2 {margin-left:1pt;margin-right:1pt;margin-top:1pt;margin-bottom:1pt; }";
-  strNSS += "p.whs5 {margin-right:1pt;margin-top:1pt;margin-bottom:1pt; }";
-  strNSS += "p.whs6 {margin-right:1pt;margin-top:1pt;margin-bottom:1pt; }";
-  strNSS += "p.whs7 {margin-left:1pt;margin-right:1pt;margin-top:1pt;margin-bottom:1pt; }";
-  strNSS +="</style>";
-  document.write(strNSS);
-}
-//-->
-</script>
-<script type="text/javascript" language="JavaScript" title="WebHelpInlineScript">
-<!--
-function reDo() {
-  if (innerWidth != origWidth || innerHeight != origHeight)
-     location.reload();
-}
-if ((parseInt(navigator.appVersion) == 4) && (navigator.appName == "Netscape")) {
-       origWidth = innerWidth;
-       origHeight = innerHeight;
-       onresize = reDo;
-}
-onerror = null; 
-//-->
-</script>
-<style type="text/css">
-<!--
-div.WebHelpPopupMenu { position:absolute; left:0px; top:0px; z-index:4; visibility:hidden; }
-p.WebHelpNavBar { text-align:right; }
--->
-</style><script type="text/javascript" language="javascript1.2" src="../whmsg.js"></script>
-<script type="text/javascript" language="javascript" src="../whver.js"></script>
-<script type="text/javascript" language="javascript1.2" src="../whproxy.js"></script>
-<script type="text/javascript" language="javascript1.2" src="../whutils.js"></script>
-<script type="text/javascript" language="javascript1.2" src="../whtopic.js"></script>
-<script type="text/javascript" language="javascript1.2">
-<!--
-if (window.gbWhTopic)
-{
-       if (window.setRelStartPage)
-       {
-       addTocInfo("Geometry module\nTransforming geometrical objects\nBoolean Operations\nUsing boolean operations");
-addButton("show",BTN_IMG,"Show","","","","",0,0,"../whd_show0.gif","../whd_show2.gif","../whd_show1.gif");
-addButton("hide",BTN_IMG,"Hide","","","","",0,0,"../whd_hide0.gif","../whd_hide2.gif","../whd_hide1.gif");
-
-       }
-
-
-       if (window.setRelStartPage)
-       {
-       setRelStartPage("../index.htm");
-
-               autoSync(1);
-               sendSyncInfo();
-               sendAveInfoOut();
-       }
-
-}
-else
-       if (window.gbIE4)
-               document.location.reload();
-//-->
-</script>
-</head>
-<body><script type="text/javascript" language="javascript1.2">
-<!--
-if (window.writeIntopicBar)
-       writeIntopicBar(4);
-//-->
-</script>
-<h1 class="whs1">Using Boolean Operations</h1>
-
-<p class="whs2">&nbsp;</p>
-
-<p class="whs3"><b style="font-weight: bold;"><img src="../i_blue.jpg" x-maintain-ratio="TRUE" x-save-file="TRUE" x-save-method="compute-relative" width="30px" height="30px" border="0" class="img_whs4"><span style="font-weight: normal;">You can use the following 
- boolean operations for construction of more complex geometrical objects 
- (2D &amp; 3D elements) :</span></b></p>
-
-<p class="whs3">&nbsp;</p>
-
-<ul>
-       
-       <li style="list-style: disc;"
-               type=disc
-               class=kadov-p><p class="whs5"><a href="../fuse.htm">Fuse</a></p></li>
-</ul>
-
-<ul>
-       
-       <li style="list-style: disc;"
-               type=disc
-               class=kadov-p><p class="whs5"><a href="../common.htm">Common</a></p></li>
-       
-       <li style="list-style: disc;"
-               type=disc
-               class=kadov-p><p class="whs6"><a href="../cut.htm">Cut</a></p></li>
-       
-       <li style="list-style: disc;"
-               type=disc
-               class=kadov-p><p class="whs5"><a href="../section.htm">Section</a></p></li>
-</ul>
-
-<p class="whs2">&nbsp;</p>
-
-<p class="whs7">There is a general TUI command covering 
- all these operations, which can be used alongside with separate commands 
- for each operation.</p>
-
-<p class="whs5"><span style="font-style: italic;"><I>geompy.MakeBoolean(Shape1, 
- Shape2, Operation)</I></span>, where Shape1 is the first argument and Shape2 
- is the second argument of Boolean operation, Operation is a type of the 
- Boolean operation (1 \96 Common, 2 \96 Cut, 3 \96 Fuse, 4 \96 Section).</p>
-
-<p class="whs8">&nbsp;</p>
-
-<p class="whs9"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;">Our <span style="font-weight: bold;"><B>TUI 
- Scripts</B></span> provide you with useful examples of the use of <a href="../boolean_operations.htm">Boolean 
- Operations</a>. </font></span></p>
-
-<p>&nbsp;</p>
-
-<script type="text/javascript" language="javascript1.2">
-<!--
-if (window.writeIntopicBar)
-       writeIntopicBar(0);
-//-->
-</script>
-</body>
-</html>
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image1.gif b/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image1.gif
deleted file mode 100755 (executable)
index 129d17d..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image1.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image2.gif b/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image2.gif
deleted file mode 100755 (executable)
index 56ec71d..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image2.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image3.gif b/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image3.gif
deleted file mode 100755 (executable)
index d210eb9..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image3.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image4.gif b/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image4.gif
deleted file mode 100755 (executable)
index 3372d41..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image4.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image56.gif b/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image56.gif
deleted file mode 100755 (executable)
index d7adb4c..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image56.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image57.gif b/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image57.gif
deleted file mode 100755 (executable)
index 4f79860..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image57.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image58.gif b/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image58.gif
deleted file mode 100755 (executable)
index 178eb64..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image58.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image59.gif b/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image59.gif
deleted file mode 100755 (executable)
index 18fa567..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image59.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm
deleted file mode 100755 (executable)
index de5df12..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-<!doctype HTML public "-//W3C//DTD HTML 4.0 Frameset//EN">
-
-<html>
-
-<head>
-<title>Importing and exporting geometrical objects</title>
-<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=windows-1252">
-<meta name="generator" content="RoboHelp by eHelp Corporation www.ehelp.com">
-<link rel="stylesheet" href="../default_ns.css"><script type="text/javascript" language="JavaScript" title="WebHelpSplitCss">
-<!--
-if (navigator.appName !="Netscape")
-{   document.write("<link rel='stylesheet' href='../default.css'>");}
-//-->
-</script>
-<style type="text/css">
-<!--
-p.whs1 { font-size:12pt; }
-img_whs2 { border:none; float:none; width:30px; height:30px; border-style:none; }
-p.whs3 { margin-left:40px; }
-img_whs4 { border:none; width:425px; height:269px; float:none; border-style:none; }
-img_whs5 { border:none; width:436px; height:269px; float:none; border-style:none; }
--->
-</style><script type="text/javascript" language="JavaScript" title="WebHelpInlineScript">
-<!--
-function reDo() {
-  if (innerWidth != origWidth || innerHeight != origHeight)
-     location.reload();
-}
-if ((parseInt(navigator.appVersion) == 4) && (navigator.appName == "Netscape")) {
-       origWidth = innerWidth;
-       origHeight = innerHeight;
-       onresize = reDo;
-}
-onerror = null; 
-//-->
-</script>
-<style type="text/css">
-<!--
-div.WebHelpPopupMenu { position:absolute; left:0px; top:0px; z-index:4; visibility:hidden; }
-p.WebHelpNavBar { text-align:right; }
--->
-</style><script type="text/javascript" language="javascript1.2" src="../whmsg.js"></script>
-<script type="text/javascript" language="javascript" src="../whver.js"></script>
-<script type="text/javascript" language="javascript1.2" src="../whproxy.js"></script>
-<script type="text/javascript" language="javascript1.2" src="../whutils.js"></script>
-<script type="text/javascript" language="javascript1.2" src="../whtopic.js"></script>
-<script type="text/javascript" language="javascript1.2">
-<!--
-if (window.gbWhTopic)
-{
-       if (window.setRelStartPage)
-       {
-       addTocInfo("Geometry module\nImporting/exporting geometrical objects");
-addButton("show",BTN_IMG,"Show","","","","",0,0,"../whd_show0.gif","../whd_show2.gif","../whd_show1.gif");
-addButton("hide",BTN_IMG,"Hide","","","","",0,0,"../whd_hide0.gif","../whd_hide2.gif","../whd_hide1.gif");
-
-       }
-
-
-       if (window.setRelStartPage)
-       {
-       setRelStartPage("../index.htm");
-
-               autoSync(1);
-               sendSyncInfo();
-               sendAveInfoOut();
-       }
-
-}
-else
-       if (window.gbIE4)
-               document.location.reload();
-//-->
-</script>
-</head>
-<body><script type="text/javascript" language="javascript1.2">
-<!--
-if (window.writeIntopicBar)
-       writeIntopicBar(4);
-//-->
-</script>
-<h1>Importing/exporting geometrical objects</h1>
-
-<p class="whs1"><b style="font-weight: bold;"><img src="../i_blue.jpg" x-maintain-ratio="TRUE" x-save-file="TRUE" x-save-method="compute-relative" width="30px" height="30px" border="0" class="img_whs2"> <span style="font-weight: normal;">In Geometry module you 
- can import and export geometrical objects from/into BREP, IGES, STEP </span></b><b><span 
- style="font-weight: normal;">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). &nbsp;</span></b></p>
-
-&nbsp; 
-
-<p class=TODO>To import geometrical objects from a BREP, IGES, STEP file:</p>
-
-<p class=TODO>&nbsp;</p>
-
-<p class="whs3">From the <span style="font-weight: bold;"><B>File 
- </B></span>menu choose <span style="font-weight: bold;"><B>Import. </B></span>In 
- the opening<span style="font-weight: bold;"> <B></B></span>dialog box <span style="font-weight: bold;"><B>Import</B></span> 
- select the required format of the file for importation and search for 
- a *.brep, *.iges or *.step &nbsp;file. 
- </p>
-
-<p class="whs3">&nbsp;</p>
-
-<p class="whs3"><img src="../pics/geomimport.png" x-maintain-ratio="TRUE" width="425px" height="269px" border="0" class="img_whs4"></p>
-
-<p class="whs3">&nbsp;</p>
-
-<p class="whs3">Select the required file and click <span 
- style="font-weight: bold;"><B>Open</B></span>. Your file will be imported in 
- the module and its contents (geometrical object) will be displayed in 
- the <span style="font-weight: bold;"><B>Object Browser</B></span>. </p>
-
-<p class="whs3">&nbsp;</p>
-
-<p>&nbsp;</p>
-
-<p class=TODO>To export geometrical objects into a BREP, IGES, STEP file:</p>
-
-<p class=TODO>&nbsp;</p>
-
-<p class="whs3">Select the object you wish to export, then 
- from the <span style="font-weight: bold;"><B>File </B></span>menu choose <span 
- style="font-weight: bold;"><B>Export. </B></span>In the opening dialog box<span 
- style="font-weight: bold;"><B> Export </B></span>define the required format, 
- the name and the location of the file for exportation.<span style="font-weight: bold;"> 
- <B></B></span></p>
-
-<p class="whs3">&nbsp;</p>
-
-<p class="whs3"><img src="../pics/geomexport.png" x-maintain-ratio="TRUE" width="436px" height="269px" border="0" class="img_whs5"></p>
-
-<p class="whs3">&nbsp;</p>
-
-<p class="whs3">Click <span style="font-weight: bold;"><B>Save</B></span> 
- to confirm your exportation. &nbsp;</p>
-
-<script type="text/javascript" language="javascript1.2">
-<!--
-if (window.writeIntopicBar)
-       writeIntopicBar(0);
-//-->
-</script>
-</body>
-</html>
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm
deleted file mode 100755 (executable)
index acb24e6..0000000
+++ /dev/null
@@ -1,483 +0,0 @@
-<!doctype HTML public "-//W3C//DTD HTML 4.0 Frameset//EN">
-
-<html>
-
-<head>
-<title>Using Measurement Tools</title>
-<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=windows-1252">
-<meta name="generator" content="RoboHelp by eHelp Corporation www.ehelp.com">
-<link rel="stylesheet" href="../default_ns.css"><script type="text/javascript" language="JavaScript" title="WebHelpSplitCss">
-<!--
-if (navigator.appName !="Netscape")
-{   document.write("<link rel='stylesheet' href='../default.css'>");}
-//-->
-</script>
-<style>
-<!--
-A:visited { color:#800080; }
-A:link { color:#0000ff; }
--->
-</style><style type="text/css">
-<!--
-p.whs1 { font-size:12pt; }
-img_whs2 { border:none; float:none; width:30px; height:30px; border-style:none; }
-p.whs3 { margin-left:40px; }
-img_whs4 { border:none; width:21px; height:19px; border-style:none; }
-p.whs5 { font-size:12pt; margin-left:40px; font-weight:bold; }
-img_whs6 { border:none; width:272px; height:303px; float:none; border-style:none; }
-p.whs7 { font-family:'Times New Roman' , serif; font-size:14pt; }
-img_whs8 { width:20px; height:20px; border-style:none; }
-p.whs9 { font-family:'Times New Roman' , serif; font-size:12pt; }
-img_whs10 { border:none; width:360px; height:307px; float:none; border-style:none; }
-p.whs11 { font-size:12pt; margin-left:40px; }
-img_whs12 { border:none; width:312px; height:367px; float:none; border-style:none; }
-p.whs13 { font-size:12pt; margin-left:400px; }
-img_whs14 { border:none; width:360px; height:333px; float:none; border-style:none; }
-p.whs15 { font-size:12pt; font-weight:bold; }
-img_whs16 { border:none; width:360px; height:328px; float:none; border-style:none; }
-p.whs17 { font-size:12pt; font-weight:normal; }
-img_whs18 { border:none; width:360px; height:290px; float:none; border-style:none; }
-img_whs19 { border:none; width:360px; height:405px; float:none; border-style:none; }
-img_whs20 { border:none; width:360px; height:337px; float:none; border-style:none; }
-p.whs21 { font-size:12pt; margin-left:40px; text-indent:-40px; }
-img_whs22 { border:none; width:25px; height:23px; border-style:none; }
-ul.whs23 { list-style:disc; }
-img_whs24 { border:none; width:329px; height:436px; float:none; border-style:none; }
--->
-</style><script type="text/javascript" language="JavaScript">
-<!--
-if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
-{
-  var strNSS = "<style type='text/css'>";
-  strNSS += "p.whs21 {text-indent:1pt; }";
-  strNSS +="</style>";
-  document.write(strNSS);
-}
-//-->
-</script>
-<script type="text/javascript" language="JavaScript" title="WebHelpInlineScript">
-<!--
-function reDo() {
-  if (innerWidth != origWidth || innerHeight != origHeight)
-     location.reload();
-}
-if ((parseInt(navigator.appVersion) == 4) && (navigator.appName == "Netscape")) {
-       origWidth = innerWidth;
-       origHeight = innerHeight;
-       onresize = reDo;
-}
-onerror = null; 
-//-->
-</script>
-<style type="text/css">
-<!--
-div.WebHelpPopupMenu { position:absolute; left:0px; top:0px; z-index:4; visibility:hidden; }
-p.WebHelpNavBar { text-align:right; }
--->
-</style><script type="text/javascript" language="javascript1.2" src="../whmsg.js"></script>
-<script type="text/javascript" language="javascript" src="../whver.js"></script>
-<script type="text/javascript" language="javascript1.2" src="../whproxy.js"></script>
-<script type="text/javascript" language="javascript1.2" src="../whutils.js"></script>
-<script type="text/javascript" language="javascript1.2" src="../whtopic.js"></script>
-<script type="text/javascript" language="javascript1.2">
-<!--
-if (window.gbWhTopic)
-{
-       if (window.setRelStartPage)
-       {
-       addTocInfo("Geometry module\nUsing measurement tools");
-addButton("show",BTN_IMG,"Show","","","","",0,0,"../whd_show0.gif","../whd_show2.gif","../whd_show1.gif");
-addButton("hide",BTN_IMG,"Hide","","","","",0,0,"../whd_hide0.gif","../whd_hide2.gif","../whd_hide1.gif");
-
-       }
-
-
-       if (window.setRelStartPage)
-       {
-       setRelStartPage("../index.htm");
-
-               autoSync(1);
-               sendSyncInfo();
-               sendAveInfoOut();
-       }
-
-}
-else
-       if (window.gbIE4)
-               document.location.reload();
-//-->
-</script>
-</head>
-<body><script type="text/javascript" language="javascript1.2">
-<!--
-if (window.writeIntopicBar)
-       writeIntopicBar(4);
-//-->
-</script>
-<h1>Using measurement tools</h1>
-
-<p class="whs1"><b style="font-weight: normal;"><img src="../i_blue.jpg" x-maintain-ratio="TRUE" x-save-file="TRUE" x-save-method="compute-relative" width="30px" height="30px" border="0" class="img_whs2">Measurement tools in GEOM are necessary for getting</b> different 
- data concerning created or imported geometrical objects. They are:</p>
-
-<p class="whs1">&nbsp;</p>
-
-<ul>
-       
-       <li class=kadov-p><p class="whs1"><a href="#PointCoord">Point 
- coordinates</a></p></li>
-       
-       <li class=kadov-p><p class="whs1"><a href="#Basic_properties">Basic 
- properties</a></p></li>
-       
-       <li class=kadov-p><p class="whs1"><a href="#Center_gravity">Center 
- of mass</a></p></li>
-       
-       <li class=kadov-p><p class="whs1"><a href="#Inertia_axis">Inertia</a></p></li>
-       
-       <li class=kadov-p><p class="whs1"><a href="#Bounding_box">Bounding 
- box</a></p></li>
-       
-       <li class=kadov-p><p class="whs1"><a href="#Min_distance">Min. 
- distance</a></p></li>
-       
-       <li class=kadov-p><p class="whs1"><a href="#Tolerance">Tolerance</a></p></li>
-       
-       <li class=kadov-p><p class="whs1"><a href="#Whatis">WhatIs</a></p></li>
-       
-       <li class=kadov-p><p class="whs1"><a href="#check">Check</a></p></li>
-       
-       <li class=kadov-p><p class="whs1"><a href="#Check_comp_blocks">Check 
- compound of blocks</a></p></li>
-</ul>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1">Our <span style="font-weight: bold;"><B>TUI Scripts</B></span> 
- show how to use <a href="../measurement_tools.htm">Measurement Tools</a> 
- with &nbsp;<span style="font-weight: bold;"><B>TUI 
- commands</B></span>. </p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class=TODO>To use measurement tools:</p>
-
-<p class=TODO>&nbsp;</p>
-
-<p class="whs3">In the main menu select <span style="font-weight: bold;"><B>Measures 
- </B></span>submenu.</p>
-
-<p class="whs3">&nbsp;</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1"><a name=PointCoord>&nbsp;<img src="../image49.gif" width="21px" height="19px" border="0" class="img_whs4"> <span style="font-weight: bold; font-size: 14pt;"><font size=4 style="font-size:14pt;"><B>Point coordinates</B></font></span></a></p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;">Returns the 
- coordinates of a point.</font></span></p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1"><b style="font-weight: bold;">Result:</b> Point 
- coordinates (X, Y, Z) in 3D space in the form of Python Tuple.</p>
-
-<p class="whs1"><span style="font-weight: bold;"><B>TUI command:</B></span> 
- <span style="font-style: italic;"><I>geompy.PointCoordinates(Point)</I></span>, 
- where Point is a point whose coordinates are inquired.</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs5"><img src="../pics/measures1.png" x-maintain-ratio="TRUE" width="272px" height="303px" border="0" class="img_whs6"></p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs7"><b style="font-weight: bold;"><a 
- NAME=Basic_properties
-       style="font-size: 14pt;"><img src="salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image71.gif" width="20px" height="20px" border="0" class="img_whs8"> Basic properties</a></b> 
- </p>
-
-<p class="whs9">&nbsp;</p>
-
-<p class="whs1">Returns the properties (Length, Surface &amp; 
- Volume) for the selected geometrical object.</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1"><b style="font-weight: bold;">Result:</b> Display 
- Length, Surface &amp; Volume in the form of Python Tuple.</p>
-
-<p class="whs1"><span style="font-weight: bold;"><B>TUI command:</B></span> 
- <span style="font-style: italic;"><I>geompy.BasicProperties(Shape)</I></span>, 
- where Shape is a shape whose properties are inquired.</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs3"><img src="../pics/neo-basicprop.png" x-maintain-ratio="TRUE" width="360px" height="307px" border="0" class="img_whs10"></p>
-
-<p>&nbsp;</p>
-
-<p>&nbsp;</p>
-
-<p class="whs7"><a name=Center_gravity
-       style="font-size: 14pt;"><img src="salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image72.gif" width="20px" height="20px" border="0" class="img_whs8"><b style="font-size: 14pt;"> 
- Center of mass</b></a></p>
-
-<p class="whs9">&nbsp;</p>
-
-<p class="whs1">Calculates and returns the coordinates of the 
- gravity center for the selected geometrical object.</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1"><b style="font-weight: bold;">Result:</b> GEOM_Object 
- (vertex).</p>
-
-<p class="whs1"><b style="font-weight: bold;">TUI Command:</b><i> 
- </i><span style="font-style: italic;"><I>geompy.MakeCDG(Shape)</I></span>, where 
- Shape is the shape for which a center of gravity is computed.</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs11"><img src="../pics/measures3.png" x-maintain-ratio="TRUE" width="312px" height="367px" border="0" class="img_whs12"></p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs7">&nbsp;</p>
-
-<p class="whs7"><a NAME=Inertia_axis
-       style="font-size: 14pt;"><img src="salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image73.gif" width="20px" height="20px" border="0" class="img_whs8"><b><font style="font-size: 14pt;"
-                                                                                                               size=4> Inertia</font></b></a> 
- </p>
-
-<p class="whs7">&nbsp;</p>
-
-<p class="whs1">Returns the axis of inertia for the selected 
- geometrical object.</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1"><b style="font-weight: bold;">Result:</b> Displays 
- the matrix and moments of inertia in the form of Python Tuple (I11, I12, 
- I13, </p>
-
-<p class="whs13">&nbsp;I21, 
- I22, I23, </p>
-
-<p class="whs13">&nbsp;I31, 
- I32, I33,</p>
-
-<p class="whs13"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;">&nbsp;Ix, 
- Iy, Iz)</font></span>.</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1"><span style="font-weight: bold;"><B>TUI command:</B></span> 
- <span style="font-style: italic;"><I>geompy.Inertia(Shape)</I></span>, where 
- Shape is a shape for which a matrix of inertia and moment of inertia are 
- returned.</p>
-
-<p class="whs11">&nbsp;</p>
-
-<p class="whs11"><img src="../pics/measures4.png" x-maintain-ratio="TRUE" width="360px" height="333px" border="0" class="img_whs14"></p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs7"><a NAME=Bounding_box
-       style="font-size: 14pt;"><img src="salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image74.gif" width="20px" height="20px" border="0" class="img_whs8"><b><font style="font-size: 14pt;"
-                                                                                                               size=4> Bounding 
- box</font></b></a> </p>
-
-<p class="whs7">&nbsp;</p>
-
-<p class="whs1">Returns the dimensions of the bounding box 
- for the selected geometrical object.</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1"><b style="font-weight: bold;">Result:</b> Displays 
- the dimensions of the bounding box of a geometrical object in the form 
- of Python Tuple (Xmin, Xmax, Ymin, Ymax, Zmin, Zmax).</p>
-
-<p class="whs15">TUI command: <span style="font-weight: normal; font-style: italic;"><I>geompy.BoundingBox(Shape)</I></span><span 
- style="font-weight: normal;">, where Shape is a shape for which a bounding 
- box is computed.</span></p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs11"><img src="../pics/measures5.png" x-maintain-ratio="TRUE" width="360px" height="328px" border="0" class="img_whs16"></p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs7"><a NAME=Min_distance
-       style="font-size: 14pt;"><img src="salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image75.gif" width="20px" height="20px" border="0" class="img_whs8"><b><font style="font-size: 14pt;"
-                                                                                                               size=4> Min. distance</font></b></a></p>
-
-<p class="whs7">&nbsp;</p>
-
-<p class="whs1">Returns the minimum distance between two geometrical 
- objects.</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs15">TUI command: <span style="font-weight: normal; font-style: italic;"><I>geompy.MinDistance(Shape1, 
- Shape2)</I></span><span style="font-weight: normal;">, where Shape1 and Shape2 
- are shapes between which the minimal distance computed.</span></p>
-
-<p class="whs17">&nbsp;</p>
-
-<p class="whs11"><img src="../pics/distance.png" x-maintain-ratio="TRUE" width="360px" height="290px" border="0" class="img_whs18"></p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs7"><a NAME=Tolerance
-       style="font-size: 14pt;"><img src="salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image76.gif" width="20px" height="20px" border="0" class="img_whs8"><b style="font-size: 14pt;"> 
- Tolerance</b></a> </p>
-
-<p class="whs9">&nbsp;</p>
-
-<p class="whs1">Returns the maximum and the minimum tolerance 
- for the selected geometrical object.</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1"><b style="font-weight: bold;">Result:</b> Displays 
- the tolerance values (FaceMinTol, FaceMaxTol, EgdeMinTol, EgdeMaxTol, 
- VertexMinTol, VertexMaxTol).</p>
-
-<p class="whs15">TUI command: <span style="font-weight: normal; font-style: italic;"><I>geompy.Tolerance(Shape)</I></span><span 
- style="font-weight: normal;">, where Shape is a shape for which minimal 
- and maximal tolerances are returned.</span></p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs11"><img src="../pics/new-tolerance.png" x-maintain-ratio="TRUE" width="360px" height="328px" border="0" class="img_whs16"></p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs7"><a NAME=Whatis><span 
- style="font-size: 14pt;"><font size=4 style="font-size:14pt;"><img src="salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image77.gif" width="20px" height="20px" border="0" class="img_whs8"><b style="font-size: 14pt;"> WhatIs</b></a> 
- </font></span></p>
-
-<p class="whs9">&nbsp;</p>
-
-<p class="whs1">Displays types and quantities of all elements 
- composing the selected geometrical object.</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1"><span style="font-weight: bold;"><B>TUI command:</B></span> 
- <span style="font-style: italic;"><I>geompy.WhatIs(Shape)</I></span>, where Shape 
- is a shape from which a description is returned.</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs11"><img src="../pics/measures8.png" x-maintain-ratio="TRUE" width="360px" height="405px" border="0" class="img_whs19"></p>
-
-<p class="whs11">&nbsp;</p>
-
-<p class="whs11">&nbsp;</p>
-
-<p class="whs7"><a NAME=check
-       style="font-size: 14pt;"><img src="salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image78.gif" width="20px" height="20px" border="0" class="img_whs8"><b><font style="font-size: 14pt;"
-                                                                                                               size=4> Check</font></b></a> 
- </p>
-
-<p class="whs7">&nbsp;</p>
-
-<p class="whs1">Checks the topology of the selected geometrical 
- object and returns True if it is valid. <span style="font-weight: bold;"><B>Check 
- also geometry</B></span> checkbox allows to test the geometry as well. </p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1"><b style="font-weight: bold;">Result:</b> Boolean.</p>
-
-<p class="whs1"><b style="font-weight: bold;">TUI Command:</b><i> 
- </i><span style="font-style: italic;"><I>geompy.(theShape, theIsCheckGeom 
- = 0)</I></span>, where is shape which is checked for validity.</p>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs11"><img src="../pics/measures9.png" x-maintain-ratio="TRUE" width="360px" height="337px" border="0" class="img_whs20"></p>
-
-<p class="whs21">&nbsp;</p>
-
-<p class="whs21">&nbsp;</p>
-
-<p class="whs21"><a name=Check_comp_blocks><img src="../image27.gif" width="25px" height="23px" border="0" class="img_whs22"> <span style="font-size: 14pt; font-weight: bold;"><font size=4 style="font-size:14pt;"><B>Check compound 
- of blocks</B></font></span></a></p>
-
-<p class="whs21">&nbsp;</p>
-
-<p class="whs1">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:</p>
-
-<ul type="disc" class="whs23">
-       
-       <li class=kadov-p><p class="whs1">&nbsp;Each 
- element of the compound should be a Block (6 faces and 12 edges);</p></li>
-       
-       <li class=kadov-p><p class="whs1">&nbsp;A 
- connection between two Blocks should be an entire quadrangle face or an 
- entire edge;</p></li>
-       
-       <li class=kadov-p><p class="whs1">&nbsp;The 
- compound should be connected;</p></li>
-       
-       <li class=kadov-p><p class="whs1">&nbsp;Two 
- quadrangle faces should be glued. </p></li>
-</ul>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1">Informs of the following possible errors:</p>
-
-<ul type="disc" class="whs23">
-       
-       <li class=kadov-p><p class="whs1">not a block,</p></li>
-       
-       <li class=kadov-p><p class="whs1">not glued,</p></li>
-       
-       <li class=kadov-p><p class="whs1">not connected,</p></li>
-       
-       <li class=kadov-p><p class="whs1"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;">extra 
- or degenerated edge.</font></span></p></li>
-</ul>
-
-<p class="whs1">&nbsp;</p>
-
-<p class="whs1"><b style="font-weight: bold;">Result:</b> Boolean; 
- highlight in the viewer.</p>
-
-<p class="whs1"><b style="font-weight: bold;">TUI Command:</b><i> 
- </i><span style="font-style: italic;"><I>geompy.CheckCompoundOfBlocks(Compound). 
- </I></span>Checks if the<span style="font-style: italic;"> <I></I></span>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.</p>
-
-<p class="whs11">&nbsp;</p>
-
-<p class="whs11"><img src="../pics/measures10.png" x-maintain-ratio="TRUE" width="329px" height="436px" border="0" class="img_whs24"></p>
-
-<p class="whs11">&nbsp;</p>
-
-<script type="text/javascript" language="javascript1.2">
-<!--
-if (window.writeIntopicBar)
-       writeIntopicBar(0);
-//-->
-</script>
-</body>
-</html>
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image71.gif b/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image71.gif
deleted file mode 100755 (executable)
index 02e4c8f..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image71.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image72.gif b/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image72.gif
deleted file mode 100755 (executable)
index 1aebb4f..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image72.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image73.gif b/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image73.gif
deleted file mode 100755 (executable)
index f11323a..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image73.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image74.gif b/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image74.gif
deleted file mode 100755 (executable)
index c429db8..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image74.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image75.gif b/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image75.gif
deleted file mode 100755 (executable)
index 1c8dd91..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image75.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image76.gif b/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image76.gif
deleted file mode 100755 (executable)
index 7968c61..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image76.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image77.gif b/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image77.gif
deleted file mode 100755 (executable)
index a2db5a6..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image77.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image78.gif b/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image78.gif
deleted file mode 100755 (executable)
index 8de970b..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image78.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image87.gif b/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image87.gif
deleted file mode 100755 (executable)
index 03b8391..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image87.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image88.gif b/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image88.gif
deleted file mode 100755 (executable)
index e38dcab..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image88.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image89.gif b/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image89.gif
deleted file mode 100755 (executable)
index 7a9aaad..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image89.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image90.gif b/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image90.gif
deleted file mode 100755 (executable)
index 716e51b..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image90.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image100.gif b/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image100.gif
deleted file mode 100755 (executable)
index 871c6f0..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image100.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image101.gif b/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image101.gif
deleted file mode 100755 (executable)
index ffdbac7..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image101.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image102.gif b/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image102.gif
deleted file mode 100755 (executable)
index 7e683cc..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image102.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image103.gif b/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image103.gif
deleted file mode 100755 (executable)
index 9aa79cf..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image103.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image99.gif b/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image99.gif
deleted file mode 100755 (executable)
index 0f4889b..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image99.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image119.gif b/doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image119.gif
deleted file mode 100755 (executable)
index d4b54ec..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image119.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image121.gif b/doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image121.gif
deleted file mode 100755 (executable)
index b39eb20..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image121.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image122.gif b/doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image122.gif
deleted file mode 100755 (executable)
index 3917bf3..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image122.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image128.gif b/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image128.gif
deleted file mode 100755 (executable)
index 7a140ed..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image128.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image129.gif b/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image129.gif
deleted file mode 100755 (executable)
index d3fdead..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image129.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image131.gif b/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image131.gif
deleted file mode 100755 (executable)
index 2059e9d..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image131.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image132.gif b/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image132.gif
deleted file mode 100755 (executable)
index 29aaddb..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image132.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image133.gif b/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image133.gif
deleted file mode 100755 (executable)
index d55ff89..0000000
Binary files a/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image133.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/geompy_doc/classgeompyDC_1_1geompyDC.html b/doc/salome/gui/GEOM/geompy_doc/classgeompyDC_1_1geompyDC.html
deleted file mode 100644 (file)
index 60cc4ce..0000000
+++ /dev/null
@@ -1,9410 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.73 [en] (WinNT; I) [Netscape]">
-   <title>Main Page</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-&nbsp;
-</body>
-</html>
-<!-- Generated by Doxygen 1.4.7 -->
-<div class="nav">
-<a class="el" href="namespacegeompyDC.html">geompyDC</a>.<a class="el" href="classgeompyDC_1_1geompyDC.html">geompyDC</a></div>
-<h1>geompyDC.geompyDC Class Reference</h1><!-- doxytag: class="geompyDC::geompyDC" --><!-- doxytag: inherits="GEOM::_objref_GEOM_Gen" -->Inheritance diagram for geompyDC.geompyDC:<p><center><img src="classgeompyDC_1_1geompyDC__inherit__graph.jpg" border="0" usemap="#geompyDC_8geompyDC__inherit__map" alt="Inheritance graph"></center>
-<map name="geompyDC_8geompyDC__inherit__map">
-<area href="classGEOM_1_1__objref__GEOM__Gen.html" shape="rect" coords="8,9,202,33" alt="">
-</map>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Public Member Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#af8ddd61672905dce7b92a9a743663ff">__init__</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#25ea0aecb6d8820d25978244778ca819">init_geom</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#1949a3db14d23baada3e1841e0baa5ae">SubShapeName</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get name for sub-shape aSubObj of shape aMainObj.  <a href="#1949a3db14d23baada3e1841e0baa5ae"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#7db0dfa66baae9698555a059b1aba887">addToStudy</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Publish in study aShape with name aName.  <a href="#7db0dfa66baae9698555a059b1aba887"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#ee026f3fcb1fa99e51c655533cf2c1ef">addToStudyInFather</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Publish in study aShape with name aName as sub-object of previously published aFather.  <a href="#ee026f3fcb1fa99e51c655533cf2c1ef"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#d10907eea3fcd77b5c0616314c8c0cf8">MakeVertex</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create point by three coordinates.  <a href="#d10907eea3fcd77b5c0616314c8c0cf8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#a234e4855a340079db1f4106799fb97c">MakeVertexWithRef</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a point, distant from the referenced point on the given distances along the coordinate axes.  <a href="#a234e4855a340079db1f4106799fb97c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#60990e3d531796d90776bb3bfba9f1e0">MakeVertexOnCurve</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a point, corresponding to the given parameter on the given curve.  <a href="#60990e3d531796d90776bb3bfba9f1e0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#696c7e5a4c1ea2a7c99202e55ed90629">MakeTangentOnCurve</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a tangent, corresponding to the given parameter on the given curve.  <a href="#696c7e5a4c1ea2a7c99202e55ed90629"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#d63565ee22d104df4c7d4f6bfe60f2b5">MakeVectorDXDYDZ</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a vector with the given components.  <a href="#d63565ee22d104df4c7d4f6bfe60f2b5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#a555df198725426a1dd01b332767d131">MakeVector</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a vector between two points.  <a href="#a555df198725426a1dd01b332767d131"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#aa0cc8bfc8b0459e1553744b3d1cd967">MakeLine</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a line, passing through the given point and parrallel to the given direction.  <a href="#aa0cc8bfc8b0459e1553744b3d1cd967"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#dd8cf59821f38e96cf4649f8a6f542bb">MakeLineTwoPnt</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a line, passing through the given points.  <a href="#dd8cf59821f38e96cf4649f8a6f542bb"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#ca603ee3632caf15e8a67c84e53d260e">MakePlane</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a plane, passing through the given point and normal to the given vector.  <a href="#ca603ee3632caf15e8a67c84e53d260e"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#34df128a5c5b1cf1d17a8d908f504109">MakePlaneThreePnt</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a plane, passing through the three given points.  <a href="#34df128a5c5b1cf1d17a8d908f504109"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#a485bef0e5de72c0a9def2be78a8f5dc">MakePlaneFace</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a plane, similar to the existing one, but with another size of representing face.  <a href="#a485bef0e5de72c0a9def2be78a8f5dc"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#50cfea162620f440c57035f185e86be8">MakeMarker</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a local coordinate system.  <a href="#50cfea162620f440c57035f185e86be8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#d20661db76229799278b218fe8876b9c">MakeMarkerPntTwoVec</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a local coordinate system.  <a href="#d20661db76229799278b218fe8876b9c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#5ec980592e1667a038e73e33c897dc8a">MakeArc</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create an arc of circle, passing through three given points.  <a href="#5ec980592e1667a038e73e33c897dc8a"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#9235be0a43fa6a3530cde2f2a178c6a1">MakeArcCenter</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create an arc of circle from a center and 2 points.  <a href="#9235be0a43fa6a3530cde2f2a178c6a1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#a8c53f522639686427623ef671680a69">MakeCircle</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a circle with given center, normal vector and radius.  <a href="#a8c53f522639686427623ef671680a69"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#174e1bf2c1ca1a1385fdadbef4498a71">MakeCircleThreePnt</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a circle, passing through three given points.  <a href="#174e1bf2c1ca1a1385fdadbef4498a71"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#8a6255b5b91a1b4d3662eeba16fb181e">MakeEllipse</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create an ellipse with given center, normal vector and radiuses.  <a href="#8a6255b5b91a1b4d3662eeba16fb181e"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#ba71e6507ea026a9a583af92e86a4abe">MakePolyline</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a polyline on the set of points.  <a href="#ba71e6507ea026a9a583af92e86a4abe"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#1bc25a4b112a7d0c835f95548c059fee">MakeBezier</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create bezier curve on the set of points.  <a href="#1bc25a4b112a7d0c835f95548c059fee"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#0779d8a2ca8b62f171cbde07224abe61">MakeInterpol</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create B-Spline curve on the set of points.  <a href="#0779d8a2ca8b62f171cbde07224abe61"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#ebd8e665d93f32edc49caf185bd679d5">MakeSketcher</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a sketcher (wire or face), following the textual description, passed through <em>theCommand</em> argument.  <a href="#ebd8e665d93f32edc49caf185bd679d5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#cb2d962f65e8b2e44c290cc8f9b1394d">MakeSketcherOnPlane</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a sketcher (wire or face), following the textual description, passed through <em>theCommand</em> argument.  <a href="#cb2d962f65e8b2e44c290cc8f9b1394d"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#7f67b75d315b058a9dbfd0fcae8436c3">MakeBox</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a box by coordinates of two opposite vertices.  <a href="#7f67b75d315b058a9dbfd0fcae8436c3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#26a427a3ad940830e2edb3fa5505cb36">MakeBoxDXDYDZ</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a box with specified dimensions along the coordinate axes and with edges, parallel to the coordinate axes.  <a href="#26a427a3ad940830e2edb3fa5505cb36"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#b337e6c6ab478f0d793954be1bd9cb2c">MakeBoxTwoPnt</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a box with two specified opposite vertices, and with edges, parallel to the coordinate axes.  <a href="#b337e6c6ab478f0d793954be1bd9cb2c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#bc2fe5ba9c9c88249580b50209100433">MakeCylinder</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a cylinder with given base point, axis, radius and height.  <a href="#bc2fe5ba9c9c88249580b50209100433"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#b3df1c40baa03e45ec7094d146e8b963">MakeCylinderRH</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a cylinder with given radius and height at the origin of coordinate system.  <a href="#b3df1c40baa03e45ec7094d146e8b963"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#81579f2f47da0cc1d6097e1faadf2dd5">MakeSpherePntR</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a sphere with given center and radius.  <a href="#81579f2f47da0cc1d6097e1faadf2dd5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#07a746f0b76020bbb7282c2e838bd409">MakeSphere</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a sphere with given center and radius.  <a href="#07a746f0b76020bbb7282c2e838bd409"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#fb3e149785a70bf4203f477afc0c835e">MakeSphereR</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a sphere with given radius at the origin of coordinate system.  <a href="#fb3e149785a70bf4203f477afc0c835e"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#e30b53da3c95b228eb8c834b5854ef14">MakeCone</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a cone with given base point, axis, height and radiuses.  <a href="#e30b53da3c95b228eb8c834b5854ef14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#0fd12dd339d9640f7ffa0917b8532bb0">MakeConeR1R2H</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a cone with given height and radiuses at the origin of coordinate system.  <a href="#0fd12dd339d9640f7ffa0917b8532bb0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#3626eac4fedc7273364e21221fa88788">MakeTorus</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a torus with given center, normal vector and radiuses.  <a href="#3626eac4fedc7273364e21221fa88788"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#ee9c1c4391a974f97558960e90e7bb58">MakeTorusRR</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a torus with given radiuses at the origin of coordinate system.  <a href="#ee9c1c4391a974f97558960e90e7bb58"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#235c3c3893cd30d3fd2d6c75df0b9b85">MakePrism</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a shape by extrusion of the base shape along a vector, defined by two points.  <a href="#235c3c3893cd30d3fd2d6c75df0b9b85"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#ed885f2bf6c39f0aba6f7773b36acceb">MakePrismVecH</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a shape by extrusion of the base shape along the vector, i.e.  <a href="#ed885f2bf6c39f0aba6f7773b36acceb"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#ea1248fca4762d449c8f623df461dc1b">MakePipe</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a shape by extrusion of the base shape along the path shape.  <a href="#ea1248fca4762d449c8f623df461dc1b"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#f1e4818545a58c6fca5917f4f2600d9c">MakeRevolution</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a shape by revolution of the base shape around the axis on the given angle, i.e.  <a href="#f1e4818545a58c6fca5917f4f2600d9c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#2cebf57322ef8812857c0e18935b2e50">MakeThruSections</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a shell or solid passing through set of sections.Sections should be wires,edges or vertices.  <a href="#2cebf57322ef8812857c0e18935b2e50"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#9614d962ed7d981dd795367500e932e4">MakePipeWithDifferentSections</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a shape by extrusion of the profile shape along the path shape.  <a href="#9614d962ed7d981dd795367500e932e4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#f0be52d1562df21a8c8d1c5e19cfd986">MakePipeWithShellSections</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a shape by extrusion of the profile shape along the path shape.  <a href="#f0be52d1562df21a8c8d1c5e19cfd986"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#28931fb5811e065bca98d33c72ae3bcd">MakeEdge</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a linear edge with specified ends.  <a href="#28931fb5811e065bca98d33c72ae3bcd"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#a8bbbcb09ca5166b32cfca437388ce53">MakeWire</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a wire from the set of edges and wires.  <a href="#a8bbbcb09ca5166b32cfca437388ce53"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#cdb6873ee6002347bb02cc3a58282609">MakeFace</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a face on the given wire.  <a href="#cdb6873ee6002347bb02cc3a58282609"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#e29525e7b4291b7068a540a6849e958e">MakeFaceWires</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a face on the given wires set.  <a href="#e29525e7b4291b7068a540a6849e958e"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#a0c086da24dc52a36e393403e67fb602">MakeFaces</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Shortcut to <a class="el" href="classgeompyDC_1_1geompyDC.html#e29525e7b4291b7068a540a6849e958e">MakeFaceWires()</a>.  <a href="#a0c086da24dc52a36e393403e67fb602"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#f05fc666dd12c4c3b9d9e24ea6bb8e4c">MakeShell</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a shell from the set of faces and shells.  <a href="#f05fc666dd12c4c3b9d9e24ea6bb8e4c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#46ac42b6d0801facaf94f0219a98519d">MakeSolid</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a solid, bounded by the given shells.  <a href="#46ac42b6d0801facaf94f0219a98519d"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#4291d93976b7ce6dd54e50bae3f0f2a7">MakeCompound</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a compound of the given shapes.  <a href="#4291d93976b7ce6dd54e50bae3f0f2a7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#38f585da48e36d0111edb5855a55cbfb">NumberOfFaces</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Gives quantity of faces in the given shape.  <a href="#38f585da48e36d0111edb5855a55cbfb"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#7e3d02b87d35cce98b8cf9ae0fe6b8ef">NumberOfEdges</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Gives quantity of edges in the given shape.  <a href="#7e3d02b87d35cce98b8cf9ae0fe6b8ef"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#030b12f8bf19341b7fb19c8b6f78560c">ChangeOrientation</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Reverses an orientation the given shape.  <a href="#030b12f8bf19341b7fb19c8b6f78560c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#07154c139fe6ed7035fdea3e4eeecf7a">OrientationChange</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Shortcut to <a class="el" href="classgeompyDC_1_1geompyDC.html#030b12f8bf19341b7fb19c8b6f78560c">ChangeOrientation()</a>.  <a href="#07154c139fe6ed7035fdea3e4eeecf7a"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#f17be89e3cd53f3c0f39c2edd65b0fac">GetFreeFacesIDs</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Retrieve all free faces from the given shape.  <a href="#f17be89e3cd53f3c0f39c2edd65b0fac"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#9fd58edacf404f79755e7dc844252afd">GetSharedShapes</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get all sub-shapes of theShape1 of the given type, shared with theShape2.  <a href="#9fd58edacf404f79755e7dc844252afd"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#f9b62ee841439c13d856a2278133d685">GetShapesOnPlane</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find in <em>theShape</em> all sub-shapes of type <em>theShapeType</em>, situated relatively the specified plane by the certain way, defined through <em>theState</em> parameter.  <a href="#f9b62ee841439c13d856a2278133d685"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#68097cda152e42c34570c91205247290">GetShapesOnPlaneIDs</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Works like the above method, but returns list of sub-shapes indices.  <a href="#68097cda152e42c34570c91205247290"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#651b14d212b23eaa194cb8cc1e4a92df">GetShapesOnPlaneWithLocation</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find in <em>theShape</em> all sub-shapes of type <em>theShapeType</em>, situated relatively the specified plane by the certain way, defined through <em>theState</em> parameter.  <a href="#651b14d212b23eaa194cb8cc1e4a92df"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#ef1c337288dd469d08c6491a1bf1902c">GetShapesOnPlaneWithLocationIDs</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Works like the above method, but returns list of sub-shapes indices.  <a href="#ef1c337288dd469d08c6491a1bf1902c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#efbe51fb2bab5123c12b233285393066">GetShapesOnCylinder</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find in <em>theShape</em> all sub-shapes of type <em>theShapeType</em>, situated relatively the specified cylinder by the certain way, defined through <em>theState</em> parameter.  <a href="#efbe51fb2bab5123c12b233285393066"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#da671d7d2fa64f3fe87df7c055b83825">GetShapesOnCylinderIDs</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Works like the above method, but returns list of sub-shapes indices.  <a href="#da671d7d2fa64f3fe87df7c055b83825"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#ae6c2f5224df29424ca077575eabd736">GetShapesOnSphere</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find in <em>theShape</em> all sub-shapes of type <em>theShapeType</em>, situated relatively the specified sphere by the certain way, defined through <em>theState</em> parameter.  <a href="#ae6c2f5224df29424ca077575eabd736"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#3987180dd23e4c175ed948a58a6cf660">GetShapesOnSphereIDs</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Works like the above method, but returns list of sub-shapes indices.  <a href="#3987180dd23e4c175ed948a58a6cf660"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#ea27e6fad8151ea201e4f723c4a428a8">GetShapesOnQuadrangle</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find in <em>theShape</em> all sub-shapes of type <em>theShapeType</em>, situated relatively the specified quadrangle by the certain way, defined through <em>theState</em> parameter.  <a href="#ea27e6fad8151ea201e4f723c4a428a8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#1fab06e08781150f37917ac559cc2aa4">GetShapesOnQuadrangleIDs</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Works like the above method, but returns list of sub-shapes indices.  <a href="#1fab06e08781150f37917ac559cc2aa4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#1ea715c4d4e4d0f4c5e7919f2d83d4e6">GetShapesOnBox</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find in <em>theShape</em> all sub-shapes of type <em>theShapeType</em>, situated relatively the specified <em>theBox</em> by the certain way, defined through <em>theState</em> parameter.  <a href="#1ea715c4d4e4d0f4c5e7919f2d83d4e6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#73015991fea1f7bb78c7436d7ec2ebb0">GetShapesOnBoxIDs</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Works like the above method, but returns list of sub-shapes indices.  <a href="#73015991fea1f7bb78c7436d7ec2ebb0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#67ae7cef36629d18c93c5a102dee00c3">GetInPlace</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get sub-shape(s) of theShapeWhere, which are coincident with <em>theShapeWhat</em> or could be a part of it.  <a href="#67ae7cef36629d18c93c5a102dee00c3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#eed964a4cd665e5e26b9becd7c260d7b">GetSame</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get sub-shape of theShapeWhere, which is equal to <em>theShapeWhat</em>.  <a href="#eed964a4cd665e5e26b9becd7c260d7b"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#83963a360d309689ba837d8e316466c1">GetSubShape</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Obtain a composite sub-shape of &lt;aShape&gt;, composed from sub-shapes of &lt;aShape&gt;, selected by their unique IDs inside &lt;aShape&gt;.  <a href="#83963a360d309689ba837d8e316466c1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#b3cf4c129a0316ffbe7904021762549c">GetSubShapeID</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Obtain unique ID of sub-shape &lt;aSubShape&gt; inside &lt;aShape&gt;.  <a href="#b3cf4c129a0316ffbe7904021762549c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#78fa5a06b26d7d924c08892e963f3457">SubShapeAll</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Explode a shape on subshapes of a given type.  <a href="#78fa5a06b26d7d924c08892e963f3457"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#c08bbd0e4324de005e144b0bd71a62fd">SubShapeAllIDs</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Explode a shape on subshapes of a given type.  <a href="#c08bbd0e4324de005e144b0bd71a62fd"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#f6bf69ac9180b0ae6c782445d56f2c59">SubShapeAllSorted</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Explode a shape on subshapes of a given type.  <a href="#f6bf69ac9180b0ae6c782445d56f2c59"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#5e36eda3a11edc37146e5e73dd118e81">SubShapeAllSortedIDs</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Explode a shape on subshapes of a given type.  <a href="#5e36eda3a11edc37146e5e73dd118e81"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#0092ca7fbc9ed8d824f6a0f932793e47">SubShape</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Obtain a compound of sub-shapes of &lt;aShape&gt;, selected by they indices in list of all sub-shapes of type &lt;aType&gt;.  <a href="#0092ca7fbc9ed8d824f6a0f932793e47"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#bdacf7906482aacc2d5db144847f2d89">SubShapeSorted</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Obtain a compound of sub-shapes of &lt;aShape&gt;, selected by they indices in sorted list of all sub-shapes of type &lt;aType&gt;.  <a href="#bdacf7906482aacc2d5db144847f2d89"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#cd3999b10bc598e794c72f5d0100fce5">ProcessShape</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Apply a sequence of Shape Healing operators to the given object.  <a href="#cd3999b10bc598e794c72f5d0100fce5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#bbaee711561a402bdd0741ec11471278">SuppressFaces</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Remove faces from the given object (shape).  <a href="#bbaee711561a402bdd0741ec11471278"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#036ad990f98656d408899bfcd5ece429">MakeSewing</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Sewing of some shapes into single shape.  <a href="#036ad990f98656d408899bfcd5ece429"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#8d560be7edd550c5d99efa7d5500983d">Sew</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Sewing of the given object.  <a href="#8d560be7edd550c5d99efa7d5500983d"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#32d8bab454d23c5081af3cf351da2dbc">SuppressInternalWires</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Remove internal wires and edges from the given object (face).  <a href="#32d8bab454d23c5081af3cf351da2dbc"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#3bb048fd0a24d95d5477d315f06613ff">SuppressHoles</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Remove internal closed contours (holes) from the given object.  <a href="#3bb048fd0a24d95d5477d315f06613ff"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#68a586d816212080969fe6ee4f19462d">CloseContour</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Close an open wire.  <a href="#68a586d816212080969fe6ee4f19462d"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#7d5999f697974ede4dc7e2bd8bda35a9">DivideEdge</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Addition of a point to a given edge object.  <a href="#7d5999f697974ede4dc7e2bd8bda35a9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#28ff08bd5c4bc952201dc0cef7402d9b">ChangeOrientationShell</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Change orientation of the given object.  <a href="#28ff08bd5c4bc952201dc0cef7402d9b"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#41fb7f3129e0cd4dd7fe464d18fba515">ChangeOrientationShellCopy</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Change orientation of the given object.  <a href="#41fb7f3129e0cd4dd7fe464d18fba515"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#4ed122bb69d03337a8660f1a550916d8">GetFreeBoundary</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list of wires (wrapped in GEOM_Object-s), that constitute a free boundary of the given shape.  <a href="#4ed122bb69d03337a8660f1a550916d8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#e9bfb58d56f250fd0cb515e3523ac64e">MakeCopy</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a copy of the given object.  <a href="#e9bfb58d56f250fd0cb515e3523ac64e"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#3f2195ae25913232c21e0b9fe4d14645">MakeFilling</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a filling from the given compound of contours.  <a href="#3f2195ae25913232c21e0b9fe4d14645"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#8b789fb1eac91f08fed5643735ef82f2">MakeGlueFaces</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Replace coincident faces in theShape by one face.  <a href="#8b789fb1eac91f08fed5643735ef82f2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#34bb9c3bfcf52999473f8ed6849d8226">GetGlueFaces</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find coincident faces in theShape for possible gluing.  <a href="#34bb9c3bfcf52999473f8ed6849d8226"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#a025213e01e49556bccf2b98e67597a8">MakeGlueFacesByList</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Replace coincident faces in theShape by one face in compliance with given list of faces.  <a href="#a025213e01e49556bccf2b98e67597a8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#f867726a40416a5a56c61016cc973a6d">MakeBoolean</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Perform one of boolean operations on two given shapes.  <a href="#f867726a40416a5a56c61016cc973a6d"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#e8233b6151298410ca8a0a27f938de31">MakeCommon</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Shortcut to MakeBoolean(s1, s2, 1).  <a href="#e8233b6151298410ca8a0a27f938de31"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#1811661330f4b7497d231898153623e1">MakeCut</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Shortcut to MakeBoolean(s1, s2, 2).  <a href="#1811661330f4b7497d231898153623e1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#91cedb6151173844ea4774b2594d3ede">MakeFuse</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Shortcut to MakeBoolean(s1, s2, 3).  <a href="#91cedb6151173844ea4774b2594d3ede"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#db309b5427f795aa4468380a319cf13b">MakeSection</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Shortcut to MakeBoolean(s1, s2, 4).  <a href="#db309b5427f795aa4468380a319cf13b"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#693e98c94226019c732c577f4e2bae08">MakePartition</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Perform partition operation.  <a href="#693e98c94226019c732c577f4e2bae08"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#91a00e9db2eaa9bde1b8d2c34c92b299">MakePartitionNonSelfIntersectedShape</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Perform partition operation.  <a href="#91a00e9db2eaa9bde1b8d2c34c92b299"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#a48ac8ff0e107f4d8e93bd664ca8bf15">Partition</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Shortcut to <a class="el" href="classgeompyDC_1_1geompyDC.html#693e98c94226019c732c577f4e2bae08">MakePartition()</a>.  <a href="#a48ac8ff0e107f4d8e93bd664ca8bf15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#8cc6a68037fff53d6d525a96df5fa669">MakeHalfPartition</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Perform partition of the Shape with the Plane.  <a href="#8cc6a68037fff53d6d525a96df5fa669"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#ae13dcb7c8887b5a041fb6db9132bf49">MakeTranslationTwoPoints</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Translate the given object along the vector, specified by its end points, creating its copy before the translation.  <a href="#ae13dcb7c8887b5a041fb6db9132bf49"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#7ad489d0ca9d6105742129bb18b9b949">MakeTranslation</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Translate the given object along the vector, specified by its components, creating its copy before the translation.  <a href="#7ad489d0ca9d6105742129bb18b9b949"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#d9d5fd17912e5f49ba4b9eccef1cfeaf">MakeTranslationVector</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Translate the given object along the given vector, creating its copy before the translation.  <a href="#d9d5fd17912e5f49ba4b9eccef1cfeaf"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#dd060f21b775de207551c4b6e435e56c">MakeRotation</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Rotate the given object around the given axis on the given angle, creating its copy before the rotatation.  <a href="#dd060f21b775de207551c4b6e435e56c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#607eb745f4538c19eb12ae3517d39007">MakeRotationThreePoints</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Rotate given object around vector perpendicular to plane containing three points, creating its copy before the rotatation.  <a href="#607eb745f4538c19eb12ae3517d39007"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#56de5cb4e4835ec2d52a226e392ebb15">MakeScaleTransform</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Scale the given object by the factor, creating its copy before the scaling.  <a href="#56de5cb4e4835ec2d52a226e392ebb15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#24217f6fdddd62d6539c1b964f175b38">MakeMirrorByPlane</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create an object, symmetrical to the given one relatively the given plane.  <a href="#24217f6fdddd62d6539c1b964f175b38"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#17fbac698ec8c33d93b1de51ac4874cb">MakeMirrorByAxis</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create an object, symmetrical to the given one relatively the given axis.  <a href="#17fbac698ec8c33d93b1de51ac4874cb"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#8655b456f413267ed78a3c309b6304f9">MakeMirrorByPoint</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create an object, symmetrical to the given one relatively the given point.  <a href="#8655b456f413267ed78a3c309b6304f9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#e56618159887843f81359c4481bf7406">MakePosition</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Modify the Location of the given object by LCS, creating its copy before the setting.  <a href="#e56618159887843f81359c4481bf7406"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#981351eeef1b763896c836cc7f253312">MakeOffset</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create new object as offset of the given one.  <a href="#981351eeef1b763896c836cc7f253312"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#c9a473ec03e5c63896685b0e34481fd2">MakeMultiTranslation1D</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Translate the given object along the given vector a given number times.  <a href="#c9a473ec03e5c63896685b0e34481fd2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#ab32f56d90ecb1a6b2298dbfbdd7d83c">MakeMultiTranslation2D</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Conseqently apply two specified translations to theObject specified number of times.  <a href="#ab32f56d90ecb1a6b2298dbfbdd7d83c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#38982348093ee6fab2c9a4583a2ca511">MultiRotate1D</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Rotate the given object around the given axis a given number times.  <a href="#38982348093ee6fab2c9a4583a2ca511"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#616f750a1eeda26ce7277f18f6247693">MultiRotate2D</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Rotate the given object around the given axis on the given angle a given number times and multi-translate each rotation result.  <a href="#616f750a1eeda26ce7277f18f6247693"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#eedbceb1c3dda0840de2b0eb4181c359">MakeMultiRotation1D</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The same, as <a class="el" href="classgeompyDC_1_1geompyDC.html#38982348093ee6fab2c9a4583a2ca511">MultiRotate1D()</a>, but axis is given by direction and point.  <a href="#eedbceb1c3dda0840de2b0eb4181c359"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#8316876f521e705a923d1269a9a8e7f3">MakeMultiRotation2D</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The same, as <a class="el" href="classgeompyDC_1_1geompyDC.html#616f750a1eeda26ce7277f18f6247693">MultiRotate2D()</a>, but axis is given by direction and point.  <a href="#8316876f521e705a923d1269a9a8e7f3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#63bda9af6c88695354bcff0b367fbe1b">MakeFilletAll</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Perform a fillet on all edges of the given shape.  <a href="#63bda9af6c88695354bcff0b367fbe1b"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#974837854699fa8b1a8745527f51873a">MakeFillet</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Perform a fillet on the specified edges/faces of the given shape.  <a href="#974837854699fa8b1a8745527f51873a"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#3e51747789c633e2f971cb4b607dbf73">MakeChamferAll</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Perform a symmetric chamfer on all edges of the given shape.  <a href="#3e51747789c633e2f971cb4b607dbf73"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#fdfd03b730f47776a40d153c11f7128c">MakeChamferEdge</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Perform a chamfer on edges, common to the specified faces, with distance D1 on the Face1.  <a href="#fdfd03b730f47776a40d153c11f7128c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#15f9862deb40103a8b910d66d13391e5">MakeChamferFaces</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Perform a chamfer on all edges of the specified faces, with distance D1 on the first specified face (if several for one edge).  <a href="#15f9862deb40103a8b910d66d13391e5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#27c2e095df94471a5cee3edf005f527f">MakeChamfer</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Shortcut to <a class="el" href="classgeompyDC_1_1geompyDC.html#fdfd03b730f47776a40d153c11f7128c">MakeChamferEdge()</a> and <a class="el" href="classgeompyDC_1_1geompyDC.html#15f9862deb40103a8b910d66d13391e5">MakeChamferFaces()</a>.  <a href="#27c2e095df94471a5cee3edf005f527f"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#d71461f31b4b633f1ae8ecf19d2026c6">Archimede</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Perform an Archimde operation on the given shape with given parameters.  <a href="#d71461f31b4b633f1ae8ecf19d2026c6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#9238e5dbb4bc2295e25b8a1c1becc569">PointCoordinates</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get point coordinates.  <a href="#9238e5dbb4bc2295e25b8a1c1becc569"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#07b3380d65462c2473d817ba9ba93732">BasicProperties</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get summarized length of all wires, area of surface and volume of the given shape.  <a href="#07b3380d65462c2473d817ba9ba93732"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#56e1764834e88b2fff2e341474c5b2a8">BoundingBox</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get parameters of bounding box of the given shape.  <a href="#56e1764834e88b2fff2e341474c5b2a8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#b0c0c06d7ccf5e768cb68b90ef2063bb">Inertia</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get inertia matrix and moments of inertia of theShape.  <a href="#b0c0c06d7ccf5e768cb68b90ef2063bb"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#0dd7dc10f4871d5a6ef5e1024c3847ea">MinDistance</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get minimal distance between the given shapes.  <a href="#0dd7dc10f4871d5a6ef5e1024c3847ea"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#216d622cb1e479c6b50b974363881e24">Tolerance</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get min and max tolerances of sub-shapes of theShape.  <a href="#216d622cb1e479c6b50b974363881e24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#81dcea9d11cd1e7e2a6fc7fc82c9747b">WhatIs</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Obtain description of the given shape (number of sub-shapes of each type).  <a href="#81dcea9d11cd1e7e2a6fc7fc82c9747b"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#bcfbd3959bf92bd7e8db4dd646d8d49d">MakeCDG</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a point, situated at the centre of mass of theShape.  <a href="#bcfbd3959bf92bd7e8db4dd646d8d49d"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#63d7e6c328b2864bcba0d61809ea8fa9">CheckShape</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check a topology of the given shape.  <a href="#63d7e6c328b2864bcba0d61809ea8fa9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#ed127e0ebf2001c61b9b4faed95313cb">GetPosition</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get position (LCS) of theShape.  <a href="#ed127e0ebf2001c61b9b4faed95313cb"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#a29a8ae880663ba09edb8b35688646be">KindOfShape</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get kind of theShape.  <a href="#a29a8ae880663ba09edb8b35688646be"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#57106a55755e9b303464b3f416ca94f3">Import</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Import a shape from the BREP or IGES or STEP file (depends on given format) with given name.  <a href="#57106a55755e9b303464b3f416ca94f3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#68da55be4e4b99fd7ddf22ce58b9cefc">ImportBREP</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Shortcut to <a class="el" href="classgeompyDC_1_1geompyDC.html#57106a55755e9b303464b3f416ca94f3">Import()</a> for BREP format.  <a href="#68da55be4e4b99fd7ddf22ce58b9cefc"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#113c78a060c34a5ca7b72f526a08b247">ImportIGES</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Shortcut to <a class="el" href="classgeompyDC_1_1geompyDC.html#57106a55755e9b303464b3f416ca94f3">Import()</a> for IGES format.  <a href="#113c78a060c34a5ca7b72f526a08b247"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#35b653ecb3349e0b5835802064ed5792">ImportSTEP</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Shortcut to <a class="el" href="classgeompyDC_1_1geompyDC.html#57106a55755e9b303464b3f416ca94f3">Import()</a> for STEP format.  <a href="#35b653ecb3349e0b5835802064ed5792"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#97cf9d2c6b169c617297bcb0ff360d80">Export</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Export the given shape into a file with given name.  <a href="#97cf9d2c6b169c617297bcb0ff360d80"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#b98e62e986537d6dbcf09db82268133f">ExportBREP</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Shortcut to <a class="el" href="classgeompyDC_1_1geompyDC.html#97cf9d2c6b169c617297bcb0ff360d80">Export()</a> for BREP format.  <a href="#b98e62e986537d6dbcf09db82268133f"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#58cabb942475e87acfe20cf64789d09f">ExportIGES</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Shortcut to <a class="el" href="classgeompyDC_1_1geompyDC.html#97cf9d2c6b169c617297bcb0ff360d80">Export()</a> for IGES format.  <a href="#58cabb942475e87acfe20cf64789d09f"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#b90ced1bdda21fd895146ecbef93c5b1">ExportSTEP</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Shortcut to <a class="el" href="classgeompyDC_1_1geompyDC.html#97cf9d2c6b169c617297bcb0ff360d80">Export()</a> for STEP format.  <a href="#b90ced1bdda21fd895146ecbef93c5b1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#438ffa67d7e23027c7ffc5e783648a99">MakeQuad</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a quadrangle face from four edges.  <a href="#438ffa67d7e23027c7ffc5e783648a99"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#5859f858dddc4697da0a54650a89c630">MakeQuad2Edges</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a quadrangle face on two edges.  <a href="#5859f858dddc4697da0a54650a89c630"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#d22d10791fbe72e26d95c790f4b12f97">MakeQuad4Vertices</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a quadrangle face with specified corners.  <a href="#d22d10791fbe72e26d95c790f4b12f97"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#011d7b1e772d37e07b0db4e2c5480865">MakeHexa</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a hexahedral solid, bounded by the six given faces.  <a href="#011d7b1e772d37e07b0db4e2c5480865"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#d1d440df311f95e73311279e6c7f4b3e">MakeHexa2Faces</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a hexahedral solid between two given faces.  <a href="#d1d440df311f95e73311279e6c7f4b3e"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#2f8102f4db31a9b15d605b8b644c1e1d">GetPoint</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a vertex, found in the given shape by its coordinates.  <a href="#2f8102f4db31a9b15d605b8b644c1e1d"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#5a135eed8efccf5a21d19376faf3f51f">GetEdge</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an edge, found in the given shape by two given vertices.  <a href="#5a135eed8efccf5a21d19376faf3f51f"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#5cd9a2e1962945ad63435accccb04532">GetEdgeNearPoint</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an edge of the given shape, which has minimal distance to the given point.  <a href="#5cd9a2e1962945ad63435accccb04532"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#6825dde156e5fa007276494e1474d1a7">GetFaceByPoints</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns a face, found in the given shape by four given corner vertices.  <a href="#6825dde156e5fa007276494e1474d1a7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#8a87c9c4cfae32e37ed255b0a325952a">GetFaceByEdges</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a face of block, found in the given shape by two given edges.  <a href="#8a87c9c4cfae32e37ed255b0a325952a"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#3a78ade4a5640a76a6bc14a3205516aa">GetOppositeFace</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a face, opposite to the given one in the given block.  <a href="#3a78ade4a5640a76a6bc14a3205516aa"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#fd4db71d0d90143094fb9461be1345da">GetFaceNearPoint</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a face of the given shape, which has minimal distance to the given point.  <a href="#fd4db71d0d90143094fb9461be1345da"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#712db7946c95195cc4e21b04ccfd1e51">GetFaceByNormale</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a face of block, whose outside normale has minimal angle with the given vector.  <a href="#712db7946c95195cc4e21b04ccfd1e51"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#c3ebd44de8eaa8b35e21120c01130c28">CheckCompoundOfBlocks</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check, if the compound of blocks is given.  <a href="#c3ebd44de8eaa8b35e21120c01130c28"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#719a37bde6e44c537845fc95bd4171ef">RemoveExtraEdges</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Remove all seam and degenerated edges from <em>theShape</em>.  <a href="#719a37bde6e44c537845fc95bd4171ef"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#cb8e3a5d2a9b43ad0a061d98a5adf066">CheckAndImprove</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check, if the given shape is a blocks compound.  <a href="#cb8e3a5d2a9b43ad0a061d98a5adf066"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#c9f139e013728ca4b9e9176cc270dc9c">MakeBlockExplode</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get all the blocks, contained in the given compound.  <a href="#c9f139e013728ca4b9e9176cc270dc9c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#84908160eb9c556e90fc56482c78b3d6">GetBlockNearPoint</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find block, containing the given point inside its volume or on boundary.  <a href="#84908160eb9c556e90fc56482c78b3d6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#c1a9fb16ff249201e79c5c3ff44dd0bb">GetBlockByParts</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find block, containing all the elements, passed as the parts, or maximum quantity of them.  <a href="#c1a9fb16ff249201e79c5c3ff44dd0bb"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#069fdba39a027adf8abbae169fd47ab2">GetBlocksByParts</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return all blocks, containing all the elements, passed as the parts.  <a href="#069fdba39a027adf8abbae169fd47ab2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#5344840833d7500e7823b9ab19927d33">MakeMultiTransformation1D</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Multi-transformate block and glue the result.  <a href="#5344840833d7500e7823b9ab19927d33"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#967f8f3080541525e772700ed30af9eb">MakeMultiTransformation2D</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Multi-transformate block and glue the result.  <a href="#967f8f3080541525e772700ed30af9eb"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#e386685281c22ea9fa42abf0faba0fd0">Propagate</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Build all possible propagation groups.  <a href="#e386685281c22ea9fa42abf0faba0fd0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#a9d7a73c8d03d5b448e70e0990ad0b67">CreateGroup</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Creates a new group which will store sub shapes of theMainShape.  <a href="#a9d7a73c8d03d5b448e70e0990ad0b67"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#42c0d3bfe8dcc8398da6fe79ddf8e866">AddObject</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Adds a sub object with ID theSubShapeId to the group.  <a href="#42c0d3bfe8dcc8398da6fe79ddf8e866"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#f1ebbc44f8811fbeb71cffc9abd23985">RemoveObject</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Removes a sub object with ID <em>theSubShapeId</em> from the group.  <a href="#f1ebbc44f8811fbeb71cffc9abd23985"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#952c89c431a7d8b80d7f60030bb7fe26">UnionList</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Adds to the group all the given shapes.  <a href="#952c89c431a7d8b80d7f60030bb7fe26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#feb077c171bca22d724adce47a576c51">UnionIDs</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Works like the above method, but argument theSubShapes here is a list of sub-shapes indices.  <a href="#feb077c171bca22d724adce47a576c51"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#7d131e5368d0cbef869dc8f7e625943f">DifferenceList</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Removes from the group all the given shapes.  <a href="#7d131e5368d0cbef869dc8f7e625943f"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#09dcc7102fc5cf6ba7582b027dcaf8c4">DifferenceIDs</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Works like the above method, but argument theSubShapes here is a list of sub-shapes indices.  <a href="#09dcc7102fc5cf6ba7582b027dcaf8c4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#1f882d77f36782aec9552b4091e72fa2">GetObjectIDs</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns a list of sub objects ID stored in the group.  <a href="#1f882d77f36782aec9552b4091e72fa2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#89a5674df0edb6bc0d10fe2327b6dd69">GetType</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns a type of sub objects stored in the group.  <a href="#89a5674df0edb6bc0d10fe2327b6dd69"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#4cb71ccbb6ce142438dac7ab8b1bfbcd">GetMainShape</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns a main shape associated with the group.  <a href="#4cb71ccbb6ce142438dac7ab8b1bfbcd"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#b7c0fb87c91fbdc021c72b58b56c73f4">GetEdgesByLength</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create group of edges of theShape, whose length is in range [min_length, max_length].  <a href="#b7c0fb87c91fbdc021c72b58b56c73f4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#2c911eb0c53d1c4e22dedd2196055d18">SelectEdges</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create group of edges of selected shape, whose length is in range [min_length, max_length].  <a href="#2c911eb0c53d1c4e22dedd2196055d18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">def&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#fdd468507a5639f23702618029a42f5e">addPath</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Add Path to load python scripts from.  <a href="#fdd468507a5639f23702618029a42f5e"></a><br></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#9485018bf453de77f19cfddb21d3db7d">myBuilder</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#bbaafac224de10f47a6ade537922d0e1">myStudyId</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#6d683d934b8329fdbb475d9c6e61fc55">father</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#cb9f574a04df268d2ac3dad4084a501a">BasicOp</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#4e6874f535a360865d46651d158008a4">CurvesOp</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#e83f2aa2b03d2fa22da016445792a38d">PrimOp</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#808040354de98ebe2da91b260acdebc3">ShapesOp</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#4ffc95e51898e9fb01ddd6f81b5b4d8a">HealOp</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#399bd9f35bcbba929ce14514bff80172">InsertOp</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#c0937479ddda039044ef8a77b3856589">BoolOp</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#71257bf08344eb67180476997550faa4">TrsfOp</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#70088920b0ecf7c2f91752773076d10a">LocalOp</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#5553df463eb205a7d8d129984330f570">MeasuOp</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#79bef537fb16d86a07700b14d66cfabd">BlocksOp</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#d456a011f482dbd6f98505b6c4f5624d">GroupOp</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html#cc738d95c175885b16443c9476218ffb">myStudy</a></td></tr>
-
-</table>
-<hr><h2>Member Function Documentation</h2>
-<a class="anchor" name="af8ddd61672905dce7b92a9a743663ff"></a><!-- doxytag: member="geompyDC::geompyDC::__init__" ref="af8ddd61672905dce7b92a9a743663ff" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.__init__           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>          </td>
-          <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="25ea0aecb6d8820d25978244778ca819"></a><!-- doxytag: member="geompyDC::geompyDC::init_geom" ref="25ea0aecb6d8820d25978244778ca819" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.init_geom           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theStudy</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="1949a3db14d23baada3e1841e0baa5ae"></a><!-- doxytag: member="geompyDC::geompyDC::SubShapeName" ref="1949a3db14d23baada3e1841e0baa5ae" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.SubShapeName           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aSubObj</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aMainObj</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="7db0dfa66baae9698555a059b1aba887"></a><!-- doxytag: member="geompyDC::geompyDC::addToStudy" ref="7db0dfa66baae9698555a059b1aba887" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.addToStudy           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aName</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="ee026f3fcb1fa99e51c655533cf2c1ef"></a><!-- doxytag: member="geompyDC::geompyDC::addToStudyInFather" ref="ee026f3fcb1fa99e51c655533cf2c1ef" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.addToStudyInFather           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aFather</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aName</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="d10907eea3fcd77b5c0616314c8c0cf8"></a><!-- doxytag: member="geompyDC::geompyDC::MakeVertex" ref="d10907eea3fcd77b5c0616314c8c0cf8" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeVertex           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theX</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theY</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theZ</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theX</em>&nbsp;</td><td>The X coordinate of the point. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theY</em>&nbsp;</td><td>The Y coordinate of the point. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theZ</em>&nbsp;</td><td>The Z coordinate of the point. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created point.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="a234e4855a340079db1f4106799fb97c"></a><!-- doxytag: member="geompyDC::geompyDC::MakeVertexWithRef" ref="a234e4855a340079db1f4106799fb97c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeVertexWithRef           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theReference</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theX</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theY</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theZ</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theReference</em>&nbsp;</td><td>The referenced point. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theX</em>&nbsp;</td><td>Displacement from the referenced point along OX axis. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theY</em>&nbsp;</td><td>Displacement from the referenced point along OY axis. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theZ</em>&nbsp;</td><td>Displacement from the referenced point along OZ axis. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created point.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="60990e3d531796d90776bb3bfba9f1e0"></a><!-- doxytag: member="geompyDC::geompyDC::MakeVertexOnCurve" ref="60990e3d531796d90776bb3bfba9f1e0" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeVertexOnCurve           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theRefCurve</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theParameter</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theRefCurve</em>&nbsp;</td><td>The referenced curve. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theParameter</em>&nbsp;</td><td>Value of parameter on the referenced curve. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created point.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="696c7e5a4c1ea2a7c99202e55ed90629"></a><!-- doxytag: member="geompyDC::geompyDC::MakeTangentOnCurve" ref="696c7e5a4c1ea2a7c99202e55ed90629" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeTangentOnCurve           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theRefCurve</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theParameter</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theRefCurve</em>&nbsp;</td><td>The referenced curve. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theParameter</em>&nbsp;</td><td>Value of parameter on the referenced curve. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created tangent. </dd></dl>
-
-</div>
-</div><p>
-<a class="anchor" name="d63565ee22d104df4c7d4f6bfe60f2b5"></a><!-- doxytag: member="geompyDC::geompyDC::MakeVectorDXDYDZ" ref="d63565ee22d104df4c7d4f6bfe60f2b5" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeVectorDXDYDZ           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theDX</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theDY</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theDZ</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theDX</em>&nbsp;</td><td>X component of the vector. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theDY</em>&nbsp;</td><td>Y component of the vector. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theDZ</em>&nbsp;</td><td>Z component of the vector. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created vector.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="a555df198725426a1dd01b332767d131"></a><!-- doxytag: member="geompyDC::geompyDC::MakeVector" ref="a555df198725426a1dd01b332767d131" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeVector           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt1</em>&nbsp;</td><td>Start point for the vector. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePnt2</em>&nbsp;</td><td>End point for the vector. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created vector. </dd></dl>
-
-</div>
-</div><p>
-<a class="anchor" name="aa0cc8bfc8b0459e1553744b3d1cd967"></a><!-- doxytag: member="geompyDC::geompyDC::MakeLine" ref="aa0cc8bfc8b0459e1553744b3d1cd967" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeLine           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theDir</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt</em>&nbsp;</td><td>Point. The resulting line will pass through it. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theDir</em>&nbsp;</td><td>Direction. The resulting line will be parallel to it. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created line.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="dd8cf59821f38e96cf4649f8a6f542bb"></a><!-- doxytag: member="geompyDC::geompyDC::MakeLineTwoPnt" ref="dd8cf59821f38e96cf4649f8a6f542bb" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeLineTwoPnt           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt1</em>&nbsp;</td><td>First of two points, defining the line. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePnt2</em>&nbsp;</td><td>Second of two points, defining the line. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created line.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="ca603ee3632caf15e8a67c84e53d260e"></a><!-- doxytag: member="geompyDC::geompyDC::MakePlane" ref="ca603ee3632caf15e8a67c84e53d260e" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakePlane           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theVec</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theTrimSize</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt</em>&nbsp;</td><td>Point, the plane has to pass through. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theVec</em>&nbsp;</td><td>Vector, defining the plane normal direction. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theTrimSize</em>&nbsp;</td><td>Half size of a side of quadrangle face, representing the plane. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created plane.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="34df128a5c5b1cf1d17a8d908f504109"></a><!-- doxytag: member="geompyDC::geompyDC::MakePlaneThreePnt" ref="34df128a5c5b1cf1d17a8d908f504109" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakePlaneThreePnt           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt3</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theTrimSize</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt1</em>&nbsp;</td><td>First of three points, defining the plane. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePnt2</em>&nbsp;</td><td>Second of three points, defining the plane. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePnt3</em>&nbsp;</td><td>Fird of three points, defining the plane. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theTrimSize</em>&nbsp;</td><td>Half size of a side of quadrangle face, representing the plane. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created plane.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="a485bef0e5de72c0a9def2be78a8f5dc"></a><!-- doxytag: member="geompyDC::geompyDC::MakePlaneFace" ref="a485bef0e5de72c0a9def2be78a8f5dc" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakePlaneFace           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFace</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theTrimSize</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theFace</em>&nbsp;</td><td>Referenced plane or LCS(Marker). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theTrimSize</em>&nbsp;</td><td>New half size of a side of quadrangle face, representing the plane. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created plane.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="50cfea162620f440c57035f185e86be8"></a><!-- doxytag: member="geompyDC::geompyDC::MakeMarker" ref="50cfea162620f440c57035f185e86be8" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeMarker           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>OX</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>OY</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>OZ</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>XDX</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>XDY</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>XDZ</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>YDX</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>YDY</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>YDZ</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>OX,OY,OZ</em>&nbsp;</td><td>Three coordinates of coordinate system origin. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>XDX,XDY,XDZ</em>&nbsp;</td><td>Three components of OX direction </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>YDX,YDY,YDZ</em>&nbsp;</td><td>Three components of OY direction </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created coordinate system.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="d20661db76229799278b218fe8876b9c"></a><!-- doxytag: member="geompyDC::geompyDC::MakeMarkerPntTwoVec" ref="d20661db76229799278b218fe8876b9c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeMarkerPntTwoVec           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theOrigin</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theXVec</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theYVec</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theOrigin</em>&nbsp;</td><td>Point of coordinate system origin. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theXVec</em>&nbsp;</td><td>Vector of X direction </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theYVec</em>&nbsp;</td><td>Vector of Y direction </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created coordinate system. </dd></dl>
-
-</div>
-</div><p>
-<a class="anchor" name="5ec980592e1667a038e73e33c897dc8a"></a><!-- doxytag: member="geompyDC::geompyDC::MakeArc" ref="5ec980592e1667a038e73e33c897dc8a" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeArc           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt3</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt1</em>&nbsp;</td><td>Start point of the arc. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePnt2</em>&nbsp;</td><td>Middle point of the arc. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePnt3</em>&nbsp;</td><td>End point of the arc. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created arc.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="9235be0a43fa6a3530cde2f2a178c6a1"></a><!-- doxytag: member="geompyDC::geompyDC::MakeArcCenter" ref="9235be0a43fa6a3530cde2f2a178c6a1" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeArcCenter           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt3</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theSense</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt1</em>&nbsp;</td><td>Center of the arc </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePnt2</em>&nbsp;</td><td>Start point of the arc. (Gives also the radius of the arc) </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePnt3</em>&nbsp;</td><td>End point of the arc (Gives also a direction) </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created arc.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="a8c53f522639686427623ef671680a69"></a><!-- doxytag: member="geompyDC::geompyDC::MakeCircle" ref="a8c53f522639686427623ef671680a69" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeCircle           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theVec</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theR</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt</em>&nbsp;</td><td>Circle center. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theVec</em>&nbsp;</td><td>Vector, normal to the plane of the circle. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theR</em>&nbsp;</td><td>Circle radius. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created circle.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="174e1bf2c1ca1a1385fdadbef4498a71"></a><!-- doxytag: member="geompyDC::geompyDC::MakeCircleThreePnt" ref="174e1bf2c1ca1a1385fdadbef4498a71" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeCircleThreePnt           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt3</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt1,thePnt2,thePnt3</em>&nbsp;</td><td>Points, defining the circle. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created circle.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="8a6255b5b91a1b4d3662eeba16fb181e"></a><!-- doxytag: member="geompyDC::geompyDC::MakeEllipse" ref="8a6255b5b91a1b4d3662eeba16fb181e" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeEllipse           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theVec</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theRMajor</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theRMinor</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt</em>&nbsp;</td><td>Ellipse center. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theVec</em>&nbsp;</td><td>Vector, normal to the plane of the ellipse. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theRMajor</em>&nbsp;</td><td>Major ellipse radius. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theRMinor</em>&nbsp;</td><td>Minor ellipse radius. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created ellipse.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="ba71e6507ea026a9a583af92e86a4abe"></a><!-- doxytag: member="geompyDC::geompyDC::MakePolyline" ref="ba71e6507ea026a9a583af92e86a4abe" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakePolyline           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoints</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePoints</em>&nbsp;</td><td>Sequence of points for the polyline. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created polyline.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="1bc25a4b112a7d0c835f95548c059fee"></a><!-- doxytag: member="geompyDC::geompyDC::MakeBezier" ref="1bc25a4b112a7d0c835f95548c059fee" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeBezier           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoints</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePoints</em>&nbsp;</td><td>Sequence of points for the bezier curve. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created bezier curve.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="0779d8a2ca8b62f171cbde07224abe61"></a><!-- doxytag: member="geompyDC::geompyDC::MakeInterpol" ref="0779d8a2ca8b62f171cbde07224abe61" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeInterpol           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoints</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePoints</em>&nbsp;</td><td>Sequence of points for the B-Spline curve. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created B-Spline curve.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="ebd8e665d93f32edc49caf185bd679d5"></a><!-- doxytag: member="geompyDC::geompyDC::MakeSketcher" ref="ebd8e665d93f32edc49caf185bd679d5" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeSketcher           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theCommand</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theWorkingPlane</em> = <code>[0</code></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<br>
- Edges of the resulting wire or face will be arcs of circles and/or linear segments. <br>
- Format of the description string have to be the following:<p>
-"Sketcher[:F x1 y1]:CMD[:CMD[:CMD...]]"<p>
-Where:<ul>
-<li>x1, y1 are coordinates of the first sketcher point (zero by default),</li><li>CMD is one of<ul>
-<li>"R angle" : Set the direction by angle</li><li>"D dx dy" : Set the direction by DX &amp; DY</li></ul>
-<br>
-<ul>
-<li>"TT x y" : Create segment by point at X &amp; Y</li><li>"T dx dy" : Create segment by point with DX &amp; DY</li><li>"L length" : Create segment by direction &amp; Length</li><li>"IX x" : Create segment by direction &amp; Intersect. X</li><li>"IY y" : Create segment by direction &amp; Intersect. Y</li></ul>
-<br>
-<ul>
-<li>"C radius length" : Create arc by direction, radius and length(in degree)</li></ul>
-<br>
-<ul>
-<li>"WW" : Close Wire (to finish)</li><li>"WF" : Close Wire and build face (to finish)</li></ul>
-</li></ul>
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theCommand</em>&nbsp;</td><td>String, defining the sketcher in local coordinates of the working plane. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theWorkingPlane</em>&nbsp;</td><td>Nine double values, defining origin, OZ and OX directions of the working plane. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created wire.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="cb2d962f65e8b2e44c290cc8f9b1394d"></a><!-- doxytag: member="geompyDC::geompyDC::MakeSketcherOnPlane" ref="cb2d962f65e8b2e44c290cc8f9b1394d" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeSketcherOnPlane           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theCommand</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theWorkingPlane</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<br>
- For format of the description string see the previous method.<br>
- <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theCommand</em>&nbsp;</td><td>String, defining the sketcher in local coordinates of the working plane. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theWorkingPlane</em>&nbsp;</td><td>Planar Face or LCS(Marker) of the working plane. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created wire. </dd></dl>
-
-</div>
-</div><p>
-<a class="anchor" name="7f67b75d315b058a9dbfd0fcae8436c3"></a><!-- doxytag: member="geompyDC::geompyDC::MakeBox" ref="7f67b75d315b058a9dbfd0fcae8436c3" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeBox           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>x1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>y1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>z1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>x2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>y2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>z2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="26a427a3ad940830e2edb3fa5505cb36"></a><!-- doxytag: member="geompyDC::geompyDC::MakeBoxDXDYDZ" ref="26a427a3ad940830e2edb3fa5505cb36" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeBoxDXDYDZ           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theDX</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theDY</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theDZ</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Center of the box will be at point (DX/2, DY/2, DZ/2). <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theDX</em>&nbsp;</td><td>Length of Box edges, parallel to OX axis. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theDY</em>&nbsp;</td><td>Length of Box edges, parallel to OY axis. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theDZ</em>&nbsp;</td><td>Length of Box edges, parallel to OZ axis. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created box.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="b337e6c6ab478f0d793954be1bd9cb2c"></a><!-- doxytag: member="geompyDC::geompyDC::MakeBoxTwoPnt" ref="b337e6c6ab478f0d793954be1bd9cb2c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeBoxTwoPnt           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt1</em>&nbsp;</td><td>First of two opposite vertices. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePnt2</em>&nbsp;</td><td>Second of two opposite vertices. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created box.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="bc2fe5ba9c9c88249580b50209100433"></a><!-- doxytag: member="geompyDC::geompyDC::MakeCylinder" ref="bc2fe5ba9c9c88249580b50209100433" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeCylinder           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAxis</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theR</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theH</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt</em>&nbsp;</td><td>Central point of cylinder base. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theAxis</em>&nbsp;</td><td>Cylinder axis. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theR</em>&nbsp;</td><td>Cylinder radius. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theH</em>&nbsp;</td><td>Cylinder height. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created cylinder.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="b3df1c40baa03e45ec7094d146e8b963"></a><!-- doxytag: member="geompyDC::geompyDC::MakeCylinderRH" ref="b3df1c40baa03e45ec7094d146e8b963" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeCylinderRH           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theR</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theH</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Axis of the cylinder will be collinear to the OZ axis of the coordinate system. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theR</em>&nbsp;</td><td>Cylinder radius. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theH</em>&nbsp;</td><td>Cylinder height. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created cylinder.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="81579f2f47da0cc1d6097e1faadf2dd5"></a><!-- doxytag: member="geompyDC::geompyDC::MakeSpherePntR" ref="81579f2f47da0cc1d6097e1faadf2dd5" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeSpherePntR           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theR</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt</em>&nbsp;</td><td>Sphere center. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theR</em>&nbsp;</td><td>Sphere radius. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created sphere.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="07a746f0b76020bbb7282c2e838bd409"></a><!-- doxytag: member="geompyDC::geompyDC::MakeSphere" ref="07a746f0b76020bbb7282c2e838bd409" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeSphere           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>x</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>y</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>z</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theR</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>x,y,z</em>&nbsp;</td><td>Coordinates of sphere center. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theR</em>&nbsp;</td><td>Sphere radius. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created sphere.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="fb3e149785a70bf4203f477afc0c835e"></a><!-- doxytag: member="geompyDC::geompyDC::MakeSphereR" ref="fb3e149785a70bf4203f477afc0c835e" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeSphereR           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theR</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theR</em>&nbsp;</td><td>Sphere radius. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created sphere.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="e30b53da3c95b228eb8c834b5854ef14"></a><!-- doxytag: member="geompyDC::geompyDC::MakeCone" ref="e30b53da3c95b228eb8c834b5854ef14" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeCone           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAxis</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theR1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theR2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theH</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt</em>&nbsp;</td><td>Central point of the first cone base. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theAxis</em>&nbsp;</td><td>Cone axis. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theR1</em>&nbsp;</td><td>Radius of the first cone base. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theR2</em>&nbsp;</td><td>Radius of the second cone base. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Note:</b></dt><dd>If both radiuses are non-zero, the cone will be truncated. <p>
-If the radiuses are equal, a cylinder will be created instead. </dd></dl>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theH</em>&nbsp;</td><td>Cone height. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created cone.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="0fd12dd339d9640f7ffa0917b8532bb0"></a><!-- doxytag: member="geompyDC::geompyDC::MakeConeR1R2H" ref="0fd12dd339d9640f7ffa0917b8532bb0" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeConeR1R2H           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theR1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theR2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theH</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Axis of the cone will be collinear to the OZ axis of the coordinate system. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theR1</em>&nbsp;</td><td>Radius of the first cone base. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theR2</em>&nbsp;</td><td>Radius of the second cone base. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Note:</b></dt><dd>If both radiuses are non-zero, the cone will be truncated. <p>
-If the radiuses are equal, a cylinder will be created instead. </dd></dl>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theH</em>&nbsp;</td><td>Cone height. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created cone.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="3626eac4fedc7273364e21221fa88788"></a><!-- doxytag: member="geompyDC::geompyDC::MakeTorus" ref="3626eac4fedc7273364e21221fa88788" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeTorus           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theVec</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theRMajor</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theRMinor</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt</em>&nbsp;</td><td>Torus central point. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theVec</em>&nbsp;</td><td>Torus axis of symmetry. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theRMajor</em>&nbsp;</td><td>Torus major radius. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theRMinor</em>&nbsp;</td><td>Torus minor radius. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created torus.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="ee9c1c4391a974f97558960e90e7bb58"></a><!-- doxytag: member="geompyDC::geompyDC::MakeTorusRR" ref="ee9c1c4391a974f97558960e90e7bb58" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeTorusRR           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theRMajor</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theRMinor</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theRMajor</em>&nbsp;</td><td>Torus major radius. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theRMinor</em>&nbsp;</td><td>Torus minor radius. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created torus.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="235c3c3893cd30d3fd2d6c75df0b9b85"></a><!-- doxytag: member="geompyDC::geompyDC::MakePrism" ref="235c3c3893cd30d3fd2d6c75df0b9b85" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakePrism           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theBase</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theBase</em>&nbsp;</td><td>Base shape to be extruded. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePoint1</em>&nbsp;</td><td>First end of extrusion vector. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePoint2</em>&nbsp;</td><td>Second end of extrusion vector. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created prism.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="ed885f2bf6c39f0aba6f7773b36acceb"></a><!-- doxytag: member="geompyDC::geompyDC::MakePrismVecH" ref="ed885f2bf6c39f0aba6f7773b36acceb" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakePrismVecH           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theBase</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theVec</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theH</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-all the space, transfixed by the base shape during its translation along the vector on the given distance. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theBase</em>&nbsp;</td><td>Base shape to be extruded. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theVec</em>&nbsp;</td><td>Direction of extrusion. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theH</em>&nbsp;</td><td>Prism dimension along theVec. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created prism.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="ea1248fca4762d449c8f623df461dc1b"></a><!-- doxytag: member="geompyDC::geompyDC::MakePipe" ref="ea1248fca4762d449c8f623df461dc1b" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakePipe           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theBase</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePath</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-The path shape can be a wire or an edge. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theBase</em>&nbsp;</td><td>Base shape to be extruded. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePath</em>&nbsp;</td><td>Path shape to extrude the base shape along it. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created pipe.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="f1e4818545a58c6fca5917f4f2600d9c"></a><!-- doxytag: member="geompyDC::geompyDC::MakeRevolution" ref="f1e4818545a58c6fca5917f4f2600d9c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeRevolution           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theBase</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAxis</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAngle</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-all the space, transfixed by the base shape during its rotation around the axis on the given angle. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theBase</em>&nbsp;</td><td>Base shape to be rotated. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theAxis</em>&nbsp;</td><td>Rotation axis. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theAngle</em>&nbsp;</td><td>Rotation angle in radians. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created revolution.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="2cebf57322ef8812857c0e18935b2e50"></a><!-- doxytag: member="geompyDC::geompyDC::MakeThruSections" ref="2cebf57322ef8812857c0e18935b2e50" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeThruSections           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theSeqSections</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theModeSolid</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePreci</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theRuled</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theSeqSections</em>&nbsp;</td><td>- set of specified sections. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theModeSolid</em>&nbsp;</td><td>- mode defining building solid or shell </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePreci</em>&nbsp;</td><td>- precision 3D used for smoothing by default 1.e-6 </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theRuled</em>&nbsp;</td><td>- mode defining type of the result surfaces (ruled or smoothed). </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created shell or solid.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="9614d962ed7d981dd795367500e932e4"></a><!-- doxytag: member="geompyDC::geompyDC::MakePipeWithDifferentSections" ref="9614d962ed7d981dd795367500e932e4" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakePipeWithDifferentSections           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theSeqBases</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theLocations</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePath</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theWithContact</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theWithCorrection</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-The path shape can be a wire or an edge. the several profiles can be specified in the several locations of path. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theSeqBases</em>&nbsp;</td><td>- list of Bases shape to be extruded. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theLocations</em>&nbsp;</td><td>- 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. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePath</em>&nbsp;</td><td>- Path shape to extrude the base shape along it. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theWithContact</em>&nbsp;</td><td>- the mode defining that the section is translated to be in contact with the spine. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>-</em>&nbsp;</td><td>WithCorrection - defining that the section is rotated to be orthogonal to the spine tangent in the correspondent point </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created pipe.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="f0be52d1562df21a8c8d1c5e19cfd986"></a><!-- doxytag: member="geompyDC::geompyDC::MakePipeWithShellSections" ref="f0be52d1562df21a8c8d1c5e19cfd986" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakePipeWithShellSections           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theSeqBases</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theSeqSubBases</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theLocations</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePath</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theWithContact</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theWithCorrection</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-The path shape can be a shell or a face. the several profiles can be specified in the several locations of path. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theSeqBases</em>&nbsp;</td><td>- list of Bases shape to be extruded. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theSeqSubBases</em>&nbsp;</td><td>- list of corresponding subshapes of section shapes. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theLocations</em>&nbsp;</td><td>- 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. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePath</em>&nbsp;</td><td>- Path shape to extrude the base shape along it. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theWithContact</em>&nbsp;</td><td>- the mode defining that the section is translated to be in contact with the spine. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>-</em>&nbsp;</td><td>WithCorrection - defining that the section is rotated to be orthogonal to the spine tangent in the correspondent point </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created solids.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="28931fb5811e065bca98d33c72ae3bcd"></a><!-- doxytag: member="geompyDC::geompyDC::MakeEdge" ref="28931fb5811e065bca98d33c72ae3bcd" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeEdge           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>thePnt1</em>&nbsp;</td><td>Point for the first end of edge. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePnt2</em>&nbsp;</td><td>Point for the second end of edge. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created edge.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="a8bbbcb09ca5166b32cfca437388ce53"></a><!-- doxytag: member="geompyDC::geompyDC::MakeWire" ref="a8bbbcb09ca5166b32cfca437388ce53" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeWire           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theEdgesAndWires</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theEdgesAndWires</em>&nbsp;</td><td>List of edges and/or wires. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created wire.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="cdb6873ee6002347bb02cc3a58282609"></a><!-- doxytag: member="geompyDC::geompyDC::MakeFace" ref="cdb6873ee6002347bb02cc3a58282609" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeFace           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theWire</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>isPlanarWanted</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theWire</em>&nbsp;</td><td>closed Wire or Edge to build the face on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>isPlanarWanted</em>&nbsp;</td><td>If TRUE, only planar face will be built. If impossible, NULL object will be returned. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created face.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="e29525e7b4291b7068a540a6849e958e"></a><!-- doxytag: member="geompyDC::geompyDC::MakeFaceWires" ref="e29525e7b4291b7068a540a6849e958e" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeFaceWires           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theWires</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>isPlanarWanted</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theWires</em>&nbsp;</td><td>List of closed wires or edges to build the face on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>isPlanarWanted</em>&nbsp;</td><td>If TRUE, only planar face will be built. If impossible, NULL object will be returned. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created face.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="a0c086da24dc52a36e393403e67fb602"></a><!-- doxytag: member="geompyDC::geompyDC::MakeFaces" ref="a0c086da24dc52a36e393403e67fb602" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeFaces           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theWires</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>isPlanarWanted</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="f05fc666dd12c4c3b9d9e24ea6bb8e4c"></a><!-- doxytag: member="geompyDC::geompyDC::MakeShell" ref="f05fc666dd12c4c3b9d9e24ea6bb8e4c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeShell           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFacesAndShells</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theFacesAndShells</em>&nbsp;</td><td>List of faces and/or shells. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created shell.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="46ac42b6d0801facaf94f0219a98519d"></a><!-- doxytag: member="geompyDC::geompyDC::MakeSolid" ref="46ac42b6d0801facaf94f0219a98519d" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeSolid           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShells</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShells</em>&nbsp;</td><td>Sequence of bounding shells. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created solid.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="4291d93976b7ce6dd54e50bae3f0f2a7"></a><!-- doxytag: member="geompyDC::geompyDC::MakeCompound" ref="4291d93976b7ce6dd54e50bae3f0f2a7" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeCompound           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapes</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShapes</em>&nbsp;</td><td>List of shapes to put in compound. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created compound.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="38f585da48e36d0111edb5855a55cbfb"></a><!-- doxytag: member="geompyDC::geompyDC::NumberOfFaces" ref="38f585da48e36d0111edb5855a55cbfb" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.NumberOfFaces           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to count faces of. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>Quantity of faces.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="7e3d02b87d35cce98b8cf9ae0fe6b8ef"></a><!-- doxytag: member="geompyDC::geompyDC::NumberOfEdges" ref="7e3d02b87d35cce98b8cf9ae0fe6b8ef" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.NumberOfEdges           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to count edges of. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>Quantity of edges.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="030b12f8bf19341b7fb19c8b6f78560c"></a><!-- doxytag: member="geompyDC::geompyDC::ChangeOrientation" ref="030b12f8bf19341b7fb19c8b6f78560c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.ChangeOrientation           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to be reversed. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>The reversed copy of theShape.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="07154c139fe6ed7035fdea3e4eeecf7a"></a><!-- doxytag: member="geompyDC::geompyDC::OrientationChange" ref="07154c139fe6ed7035fdea3e4eeecf7a" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.OrientationChange           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="f17be89e3cd53f3c0f39c2edd65b0fac"></a><!-- doxytag: member="geompyDC::geompyDC::GetFreeFacesIDs" ref="f17be89e3cd53f3c0f39c2edd65b0fac" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetFreeFacesIDs           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Free face is a face, which is not shared between two shells of the shape. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to find free faces in. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of IDs of all free faces, contained in theShape.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="9fd58edacf404f79755e7dc844252afd"></a><!-- doxytag: member="geompyDC::geompyDC::GetSharedShapes" ref="9fd58edacf404f79755e7dc844252afd" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetSharedShapes           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape1</em>&nbsp;</td><td>Shape to find sub-shapes in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShape2</em>&nbsp;</td><td>Shape to find shared sub-shapes with. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeType</em>&nbsp;</td><td>Type of sub-shapes to be retrieved. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of sub-shapes of theShape1, shared with theShape2.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="f9b62ee841439c13d856a2278133d685"></a><!-- doxytag: member="geompyDC::geompyDC::GetShapesOnPlane" ref="f9b62ee841439c13d856a2278133d685" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetShapesOnPlane           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAx1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theState</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to find sub-shapes of. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeType</em>&nbsp;</td><td>Type of sub-shapes to be retrieved. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theAx1</em>&nbsp;</td><td>Vector (or line, or linear edge), specifying normal direction and location of the plane to find shapes on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theState</em>&nbsp;</td><td>The state of the subshapes to find. It can be one of ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of all found sub-shapes.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="68097cda152e42c34570c91205247290"></a><!-- doxytag: member="geompyDC::geompyDC::GetShapesOnPlaneIDs" ref="68097cda152e42c34570c91205247290" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetShapesOnPlaneIDs           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAx1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theState</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="651b14d212b23eaa194cb8cc1e4a92df"></a><!-- doxytag: member="geompyDC::geompyDC::GetShapesOnPlaneWithLocation" ref="651b14d212b23eaa194cb8cc1e4a92df" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetShapesOnPlaneWithLocation           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAx1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theState</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to find sub-shapes of. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeType</em>&nbsp;</td><td>Type of sub-shapes to be retrieved. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theAx1</em>&nbsp;</td><td>Vector (or line, or linear edge), specifying normal direction of the plane to find shapes on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePnt</em>&nbsp;</td><td>Point specifying location of the plane to find shapes on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theState</em>&nbsp;</td><td>The state of the subshapes to find. It can be one of ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of all found sub-shapes.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="ef1c337288dd469d08c6491a1bf1902c"></a><!-- doxytag: member="geompyDC::geompyDC::GetShapesOnPlaneWithLocationIDs" ref="ef1c337288dd469d08c6491a1bf1902c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetShapesOnPlaneWithLocationIDs           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAx1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePnt</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theState</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="efbe51fb2bab5123c12b233285393066"></a><!-- doxytag: member="geompyDC::geompyDC::GetShapesOnCylinder" ref="efbe51fb2bab5123c12b233285393066" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetShapesOnCylinder           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAxis</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theRadius</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theState</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to find sub-shapes of. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeType</em>&nbsp;</td><td>Type of sub-shapes to be retrieved. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theAxis</em>&nbsp;</td><td>Vector (or line, or linear edge), specifying axis of the cylinder to find shapes on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theRadius</em>&nbsp;</td><td>Radius of the cylinder to find shapes on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theState</em>&nbsp;</td><td>The state of the subshapes to find. It can be one of ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of all found sub-shapes.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="da671d7d2fa64f3fe87df7c055b83825"></a><!-- doxytag: member="geompyDC::geompyDC::GetShapesOnCylinderIDs" ref="da671d7d2fa64f3fe87df7c055b83825" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetShapesOnCylinderIDs           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAxis</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theRadius</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theState</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="ae6c2f5224df29424ca077575eabd736"></a><!-- doxytag: member="geompyDC::geompyDC::GetShapesOnSphere" ref="ae6c2f5224df29424ca077575eabd736" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetShapesOnSphere           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theCenter</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theRadius</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theState</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to find sub-shapes of. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeType</em>&nbsp;</td><td>Type of sub-shapes to be retrieved. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theCenter</em>&nbsp;</td><td>Point, specifying center of the sphere to find shapes on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theRadius</em>&nbsp;</td><td>Radius of the sphere to find shapes on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theState</em>&nbsp;</td><td>The state of the subshapes to find. It can be one of ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of all found sub-shapes.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="3987180dd23e4c175ed948a58a6cf660"></a><!-- doxytag: member="geompyDC::geompyDC::GetShapesOnSphereIDs" ref="3987180dd23e4c175ed948a58a6cf660" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetShapesOnSphereIDs           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theCenter</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theRadius</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theState</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="ea27e6fad8151ea201e4f723c4a428a8"></a><!-- doxytag: member="geompyDC::geompyDC::GetShapesOnQuadrangle" ref="ea27e6fad8151ea201e4f723c4a428a8" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetShapesOnQuadrangle           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theTopLeftPoint</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theTopRigthPoint</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theBottomLeftPoint</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theBottomRigthPoint</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theState</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to find sub-shapes of. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeType</em>&nbsp;</td><td>Type of sub-shapes to be retrieved. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theTopLeftPoint</em>&nbsp;</td><td>Point, specifying top left corner of a quadrangle </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theTopRigthPoint</em>&nbsp;</td><td>Point, specifying top right corner of a quadrangle </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theBottomLeftPoint</em>&nbsp;</td><td>Point, specifying bottom left corner of a quadrangle </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theBottomRigthPoint</em>&nbsp;</td><td>Point, specifying bottom right corner of a quadrangle </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theState</em>&nbsp;</td><td>The state of the subshapes to find. It can be one of ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of all found sub-shapes.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="1fab06e08781150f37917ac559cc2aa4"></a><!-- doxytag: member="geompyDC::geompyDC::GetShapesOnQuadrangleIDs" ref="1fab06e08781150f37917ac559cc2aa4" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetShapesOnQuadrangleIDs           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theTopLeftPoint</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theTopRigthPoint</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theBottomLeftPoint</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theBottomRigthPoint</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theState</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="1ea715c4d4e4d0f4c5e7919f2d83d4e6"></a><!-- doxytag: member="geompyDC::geompyDC::GetShapesOnBox" ref="1ea715c4d4e4d0f4c5e7919f2d83d4e6" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetShapesOnBox           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theBox</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theState</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theBox</em>&nbsp;</td><td>Shape for relative comparing. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to find sub-shapes of. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeType</em>&nbsp;</td><td>Type of sub-shapes to be retrieved. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theState</em>&nbsp;</td><td>The state of the subshapes to find. It can be one of ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of all found sub-shapes. </dd></dl>
-
-</div>
-</div><p>
-<a class="anchor" name="73015991fea1f7bb78c7436d7ec2ebb0"></a><!-- doxytag: member="geompyDC::geompyDC::GetShapesOnBoxIDs" ref="73015991fea1f7bb78c7436d7ec2ebb0" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetShapesOnBoxIDs           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theBox</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theState</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="67ae7cef36629d18c93c5a102dee00c3"></a><!-- doxytag: member="geompyDC::geompyDC::GetInPlace" ref="67ae7cef36629d18c93c5a102dee00c3" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetInPlace           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeWhere</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeWhat</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShapeWhere</em>&nbsp;</td><td>Shape to find sub-shapes of. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeWhat</em>&nbsp;</td><td>Shape, specifying what to find. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>Group of all found sub-shapes or a single found sub-shape.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="eed964a4cd665e5e26b9becd7c260d7b"></a><!-- doxytag: member="geompyDC::geompyDC::GetSame" ref="eed964a4cd665e5e26b9becd7c260d7b" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetSame           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeWhere</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeWhat</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShapeWhere</em>&nbsp;</td><td>Shape to find sub-shape of. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeWhat</em>&nbsp;</td><td>Shape, specifying what to find. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object for found sub-shape. </dd></dl>
-
-</div>
-</div><p>
-<a class="anchor" name="83963a360d309689ba837d8e316466c1"></a><!-- doxytag: member="geompyDC::geompyDC::GetSubShape" ref="83963a360d309689ba837d8e316466c1" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetSubShape           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListOfID</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="b3cf4c129a0316ffbe7904021762549c"></a><!-- doxytag: member="geompyDC::geompyDC::GetSubShapeID" ref="b3cf4c129a0316ffbe7904021762549c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetSubShapeID           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aSubShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="78fa5a06b26d7d924c08892e963f3457"></a><!-- doxytag: member="geompyDC::geompyDC::SubShapeAll" ref="78fa5a06b26d7d924c08892e963f3457" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.SubShapeAll           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aType</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to be exploded. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeType</em>&nbsp;</td><td>Type of sub-shapes to be retrieved. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of sub-shapes of type theShapeType, contained in theShape.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="c08bbd0e4324de005e144b0bd71a62fd"></a><!-- doxytag: member="geompyDC::geompyDC::SubShapeAllIDs" ref="c08bbd0e4324de005e144b0bd71a62fd" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.SubShapeAllIDs           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aType</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to be exploded. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeType</em>&nbsp;</td><td>Type of sub-shapes to be retrieved. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of IDs of sub-shapes. </dd></dl>
-
-</div>
-</div><p>
-<a class="anchor" name="f6bf69ac9180b0ae6c782445d56f2c59"></a><!-- doxytag: member="geompyDC::geompyDC::SubShapeAllSorted" ref="f6bf69ac9180b0ae6c782445d56f2c59" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.SubShapeAllSorted           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aType</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Sub-shapes will be sorted by coordinates of their gravity centers. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to be exploded. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeType</em>&nbsp;</td><td>Type of sub-shapes to be retrieved. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of sub-shapes of type theShapeType, contained in theShape.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="5e36eda3a11edc37146e5e73dd118e81"></a><!-- doxytag: member="geompyDC::geompyDC::SubShapeAllSortedIDs" ref="5e36eda3a11edc37146e5e73dd118e81" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.SubShapeAllSortedIDs           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aType</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Sub-shapes will be sorted by coordinates of their gravity centers. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to be exploded. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeType</em>&nbsp;</td><td>Type of sub-shapes to be retrieved. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of IDs of sub-shapes. </dd></dl>
-
-</div>
-</div><p>
-<a class="anchor" name="0092ca7fbc9ed8d824f6a0f932793e47"></a><!-- doxytag: member="geompyDC::geompyDC::SubShape" ref="0092ca7fbc9ed8d824f6a0f932793e47" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.SubShape           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListOfInd</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Each index is in range [1, Nb_Sub-Shapes_Of_Given_Type]<p>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="bdacf7906482aacc2d5db144847f2d89"></a><!-- doxytag: member="geompyDC::geompyDC::SubShapeSorted" ref="bdacf7906482aacc2d5db144847f2d89" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.SubShapeSorted           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListOfInd</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Each index is in range [1, Nb_Sub-Shapes_Of_Given_Type]<p>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="cd3999b10bc598e794c72f5d0100fce5"></a><!-- doxytag: member="geompyDC::geompyDC::ProcessShape" ref="cd3999b10bc598e794c72f5d0100fce5" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.ProcessShape           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theOperators</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theParameters</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theValues</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to be processed. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theOperators</em>&nbsp;</td><td>List of names of operators ("FixShape", "SplitClosedFaces", etc.). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theParameters</em>&nbsp;</td><td>List of names of parameters ("FixShape.Tolerance3d", "SplitClosedFaces.NbSplitPoints", etc.). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theValues</em>&nbsp;</td><td>List of values of parameters, in the same order as parameters are listed in <em>theParameters</em> list. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing processed shape.</dd></dl>
-Example: see GEOM_TestHealing.py 
-</div>
-</div><p>
-<a class="anchor" name="bbaee711561a402bdd0741ec11471278"></a><!-- doxytag: member="geompyDC::geompyDC::SuppressFaces" ref="bbaee711561a402bdd0741ec11471278" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.SuppressFaces           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFaces</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>Shape to be processed. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theFaces</em>&nbsp;</td><td>Indices of faces to be removed, if EMPTY then the method removes ALL faces of the given object. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing processed shape.</dd></dl>
-Example: see GEOM_TestHealing.py 
-</div>
-</div><p>
-<a class="anchor" name="036ad990f98656d408899bfcd5ece429"></a><!-- doxytag: member="geompyDC::geompyDC::MakeSewing" ref="036ad990f98656d408899bfcd5ece429" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeSewing           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theTolerance</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestHealing.py 
-</div>
-</div><p>
-<a class="anchor" name="8d560be7edd550c5d99efa7d5500983d"></a><!-- doxytag: member="geompyDC::geompyDC::Sew" ref="8d560be7edd550c5d99efa7d5500983d" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.Sew           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theTolerance</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>Shape to be processed. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theTolerance</em>&nbsp;</td><td>Required tolerance value. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing processed shape.</dd></dl>
-Example: see <a class="el" href="classgeompyDC_1_1geompyDC.html#036ad990f98656d408899bfcd5ece429">MakeSewing()</a> above 
-</div>
-</div><p>
-<a class="anchor" name="32d8bab454d23c5081af3cf351da2dbc"></a><!-- doxytag: member="geompyDC::geompyDC::SuppressInternalWires" ref="32d8bab454d23c5081af3cf351da2dbc" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.SuppressInternalWires           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theWires</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>Shape to be processed. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theWires</em>&nbsp;</td><td>Indices of wires to be removed, if EMPTY then the method removes ALL internal wires of the given object. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing processed shape.</dd></dl>
-Example: see GEOM_TestHealing.py 
-</div>
-</div><p>
-<a class="anchor" name="3bb048fd0a24d95d5477d315f06613ff"></a><!-- doxytag: member="geompyDC::geompyDC::SuppressHoles" ref="3bb048fd0a24d95d5477d315f06613ff" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.SuppressHoles           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theWires</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>Shape to be processed. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theWires</em>&nbsp;</td><td>Indices of wires to be removed, if EMPTY then the method removes ALL internal holes of the given object </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing processed shape.</dd></dl>
-Example: see GEOM_TestHealing.py 
-</div>
-</div><p>
-<a class="anchor" name="68a586d816212080969fe6ee4f19462d"></a><!-- doxytag: member="geompyDC::geompyDC::CloseContour" ref="68a586d816212080969fe6ee4f19462d" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.CloseContour           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theWires</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>isCommonVertex</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>Shape to be processed. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theWires</em>&nbsp;</td><td>Indexes of edge(s) and wire(s) to be closed within <em>theObject</em>'s shape, if -1, then theObject itself is a wire. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>isCommonVertex</em>&nbsp;</td><td>If TRUE : closure by creation of a common vertex, If FALS : closure by creation of an edge between ends. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing processed shape.</dd></dl>
-Example: see GEOM_TestHealing.py 
-</div>
-</div><p>
-<a class="anchor" name="7d5999f697974ede4dc7e2bd8bda35a9"></a><!-- doxytag: member="geompyDC::geompyDC::DivideEdge" ref="7d5999f697974ede4dc7e2bd8bda35a9" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.DivideEdge           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theEdgeIndex</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theValue</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>isByParameter</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>Shape to be processed. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theEdgeIndex</em>&nbsp;</td><td>Index of edge to be divided within theObject's shape, if -1, then theObject itself is the edge. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theValue</em>&nbsp;</td><td>Value of parameter on edge or length parameter, depending on <em>isByParameter</em>. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>isByParameter</em>&nbsp;</td><td>If TRUE : <em>theValue</em> is treated as a curve parameter [0..1], if FALSE : <em>theValue</em> is treated as a length parameter [0..1] </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing processed shape.</dd></dl>
-Example: see GEOM_TestHealing.py 
-</div>
-</div><p>
-<a class="anchor" name="28ff08bd5c4bc952201dc0cef7402d9b"></a><!-- doxytag: member="geompyDC::geompyDC::ChangeOrientationShell" ref="28ff08bd5c4bc952201dc0cef7402d9b" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.ChangeOrientationShell           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>Shape to be processed.  given shape </td></tr>
-  </table>
-</dl>
-
-</div>
-</div><p>
-<a class="anchor" name="41fb7f3129e0cd4dd7fe464d18fba515"></a><!-- doxytag: member="geompyDC::geompyDC::ChangeOrientationShellCopy" ref="41fb7f3129e0cd4dd7fe464d18fba515" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.ChangeOrientationShellCopy           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>Shape to be processed. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing processed shape. </dd></dl>
-
-</div>
-</div><p>
-<a class="anchor" name="4ed122bb69d03337a8660f1a550916d8"></a><!-- doxytag: member="geompyDC::geompyDC::GetFreeBoundary" ref="4ed122bb69d03337a8660f1a550916d8" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetFreeBoundary           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>Shape to get free boundary of. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>[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.</dd></dl>
-Example: see GEOM_TestHealing.py 
-</div>
-</div><p>
-<a class="anchor" name="e9bfb58d56f250fd0cb515e3523ac64e"></a><!-- doxytag: member="geompyDC::geompyDC::MakeCopy" ref="e9bfb58d56f250fd0cb515e3523ac64e" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeCopy           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theOriginal</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="3f2195ae25913232c21e0b9fe4d14645"></a><!-- doxytag: member="geompyDC::geompyDC::MakeFilling" ref="3f2195ae25913232c21e0b9fe4d14645" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeFilling           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theMinDeg</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theMaxDeg</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theTol2D</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theTol3D</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theNbIter</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>the compound of contours </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theMinDeg</em>&nbsp;</td><td>a minimal degree </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theMaxDeg</em>&nbsp;</td><td>a maximal degree </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theTol2D</em>&nbsp;</td><td>a 2d tolerance </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theTol3D</em>&nbsp;</td><td>a 3d tolerance </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theNbIter</em>&nbsp;</td><td>a number of iteration </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created filling surface.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="8b789fb1eac91f08fed5643735ef82f2"></a><!-- doxytag: member="geompyDC::geompyDC::MakeGlueFaces" ref="8b789fb1eac91f08fed5643735ef82f2" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeGlueFaces           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theTolerance</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Initial shape. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theTolerance</em>&nbsp;</td><td>Maximum distance between faces, which can be considered as coincident. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing a copy of theShape without coincident faces.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="34bb9c3bfcf52999473f8ed6849d8226"></a><!-- doxytag: member="geompyDC::geompyDC::GetGlueFaces" ref="34bb9c3bfcf52999473f8ed6849d8226" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetGlueFaces           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theTolerance</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Initial shape. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theTolerance</em>&nbsp;</td><td>Maximum distance between faces, which can be considered as coincident. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>ListOfGO.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="a025213e01e49556bccf2b98e67597a8"></a><!-- doxytag: member="geompyDC::geompyDC::MakeGlueFacesByList" ref="a025213e01e49556bccf2b98e67597a8" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeGlueFacesByList           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theTolerance</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFaces</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Initial shape. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theTolerance</em>&nbsp;</td><td>Maximum distance between faces, which can be considered as coincident. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theFaces</em>&nbsp;</td><td>List of faces for gluing. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing a copy of theShape without some faces.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="f867726a40416a5a56c61016cc973a6d"></a><!-- doxytag: member="geompyDC::geompyDC::MakeBoolean" ref="f867726a40416a5a56c61016cc973a6d" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeBoolean           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theOperation</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape1</em>&nbsp;</td><td>First argument for boolean operation. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShape2</em>&nbsp;</td><td>Second argument for boolean operation. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theOperation</em>&nbsp;</td><td>Indicates the operation to be done: 1 - Common, 2 - Cut, 3 - Fuse, 4 - Section. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the result shape.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="e8233b6151298410ca8a0a27f938de31"></a><!-- doxytag: member="geompyDC::geompyDC::MakeCommon" ref="e8233b6151298410ca8a0a27f938de31" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeCommon           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>s1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>s2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="1811661330f4b7497d231898153623e1"></a><!-- doxytag: member="geompyDC::geompyDC::MakeCut" ref="1811661330f4b7497d231898153623e1" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeCut           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>s1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>s2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="91cedb6151173844ea4774b2594d3ede"></a><!-- doxytag: member="geompyDC::geompyDC::MakeFuse" ref="91cedb6151173844ea4774b2594d3ede" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeFuse           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>s1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>s2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="db309b5427f795aa4468380a319cf13b"></a><!-- doxytag: member="geompyDC::geompyDC::MakeSection" ref="db309b5427f795aa4468380a319cf13b" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeSection           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>s1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>s2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="693e98c94226019c732c577f4e2bae08"></a><!-- doxytag: member="geompyDC::geompyDC::MakePartition" ref="693e98c94226019c732c577f4e2bae08" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakePartition           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListShapes</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListTools</em> = <code>[]</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListKeepInside</em> = <code>[]</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListRemoveInside</em> = <code>[]</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>Limit</em> = <code><a class="el" href="namespacegeompyDC.html#d85aa7c933dca679752d28c67018a43c">ShapeType</a>[&quot;SHAPE&quot;]</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>RemoveWebs</em> = <code>0</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListMaterials</em> = <code>[]</code></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>ListShapes</em>&nbsp;</td><td>Shapes to be intersected. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>ListTools</em>&nbsp;</td><td>Shapes to intersect theShapes. !!!NOTE: Each compound from ListShapes and ListTools will be exploded in order to avoid possible intersection between shapes from this compound. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>Limit</em>&nbsp;</td><td>Type of resulting shapes (corresponding to TopAbs_ShapeEnum).</td></tr>
-  </table>
-</dl>
-After implementation new version of PartitionAlgo (October 2006) other parameters are ignored by current functionality. They are kept in this function only for support old versions. Ignored parameters: <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>ListKeepInside</em>&nbsp;</td><td>Shapes, outside which the results will be deleted. Each shape from theKeepInside must belong to theShapes also. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>ListRemoveInside</em>&nbsp;</td><td>Shapes, inside which the results will be deleted. Each shape from theRemoveInside must belong to theShapes also. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>RemoveWebs</em>&nbsp;</td><td>If TRUE, perform Glue 3D algorithm. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>ListMaterials</em>&nbsp;</td><td>Material indices for each shape. Make sence, only if theRemoveWebs is TRUE.</td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the result shapes.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="91a00e9db2eaa9bde1b8d2c34c92b299"></a><!-- doxytag: member="geompyDC::geompyDC::MakePartitionNonSelfIntersectedShape" ref="91a00e9db2eaa9bde1b8d2c34c92b299" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakePartitionNonSelfIntersectedShape           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListShapes</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListTools</em> = <code>[]</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListKeepInside</em> = <code>[]</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListRemoveInside</em> = <code>[]</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>Limit</em> = <code><a class="el" href="namespacegeompyDC.html#d85aa7c933dca679752d28c67018a43c">ShapeType</a>[&quot;SHAPE&quot;]</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>RemoveWebs</em> = <code>0</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListMaterials</em> = <code>[]</code></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-This method may be useful if it is needed to make a partition for compound contains nonintersected shapes. Performance will be better since intersection between shapes from compound is not performed.<p>
-Description of all parameters as in previous method <a class="el" href="classgeompyDC_1_1geompyDC.html#693e98c94226019c732c577f4e2bae08">MakePartition()</a><p>
-!!!NOTE: Passed compounds (via ListShapes or via ListTools) have to consist of nonintersecting shapes.<p>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the result shapes. </dd></dl>
-
-</div>
-</div><p>
-<a class="anchor" name="a48ac8ff0e107f4d8e93bd664ca8bf15"></a><!-- doxytag: member="geompyDC::geompyDC::Partition" ref="a48ac8ff0e107f4d8e93bd664ca8bf15" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.Partition           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListShapes</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListTools</em> = <code>[]</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListKeepInside</em> = <code>[]</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListRemoveInside</em> = <code>[]</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>Limit</em> = <code><a class="el" href="namespacegeompyDC.html#d85aa7c933dca679752d28c67018a43c">ShapeType</a>[&quot;SHAPE&quot;]</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>RemoveWebs</em> = <code>0</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListMaterials</em> = <code>[]</code></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="8cc6a68037fff53d6d525a96df5fa669"></a><!-- doxytag: member="geompyDC::geompyDC::MakeHalfPartition" ref="8cc6a68037fff53d6d525a96df5fa669" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeHalfPartition           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePlane</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to be intersected. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePlane</em>&nbsp;</td><td>Tool shape, to intersect theShape. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the result shape.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="ae13dcb7c8887b5a041fb6db9132bf49"></a><!-- doxytag: member="geompyDC::geompyDC::MakeTranslationTwoPoints" ref="ae13dcb7c8887b5a041fb6db9132bf49" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeTranslationTwoPoints           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The object to be translated. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePoint1</em>&nbsp;</td><td>Start point of translation vector. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePoint2</em>&nbsp;</td><td>End point of translation vector. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the translated object.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="7ad489d0ca9d6105742129bb18b9b949"></a><!-- doxytag: member="geompyDC::geompyDC::MakeTranslation" ref="7ad489d0ca9d6105742129bb18b9b949" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeTranslation           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theDX</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theDY</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theDZ</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The object to be translated. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theDX,theDY,theDZ</em>&nbsp;</td><td>Components of translation vector. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the translated object.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="d9d5fd17912e5f49ba4b9eccef1cfeaf"></a><!-- doxytag: member="geompyDC::geompyDC::MakeTranslationVector" ref="d9d5fd17912e5f49ba4b9eccef1cfeaf" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeTranslationVector           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theVector</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The object to be translated. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theVector</em>&nbsp;</td><td>The translation vector. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the translated object.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="dd060f21b775de207551c4b6e435e56c"></a><!-- doxytag: member="geompyDC::geompyDC::MakeRotation" ref="dd060f21b775de207551c4b6e435e56c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeRotation           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAxis</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAngle</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The object to be rotated. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theAxis</em>&nbsp;</td><td>Rotation axis. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theAngle</em>&nbsp;</td><td>Rotation angle in radians. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the rotated object.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="607eb745f4538c19eb12ae3517d39007"></a><!-- doxytag: member="geompyDC::geompyDC::MakeRotationThreePoints" ref="607eb745f4538c19eb12ae3517d39007" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeRotationThreePoints           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theCentPoint</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The object to be rotated. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theCentPoint</em>&nbsp;</td><td>central point - the axis is the vector perpendicular to the plane containing the three points. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePoint1</em>&nbsp;</td><td>and thePoint2 - in a perpendicular plan of the axis. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the rotated object.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="56de5cb4e4835ec2d52a226e392ebb15"></a><!-- doxytag: member="geompyDC::geompyDC::MakeScaleTransform" ref="56de5cb4e4835ec2d52a226e392ebb15" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeScaleTransform           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFactor</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The object to be scaled. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePoint</em>&nbsp;</td><td>Center point for scaling. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theFactor</em>&nbsp;</td><td>Scaling factor value. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the scaled shape.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="24217f6fdddd62d6539c1b964f175b38"></a><!-- doxytag: member="geompyDC::geompyDC::MakeMirrorByPlane" ref="24217f6fdddd62d6539c1b964f175b38" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeMirrorByPlane           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePlane</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The object to be mirrored. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePlane</em>&nbsp;</td><td>Plane of symmetry. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the mirrored shape.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="17fbac698ec8c33d93b1de51ac4874cb"></a><!-- doxytag: member="geompyDC::geompyDC::MakeMirrorByAxis" ref="17fbac698ec8c33d93b1de51ac4874cb" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeMirrorByAxis           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAxis</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The object to be mirrored. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theAxis</em>&nbsp;</td><td>Axis of symmetry. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the mirrored shape.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="8655b456f413267ed78a3c309b6304f9"></a><!-- doxytag: member="geompyDC::geompyDC::MakeMirrorByPoint" ref="8655b456f413267ed78a3c309b6304f9" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeMirrorByPoint           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The object to be mirrored. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePoint</em>&nbsp;</td><td>Point of symmetry. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the mirrored shape.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="e56618159887843f81359c4481bf7406"></a><!-- doxytag: member="geompyDC::geompyDC::MakePosition" ref="e56618159887843f81359c4481bf7406" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakePosition           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theStartLCS</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theEndLCS</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The object to be displaced. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theStartLCS</em>&nbsp;</td><td>Coordinate system to perform displacement from it. If <em>theStartLCS</em> is NULL, displacement will be performed from global CS. If <em>theObject</em> itself is used as <em>theStartLCS</em>, its location will be changed to <em>theEndLCS</em>. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theEndLCS</em>&nbsp;</td><td>Coordinate system to perform displacement to it. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the displaced shape.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="981351eeef1b763896c836cc7f253312"></a><!-- doxytag: member="geompyDC::geompyDC::MakeOffset" ref="981351eeef1b763896c836cc7f253312" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeOffset           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theOffset</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The base object for the offset. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theOffset</em>&nbsp;</td><td>Offset value. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the offset object.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="c9a473ec03e5c63896685b0e34481fd2"></a><!-- doxytag: member="geompyDC::geompyDC::MakeMultiTranslation1D" ref="c9a473ec03e5c63896685b0e34481fd2" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeMultiTranslation1D           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theVector</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theStep</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theNbTimes</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The object to be translated. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theVector</em>&nbsp;</td><td>Direction of the translation. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theStep</em>&nbsp;</td><td>Distance to translate on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theNbTimes</em>&nbsp;</td><td>Quantity of translations to be done. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing compound of all the shapes, obtained after each translation.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="ab32f56d90ecb1a6b2298dbfbdd7d83c"></a><!-- doxytag: member="geompyDC::geompyDC::MakeMultiTranslation2D" ref="ab32f56d90ecb1a6b2298dbfbdd7d83c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeMultiTranslation2D           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theVector1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theStep1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theNbTimes1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theVector2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theStep2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theNbTimes2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The object to be translated. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theVector1</em>&nbsp;</td><td>Direction of the first translation. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theStep1</em>&nbsp;</td><td>Step of the first translation. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theNbTimes1</em>&nbsp;</td><td>Quantity of translations to be done along theVector1. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theVector2</em>&nbsp;</td><td>Direction of the second translation. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theStep2</em>&nbsp;</td><td>Step of the second translation. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theNbTimes2</em>&nbsp;</td><td>Quantity of translations to be done along theVector2. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing compound of all the shapes, obtained after each translation.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="38982348093ee6fab2c9a4583a2ca511"></a><!-- doxytag: member="geompyDC::geompyDC::MultiRotate1D" ref="38982348093ee6fab2c9a4583a2ca511" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MultiRotate1D           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAxis</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theNbTimes</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Rotation angle will be 2*PI/theNbTimes. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The object to be rotated. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theAxis</em>&nbsp;</td><td>The rotation axis. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theNbTimes</em>&nbsp;</td><td>Quantity of rotations to be done. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing compound of all the shapes, obtained after each rotation.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="616f750a1eeda26ce7277f18f6247693"></a><!-- doxytag: member="geompyDC::geompyDC::MultiRotate2D" ref="616f750a1eeda26ce7277f18f6247693" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MultiRotate2D           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAxis</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theAngle</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theNbTimes1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theStep</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theNbTimes2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Translation direction passes through center of gravity of rotated shape and its projection on the rotation axis. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>The object to be rotated. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theAxis</em>&nbsp;</td><td>Rotation axis. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theAngle</em>&nbsp;</td><td>Rotation angle in graduces. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theNbTimes1</em>&nbsp;</td><td>Quantity of rotations to be done. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theStep</em>&nbsp;</td><td>Translation distance. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theNbTimes2</em>&nbsp;</td><td>Quantity of translations to be done. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing compound of all the shapes, obtained after each transformation.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="eedbceb1c3dda0840de2b0eb4181c359"></a><!-- doxytag: member="geompyDC::geompyDC::MakeMultiRotation1D" ref="eedbceb1c3dda0840de2b0eb4181c359" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeMultiRotation1D           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aDir</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aPoint</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aNbTimes</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="8316876f521e705a923d1269a9a8e7f3"></a><!-- doxytag: member="geompyDC::geompyDC::MakeMultiRotation2D" ref="8316876f521e705a923d1269a9a8e7f3" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeMultiRotation2D           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aDir</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aPoint</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>anAngle</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>nbtimes1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aStep</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>nbtimes2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="63bda9af6c88695354bcff0b367fbe1b"></a><!-- doxytag: member="geompyDC::geompyDC::MakeFilletAll" ref="63bda9af6c88695354bcff0b367fbe1b" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeFilletAll           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theR</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape, to perform fillet on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theR</em>&nbsp;</td><td>Fillet radius. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the result shape.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="974837854699fa8b1a8745527f51873a"></a><!-- doxytag: member="geompyDC::geompyDC::MakeFillet" ref="974837854699fa8b1a8745527f51873a" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeFillet           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theR</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theListShapes</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape, to perform fillet on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theR</em>&nbsp;</td><td>Fillet radius. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeType</em>&nbsp;</td><td>Type of shapes in &lt;theListShapes&gt;. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theListShapes</em>&nbsp;</td><td>Global indices of edges/faces to perform fillet on. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Note:</b></dt><dd>Global index of sub-shape can be obtained, using method geompy.GetSubShapeID(). </dd></dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the result shape.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="3e51747789c633e2f971cb4b607dbf73"></a><!-- doxytag: member="geompyDC::geompyDC::MakeChamferAll" ref="3e51747789c633e2f971cb4b607dbf73" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeChamferAll           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theD</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape, to perform chamfer on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theD</em>&nbsp;</td><td>Chamfer size along each face. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the result shape.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="fdfd03b730f47776a40d153c11f7128c"></a><!-- doxytag: member="geompyDC::geompyDC::MakeChamferEdge" ref="fdfd03b730f47776a40d153c11f7128c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeChamferEdge           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theD1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theD2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFace1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFace2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape, to perform chamfer on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theD1</em>&nbsp;</td><td>Chamfer size along <em>theFace1</em>. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theD2</em>&nbsp;</td><td>Chamfer size along <em>theFace2</em>. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theFace1,theFace2</em>&nbsp;</td><td>Global indices of two faces of <em>theShape</em>. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Note:</b></dt><dd>Global index of sub-shape can be obtained, using method geompy.GetSubShapeID(). </dd></dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the result shape.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="15f9862deb40103a8b910d66d13391e5"></a><!-- doxytag: member="geompyDC::geompyDC::MakeChamferFaces" ref="15f9862deb40103a8b910d66d13391e5" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeChamferFaces           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theD1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theD2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFaces</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape, to perform chamfer on. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theD1</em>&nbsp;</td><td>Chamfer size along face from <em>theFaces</em>. If both faces, connected to the edge, are in <em>theFaces</em>, <em>theD1</em> will be get along face, which is nearer to <em>theFaces</em> beginning. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theD2</em>&nbsp;</td><td>Chamfer size along another of two faces, connected to the edge. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theFaces</em>&nbsp;</td><td>Sequence of global indices of faces of <em>theShape</em>. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Note:</b></dt><dd>Global index of sub-shape can be obtained, using method geompy.GetSubShapeID(). </dd></dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the result shape.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="27c2e095df94471a5cee3edf005f527f"></a><!-- doxytag: member="geompyDC::geompyDC::MakeChamfer" ref="27c2e095df94471a5cee3edf005f527f" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeChamfer           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>d1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>d2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>aShapeType</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>ListShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="d71461f31b4b633f1ae8ecf19d2026c6"></a><!-- doxytag: member="geompyDC::geompyDC::Archimede" ref="d71461f31b4b633f1ae8ecf19d2026c6" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.Archimede           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theWeight</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theWaterDensity</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theMeshDeflection</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-The object presenting the resulting face is returned. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to be put in water. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theWeight</em>&nbsp;</td><td>Weight og the shape. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theWaterDensity</em>&nbsp;</td><td>Density of the water. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theMeshDeflection</em>&nbsp;</td><td>Deflection of the mesh, using to compute the section. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing a section of <em>theShape</em> by a plane, corresponding to water level.</dd></dl>
-Example: see GEOM_TestAll.py 
-</div>
-</div><p>
-<a class="anchor" name="9238e5dbb4bc2295e25b8a1c1becc569"></a><!-- doxytag: member="geompyDC::geompyDC::PointCoordinates" ref="9238e5dbb4bc2295e25b8a1c1becc569" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.PointCoordinates           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>Point</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Returns:</b></dt><dd>[x, y, z]</dd></dl>
-Example: see GEOM_TestMeasures.py 
-</div>
-</div><p>
-<a class="anchor" name="07b3380d65462c2473d817ba9ba93732"></a><!-- doxytag: member="geompyDC::geompyDC::BasicProperties" ref="07b3380d65462c2473d817ba9ba93732" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.BasicProperties           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to define properties of. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>[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.</dd></dl>
-Example: see GEOM_TestMeasures.py 
-</div>
-</div><p>
-<a class="anchor" name="56e1764834e88b2fff2e341474c5b2a8"></a><!-- doxytag: member="geompyDC::geompyDC::BoundingBox" ref="56e1764834e88b2fff2e341474c5b2a8" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.BoundingBox           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to obtain bounding box of. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>[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.</dd></dl>
-Example: see GEOM_TestMeasures.py 
-</div>
-</div><p>
-<a class="anchor" name="b0c0c06d7ccf5e768cb68b90ef2063bb"></a><!-- doxytag: member="geompyDC::geompyDC::Inertia" ref="b0c0c06d7ccf5e768cb68b90ef2063bb" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.Inertia           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to calculate inertia of. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>[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.</dd></dl>
-Example: see GEOM_TestMeasures.py 
-</div>
-</div><p>
-<a class="anchor" name="0dd7dc10f4871d5a6ef5e1024c3847ea"></a><!-- doxytag: member="geompyDC::geompyDC::MinDistance" ref="0dd7dc10f4871d5a6ef5e1024c3847ea" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MinDistance           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape1,theShape2</em>&nbsp;</td><td>Shapes to find minimal distance between. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>Value of the minimal distance between the given shapes.</dd></dl>
-Example: see GEOM_TestMeasures.py 
-</div>
-</div><p>
-<a class="anchor" name="216d622cb1e479c6b50b974363881e24"></a><!-- doxytag: member="geompyDC::geompyDC::Tolerance" ref="216d622cb1e479c6b50b974363881e24" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.Tolerance           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape, to get tolerances of. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>[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.</dd></dl>
-Example: see GEOM_TestMeasures.py 
-</div>
-</div><p>
-<a class="anchor" name="81dcea9d11cd1e7e2a6fc7fc82c9747b"></a><!-- doxytag: member="geompyDC::geompyDC::WhatIs" ref="81dcea9d11cd1e7e2a6fc7fc82c9747b" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.WhatIs           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to be described. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>Description of the given shape.</dd></dl>
-Example: see GEOM_TestMeasures.py 
-</div>
-</div><p>
-<a class="anchor" name="bcfbd3959bf92bd7e8db4dd646d8d49d"></a><!-- doxytag: member="geompyDC::geompyDC::MakeCDG" ref="bcfbd3959bf92bd7e8db4dd646d8d49d" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeCDG           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to define centre of mass of. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created point.</dd></dl>
-Example: see GEOM_TestMeasures.py 
-</div>
-</div><p>
-<a class="anchor" name="63d7e6c328b2864bcba0d61809ea8fa9"></a><!-- doxytag: member="geompyDC::geompyDC::CheckShape" ref="63d7e6c328b2864bcba0d61809ea8fa9" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.CheckShape           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theIsCheckGeom</em> = <code>0</code></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to check validity of. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theIsCheckGeom</em>&nbsp;</td><td>If FALSE, only the shape's topology will be checked, if TRUE, the shape's geometry will be checked also. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>TRUE, if the shape "seems to be valid". If theShape is invalid, prints a description of problem.</dd></dl>
-Example: see GEOM_TestMeasures.py 
-</div>
-</div><p>
-<a class="anchor" name="ed127e0ebf2001c61b9b4faed95313cb"></a><!-- doxytag: member="geompyDC::geompyDC::GetPosition" ref="ed127e0ebf2001c61b9b4faed95313cb" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetPosition           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Origin of the LCS is situated at the shape's center of mass. Axes of the LCS are obtained from shape's location or, if the shape is a planar face, from position of its plane.<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to calculate position of. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>[Ox,Oy,Oz, Zx,Zy,Zz, Xx,Xy,Xz]. Ox,Oy,Oz: Coordinates of shape's LCS origin. Zx,Zy,Zz: Coordinates of shape's LCS normal(main) direction. Xx,Xy,Xz: Coordinates of shape's LCS X direction.</dd></dl>
-Example: see GEOM_TestMeasures.py 
-</div>
-</div><p>
-<a class="anchor" name="a29a8ae880663ba09edb8b35688646be"></a><!-- doxytag: member="geompyDC::geompyDC::KindOfShape" ref="a29a8ae880663ba09edb8b35688646be" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.KindOfShape           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to get a kind of. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>Returns a kind of shape in terms of <em>GEOM_IKindOfShape.shape_kind</em> enumeration and a list of parameters, describing the shape. </dd></dl>
-<dl compact><dt><b>Note:</b></dt><dd>Concrete meaning of each value, returned via <em>theIntegers</em> or <em>theDoubles</em> list depends on the kind of the shape. The full list of possible outputs is:</dd></dl>
-geompy.kind.COMPOUND nb_solids nb_faces nb_edges nb_vertices geompy.kind.COMPSOLID nb_solids nb_faces nb_edges nb_vertices<p>
-geompy.kind.SHELL <a class="el" href="classgeompyDC_1_1info.html#e26dc8be1afb44222ab88b4a9852c6aa">geompy.info.CLOSED</a> nb_faces nb_edges nb_vertices geompy.kind.SHELL <a class="el" href="classgeompyDC_1_1info.html#b717bbcea5e0faa48760b0be4706ec57">geompy.info.UNCLOSED</a> nb_faces nb_edges nb_vertices<p>
-geompy.kind.WIRE <a class="el" href="classgeompyDC_1_1info.html#e26dc8be1afb44222ab88b4a9852c6aa">geompy.info.CLOSED</a> nb_edges nb_vertices geompy.kind.WIRE <a class="el" href="classgeompyDC_1_1info.html#b717bbcea5e0faa48760b0be4706ec57">geompy.info.UNCLOSED</a> nb_edges nb_vertices<p>
-geompy.kind.SPHERE xc yc zc R geompy.kind.CYLINDER xb yb zb dx dy dz R H geompy.kind.BOX xc yc zc ax ay az geompy.kind.ROTATED_BOX xc yc zc zx zy zz xx xy xz ax ay az geompy.kind.TORUS xc yc zc dx dy dz R_1 R_2 geompy.kind.CONE xb yb zb dx dy dz R_1 R_2 H geompy.kind.POLYHEDRON nb_faces nb_edges nb_vertices geompy.kind.SOLID nb_faces nb_edges nb_vertices<p>
-geompy.kind.SPHERE2D xc yc zc R geompy.kind.CYLINDER2D xb yb zb dx dy dz R H geompy.kind.TORUS2D xc yc zc dx dy dz R_1 R_2 geompy.kind.CONE2D xc yc zc dx dy dz R_1 R_2 H geompy.kind.DISK_CIRCLE xc yc zc dx dy dz R geompy.kind.DISK_ELLIPSE xc yc zc dx dy dz R_1 R_2 geompy.kind.POLYGON xo yo zo dx dy dz nb_edges nb_vertices geompy.kind.PLANE xo yo zo dx dy dz geompy.kind.PLANAR xo yo zo dx dy dz nb_edges nb_vertices geompy.kind.FACE nb_edges nb_vertices<p>
-geompy.kind.CIRCLE xc yc zc dx dy dz R geompy.kind.ARC_CIRCLE xc yc zc dx dy dz R x1 y1 z1 x2 y2 z2 geompy.kind.ELLIPSE xc yc zc dx dy dz R_1 R_2 geompy.kind.ARC_ELLIPSE xc yc zc dx dy dz R_1 R_2 x1 y1 z1 x2 y2 z2 geompy.kind.LINE xo yo zo dx dy dz geompy.kind.SEGMENT x1 y1 z1 x2 y2 z2 geompy.kind.EDGE nb_vertices<p>
-geompy.kind.VERTEX x y z<p>
-Example: see GEOM_TestMeasures.py 
-</div>
-</div><p>
-<a class="anchor" name="57106a55755e9b303464b3f416ca94f3"></a><!-- doxytag: member="geompyDC::geompyDC::Import" ref="57106a55755e9b303464b3f416ca94f3" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.Import           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFileName</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFormatName</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theFileName</em>&nbsp;</td><td>The file, containing the shape. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theFormatName</em>&nbsp;</td><td>Specify format for the file reading. Available formats can be obtained with InsertOp.ImportTranslators() method. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the imported shape.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="68da55be4e4b99fd7ddf22ce58b9cefc"></a><!-- doxytag: member="geompyDC::geompyDC::ImportBREP" ref="68da55be4e4b99fd7ddf22ce58b9cefc" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.ImportBREP           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFileName</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="113c78a060c34a5ca7b72f526a08b247"></a><!-- doxytag: member="geompyDC::geompyDC::ImportIGES" ref="113c78a060c34a5ca7b72f526a08b247" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.ImportIGES           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFileName</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="35b653ecb3349e0b5835802064ed5792"></a><!-- doxytag: member="geompyDC::geompyDC::ImportSTEP" ref="35b653ecb3349e0b5835802064ed5792" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.ImportSTEP           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFileName</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="97cf9d2c6b169c617297bcb0ff360d80"></a><!-- doxytag: member="geompyDC::geompyDC::Export" ref="97cf9d2c6b169c617297bcb0ff360d80" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.Export           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFileName</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFormatName</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theObject</em>&nbsp;</td><td>Shape to be stored in the file. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theFileName</em>&nbsp;</td><td>Name of the file to store the given shape in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theFormatName</em>&nbsp;</td><td>Specify format for the shape storage. Available formats can be obtained with InsertOp.ImportTranslators() method.</td></tr>
-  </table>
-</dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="b98e62e986537d6dbcf09db82268133f"></a><!-- doxytag: member="geompyDC::geompyDC::ExportBREP" ref="b98e62e986537d6dbcf09db82268133f" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.ExportBREP           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFileName</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="58cabb942475e87acfe20cf64789d09f"></a><!-- doxytag: member="geompyDC::geompyDC::ExportIGES" ref="58cabb942475e87acfe20cf64789d09f" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.ExportIGES           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFileName</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="b90ced1bdda21fd895146ecbef93c5b1"></a><!-- doxytag: member="geompyDC::geompyDC::ExportSTEP" ref="b90ced1bdda21fd895146ecbef93c5b1" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.ExportSTEP           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theObject</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFileName</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="438ffa67d7e23027c7ffc5e783648a99"></a><!-- doxytag: member="geompyDC::geompyDC::MakeQuad" ref="438ffa67d7e23027c7ffc5e783648a99" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeQuad           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>E1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>E2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>E3</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>E4</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Order of Edges is not important. It is not necessary that edges share the same vertex. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>E1,E2,E3,E4</em>&nbsp;</td><td>Edges for the face bound. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created face.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="5859f858dddc4697da0a54650a89c630"></a><!-- doxytag: member="geompyDC::geompyDC::MakeQuad2Edges" ref="5859f858dddc4697da0a54650a89c630" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeQuad2Edges           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>E1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>E2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-The missing edges will be built by creating the shortest ones. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>E1,E2</em>&nbsp;</td><td>Two opposite edges for the face. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created face.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="d22d10791fbe72e26d95c790f4b12f97"></a><!-- doxytag: member="geompyDC::geompyDC::MakeQuad4Vertices" ref="d22d10791fbe72e26d95c790f4b12f97" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeQuad4Vertices           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>V1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>V2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>V3</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>V4</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-The missing edges will be built by creating the shortest ones. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>V1,V2,V3,V4</em>&nbsp;</td><td>Corner vertices for the face. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created face.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="011d7b1e772d37e07b0db4e2c5480865"></a><!-- doxytag: member="geompyDC::geompyDC::MakeHexa" ref="011d7b1e772d37e07b0db4e2c5480865" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeHexa           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>F1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>F2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>F3</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>F4</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>F5</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>F6</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Order of faces is not important. It is not necessary that Faces share the same edge. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>F1,F2,F3,F4,F5,F6</em>&nbsp;</td><td>Faces for the hexahedral solid. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created solid.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="d1d440df311f95e73311279e6c7f4b3e"></a><!-- doxytag: member="geompyDC::geompyDC::MakeHexa2Faces" ref="d1d440df311f95e73311279e6c7f4b3e" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeHexa2Faces           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>F1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>F2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-The missing faces will be built by creating the smallest ones. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>F1,F2</em>&nbsp;</td><td>Two opposite faces for the hexahedral solid. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the created solid.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="2f8102f4db31a9b15d605b8b644c1e1d"></a><!-- doxytag: member="geompyDC::geompyDC::GetPoint" ref="2f8102f4db31a9b15d605b8b644c1e1d" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetPoint           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theX</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theY</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theZ</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theEpsilon</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Block or a compound of blocks. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theX,theY,theZ</em>&nbsp;</td><td>Coordinates of the sought vertex. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theEpsilon</em>&nbsp;</td><td>Maximum allowed distance between the resulting vertex and point with the given coordinates. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the found vertex.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="5a135eed8efccf5a21d19376faf3f51f"></a><!-- doxytag: member="geompyDC::geompyDC::GetEdge" ref="5a135eed8efccf5a21d19376faf3f51f" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetEdge           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Block or a compound of blocks. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePoint1,thePoint2</em>&nbsp;</td><td>Points, close to the ends of the desired edge. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the found edge.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="5cd9a2e1962945ad63435accccb04532"></a><!-- doxytag: member="geompyDC::geompyDC::GetEdgeNearPoint" ref="5cd9a2e1962945ad63435accccb04532" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetEdgeNearPoint           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Block or a compound of blocks. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePoint</em>&nbsp;</td><td>Point, close to the desired edge. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the found edge.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="6825dde156e5fa007276494e1474d1a7"></a><!-- doxytag: member="geompyDC::geompyDC::GetFaceByPoints" ref="6825dde156e5fa007276494e1474d1a7" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetFaceByPoints           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint3</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint4</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Block or a compound of blocks. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePoint1-thePoint4</em>&nbsp;</td><td>Points, close to the corners of the desired face. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the found face.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="8a87c9c4cfae32e37ed255b0a325952a"></a><!-- doxytag: member="geompyDC::geompyDC::GetFaceByEdges" ref="8a87c9c4cfae32e37ed255b0a325952a" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetFaceByEdges           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theEdge1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theEdge2</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Block or a compound of blocks. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theEdge1,theEdge2</em>&nbsp;</td><td>Edges, close to the edges of the desired face. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the found face.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="3a78ade4a5640a76a6bc14a3205516aa"></a><!-- doxytag: member="geompyDC::geompyDC::GetOppositeFace" ref="3a78ade4a5640a76a6bc14a3205516aa" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetOppositeFace           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theBlock</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theFace</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theBlock</em>&nbsp;</td><td>Must be a hexahedral solid. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theFace</em>&nbsp;</td><td>Face of <em>theBlock</em>, opposite to the desired face. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the found face.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="fd4db71d0d90143094fb9461be1345da"></a><!-- doxytag: member="geompyDC::geompyDC::GetFaceNearPoint" ref="fd4db71d0d90143094fb9461be1345da" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetFaceNearPoint           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Block or a compound of blocks. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePoint</em>&nbsp;</td><td>Point, close to the desired face. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the found face.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="712db7946c95195cc4e21b04ccfd1e51"></a><!-- doxytag: member="geompyDC::geompyDC::GetFaceByNormale" ref="712db7946c95195cc4e21b04ccfd1e51" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetFaceByNormale           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theBlock</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theVector</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Block or a compound of blocks. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theVector</em>&nbsp;</td><td>Vector, close to the normale of the desired face. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the found face.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="c3ebd44de8eaa8b35e21120c01130c28"></a><!-- doxytag: member="geompyDC::geompyDC::CheckCompoundOfBlocks" ref="c3ebd44de8eaa8b35e21120c01130c28" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.CheckCompoundOfBlocks           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theCompound</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-To be considered as a compound of blocks, the given shape must satisfy the following conditions:<ul>
-<li>Each element of the compound should be a Block (6 faces and 12 edges).</li><li>A connection between two Blocks should be an entire quadrangle face or an entire edge.</li><li>The compound should be connexe.</li><li>The glue between two quadrangle faces should be applied. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theCompound</em>&nbsp;</td><td>The compound to check. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>TRUE, if the given shape is a compound of blocks. If theCompound is not valid, prints all discovered errors.</dd></dl>
-Example: see GEOM_Spanner.py </li></ul>
-
-</div>
-</div><p>
-<a class="anchor" name="719a37bde6e44c537845fc95bd4171ef"></a><!-- doxytag: member="geompyDC::geompyDC::RemoveExtraEdges" ref="719a37bde6e44c537845fc95bd4171ef" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.RemoveExtraEdges           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Unite faces and edges, sharing one surface. It means that this faces must have references to one C++ surface object (handle). <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>The compound or single solid to remove irregular edges from. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>Improved shape.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="cb8e3a5d2a9b43ad0a061d98a5adf066"></a><!-- doxytag: member="geompyDC::geompyDC::CheckAndImprove" ref="cb8e3a5d2a9b43ad0a061d98a5adf066" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.CheckAndImprove           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Fix all detected errors. <dl compact><dt><b>Note:</b></dt><dd>Single block can be also fixed by this method. </dd></dl>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theCompound</em>&nbsp;</td><td>The compound to check and improve. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>Improved compound.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="c9f139e013728ca4b9e9176cc270dc9c"></a><!-- doxytag: member="geompyDC::geompyDC::MakeBlockExplode" ref="c9f139e013728ca4b9e9176cc270dc9c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeBlockExplode           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theCompound</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theMinNbFaces</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theMaxNbFaces</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theCompound</em>&nbsp;</td><td>The compound to explode. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theMinNbFaces</em>&nbsp;</td><td>If solid has lower number of faces, it is not a block. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theMaxNbFaces</em>&nbsp;</td><td>If solid has higher number of faces, it is not a block. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Note:</b></dt><dd>If theMaxNbFaces = 0, the maximum number of faces is not restricted. </dd></dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of GEOM_Objects, containing the retrieved blocks.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="84908160eb9c556e90fc56482c78b3d6"></a><!-- doxytag: member="geompyDC::geompyDC::GetBlockNearPoint" ref="84908160eb9c556e90fc56482c78b3d6" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetBlockNearPoint           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theCompound</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>thePoint</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theCompound</em>&nbsp;</td><td>Compound, to find block in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>thePoint</em>&nbsp;</td><td>Point, close to the desired block. If the point lays on boundary between some blocks, we return block with nearest center. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the found block.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="c1a9fb16ff249201e79c5c3ff44dd0bb"></a><!-- doxytag: member="geompyDC::geompyDC::GetBlockByParts" ref="c1a9fb16ff249201e79c5c3ff44dd0bb" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetBlockByParts           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theCompound</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theParts</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theCompound</em>&nbsp;</td><td>Compound, to find block in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theParts</em>&nbsp;</td><td>List of faces and/or edges and/or vertices to be parts of the found block. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the found block.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="069fdba39a027adf8abbae169fd47ab2"></a><!-- doxytag: member="geompyDC::geompyDC::GetBlocksByParts" ref="069fdba39a027adf8abbae169fd47ab2" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetBlocksByParts           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theCompound</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theParts</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theCompound</em>&nbsp;</td><td>Compound, to find blocks in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theParts</em>&nbsp;</td><td>List of faces and/or edges and/or vertices to be parts of the found blocks. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of GEOM_Objects, containing the found blocks.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="5344840833d7500e7823b9ab19927d33"></a><!-- doxytag: member="geompyDC::geompyDC::MakeMultiTransformation1D" ref="5344840833d7500e7823b9ab19927d33" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeMultiTransformation1D           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>Block</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>DirFace1</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>DirFace2</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>NbTimes</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Transformation is defined so, as to superpose direction faces. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>Block</em>&nbsp;</td><td>Hexahedral solid to be multi-transformed. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>DirFace1</em>&nbsp;</td><td>ID of First direction face. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>DirFace2</em>&nbsp;</td><td>ID of Second direction face. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>NbTimes</em>&nbsp;</td><td>Quantity of transformations to be done. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Note:</b></dt><dd>Unique ID of sub-shape can be obtained, using method <a class="el" href="classgeompyDC_1_1geompyDC.html#b3cf4c129a0316ffbe7904021762549c">GetSubShapeID()</a>. </dd></dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the result shape.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="967f8f3080541525e772700ed30af9eb"></a><!-- doxytag: member="geompyDC::geompyDC::MakeMultiTransformation2D" ref="967f8f3080541525e772700ed30af9eb" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.MakeMultiTransformation2D           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>Block</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>DirFace1U</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>DirFace2U</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>NbTimesU</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>DirFace1V</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>DirFace2V</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>NbTimesV</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>Block</em>&nbsp;</td><td>Hexahedral solid to be multi-transformed. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>DirFace1U,DirFace2U</em>&nbsp;</td><td>IDs of Direction faces for the first transformation. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>DirFace1V,DirFace2V</em>&nbsp;</td><td>IDs of Direction faces for the second transformation. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>NbTimesU,NbTimesV</em>&nbsp;</td><td>Quantity of transformations to be done. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>New GEOM_Object, containing the result shape.</dd></dl>
-Example: see GEOM_Spanner.py 
-</div>
-</div><p>
-<a class="anchor" name="e386685281c22ea9fa42abf0faba0fd0"></a><!-- doxytag: member="geompyDC::geompyDC::Propagate" ref="e386685281c22ea9fa42abf0faba0fd0" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.Propagate           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-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. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theShape</em>&nbsp;</td><td>Shape to build propagation groups on. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>List of GEOM_Objects, each of them is a propagation group.</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="a9d7a73c8d03d5b448e70e0990ad0b67"></a><!-- doxytag: member="geompyDC::geompyDC::CreateGroup" ref="a9d7a73c8d03d5b448e70e0990ad0b67" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.CreateGroup           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theMainShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShapeType</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theMainShape</em>&nbsp;</td><td>is a GEOM object on which the group is selected </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theShapeType</em>&nbsp;</td><td>defines a shape type of the group </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a newly created GEOM group</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="42c0d3bfe8dcc8398da6fe79ddf8e866"></a><!-- doxytag: member="geompyDC::geompyDC::AddObject" ref="42c0d3bfe8dcc8398da6fe79ddf8e866" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.AddObject           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theGroup</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theSubShapeID</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theGroup</em>&nbsp;</td><td>is a GEOM group to which the new sub shape is added </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theSubShapeID</em>&nbsp;</td><td>is a sub shape ID in the main object. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Note:</b></dt><dd>Use method <a class="el" href="classgeompyDC_1_1geompyDC.html#b3cf4c129a0316ffbe7904021762549c">GetSubShapeID()</a> to get an unique ID of the sub shape</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="f1ebbc44f8811fbeb71cffc9abd23985"></a><!-- doxytag: member="geompyDC::geompyDC::RemoveObject" ref="f1ebbc44f8811fbeb71cffc9abd23985" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.RemoveObject           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theGroup</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theSubShapeID</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theGroup</em>&nbsp;</td><td>is a GEOM group from which the new sub shape is removed </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theSubShapeID</em>&nbsp;</td><td>is a sub shape ID in the main object. </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Note:</b></dt><dd>Use method <a class="el" href="classgeompyDC_1_1geompyDC.html#b3cf4c129a0316ffbe7904021762549c">GetSubShapeID()</a> to get an unique ID of the sub shape</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="952c89c431a7d8b80d7f60030bb7fe26"></a><!-- doxytag: member="geompyDC::geompyDC::UnionList" ref="952c89c431a7d8b80d7f60030bb7fe26" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.UnionList           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theGroup</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theSubShapes</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-No errors, if some shapes are alredy included. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theGroup</em>&nbsp;</td><td>is a GEOM group to which the new sub shapes are added. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theSubShapes</em>&nbsp;</td><td>is a list of sub shapes to be added.</td></tr>
-  </table>
-</dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="feb077c171bca22d724adce47a576c51"></a><!-- doxytag: member="geompyDC::geompyDC::UnionIDs" ref="feb077c171bca22d724adce47a576c51" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.UnionIDs           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theGroup</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theSubShapes</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="7d131e5368d0cbef869dc8f7e625943f"></a><!-- doxytag: member="geompyDC::geompyDC::DifferenceList" ref="7d131e5368d0cbef869dc8f7e625943f" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.DifferenceList           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theGroup</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theSubShapes</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-No errors, if some shapes are not included. <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theGroup</em>&nbsp;</td><td>is a GEOM group from which the sub-shapes are removed. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>theSubShapes</em>&nbsp;</td><td>is a list of sub-shapes to be removed.</td></tr>
-  </table>
-</dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="09dcc7102fc5cf6ba7582b027dcaf8c4"></a><!-- doxytag: member="geompyDC::geompyDC::DifferenceIDs" ref="09dcc7102fc5cf6ba7582b027dcaf8c4" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.DifferenceIDs           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theGroup</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theSubShapes</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="1f882d77f36782aec9552b4091e72fa2"></a><!-- doxytag: member="geompyDC::geompyDC::GetObjectIDs" ref="1f882d77f36782aec9552b4091e72fa2" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetObjectIDs           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theGroup</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theGroup</em>&nbsp;</td><td>is a GEOM group for which a list of IDs is requested</td></tr>
-  </table>
-</dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="89a5674df0edb6bc0d10fe2327b6dd69"></a><!-- doxytag: member="geompyDC::geompyDC::GetType" ref="89a5674df0edb6bc0d10fe2327b6dd69" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetType           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theGroup</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theGroup</em>&nbsp;</td><td>is a GEOM group which type is returned.</td></tr>
-  </table>
-</dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="4cb71ccbb6ce142438dac7ab8b1bfbcd"></a><!-- doxytag: member="geompyDC::geompyDC::GetMainShape" ref="4cb71ccbb6ce142438dac7ab8b1bfbcd" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetMainShape           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theGroup</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>theGroup</em>&nbsp;</td><td>is a GEOM group for which a main shape object is requested </td></tr>
-  </table>
-</dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a GEOM object which is a main shape for theGroup</dd></dl>
-Example: see GEOM_TestOthers.py 
-</div>
-</div><p>
-<a class="anchor" name="b7c0fb87c91fbdc021c72b58b56c73f4"></a><!-- doxytag: member="geompyDC::geompyDC::GetEdgesByLength" ref="b7c0fb87c91fbdc021c72b58b56c73f4" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.GetEdgesByLength           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>theShape</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>min_length</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>max_length</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>include_min</em> = <code>1</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>include_max</em> = <code>1</code></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-If include_min/max == 0, edges with length == min/max_length will not be included in result. 
-</div>
-</div><p>
-<a class="anchor" name="2c911eb0c53d1c4e22dedd2196055d18"></a><!-- doxytag: member="geompyDC::geompyDC::SelectEdges" ref="2c911eb0c53d1c4e22dedd2196055d18" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.SelectEdges           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>min_length</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>max_length</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>include_min</em> = <code>1</code>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>include_max</em> = <code>1</code></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-If include_min/max == 0, edges with length == min/max_length will not be included in result. 
-</div>
-</div><p>
-<a class="anchor" name="fdd468507a5639f23702618029a42f5e"></a><!-- doxytag: member="geompyDC::geompyDC::addPath" ref="fdd468507a5639f23702618029a42f5e" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">def geompyDC.geompyDC.addPath           </td>
-          <td>(</td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>self</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&nbsp;</td>
-          <td class="paramname"> <em>Path</em></td><td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td><td width="100%"></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="9485018bf453de77f19cfddb21d3db7d"></a><!-- doxytag: member="geompyDC::geompyDC::myBuilder" ref="9485018bf453de77f19cfddb21d3db7d" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#9485018bf453de77f19cfddb21d3db7d">geompyDC.geompyDC.myBuilder</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="bbaafac224de10f47a6ade537922d0e1"></a><!-- doxytag: member="geompyDC::geompyDC::myStudyId" ref="bbaafac224de10f47a6ade537922d0e1" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#bbaafac224de10f47a6ade537922d0e1">geompyDC.geompyDC.myStudyId</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="6d683d934b8329fdbb475d9c6e61fc55"></a><!-- doxytag: member="geompyDC::geompyDC::father" ref="6d683d934b8329fdbb475d9c6e61fc55" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#6d683d934b8329fdbb475d9c6e61fc55">geompyDC.geompyDC.father</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="cb9f574a04df268d2ac3dad4084a501a"></a><!-- doxytag: member="geompyDC::geompyDC::BasicOp" ref="cb9f574a04df268d2ac3dad4084a501a" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#cb9f574a04df268d2ac3dad4084a501a">geompyDC.geompyDC.BasicOp</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="4e6874f535a360865d46651d158008a4"></a><!-- doxytag: member="geompyDC::geompyDC::CurvesOp" ref="4e6874f535a360865d46651d158008a4" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#4e6874f535a360865d46651d158008a4">geompyDC.geompyDC.CurvesOp</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="e83f2aa2b03d2fa22da016445792a38d"></a><!-- doxytag: member="geompyDC::geompyDC::PrimOp" ref="e83f2aa2b03d2fa22da016445792a38d" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#e83f2aa2b03d2fa22da016445792a38d">geompyDC.geompyDC.PrimOp</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="808040354de98ebe2da91b260acdebc3"></a><!-- doxytag: member="geompyDC::geompyDC::ShapesOp" ref="808040354de98ebe2da91b260acdebc3" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#808040354de98ebe2da91b260acdebc3">geompyDC.geompyDC.ShapesOp</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="4ffc95e51898e9fb01ddd6f81b5b4d8a"></a><!-- doxytag: member="geompyDC::geompyDC::HealOp" ref="4ffc95e51898e9fb01ddd6f81b5b4d8a" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#4ffc95e51898e9fb01ddd6f81b5b4d8a">geompyDC.geompyDC.HealOp</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="399bd9f35bcbba929ce14514bff80172"></a><!-- doxytag: member="geompyDC::geompyDC::InsertOp" ref="399bd9f35bcbba929ce14514bff80172" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#399bd9f35bcbba929ce14514bff80172">geompyDC.geompyDC.InsertOp</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="c0937479ddda039044ef8a77b3856589"></a><!-- doxytag: member="geompyDC::geompyDC::BoolOp" ref="c0937479ddda039044ef8a77b3856589" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#c0937479ddda039044ef8a77b3856589">geompyDC.geompyDC.BoolOp</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="71257bf08344eb67180476997550faa4"></a><!-- doxytag: member="geompyDC::geompyDC::TrsfOp" ref="71257bf08344eb67180476997550faa4" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#71257bf08344eb67180476997550faa4">geompyDC.geompyDC.TrsfOp</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="70088920b0ecf7c2f91752773076d10a"></a><!-- doxytag: member="geompyDC::geompyDC::LocalOp" ref="70088920b0ecf7c2f91752773076d10a" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#70088920b0ecf7c2f91752773076d10a">geompyDC.geompyDC.LocalOp</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="5553df463eb205a7d8d129984330f570"></a><!-- doxytag: member="geompyDC::geompyDC::MeasuOp" ref="5553df463eb205a7d8d129984330f570" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#5553df463eb205a7d8d129984330f570">geompyDC.geompyDC.MeasuOp</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="79bef537fb16d86a07700b14d66cfabd"></a><!-- doxytag: member="geompyDC::geompyDC::BlocksOp" ref="79bef537fb16d86a07700b14d66cfabd" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#79bef537fb16d86a07700b14d66cfabd">geompyDC.geompyDC.BlocksOp</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="d456a011f482dbd6f98505b6c4f5624d"></a><!-- doxytag: member="geompyDC::geompyDC::GroupOp" ref="d456a011f482dbd6f98505b6c4f5624d" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#d456a011f482dbd6f98505b6c4f5624d">geompyDC.geompyDC.GroupOp</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="cc738d95c175885b16443c9476218ffb"></a><!-- doxytag: member="geompyDC::geompyDC::myStudy" ref="cc738d95c175885b16443c9476218ffb" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="classgeompyDC_1_1geompyDC.html#cc738d95c175885b16443c9476218ffb">geompyDC.geompyDC.myStudy</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-</DIV>
-<DIV class="div-footer">
-Generated on Thu Jun 21 12:28:15 2007 for SALOME - GEOM - v.4.0.0 by&nbsp;<A href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></A> 1.4.7</DIV>
-</BODY>
-</HTML>
diff --git a/doc/salome/gui/GEOM/geompy_doc/classgeompyDC_1_1geompyDC__inherit__graph.jpg b/doc/salome/gui/GEOM/geompy_doc/classgeompyDC_1_1geompyDC__inherit__graph.jpg
deleted file mode 100644 (file)
index b635532..0000000
Binary files a/doc/salome/gui/GEOM/geompy_doc/classgeompyDC_1_1geompyDC__inherit__graph.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/geompy_doc/classgeompyDC_1_1info.html b/doc/salome/gui/GEOM/geompy_doc/classgeompyDC_1_1info.html
deleted file mode 100644 (file)
index dc220ec..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.73 [en] (WinNT; I) [Netscape]">
-   <title>Main Page</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-&nbsp;
-</body>
-</html>
-<!-- Generated by Doxygen 1.4.7 -->
-<div class="nav">
-<a class="el" href="namespacegeompyDC.html">geompyDC</a>.<a class="el" href="classgeompyDC_1_1info.html">info</a></div>
-<h1>geompyDC.info Class Reference</h1><!-- doxytag: class="geompyDC::info" --><table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Static Public Attributes</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1info.html#ec486e837378c061897b2e1b8aefde41">UNKNOWN</a> = 0</td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1info.html#e26dc8be1afb44222ab88b4a9852c6aa">CLOSED</a> = 1</td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1info.html#b717bbcea5e0faa48760b0be4706ec57">UNCLOSED</a> = 2</td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="ec486e837378c061897b2e1b8aefde41"></a><!-- doxytag: member="geompyDC::info::UNKNOWN" ref="ec486e837378c061897b2e1b8aefde41" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="classgeompyDC_1_1info.html#ec486e837378c061897b2e1b8aefde41">geompyDC.info.UNKNOWN</a> = 0<code> [static]</code>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="e26dc8be1afb44222ab88b4a9852c6aa"></a><!-- doxytag: member="geompyDC::info::CLOSED" ref="e26dc8be1afb44222ab88b4a9852c6aa" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="classgeompyDC_1_1info.html#e26dc8be1afb44222ab88b4a9852c6aa">geompyDC.info.CLOSED</a> = 1<code> [static]</code>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="b717bbcea5e0faa48760b0be4706ec57"></a><!-- doxytag: member="geompyDC::info::UNCLOSED" ref="b717bbcea5e0faa48760b0be4706ec57" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="classgeompyDC_1_1info.html#b717bbcea5e0faa48760b0be4706ec57">geompyDC.info.UNCLOSED</a> = 2<code> [static]</code>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-</DIV>
-<DIV class="div-footer">
-Generated on Thu Jun 21 12:28:15 2007 for SALOME - GEOM - v.4.0.0 by&nbsp;<A href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></A> 1.4.7</DIV>
-</BODY>
-</HTML>
diff --git a/doc/salome/gui/GEOM/geompy_doc/doxygen.css b/doc/salome/gui/GEOM/geompy_doc/doxygen.css
deleted file mode 100644 (file)
index dc9da52..0000000
+++ /dev/null
@@ -1,218 +0,0 @@
-H1 {
-       text-align: center;
-       font-family: Geneva, Arial, Helvetica, sans-serif;
-}
-H2 {
-       font-family: Geneva, Arial, Helvetica, sans-serif;
-}
-CAPTION { font-weight: bold }
-DIV.qindex {
-       width: 100%;
-       background-color: #eeeeff;
-       border: 1px solid #B0B0B0;
-       text-align: center;
-       margin: 2px;
-       padding: 2px;
-       line-height: 120%;
-}
-A.qindex {
-       text-decoration: none;
-       font-weight: bold;
-       color: #1A419D;
-       padding: 2px;
-}
-A.qindex:visited {
-       text-decoration: none;
-       font-weight: bold;
-       color: #1A419D
-       padding: 2px;
-}
-A.qindex:hover {
-       text-decoration: none;
-       background-color: #ddddff;
-       padding: 2px;
-}
-A.qindexHL {
-       text-decoration: none;
-       font-weight: bold;
-       background-color: #6666cc;
-       color: #ffffff;
-       padding: 2px 6px;
-       border: 1px double #9295C2;
-}
-A.qindexHL:hover {
-       text-decoration: none;
-       background-color: #6666cc;
-       color: #ffffff;
-       padding: 2px 6px;
-}
-A.qindexHL:visited { text-decoration: none; background-color: #6666cc; color: #ffffff }
-A.el { text-decoration: none; font-weight: bold }
-A.elRef { font-weight: bold }
-A.code { text-decoration: none; font-weight: normal; color: #1A419D}
-A.codeRef { font-weight: normal; color: #1A419D}
-A:hover { text-decoration: none; background-color: #f2f2ff }
-DL.el { margin-left: -1cm }
-PRE.fragment {
-       border: 1px solid #CCCCCC;
-       background-color: #f5f5f5;
-       margin-top: 4px;
-       margin-bottom: 4px;
-       margin-left: 2px;
-       margin-right: 8px;
-       padding-left: 6px;
-       padding-right: 6px;
-       padding-top: 4px;
-       padding-bottom: 4px;
-}
-DIV.fragment {
-       border: 1px solid #CCCCCC;
-       background-color: #f5f5f5;
-       padding: 6px;
-}
-DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }
-TD.md { background-color: #F4F4FB; font-weight: bold; }
-TD.mdname1 { background-color: #F4F4FB; font-weight: bold; color: #602020; }
-TD.mdname { background-color: #F4F4FB; font-weight: bold; color: #602020; width: 600px; }
-DIV.groupHeader {
-       margin-left: 16px;
-       margin-top: 12px;
-       margin-bottom: 6px;
-       font-weight: bold;
-       font-family: Geneva, Arial, Helvetica, sans-serif;
-}
-DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller }
-BODY {
-       background: white;
-       color: black;
-       margin-right: 20px;
-       margin-left: 20px;
-}
-TD.indexkey {
-       background-color: #eeeeff;
-       font-weight: bold;
-       padding-right  : 10px;
-       padding-top    : 2px;
-       padding-left   : 10px;
-       padding-bottom : 2px;
-       margin-left    : 0px;
-       margin-right   : 0px;
-       margin-top     : 2px;
-       margin-bottom  : 2px;
-       border: 1px solid #CCCCCC;
-}
-TD.indexvalue {
-       background-color: #eeeeff;
-       font-style: italic;
-       padding-right  : 10px;
-       padding-top    : 2px;
-       padding-left   : 10px;
-       padding-bottom : 2px;
-       margin-left    : 0px;
-       margin-right   : 0px;
-       margin-top     : 2px;
-       margin-bottom  : 2px;
-       border: 1px solid #CCCCCC;
-}
-TR.memlist {
-   background-color: #f0f0f0; 
-}
-P.formulaDsp { text-align: center; }
-IMG.formulaDsp { }
-IMG.formulaInl { vertical-align: middle; }
-SPAN.keyword       { color: #008000 }
-SPAN.keywordtype   { color: #604020 }
-SPAN.keywordflow   { color: #e08000 }
-SPAN.comment       { color: #800000 }
-SPAN.preprocessor  { color: #806020 }
-SPAN.stringliteral { color: #002080 }
-SPAN.charliteral   { color: #008080 }
-.mdTable {
-       border: 1px solid #868686;
-       background-color: #F4F4FB;
-}
-.mdRow {
-       padding: 8px 10px;
-}
-.mdescLeft {
-       font-size: smaller;
-       font-style: italic;
-       background-color: #FAFAFA;
-       padding-left: 8px;
-       border-top: 1px none #E0E0E0;
-       border-right: 1px none #E0E0E0;
-       border-bottom: 1px none #E0E0E0;
-       border-left: 1px none #E0E0E0;
-       margin: 0px;
-}
-.mdescRight {
-       font-size: smaller;
-       font-style: italic;
-       background-color: #FAFAFA;
-       padding-left: 4px;
-       border-top: 1px none #E0E0E0;
-       border-right: 1px none #E0E0E0;
-       border-bottom: 1px none #E0E0E0;
-       border-left: 1px none #E0E0E0;
-       margin: 0px;
-       padding-bottom: 0px;
-       padding-right: 8px;
-}
-.memItemLeft {
-       padding: 1px 0px 0px 8px;
-       margin: 4px;
-       border-top-width: 1px;
-       border-right-width: 1px;
-       border-bottom-width: 1px;
-       border-left-width: 1px;
-       border-top-style: solid;
-       border-top-color: #E0E0E0;
-       border-right-color: #E0E0E0;
-       border-bottom-color: #E0E0E0;
-       border-left-color: #E0E0E0;
-       border-right-style: none;
-       border-bottom-style: none;
-       border-left-style: none;
-       background-color: #FAFAFA;
-       font-family: Geneva, Arial, Helvetica, sans-serif;
-       font-size: 12px;
-}
-.memItemRight {
-       padding: 1px 0px 0px 8px;
-       margin: 4px;
-       border-top-width: 1px;
-       border-right-width: 1px;
-       border-bottom-width: 1px;
-       border-left-width: 1px;
-       border-top-style: solid;
-       border-top-color: #E0E0E0;
-       border-right-color: #E0E0E0;
-       border-bottom-color: #E0E0E0;
-       border-left-color: #E0E0E0;
-       border-right-style: none;
-       border-bottom-style: none;
-       border-left-style: none;
-       background-color: #FAFAFA;
-       font-family: Geneva, Arial, Helvetica, sans-serif;
-       font-size: 13px;
-}
-.search     { color: #003399;
-              font-weight: bold;
-}
-FORM.search {
-              margin-bottom: 0px;
-              margin-top: 0px;
-}
-INPUT.search { font-size: 75%;
-               color: #000080;
-               font-weight: normal;
-               background-color: #eeeeff;
-}
-TD.tiny      { font-size: 75%;
-}
-a {
-       color: #252E78;
-}
-a:visited {
-       color: #3D2185;
-}
diff --git a/doc/salome/gui/GEOM/geompy_doc/namespacegeompy.html b/doc/salome/gui/GEOM/geompy_doc/namespacegeompy.html
deleted file mode 100644 (file)
index 5a7d6e1..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.73 [en] (WinNT; I) [Netscape]">
-   <title>Main Page</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-&nbsp;
-</body>
-</html>
-<!-- Generated by Doxygen 1.4.7 -->
-<h1>Package geompy</h1>
-<p>
-<p>
-For available methods please see documentation of 
-<a class="el" href="classgeompyDC_1_1geompyDC.html">geompyDC</a> class,
-implemented in <a class="el" href="namespacegeompyDC.html">geompyDC.py</a> script.
-All methods of geompyDC class are accessible via geompy namespace, for example &quot;box = geompy.MakeBoxDXDYDZ(10.,20.,30.)&quot;.
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">tuple&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacegeompy.html#96bc383a8e96df6d938b485e9e1b5e11">geom</a> = lcc.FindOrLoadComponent(&quot;FactoryServer&quot;, &quot;GEOM&quot;)</td></tr>
-
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="96bc383a8e96df6d938b485e9e1b5e11"></a><!-- doxytag: member="geompy::geom" ref="96bc383a8e96df6d938b485e9e1b5e11" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">tuple <a class="el" href="namespacegeompy.html#96bc383a8e96df6d938b485e9e1b5e11">geompy.geom</a> = lcc.FindOrLoadComponent(&quot;FactoryServer&quot;, &quot;GEOM&quot;)<code> [static]</code>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-</DIV>
-<DIV class="div-footer">
-Generated on Thu Jun 21 12:28:15 2007 for SALOME - GEOM - v.4.0.0 by&nbsp;<A href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></A> 1.4.7</DIV>
-</BODY>
-</HTML>
diff --git a/doc/salome/gui/GEOM/geompy_doc/namespacegeompyDC.html b/doc/salome/gui/GEOM/geompy_doc/namespacegeompyDC.html
deleted file mode 100644 (file)
index 313f21f..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.73 [en] (WinNT; I) [Netscape]">
-   <title>Main Page</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-&nbsp;
-</body>
-</html>
-<!-- Generated by Doxygen 1.4.7 -->
-<h1>Package geompyDC</h1>
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1info.html">info</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classgeompyDC_1_1geompyDC.html">geompyDC</a></td></tr>
-
-<tr><td colspan="2"><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">dictionary&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacegeompyDC.html#d85aa7c933dca679752d28c67018a43c">ShapeType</a> = {&quot;COMPOUND&quot;:0, &quot;COMPSOLID&quot;:1, &quot;SOLID&quot;:2, &quot;SHELL&quot;:3, &quot;FACE&quot;:4, &quot;WIRE&quot;:5, &quot;EDGE&quot;:6, &quot;VERTEX&quot;:7, &quot;SHAPE&quot;:8}</td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacegeompyDC.html#55ea9fd7f9b97796036ae6996f4c0a83">kind</a> = GEOM.GEOM_IKindOfShape</td></tr>
-
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="d85aa7c933dca679752d28c67018a43c"></a><!-- doxytag: member="geompyDC::ShapeType" ref="d85aa7c933dca679752d28c67018a43c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">dictionary <a class="el" href="namespacegeompyDC.html#d85aa7c933dca679752d28c67018a43c">geompyDC.ShapeType</a> = {&quot;COMPOUND&quot;:0, &quot;COMPSOLID&quot;:1, &quot;SOLID&quot;:2, &quot;SHELL&quot;:3, &quot;FACE&quot;:4, &quot;WIRE&quot;:5, &quot;EDGE&quot;:6, &quot;VERTEX&quot;:7, &quot;SHAPE&quot;:8}<code> [static]</code>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="55ea9fd7f9b97796036ae6996f4c0a83"></a><!-- doxytag: member="geompyDC::kind" ref="55ea9fd7f9b97796036ae6996f4c0a83" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="namespacegeompyDC.html#55ea9fd7f9b97796036ae6996f4c0a83">geompyDC.kind</a> = GEOM.GEOM_IKindOfShape<code> [static]</code>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-</DIV>
-<DIV class="div-footer">
-Generated on Thu Jun 21 12:28:15 2007 for SALOME - GEOM - v.4.0.0 by&nbsp;<A href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></A> 1.4.7</DIV>
-</BODY>
-</HTML>
diff --git a/doc/salome/gui/GEOM/images/3dsketch1.png b/doc/salome/gui/GEOM/images/3dsketch1.png
new file mode 100755 (executable)
index 0000000..087ea15
Binary files /dev/null and b/doc/salome/gui/GEOM/images/3dsketch1.png differ
diff --git a/doc/salome/gui/GEOM/images/3dsketch2.png b/doc/salome/gui/GEOM/images/3dsketch2.png
new file mode 100755 (executable)
index 0000000..51f171d
Binary files /dev/null and b/doc/salome/gui/GEOM/images/3dsketch2.png differ
diff --git a/doc/salome/gui/GEOM/images/3dsketch3.png b/doc/salome/gui/GEOM/images/3dsketch3.png
new file mode 100755 (executable)
index 0000000..feb56e7
Binary files /dev/null and b/doc/salome/gui/GEOM/images/3dsketch3.png differ
index fbe753880e608ab5b15dad1275d069a7b2816e7b..f62f1b2cd6d0ce81c87081387d058dd56f4c8fa6 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/angle.png and b/doc/salome/gui/GEOM/images/angle.png differ
index 260a5fb7d6a00b9c4fb0c1b455c2af336c7211c7..b7ef8777f019f01f4d5ae7489a0c12dde98a5cee 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/arc.png and b/doc/salome/gui/GEOM/images/arc.png differ
index 2bced2ae0eb7370d081b1ea8eab4b4a8c9600e4f..6305cac1ea86fd809f6aad867c70a01e1138e8cc 100644 (file)
Binary files a/doc/salome/gui/GEOM/images/arc2.png and b/doc/salome/gui/GEOM/images/arc2.png differ
index cd620020e4e2159eb4888c2eacfe267efc1a3765..4ee2ee9b67820f189ff3445189a45b76d1126ce2 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/archimede.png and b/doc/salome/gui/GEOM/images/archimede.png differ
diff --git a/doc/salome/gui/GEOM/images/arcofellipse1.png b/doc/salome/gui/GEOM/images/arcofellipse1.png
new file mode 100644 (file)
index 0000000..cd50fff
Binary files /dev/null and b/doc/salome/gui/GEOM/images/arcofellipse1.png differ
diff --git a/doc/salome/gui/GEOM/images/arcofellipse2.png b/doc/salome/gui/GEOM/images/arcofellipse2.png
new file mode 100644 (file)
index 0000000..24172df
Binary files /dev/null and b/doc/salome/gui/GEOM/images/arcofellipse2.png differ
index 71a93b0c9bd2d768396d783b5aa5ae7a4cde33b0..d3220c5f3b1d3bc98a5688c40381063f4d1f14fd 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/block1.png and b/doc/salome/gui/GEOM/images/block1.png differ
index c66dd7f0286463bb7c281873ffa336ac8d97e9df..dee06e0a16ea98b56ae3cd551a773881fe6988db 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/block2.png and b/doc/salome/gui/GEOM/images/block2.png differ
index 61aad9b43a4ca7540620889ad23c35d3fe2a7241..af481b7aa04c1c3e5771f22cc1e32856d4b73c68 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/block3.png and b/doc/salome/gui/GEOM/images/block3.png differ
index d0661b6e98b1920495af89e0be060960f749ea52..5ac83e27a82a031abd96edb486b3006c68824b51 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/block4.png and b/doc/salome/gui/GEOM/images/block4.png differ
index 9810f6f0dfd56691b09c95349195cc4b63d8c9c8..04159c06861aa7b94d4a27e4c92fd7dbc755bc4c 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/block5.png and b/doc/salome/gui/GEOM/images/block5.png differ
index 3f997a772f3cff99490112abddee31418f5addf3..4cee18f8c8f05cecd47cfc51aab26f9b726f409c 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/bool1.png and b/doc/salome/gui/GEOM/images/bool1.png differ
index 4e9b968622f6087d707521eb3f79ef268c368ba5..bf027eb3ae801c6d0ac611ae2994d241b3e5949e 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/bool2.png and b/doc/salome/gui/GEOM/images/bool2.png differ
index af409a15e4f92d69e4b5ea3925d8b031a75b79f0..91fffb1302d999abb55999514f88a2bf02bd749c 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/bool3.png and b/doc/salome/gui/GEOM/images/bool3.png differ
index 812027dcf19b8d83a87aa94c131cc91382212e21..d5ce8e240dbd3014f0edf1849ffe7ab18733205a 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/box1.png and b/doc/salome/gui/GEOM/images/box1.png differ
index 85a737afb6347f3d7445455c6dc39c9ff42f4321..cf3be7e1f0b0ee20ff49d7d373626295a10a5341 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/box2.png and b/doc/salome/gui/GEOM/images/box2.png differ
diff --git a/doc/salome/gui/GEOM/images/box3.png b/doc/salome/gui/GEOM/images/box3.png
new file mode 100755 (executable)
index 0000000..b64fdf9
Binary files /dev/null and b/doc/salome/gui/GEOM/images/box3.png differ
index fdbe02fbddc47452c30825303dec964cfc33be82..d5cbde12023f307898db6c1da3956d3cc9deb090 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/chamfer1.png and b/doc/salome/gui/GEOM/images/chamfer1.png differ
index 24d6e124e7f5d56888f68e6190b27cd0cc925326..65c56322143d33ea26fa8dc1c89e1b81df1eeca2 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/chamfer2.png and b/doc/salome/gui/GEOM/images/chamfer2.png differ
index 801f8db2f47e19d0e855f91d6dd781ae5fc13402..e0af355ac46ff367128add5131dd4c0ed2a9eb5b 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/chamfer3.png and b/doc/salome/gui/GEOM/images/chamfer3.png differ
index 14476b4479fa14ba51ba2705018247e14d5e4717..74d5bd54a030056a074790306ba344b67b01120f 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/chamfer4.png and b/doc/salome/gui/GEOM/images/chamfer4.png differ
index 95322ed6984d2e59c0a267940801ddd3dca74da9..4e8811cc8e3d8c8d01daa5a1bd25c091cfb3836a 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/changeorientation.png and b/doc/salome/gui/GEOM/images/changeorientation.png differ
index 21933a5457222d45a748bdd3d264aae969e7059b..40bf4168c41d3f1f2a82bccfa3035574c74f2983 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/circle1.png and b/doc/salome/gui/GEOM/images/circle1.png differ
index 77299521c771c0249bf389fdd0cec28fc2ca7888..2597148d6114aa35f261058a9a807271059f03c5 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/circle2.png and b/doc/salome/gui/GEOM/images/circle2.png differ
index 39aa5b1bac57ec9a3f8945e46cb252166f6a4571..22481c9ffe7335a4177fd2054f892ee7bcf80eda 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/circle3.png and b/doc/salome/gui/GEOM/images/circle3.png differ
index f5a95922addd087c2a81a1cbddfce7f2c021e664..d59c3a7fda42239080d6ad80c92ae14b165cbd83 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/cone1.png and b/doc/salome/gui/GEOM/images/cone1.png differ
index 1b058214021a13831fe8058f41a5a203f43ddb10..953691e1ba9c7586eb2d165c81ce245ae8472fcd 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/cone2.png and b/doc/salome/gui/GEOM/images/cone2.png differ
diff --git a/doc/salome/gui/GEOM/images/creategroup.png b/doc/salome/gui/GEOM/images/creategroup.png
new file mode 100755 (executable)
index 0000000..f629103
Binary files /dev/null and b/doc/salome/gui/GEOM/images/creategroup.png differ
index a9541de0a3e590c8c2f174204f64a64c4491c3de..b9af501eba400155fc025dd37b751791e0c8bd26 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/curve.png and b/doc/salome/gui/GEOM/images/curve.png differ
index 71b619df8b8ba3f097d2d5dd93daaddd185925a2..089dac2824f1261ff7d6fb63291984d564f11ee1 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/cylinder1.png and b/doc/salome/gui/GEOM/images/cylinder1.png differ
index ee6ed12e614b00840439cf70a41f58bee0e0eea9..ad6af2947a922418cdeb744e616fc81066dbf83f 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/cylinder2.png and b/doc/salome/gui/GEOM/images/cylinder2.png differ
index 63f984b751d40f27a552e768a767a6210bfd115c..53a2f41b5fc8124813eeef6e430529af1efef9a8 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/dialog.png and b/doc/salome/gui/GEOM/images/dialog.png differ
diff --git a/doc/salome/gui/GEOM/images/disk1.png b/doc/salome/gui/GEOM/images/disk1.png
new file mode 100644 (file)
index 0000000..215df98
Binary files /dev/null and b/doc/salome/gui/GEOM/images/disk1.png differ
diff --git a/doc/salome/gui/GEOM/images/disk2.png b/doc/salome/gui/GEOM/images/disk2.png
new file mode 100644 (file)
index 0000000..d6a7a3d
Binary files /dev/null and b/doc/salome/gui/GEOM/images/disk2.png differ
diff --git a/doc/salome/gui/GEOM/images/disk3.png b/doc/salome/gui/GEOM/images/disk3.png
new file mode 100644 (file)
index 0000000..5dd30b5
Binary files /dev/null and b/doc/salome/gui/GEOM/images/disk3.png differ
diff --git a/doc/salome/gui/GEOM/images/disks.png b/doc/salome/gui/GEOM/images/disks.png
new file mode 100644 (file)
index 0000000..368d9b6
Binary files /dev/null and b/doc/salome/gui/GEOM/images/disks.png differ
index 141ec8e5aa6f67876c3912bbb9170f61960113e5..594bef905b8b4726328375860e8d3c766bd34d80 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/distance.png and b/doc/salome/gui/GEOM/images/distance.png differ
index db3e235751c30bf972958ebaaff93fa8bf7fd71c..25a55f8a75de91e798cc31e9004feb68f840aae0 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/editgroup.png and b/doc/salome/gui/GEOM/images/editgroup.png differ
index 0888b5021ba27724c0c253d16118e4f3417bbdde..8eea6cae629ab918cdd81998187a6b73c742c769 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/ellipse.png and b/doc/salome/gui/GEOM/images/ellipse.png differ
diff --git a/doc/salome/gui/GEOM/images/explode.png b/doc/salome/gui/GEOM/images/explode.png
new file mode 100755 (executable)
index 0000000..34a6b66
Binary files /dev/null and b/doc/salome/gui/GEOM/images/explode.png differ
index 44a1822256c87e8809a85cd8de872f03b1d5551e..5ec63e0b8629ad849d59945f4be5c314dad49176 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/extrusion1.png and b/doc/salome/gui/GEOM/images/extrusion1.png differ
index 53dbe7d72b5970fa5624a1a93645980a4b957931..28ef202172ef8275220865c0dc1d6ecccbeb4f6d 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/extrusion2.png and b/doc/salome/gui/GEOM/images/extrusion2.png differ
diff --git a/doc/salome/gui/GEOM/images/extrusion3.png b/doc/salome/gui/GEOM/images/extrusion3.png
new file mode 100644 (file)
index 0000000..5147f78
Binary files /dev/null and b/doc/salome/gui/GEOM/images/extrusion3.png differ
diff --git a/doc/salome/gui/GEOM/images/face1.png b/doc/salome/gui/GEOM/images/face1.png
new file mode 100644 (file)
index 0000000..2fbea98
Binary files /dev/null and b/doc/salome/gui/GEOM/images/face1.png differ
diff --git a/doc/salome/gui/GEOM/images/face2.png b/doc/salome/gui/GEOM/images/face2.png
new file mode 100644 (file)
index 0000000..97ce397
Binary files /dev/null and b/doc/salome/gui/GEOM/images/face2.png differ
diff --git a/doc/salome/gui/GEOM/images/faces.png b/doc/salome/gui/GEOM/images/faces.png
new file mode 100644 (file)
index 0000000..b97e81e
Binary files /dev/null and b/doc/salome/gui/GEOM/images/faces.png differ
index 7fd3db53f71f6be1e357bb2efbb76b23569a0897..99093f6d5b0b8b5013bc78a574f85cb3ae817373 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/fillet1.png and b/doc/salome/gui/GEOM/images/fillet1.png differ
index 2eab8754b284f6d54dc8cc271ef0ba6695c7838b..3c94f1410eb7aceded0cf9eb740ac83aa0ffdecc 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/fillet2.png and b/doc/salome/gui/GEOM/images/fillet2.png differ
diff --git a/doc/salome/gui/GEOM/images/fillet2d_1.png b/doc/salome/gui/GEOM/images/fillet2d_1.png
new file mode 100755 (executable)
index 0000000..859796a
Binary files /dev/null and b/doc/salome/gui/GEOM/images/fillet2d_1.png differ
diff --git a/doc/salome/gui/GEOM/images/fillet2d_2.png b/doc/salome/gui/GEOM/images/fillet2d_2.png
new file mode 100755 (executable)
index 0000000..58579c4
Binary files /dev/null and b/doc/salome/gui/GEOM/images/fillet2d_2.png differ
index 6e46e05dd4dacc2e2678721516bf0d288c7f6e25..62564febaf6e321b9354e6446b7f9dedd22597fd 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/fillet3.png and b/doc/salome/gui/GEOM/images/fillet3.png differ
index 1fb29455c8d99228329e0b9270bf785770f81fb7..3263ea47575c6720a743e3698a644a099052402d 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/filling.png and b/doc/salome/gui/GEOM/images/filling.png differ
index f51ab22fd4fb0d57eb5dd64a19e3cb6f79a9a6eb..8e0706a40ec21f7d5037a89a9d70c804c94bf261 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/geomcreategroup.png and b/doc/salome/gui/GEOM/images/geomcreategroup.png differ
diff --git a/doc/salome/gui/GEOM/images/geomeimport.png b/doc/salome/gui/GEOM/images/geomeimport.png
new file mode 100755 (executable)
index 0000000..8e44ae0
Binary files /dev/null and b/doc/salome/gui/GEOM/images/geomeimport.png differ
index c37713941297964547663c1cd0891e9d6357156f..4d4d3fb33f2fe4764a890952fd2b58159067525b 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/geomexport.png and b/doc/salome/gui/GEOM/images/geomexport.png differ
index 516a819bd1b416f1a551d421384390d76ae2bc36..d194ec5b6aa426ddbc996f9d6949df5258a558d0 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/geomimport.png and b/doc/salome/gui/GEOM/images/geomimport.png differ
diff --git a/doc/salome/gui/GEOM/images/geomimport_reopen.png b/doc/salome/gui/GEOM/images/geomimport_reopen.png
new file mode 100644 (file)
index 0000000..9d6745d
Binary files /dev/null and b/doc/salome/gui/GEOM/images/geomimport_reopen.png differ
diff --git a/doc/salome/gui/GEOM/images/geomscreen.png b/doc/salome/gui/GEOM/images/geomscreen.png
new file mode 100755 (executable)
index 0000000..a8df645
Binary files /dev/null and b/doc/salome/gui/GEOM/images/geomscreen.png differ
index 54fa5bf6e0e493faf9f20d9b31bea7b6e3f00820..48a40d6e12dba544f84f52456889c39a6ec60f70 100644 (file)
Binary files a/doc/salome/gui/GEOM/images/glue1.png and b/doc/salome/gui/GEOM/images/glue1.png differ
index 475e54f6586555c78c3ea6ecc294eb505f9ebc86..08fb4f97e159e01793a30673448ad3c8c411c25e 100644 (file)
Binary files a/doc/salome/gui/GEOM/images/glue2.png and b/doc/salome/gui/GEOM/images/glue2.png differ
index a8c6d884e11ac9c85fde759c41925a63e27ecfea..de80520b99a01390078bacff525d76bc37212cb0 100644 (file)
Binary files a/doc/salome/gui/GEOM/images/glue3.png and b/doc/salome/gui/GEOM/images/glue3.png differ
diff --git a/doc/salome/gui/GEOM/images/image18.gif b/doc/salome/gui/GEOM/images/image18.gif
deleted file mode 100755 (executable)
index 511bd44..0000000
Binary files a/doc/salome/gui/GEOM/images/image18.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image18.png b/doc/salome/gui/GEOM/images/image18.png
new file mode 100755 (executable)
index 0000000..7f34b8b
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image18.png differ
index ddfeaa1fb56e79237171d3650dd59762e36def9e..5857ccc61063874ba5e7e26fc9b966882369cc98 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/image2.jpg and b/doc/salome/gui/GEOM/images/image2.jpg differ
diff --git a/doc/salome/gui/GEOM/images/image2.png b/doc/salome/gui/GEOM/images/image2.png
new file mode 100755 (executable)
index 0000000..de2a436
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image2.png differ
diff --git a/doc/salome/gui/GEOM/images/image26.gif b/doc/salome/gui/GEOM/images/image26.gif
deleted file mode 100755 (executable)
index cb7f53a..0000000
Binary files a/doc/salome/gui/GEOM/images/image26.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image26.png b/doc/salome/gui/GEOM/images/image26.png
new file mode 100755 (executable)
index 0000000..8b714aa
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image26.png differ
diff --git a/doc/salome/gui/GEOM/images/image33.gif b/doc/salome/gui/GEOM/images/image33.gif
deleted file mode 100755 (executable)
index 53de533..0000000
Binary files a/doc/salome/gui/GEOM/images/image33.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image33.png b/doc/salome/gui/GEOM/images/image33.png
new file mode 100755 (executable)
index 0000000..a70fb59
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image33.png differ
diff --git a/doc/salome/gui/GEOM/images/image56.gif b/doc/salome/gui/GEOM/images/image56.gif
deleted file mode 100755 (executable)
index 049e1eb..0000000
Binary files a/doc/salome/gui/GEOM/images/image56.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image56.png b/doc/salome/gui/GEOM/images/image56.png
new file mode 100755 (executable)
index 0000000..9e365e1
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image56.png differ
diff --git a/doc/salome/gui/GEOM/images/image57.gif b/doc/salome/gui/GEOM/images/image57.gif
deleted file mode 100755 (executable)
index e0f9e31..0000000
Binary files a/doc/salome/gui/GEOM/images/image57.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image57.png b/doc/salome/gui/GEOM/images/image57.png
new file mode 100755 (executable)
index 0000000..3b8f415
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image57.png differ
index 139809a00a92d5da4044f47f97167b10fe8e2b24..f75f4e508dcfa51be59991f77db0698779a882fd 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/line1.png and b/doc/salome/gui/GEOM/images/line1.png differ
index f5d68da4265df567a98a5a7df4bf7427d612e7f9..650d6bd8bb12c1c524c632827c1bbba86361f507 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/line2.png and b/doc/salome/gui/GEOM/images/line2.png differ
index 6d5d698b4ef83462a01fde543b1f0deb367d696c..6233dd9c12a102cc530a0294fcedd0391a9090d9 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/measures1.png and b/doc/salome/gui/GEOM/images/measures1.png differ
index 33023cc49af841d9fec69d0c50c0b0ac4624c28e..091b2c0aa3afcd60af29af3ee46bed799bc8ede1 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/measures10.png and b/doc/salome/gui/GEOM/images/measures10.png differ
index 9a55aad4afbc44ba5e49931cdc14584185f9edbe..320663b6abfefd92f849c6e981e52a238071ba4e 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/measures3.png and b/doc/salome/gui/GEOM/images/measures3.png differ
index ea243e88804b1c0bc6c9279d894938ff59795e7e..dcf0f8f47c7e9cc9c8e53105e96ded011225fdca 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/measures4.png and b/doc/salome/gui/GEOM/images/measures4.png differ
index a323426e60197e1a2c0d314c054ba611a1e47e21..13af1afdfa7f0112c80a0725a3e3fa828c3b75d9 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/measures5.png and b/doc/salome/gui/GEOM/images/measures5.png differ
index 94bed3271dafc7a5005200bd1e9bdca605b232b6..1aaaf2b69b3cb0ecb3f9a4f130d7141c9c43ab55 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/measures8.png and b/doc/salome/gui/GEOM/images/measures8.png differ
diff --git a/doc/salome/gui/GEOM/images/measures8a.png b/doc/salome/gui/GEOM/images/measures8a.png
new file mode 100644 (file)
index 0000000..d7199f2
Binary files /dev/null and b/doc/salome/gui/GEOM/images/measures8a.png differ
index 7d42d29350ed6570db3291aa847a00da0f5273d1..38a29bb171abc2e51a1c41814920cb1d69b987da 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/measures9.png and b/doc/salome/gui/GEOM/images/measures9.png differ
index 7dfe730c375d34cf8b37b043a3b9e4f2b67573e9..ee4b2ea3146b6b5781b70fc7c1c5c6ff2e4b34ea 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/mtrans1.png and b/doc/salome/gui/GEOM/images/mtrans1.png differ
index 62b35bb0c172183481c7f9e6240c7ac577870097..1d80d6547b9b3e69748f229dfe1eca610f10c265 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/mtrans2.png and b/doc/salome/gui/GEOM/images/mtrans2.png differ
index 207e920f9ca612daef5a63f9dc5447e6b35f1581..ee26e0b7cb235531f995f5ae60ae6f59c7ec0091 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/mtransf1.png and b/doc/salome/gui/GEOM/images/mtransf1.png differ
index 3435f0f8cb88ffc50747e35f5d50967002e6d0df..c4077ed98abcc874084d10c0a57f045521685e17 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/mtransf2.png and b/doc/salome/gui/GEOM/images/mtransf2.png differ
index 628d8b0a634fd410686589d102839957e8123888..8211c1cc30bca8f71fd4f16e285726b7f4619d1e 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/mtransf3.png and b/doc/salome/gui/GEOM/images/mtransf3.png differ
index cbe904444dcf774e376fd082cc7662371e33b5ab..f401af3aaa44aefc907ac71a64e919d33de9f84a 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/mtransf4.png and b/doc/salome/gui/GEOM/images/mtransf4.png differ
index 2a9d7ca2a908d5410c921653d07fb5f87fc65d6d..e36d937f3061296781f6202d02eebf4c0f9ab385 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-basicprop.png and b/doc/salome/gui/GEOM/images/neo-basicprop.png differ
index f0dabe311d338af72e518f734344895efc939200..273d000f22761ed22225d8fe7a3c767de8a25f48 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-detect2.png and b/doc/salome/gui/GEOM/images/neo-detect2.png differ
index dbbcf8ef534ca0fa2e5f1520528e7286c2661542..b54a335da864ccfb8f9c1217c216dd09cc18494e 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-isos.png and b/doc/salome/gui/GEOM/images/neo-isos.png differ
index 9bdacafa251f8537bd29c5b5adee370e6cf7aead..b464565a986207c3e4a9a388dca6db20953e7909 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-localcs1.png and b/doc/salome/gui/GEOM/images/neo-localcs1.png differ
index 3fc54a67ce73f3a8063668d7ebe59b20fbaaadef..f5b40bec477983e2cc9657e79da2cdf445c0ff4b 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-localcs2.png and b/doc/salome/gui/GEOM/images/neo-localcs2.png differ
index 01c8e24fa2b9ea0458cfe7a59fed328d3399d68d..1918b674c9e75e9648395437ca138131d2c815ba 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-localcs3.png and b/doc/salome/gui/GEOM/images/neo-localcs3.png differ
index 6cf2ab91b6fe7d8fd92a1ed0e7d2d6f38cfe66bf..3510a636cc0abe83fa06a3a33f532827c2e47f6c 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-mrot1.png and b/doc/salome/gui/GEOM/images/neo-mrot1.png differ
index e2f37e0527d31486e11c3a981d50f9f3a1f6f497..07463ed14b14af06db80d00e0cc2298c19f9fc84 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-mrot2.png and b/doc/salome/gui/GEOM/images/neo-mrot2.png differ
index 88a7a8b8a892c069aef47857a6ebefbce68ff238..b7edefb7ec900715cb2467c088cf1b0472f99dc6 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-obj1.png and b/doc/salome/gui/GEOM/images/neo-obj1.png differ
index c940eaa38f4cc7c6f8c0e9bb06fb9cf25e1bdb20..3ce42b45c8ce5df1187774da46ce5d0cce3f336f 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-obj2.png and b/doc/salome/gui/GEOM/images/neo-obj2.png differ
index d773938e2758a7ca1a513b54f9cbe694551e44ab..65464a70cd4fda36a51ba4ad7f4cf987c62fe1b0 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-obj3.png and b/doc/salome/gui/GEOM/images/neo-obj3.png differ
index 5ac05dc6c5717d14df5852f740107138f5d9c3a1..283601c26391ac4979958f6ecd55682ea60353a9 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-obj4.png and b/doc/salome/gui/GEOM/images/neo-obj4.png differ
index e1579f082403ed62cfca3e0872f5850901b6a74b..8b5bb2a0f98818de03671c3ed64a87d7520580f9 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-obj5.png and b/doc/salome/gui/GEOM/images/neo-obj5.png differ
index b6b3be4409089cadf829ac0dab8614cb6bc59646..fd8af08117572689f65cccd752443a753fd9ce8b 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-obj6.png and b/doc/salome/gui/GEOM/images/neo-obj6.png differ
index 15dfa23765872e6f56121e4df094e20d6c291d05..d15d13d9039917c73115c678142ba4897ae2c81d 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-obj7.png and b/doc/salome/gui/GEOM/images/neo-obj7.png differ
index 3bc59b860941c4c0a892f3d8a627d3f2c6444b46..e58133a41d8059ff61d2fb1c7a36983aa14945d4 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-point2.png and b/doc/salome/gui/GEOM/images/neo-point2.png differ
index 7130e8b0827131d778bceb29f058d6fba5630f7e..23ec1f3e678a03d07daa600ce187b1f71bea2086 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-scetcher1.png and b/doc/salome/gui/GEOM/images/neo-scetcher1.png differ
index 330e1e3a355b324b9fb6c1aa96a2bda1563efb19..837031035d57dfe4e1a4f1da760e45d133ccdb46 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-scetcher2.png and b/doc/salome/gui/GEOM/images/neo-scetcher2.png differ
index 0d58ad2449132e77f5487e0ccce2808c668c57ce..f73794cbf7ee2ff83e3a614ac1e8b0d461075c91 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-section.png and b/doc/salome/gui/GEOM/images/neo-section.png differ
diff --git a/doc/salome/gui/GEOM/images/neo-tolerance.png b/doc/salome/gui/GEOM/images/neo-tolerance.png
new file mode 100755 (executable)
index 0000000..2ee3a4e
Binary files /dev/null and b/doc/salome/gui/GEOM/images/neo-tolerance.png differ
index ec1fb7f7065b0f3bd5d2cf710afc863a80455529..bff078966b45ea79ef3640cd4c16040a452c55f7 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/neo-transparency.png and b/doc/salome/gui/GEOM/images/neo-transparency.png differ
index 796115ba90629a1d9fd8841230e4389b771263d7..6629a0d26d83eafee65993b452c67bcbfff2529e 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/new-tolerance.png and b/doc/salome/gui/GEOM/images/new-tolerance.png differ
index 5f8a343993e30665b396b5f4a00c2cc8c3c13b44..10a40abd17e274191944eb3f2e4990d9ca4b8117 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/normaletoface.png and b/doc/salome/gui/GEOM/images/normaletoface.png differ
index 440dc3c55f20b5732e1d02a95c10496eb2fa7636..026d13d09704133bd1e870222f46af3b89cf4680 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/partition1.png and b/doc/salome/gui/GEOM/images/partition1.png differ
index a67ec9d8bb56c64997b19bb3e7b38701982c0fea..97dcbdc7b023da3ba931b04932fdaab21e0f30ae 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/partition2.png and b/doc/salome/gui/GEOM/images/partition2.png differ
index e773731d23220ff8bde35e4232d9fa8e4e4cc35c..d75445374e6f1fff636e58da8d7ed909c0a6f9be 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/pipe.png and b/doc/salome/gui/GEOM/images/pipe.png differ
diff --git a/doc/salome/gui/GEOM/images/pipe2.png b/doc/salome/gui/GEOM/images/pipe2.png
new file mode 100755 (executable)
index 0000000..66d6d9f
Binary files /dev/null and b/doc/salome/gui/GEOM/images/pipe2.png differ
index 4424b6bf11d3da2a557f6c9ce17411563837b155..fca02823d66e541526442d301caf2e91361b8fe4 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/pipe_wire_edgesn.png and b/doc/salome/gui/GEOM/images/pipe_wire_edgesn.png differ
diff --git a/doc/salome/gui/GEOM/images/pipebinormalsn.png b/doc/salome/gui/GEOM/images/pipebinormalsn.png
new file mode 100644 (file)
index 0000000..d48cc4c
Binary files /dev/null and b/doc/salome/gui/GEOM/images/pipebinormalsn.png differ
diff --git a/doc/salome/gui/GEOM/images/pipesn.png b/doc/salome/gui/GEOM/images/pipesn.png
deleted file mode 100755 (executable)
index 11ac109..0000000
Binary files a/doc/salome/gui/GEOM/images/pipesn.png and /dev/null differ
index 47a9b8bcdabb3ac9d803b779a0c07a9c7ebae69d..aaf7f12d5ad4e74d3d33de1a7cf2dcb8b257eb10 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/plane1.png and b/doc/salome/gui/GEOM/images/plane1.png differ
index f4b880b448f96987d5309bfb4974a864778dd6a8..3644d6b38498e5a336da626d0462f68a534474c8 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/plane2.png and b/doc/salome/gui/GEOM/images/plane2.png differ
index 1727e3bb0ff215e038040c2f6eb240911b788304..b815f8d0d666168bcee7ebd3ccf70ae2b7291a01 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/plane3.png and b/doc/salome/gui/GEOM/images/plane3.png differ
index e359819c551674f173bcefe816a468ff0f4a9245..940871d1e138074335b6c5c69018400dcb5aa32b 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/point1.png and b/doc/salome/gui/GEOM/images/point1.png differ
index df151abfacb404ddb60470ad3a2a828d9f892876..b36ee3fab5814609c695dd76614c7715139a52d7 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/point2.png and b/doc/salome/gui/GEOM/images/point2.png differ
index 14e9827c7b36738eab8dd4328bdb40c5e4aff745..35c28ad50383fd5db94d0c4649c11d2cfc0fada7 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/point3.png and b/doc/salome/gui/GEOM/images/point3.png differ
index b29de102c06f1e0d0e86a8768c4244ed40573eff..08739979aba52897a6ab63debced0705aec8a288 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/point4.png and b/doc/salome/gui/GEOM/images/point4.png differ
diff --git a/doc/salome/gui/GEOM/images/point5.png b/doc/salome/gui/GEOM/images/point5.png
new file mode 100755 (executable)
index 0000000..e005604
Binary files /dev/null and b/doc/salome/gui/GEOM/images/point5.png differ
index 50538dd4b250310eb91c338a6e0cfb747a1ce961..64cc0f0b38a2ec195167531df6c4991313ccb7b5 100644 (file)
Binary files a/doc/salome/gui/GEOM/images/remove_extra_edges.png and b/doc/salome/gui/GEOM/images/remove_extra_edges.png differ
index 2b47fa5a4c4776616a6828a84e3e6a67d4775010..7347daac07cd07c932a892f40baf7f5d2120c8f5 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/repair1.png and b/doc/salome/gui/GEOM/images/repair1.png differ
index c3c77164afa8b0bedb00d95174811afe74d01255..ccdebd77b60674cc9bbcc4a6e3fed88cd7b5e0f7 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/repair10.png and b/doc/salome/gui/GEOM/images/repair10.png differ
index 488a6a4c9c16326a68fb068082d1b4e9c753e1f9..8049d60e8d601a86def03e5b8e192eae3c15edd4 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/repair2.png and b/doc/salome/gui/GEOM/images/repair2.png differ
index 4c2a41f9001a120b98cd681fde2c6257501de24b..930957d5b661336965fbb7421d8887dac34f6f2c 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/repair3.png and b/doc/salome/gui/GEOM/images/repair3.png differ
index 2af7cbabb2e62fa02109c39d7e065d8b220f543b..de44ae3c0158f7bf33e08e79e79207a0398cf66e 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/repair4.png and b/doc/salome/gui/GEOM/images/repair4.png differ
index b99fbcbafc6656e7864fccb721a683232bf72854..de44ae3c0158f7bf33e08e79e79207a0398cf66e 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/repair5.png and b/doc/salome/gui/GEOM/images/repair5.png differ
index 5123d1f841286f649175afca327df4fb17c53742..652f4eced984c654b97751983250c358c2b70b43 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/repair6.png and b/doc/salome/gui/GEOM/images/repair6.png differ
index 2b553b9fd6f429e9ddb86e9b8d152b78cba22f32..527b3b80b8f87ab7f557e3171c7c511485e35bb5 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/repair7.png and b/doc/salome/gui/GEOM/images/repair7.png differ
index f0016836e865ab9c8bd100e745a1aeb9569987ff..d7654461b78ca10fa0290c75147b75f925e3416b 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/repair8.png and b/doc/salome/gui/GEOM/images/repair8.png differ
index 7f5d4f5c3ab09ecc285b80f1fbb6eef41dadacc6..72b7d32afd0c9807c62ffb31f536120270360847 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/repair9.png and b/doc/salome/gui/GEOM/images/repair9.png differ
diff --git a/doc/salome/gui/GEOM/images/restore-ss-OB-cut.png b/doc/salome/gui/GEOM/images/restore-ss-OB-cut.png
new file mode 100644 (file)
index 0000000..51b5a4f
Binary files /dev/null and b/doc/salome/gui/GEOM/images/restore-ss-OB-cut.png differ
diff --git a/doc/salome/gui/GEOM/images/restore-ss-OB.png b/doc/salome/gui/GEOM/images/restore-ss-OB.png
new file mode 100644 (file)
index 0000000..4db07eb
Binary files /dev/null and b/doc/salome/gui/GEOM/images/restore-ss-OB.png differ
diff --git a/doc/salome/gui/GEOM/images/restore-ss-cut.png b/doc/salome/gui/GEOM/images/restore-ss-cut.png
new file mode 100644 (file)
index 0000000..8db26d8
Binary files /dev/null and b/doc/salome/gui/GEOM/images/restore-ss-cut.png differ
diff --git a/doc/salome/gui/GEOM/images/restore-ss-dialog.png b/doc/salome/gui/GEOM/images/restore-ss-dialog.png
new file mode 100644 (file)
index 0000000..64fc9d2
Binary files /dev/null and b/doc/salome/gui/GEOM/images/restore-ss-dialog.png differ
diff --git a/doc/salome/gui/GEOM/images/restore-ss-viewer-after.png b/doc/salome/gui/GEOM/images/restore-ss-viewer-after.png
new file mode 100644 (file)
index 0000000..d25b113
Binary files /dev/null and b/doc/salome/gui/GEOM/images/restore-ss-viewer-after.png differ
diff --git a/doc/salome/gui/GEOM/images/restore-ss-viewer-before.png b/doc/salome/gui/GEOM/images/restore-ss-viewer-before.png
new file mode 100644 (file)
index 0000000..4fa5b13
Binary files /dev/null and b/doc/salome/gui/GEOM/images/restore-ss-viewer-before.png differ
diff --git a/doc/salome/gui/GEOM/images/restore-ss-viewer-cut.png b/doc/salome/gui/GEOM/images/restore-ss-viewer-cut.png
new file mode 100644 (file)
index 0000000..d745bce
Binary files /dev/null and b/doc/salome/gui/GEOM/images/restore-ss-viewer-cut.png differ
index 68761025a732b4a3ad42bc323b6069fda7c39efb..f0e3fa9d81864f878b092f7767d50badfdb185df 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/revolution.png and b/doc/salome/gui/GEOM/images/revolution.png differ
diff --git a/doc/salome/gui/GEOM/images/scale_transformsn3.png b/doc/salome/gui/GEOM/images/scale_transformsn3.png
new file mode 100644 (file)
index 0000000..c7f8adb
Binary files /dev/null and b/doc/salome/gui/GEOM/images/scale_transformsn3.png differ
diff --git a/doc/salome/gui/GEOM/images/scale_transformsn4.png b/doc/salome/gui/GEOM/images/scale_transformsn4.png
new file mode 100644 (file)
index 0000000..fafa6f0
Binary files /dev/null and b/doc/salome/gui/GEOM/images/scale_transformsn4.png differ
index 70800b28a85152860df923033e14da4ba6bc882d..2a8dfe49d651004323790308522f52a08dc6ef2d 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/selectcolor.png and b/doc/salome/gui/GEOM/images/selectcolor.png differ
diff --git a/doc/salome/gui/GEOM/images/shapesonshape.png b/doc/salome/gui/GEOM/images/shapesonshape.png
new file mode 100755 (executable)
index 0000000..0c01b3b
Binary files /dev/null and b/doc/salome/gui/GEOM/images/shapesonshape.png differ
diff --git a/doc/salome/gui/GEOM/images/shonshex1.png b/doc/salome/gui/GEOM/images/shonshex1.png
new file mode 100755 (executable)
index 0000000..7a1c97e
Binary files /dev/null and b/doc/salome/gui/GEOM/images/shonshex1.png differ
diff --git a/doc/salome/gui/GEOM/images/shonshex2.png b/doc/salome/gui/GEOM/images/shonshex2.png
new file mode 100755 (executable)
index 0000000..7d16db9
Binary files /dev/null and b/doc/salome/gui/GEOM/images/shonshex2.png differ
index 377f1c9ce8c2015df0ff8aca64f65bc068e21565..ceb1d2d2b61ae91c3a49166e513b7ba2274d73c7 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/sphere1.png and b/doc/salome/gui/GEOM/images/sphere1.png differ
index dd2cadb1ffa8b281b721db56507fd76c3379f587..4d8016bff00ef8acff1fc6cffcd3a5d4a279795d 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/sphere2.png and b/doc/salome/gui/GEOM/images/sphere2.png differ
index 28e18afa036cde6babcf0fe70205b125fd199ebb..0a895d4d057693c7781de432cc5feba32e4d6472 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/torus1.png and b/doc/salome/gui/GEOM/images/torus1.png differ
index 8877f1c372ff230bab53bb5d6c412aa1fa211773..96fa9599b6ab6de9379b9bb94060298b5c7a1aaf 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/torus2.png and b/doc/salome/gui/GEOM/images/torus2.png differ
index 8dbf8fe11bc93a7bdda2dd756c8013fda14ca5e8..0ed8d8d93dc55bdd6175b1546dba94524c48ac96 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/transformation1.png and b/doc/salome/gui/GEOM/images/transformation1.png differ
index 0847a5e0359ddb890c6133b9d1124806e3e6ab3c..7aa59f16bd0772eddda7408cb383ce07be3b962e 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/transformation10.png and b/doc/salome/gui/GEOM/images/transformation10.png differ
diff --git a/doc/salome/gui/GEOM/images/transformation10a.png b/doc/salome/gui/GEOM/images/transformation10a.png
new file mode 100644 (file)
index 0000000..c24b6aa
Binary files /dev/null and b/doc/salome/gui/GEOM/images/transformation10a.png differ
index b78acec2e4416a5ab1d6fda302d517ee5dad59aa..02ae8123330a6c128ea17e6c6f74b21e5524d4ea 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/transformation11.png and b/doc/salome/gui/GEOM/images/transformation11.png differ
diff --git a/doc/salome/gui/GEOM/images/transformation12.png b/doc/salome/gui/GEOM/images/transformation12.png
new file mode 100644 (file)
index 0000000..66ea984
Binary files /dev/null and b/doc/salome/gui/GEOM/images/transformation12.png differ
diff --git a/doc/salome/gui/GEOM/images/transformation13.png b/doc/salome/gui/GEOM/images/transformation13.png
new file mode 100644 (file)
index 0000000..1ae0170
Binary files /dev/null and b/doc/salome/gui/GEOM/images/transformation13.png differ
diff --git a/doc/salome/gui/GEOM/images/transformation14.png b/doc/salome/gui/GEOM/images/transformation14.png
new file mode 100644 (file)
index 0000000..ba31ef9
Binary files /dev/null and b/doc/salome/gui/GEOM/images/transformation14.png differ
index 569752740c6dc8efb08661a0d30dbc976a6db9d1..3642ceda8e5757741fcc4623f3741749eb126430 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/transformation2.png and b/doc/salome/gui/GEOM/images/transformation2.png differ
index 96a1f1e36c8336df1c6c975b3e18fab731022984..fb9a09feff570bfe898b3ce69c008011c01762a2 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/transformation3.png and b/doc/salome/gui/GEOM/images/transformation3.png differ
index 323c3d0ae1722a8526914e105011bb6621b2bfa8..42f4bf79bb941692fe0b6f88999d0f243317cf9c 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/transformation4.png and b/doc/salome/gui/GEOM/images/transformation4.png differ
index 64d2d4149c9b4509dc9d0226756b567e9a17e2ac..1d98b09f00bdffc10284cf4d8b18ea6402fc63db 100644 (file)
Binary files a/doc/salome/gui/GEOM/images/transformation4a.png and b/doc/salome/gui/GEOM/images/transformation4a.png differ
index 8d1cf925423b5c265e48f51d23a949b2404c5642..48b632622bed3ce4a3c2f11ec6c7486a8fcb0ed7 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/transformation5.png and b/doc/salome/gui/GEOM/images/transformation5.png differ
index 3e3828bd8f4a43b77b55553a8f840ea9611a5257..b77c7450f27746a40fbd0ec5e60c3ae53863f8da 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/transformation6.png and b/doc/salome/gui/GEOM/images/transformation6.png differ
index 03a16fe0156568f616a7d57674498aca4dd35bca..cadec9ec2c4cdc580acf25b766ecd2888dca5164 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/transformation7.png and b/doc/salome/gui/GEOM/images/transformation7.png differ
index 77d0303855232f3b1845ddfb9e427f31c6193be5..316314320b7576883df49fce5ec0099e5c8fde71 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/transformation8.png and b/doc/salome/gui/GEOM/images/transformation8.png differ
index c7f6194d3b0eee40b39a155608837ebf405b113f..1b633a4909331017a6aca91346dc275405e9403b 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/transformation9.png and b/doc/salome/gui/GEOM/images/transformation9.png differ
diff --git a/doc/salome/gui/GEOM/images/translation3.png b/doc/salome/gui/GEOM/images/translation3.png
new file mode 100644 (file)
index 0000000..19337ce
Binary files /dev/null and b/doc/salome/gui/GEOM/images/translation3.png differ
index 46e3b20f3fd00fc38ebaed0e22040c5167796e2b..e702853e0c17c7a9259fd8f52c4b86775ac27f3f 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/vector1.png and b/doc/salome/gui/GEOM/images/vector1.png differ
index bb5c64c5624cfa72d31dc80d5ee9bc6cf4818827..ca71d9df49730fe933827b7cc6414d8292b8528d 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/vector2.png and b/doc/salome/gui/GEOM/images/vector2.png differ
index 00835eb544ac6999ea0f50241433508bc814d587..b85732f24177d82f9a32e453cdd3c8429e2c1d86 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/workplane4.png and b/doc/salome/gui/GEOM/images/workplane4.png differ
index 925ac573bedab021996d5e69304e6d40b705bc4f..24004c1114c61083727a7cd563052beca477f4df 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/workplane5.png and b/doc/salome/gui/GEOM/images/workplane5.png differ
index 1f65862f8df11fc6a29e1b92754e5f3003587dde..6cdcbdbca5bc25c117dbcd39b7a0589df7ba091f 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/workplane6.png and b/doc/salome/gui/GEOM/images/workplane6.png differ
index 00951bcd0f81416578643f39dfb2b6f62b3f78d7..f16624bbd6e840c74b73a723740661f7e9183e4e 100644 (file)
@@ -26,9 +26,9 @@ the point according to one of the selected modes.
 
 \n <b>Example:</b>
 
-\image html image167.jpg
+\image html image167.jpg "The initial edge"
 
-\image html image168.jpg
+\image html image168.jpg "The edge split in two segments" 
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of 
 \ref tui_add_point_on_edge "Repairing Operations".
index 6019112b6b5eb46b58f80ae3be5ed59c0fd84efd..933a8d018ae197f0e67a39c082350ad6f7a110e2 100644 (file)
@@ -22,11 +22,11 @@ deflection of the mesh, using to compute the section.
 
 \n <b>Example:</b>
 
-\image html archimedesn1.png
+\image html archimedesn1.png "The shape"
 
-\image html archimedesn2.png
+\image html archimedesn2.png "The waterline on the shape"
 
-\image html archimedesn3.png
+\image html archimedesn3.png "The resulting plane"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of 
 \ref tui_archimede "Basic Operations".
diff --git a/doc/salome/gui/GEOM/input/basic_operations.doc b/doc/salome/gui/GEOM/input/basic_operations.doc
deleted file mode 100644 (file)
index a0dc155..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
-
-\page basic_operations_page Basic Operations
-
-<ul>
-<li>\subpage partition_page</li>
-<li>\subpage archimede_page</li>
-</ul>
-
-*/
\ No newline at end of file
index 8fe02df8d10db9532e8ee0e99e44a120550d9ff2..685f99509e2e49843b7b29526b6774eabf4e6968 100644 (file)
@@ -2,10 +2,15 @@
 
 \page blocks_operations_page Blocks Operations
 
+The solids built by blocks \ref  build_by_blocks_page can be
+processed with blocks transformation operations: 
+
 <ul>
-<li>\subpage multi_transformation_operation_page</li>
-<li>\subpage explode_on_blocks_operation_page</li> 
-<li>\subpage propagate_operation_page</li>
+<li>\subpage multi_transformation_operation_page "Multi-transformation" - produces several translations of a block in one or two directions.</li>
+<li>\subpage explode_on_blocks_operation_page "Explode on blocks" -
+returns blocks of the given compound.</li> 
+<li>\subpage propagate_operation_page "Propagate" - builds all
+possible propagation groups from the given shape.</li>
 </ul>
 
 */
\ No newline at end of file
diff --git a/doc/salome/gui/GEOM/input/boolean_operations.doc b/doc/salome/gui/GEOM/input/boolean_operations.doc
deleted file mode 100644 (file)
index 80d560e..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*!
-
-\page boolean_operations_page Boolean Operations
-
-<ul>
-<li>\subpage using_boolean_operations_page</li>
-<li>\subpage fuse_operation_page</li>
-<li>\subpage common_operation_page</li>
-<li>\subpage cut_operation_page</li>
-<li>\subpage section_opeartion_page</li>
-</ul>
-
-*/
\ No newline at end of file
index d3964eca2a1c26c237694f51a4eef25bad437f41..fa2611d7c37e5c1b23a459fa972371ad7b790f6c 100644 (file)
@@ -65,7 +65,7 @@ four edges from which the face is constructed.</li>
 \image html block3.png
 
 \n <b>Example:</b>
-\image html image185.jpg
+\image html image185.jpg "Quadrangle face built by blocks"
 
 
 <br><br>
@@ -110,6 +110,9 @@ automatically.</li>
 \image html image181.jpg
 <center>Hexahedral Solid built on the base of two Faces</center>
 
+
+The created blocks can be processed with  \ref blocks_operations_page "Operations on Blocks".
+
 Our <b>TUI Scripts</b> provide you with useful examples of
 \ref tui_building_by_blocks_page "Building by Blocks".
 
index 53e11409423f24f29739797c6a8aca06f1aeacba..38fdba84320cb964fb1eadd55ecabbe8a5f4f55d 100644 (file)
@@ -16,11 +16,11 @@ Dimension (radius) of the chamfer.
 
 \image html chamfer1.png
 
-\image html chamfer_all.png
+\image html chamfer_all.png "Chamfer on the whole object"
 
 \n In the algorithms below there exist two ways to define the \b
 Dimension of the Chamfer
-\n Firstly the \b Dimension can be defined via \b D1 and \D2, which
+\n Firstly the \b Dimension can be defined via \b D1 and \D2, which
 represent the offset on the first and the second face forming the
 edge. 
 \n Secondly the \b Dimension can be defined via \b D, which represents
@@ -44,7 +44,7 @@ Face1, Face2),</em> where \em D1 is a chamfer size along \em Face1 and
 
 \image html chamfer2.png
 
-\image html chamfer_edge.png
+\image html chamfer_edge.png "Chamfer on the specified edges"
 
 \n To create chamfer on the specified faces of the given shape,  you need
 to define the <b>Main Object</b> to create a fillet on, select the
@@ -62,7 +62,7 @@ ListOfFaceID),</em> where \em D1 is a chamfer size along \em Face1 and
 
 \image html chamfer3.png
 
-\image html chamfer_faces.png
+\image html chamfer_faces.png "Chamfer on the specified faces"
 
 \n To create chamfer on an arbitrary set of edges of the given shape
 to define the <b>Main Object</b> to create a fillet on, select the
diff --git a/doc/salome/gui/GEOM/input/check_free_boundaries_operation.doc b/doc/salome/gui/GEOM/input/check_free_boundaries_operation.doc
deleted file mode 100644 (file)
index f586dde..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*!
-
-\page check_free_boundaries_operation_page Check Free Boundaries
-
-\n To <b>Check Free Boundaries</b> in the <b>Main Menu</b> select <b>Repair - > Check Free Boundaries</b>.
-
-\n This operation detects wires and edges that are not shared between
-two faces and are considered a shape's boundary. This control highlights them.
-
-\n The \b Result will be a \b GEOM_Object. 
-
-\n <b>TUI Command:</b> <em>(NoError, ClosedWires, OpenWires) =
-geompy.GetFreeBoundary(Shape),</em> where \em Shape is a shape to be
-checked, \em NoError is false if an error occurred while checking free
-boundaries, \em ClosedWires is a list of closed free boundary wires,
-\em OpenWires is a list of open free boundary wires.
-
-\image html repair9.png
-
-\n <b>Example:</b>
-
-\image html free_boudaries1.png
-
-\image html free_boudaries2.png
-
-Our <b>TUI Scripts</b> provide you with useful examples of the use of 
-\ref tui_check_free_boundaries "Repairing Operations".
-
-*/
diff --git a/doc/salome/gui/GEOM/input/check_free_faces_operation.doc b/doc/salome/gui/GEOM/input/check_free_faces_operation.doc
deleted file mode 100644 (file)
index acf9d54..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*!
-
-\page check_free_faces_operation_page Check Free Faces
-
-\n To <b>Check Free Faces</b> in the <b>Main Menu</b> select <b>Repair - > Check Free Faces</b>.
-\n This operation highlights all free faces from a given shape. A free
-face is a face which is not shared between two objects of the shape.
-
-\n \b NOTE: This functionality works only in VTK viewer.
-
-\n The \b Result will be a \b GEOM_Object (a list of IDs of all free
-faces, containing in the shape).
-\n <b>TUI Command:</b> <em>GetFreeFacesIDs(Shape),</em> where \em Shape is
-a shape to be checked.
-
-\image html repair10.png
-
-\n <b>Example:</b>
-
-\image html free_faces1.png
-
-\image html free_faces2.png
-
-Our <b>TUI Scripts</b> provide you with useful examples of the use of
-\ref tui_check_free_faces "Repairing Operations".
-
-*/
index 21cd27749b0e6dd520274eb170edb096f08aeb7e..dfefce0dfd9799e5732548532f9ff245f772aa7d 100644 (file)
@@ -9,14 +9,16 @@
 \n The \b Result will be any \b GEOM_Object.
 \n <b>TUI Command:</b> <em>geompy.MakeCommon(s1, s2)</em>
 \n <b>Arguments:</b> Name + 2 shapes.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html bool2.png
 
 \n <b>Example:</b>
 
-\image html fusesn1.png
+\image html fusesn1.png "The initial shapes"
 
-\image html commonsn.png
+\image html commonsn.png "The resulting object" 
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_common "Boolean Operations".
diff --git a/doc/salome/gui/GEOM/input/creating_3dsketcher.doc b/doc/salome/gui/GEOM/input/creating_3dsketcher.doc
new file mode 100755 (executable)
index 0000000..bb914ea
--- /dev/null
@@ -0,0 +1,31 @@
+/*!
+
+\page create_3dsketcher_page 3D Sketcher
+
+3D Sketcher allows creating a closed or unclosed 3D wire from a list of points.
+
+To create a 3D Sketch, select in the main menu <em>New Entity -> 3D Sketch</em>.
+
+\image html 3dsketch2.png
+
+The position of each coordinates can be defined by absolute coordinates X, Y, Z or
+by relative coordinates DX, DY, DZ with respect to the previous Applied point.
+Type of coordinates can be selected by the <b>Coordinates Type</b> radio buttons.
+\n <b>"Sketch Validation"</b> button applies the wire, only red part will be built by "Sketch Validation".
+\n <b>"Sketch Closure"</b> will close the Sketch by straight line from last red part and apply it. 
+To make a closed wire using the TUI command, the first and the last point shoul 
+have the same coordinates.
+
+The Result of the operation will be a \b GEOM_Object.
+
+<b>TUI Command:</b> <em>geompy.Make3DSketcher( [ PointsList ] )</em>
+This algorithm creates a wire, from the list of real values which define XYZ 
+coordinates of points.
+
+<b>Example:</b>
+
+\image html 3dsketch1.png
+
+Our <b>TUI Scripts</b> provide you with useful examples of the use of
+\ref tui_3dsketcher_page "3D Sketcher".
+*/
index ebaf38aaa978a6854f75e9c5d938f25e8bad273b..26b0b4601b0d9533f8cfd396f5932bad7dd8bf06 100644 (file)
@@ -2,8 +2,10 @@
 
 \page create_adv_obj_page Creating Advanced Geometrical Objects
 
+<b>New Entity -> Build </b> submenu allows to create topological
+entities: 
+
 <ul>
-<li>\subpage create_explode_page</li>
 <li>\subpage create_edge_page</li>
 <li>\subpage create_wire_page</li>
 <li>\subpage create_face_page</li>
index 8ee49ca23c6a2996c774aa9937f248819f807bdd..4537a8a0fbf8ea95ed034549d4128b772530d815 100644 (file)
@@ -29,6 +29,17 @@ Point, End Point, boolean Sense)</em>
 
 \image html arc2.png
 
+Finally, it is possible to create an <b>Arc of Ellipse</b>, which is also done by three points: 
+the Arguments <b>Point 1</b>, <b>Point 2</b> and the <b>Center Point</b>. The arc is built on the Ellipse that 
+lies in the plane defined by the three points, with the center in the <b>Center point</b>. 
+The major radius of the Ellipse is defined by the distance between the <b>Center Point</b> and 
+the most remote Argument point. The minor radius is defined by the shortest distance between the 
+other Argument point and the major radius.
+\n <b>TUI Command:</b> <em>geompy.MakeArcOfEllipse(Center Point, First Point, Second Point)</em>
+\n <b>Arguments:</b> Name + 3 vertices.
+
+\image html arcofellipse2.png
+
 \n <b>Examples:</b>
 
 \image html arcsn.png
@@ -40,4 +51,10 @@ Point, End Point, boolean Sense)</em>
 \image html arcsn2.png
 <center>Reversed arc.</center>
 
+\image html arcofellipse1.png
+<center>Arc Of Ellipse.</center>
+
+Our <b>TUI Scripts</b> provide you with useful examples of creation of
+\ref tui_creation_arc "Basic Geometric Objects".
 */
+
index a9a1cb3bba3767cd6b7b221d6b42bf8d61a57253..49e3b2f34e879f5aa62b8fd5221de9c36018507e 100644 (file)
@@ -2,6 +2,9 @@
 
 \page create_basic_geom_obj_page Creating Basic Geometric Objects
 
+<b>New Entity -> Basic </b> submenu gives access to creation of such
+geometrical objects as: 
+
 <ul>
 <li>\subpage create_point_page</li>
 <li>\subpage create_line_page</li>
index 7c8268b0761633bccd319053c6c3656f712fddd6..8170884635ad207ffc90704ef4418b8bd16579b0 100644 (file)
@@ -30,10 +30,14 @@ accessible only via \b TUI commands.
 this way you don't need to create them in advance).
 \n <b>TUI Command:</b> <em>geompy.MakeBox(x1,y1,z1,x2,y2,z2)</em>
 \n <b>Arguments:</b> Name + X, Y and Z coordinates of both points.
+\note You can also use variables defined in the SALOME \b NoteBook
+to specify any numerical parameters of the box.
+
+\image html box3.png
 
 <b>Example:</b>
 
-\image html boxes.png
+\image html boxes.png "Boxes"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of 
 \ref tui_creation_box "Primitives".
index 153c610059d709eb17a62eb8336dcd3b6426713e..4ea76099347ecb30590c2bcdea9f70b48d9a3bd1 100644 (file)
@@ -15,6 +15,10 @@ Radius)</em>
 \n <b>Arguments:</b> Name + 1 vertex (for the center) + 1 edge (for
 the direction) + Radius.
 
+\note By default it is presumed that the <b>Center Point</b> is located at the  Origin of the global
+coordinate system, and the  \b Vector corresponds to OZ axis of the global
+coordinate system.
+
 \image html circle1.png
 
 \n Secondly, you can define a \b Circle by three \b Points that lie on it. 
@@ -23,9 +27,6 @@ the direction) + Radius.
 
 \image html circle2.png
 
-<b>Example:</b>
-\image html circles.png
-
 \n Finally, you can define a circle by a <b>Center Point</b> and two
 \b Points.  
 \n <b>TUI Command:</b> <em>geompy.MakeCircleCenter2Pnt(Point1, Point2,
@@ -36,6 +37,9 @@ to define the plane where the circle lies.
 
 \image html circle3.png
 
+<b>Example:</b>
+\image html circles.png "A circle by vector and radius and a circle by three points"
+
 Our <b>TUI Scripts</b> provide you with useful examples of creation of 
 \ref tui_creation_circle "Basic Geometric Objects".
 
index 6edbfd9c558351d4f7661f09657731daa9744c68..0d0404336d4291db69e32ff63d9b13b47cd33598 100644 (file)
@@ -2,11 +2,19 @@
 
 \page create_complex_obj_page Creating Complex Objects
 
+<b>New entity -> Generation</b> submenu allows creating new geometric
+objects by modification and multiplication of the existing objects: 
+
+
 <ul>
-<li>\subpage create_extrusion_page</li>
-<li>\subpage create_revolution_page</li>
-<li>\subpage create_filling_page</li>
-<li>\subpage create_extrusion_alongpath_page</li>
+<li>\subpage create_extrusion_page "Extrude" a 2D object by vector,
+creating a 3D object. </li> 
+<li>\subpage create_revolution_page "Revolve" an object around an
+axis, creating a body of revolution.</li>
+<li>\subpage create_filling_page  "Create a surface" from a set of edges.</li>
+<li>\subpage create_extrusion_alongpath_page "Extrude an object along a path", 
+creating a more complex trajectory object.</li>
+
 </ul>
 
 */
index 30d685ba15dac634cfe980c6416388d3cbb4b0e7..d139c2b111f101f145dbb749c38f422dcc9bb103 100644 (file)
@@ -10,14 +10,16 @@ Entity - > Build - > Compound</b>.
 
 \n <b>TUI Command:</b> <em>geompy.MakeCompound(ListOfShape)</em>
 \n <b>Arguments:</b> Name + List of shapes.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html neo-obj7.png
 
 \n <b>Example:</b>
 
-\image html compoundsn.png
+\image html compoundsn.png "Edges for creation of a compound"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of 
 \ref tui_creation_compound "Advanced Geometric Objects".
 
-*/
\ No newline at end of file
+*/
index 827db860ff206c4a0ddc8099a0f2bf50e2c08087..2ce6757d2e93df3664fcba5dc778429c35f4c09d 100644 (file)
@@ -33,7 +33,7 @@ the radiuses are equal, a \b Cylinder will be created instead.
 
 <b>Example:</b>
 
-\image html cones.png
+\image html cones.png "Normal and truncated cones"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of 
 \ref tui_creation_cone "Primitives".
index d6debda15a5b1067b7cf96256c7d19525d5e24ac..1e1cbc16d289a88770d0ca89d19e1243ce93eaed 100644 (file)
@@ -28,7 +28,7 @@ height).
 
 <b>Example:</b>
 
-\image html cylinders.png
+\image html cylinders.png "Cylinders"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of 
 \ref tui_creation_cylinder "Primitives".
diff --git a/doc/salome/gui/GEOM/input/creating_disk.doc b/doc/salome/gui/GEOM/input/creating_disk.doc
new file mode 100755 (executable)
index 0000000..b1e329f
--- /dev/null
@@ -0,0 +1,44 @@
+/*!
+
+\page create_disk_page Disk
+
+A primitive called disk is a round plane with a certain radius and orientation
+
+To create a \b Disk in the <b>Main Menu</b> select <b>New Entity - >
+Primitives - > Disk</b>
+
+\n There are 3 algorithms to create a \b Disk in 3D space. 
+\n The \b Result of each operation will be a GEOM_Object (face).
+
+\n Firstly, you can create a \b Disk at the origin 
+of coordinates defining its radius and selecting the orientation of its axis with radio
+ buttons (OXY, OYZ or OZX).This 
+means that the Disk will lie in "OXY", "OYZ" or "OZX" plane correspondingly.
+\n <b>TUI Command:</b> <em>geompy.MakeDiskR(Radius, Orientation)</em>
+\n <b>Arguments:</b> Name + 2 values (Dimensions at origin: radius and
+orientation).
+
+\image html disk1.png
+
+\n Secondly, you can define a \b Disk by a <b>Center Point</b>, a \b
+Vector defining the normal of a circle and a \b Radius.
+\n <b>TUI Command:</b> <em>geompy.MakeDiskPntVecR(Point, Vector,
+Radius)</em>
+\n <b>Arguments:</b> Name + 1 vertex (for the center) + 1 edge (for
+the direction) + Radius.
+
+\image html disk2.png
+
+\n Finally, you can define a \b Disk by three \b Points that lie on its boundary. 
+\n <b>TUI Command:</b> <em>geompy.MakeDiskThreePnt(Point1, Point2, Point3)</em>
+\n <b>Arguments:</b> Name + 3 points which will form the disk.
+
+\image html disk3.png
+
+<b>Example:</b>
+\image html disks.png "Disks"
+
+Our <b>TUI Scripts</b> provide you with useful examples of creating 
+\ref tui_creation_disk "Primitives".
+
+*/
index fb4cebff83e6c9e0104246e0da1c9dc403e60bf3..6d45a541858e5e5970de5e3efc2287d0ef16ef7b 100644 (file)
@@ -18,7 +18,7 @@ of the edge.
 
 \n <b>Example:</b>
 
-\image html edgesn.png
+\image html edgesn.png "Edge"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of 
 \ref tui_creation_edge "Advanced Geometric Objects".
index 78972181b06d32207d258976a21f0e95f7119710..2beaa908664c9439bcff80f0dc7051750d0ea16e 100644 (file)
@@ -12,13 +12,17 @@ Vector giving its normal, and its <b>Major & Minor Radiuses</b>.
 \n <b>Arguments:</b> Name + 1 vertex (for the center) + 1 edge (for
 the direction) + 1 X Radius + 1 Y Radius.
 
+\note By default it is presumed that the <b>Center Point</b> is located at the  Origin of the global
+coordinate system, and the  \b Vector corresponds to OZ axis of the global
+coordinate system.
+
 \image html ellipse.png
 
 <b>Example:</b>
 
-\image html ellipsesn.png
+\image html ellipsesn.png "Ellipse"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of
 \ref tui_creation_ellipse "Basic Geometric Objects".
 
-*/
\ No newline at end of file
+*/
index 515978e331a93f72fa11dc4c559e6e4c709d0206..747aba637346d72fc3ca7289b48fb4abbaa9b8b2 100644 (file)
@@ -36,8 +36,12 @@ in sorted list of all sub-shapes of the given Type. Each index is in
 the range [1, Nb_Sub-Shapes_Of_Given_Type]</li>
 </ul>
 
-\n <b>Arguments:</b>1 SHAPE + 1 type of SubShape.
+\n <b>Arguments: </b>1 SHAPE + 1 type of SubShape.
 
 \image html neo-obj1.png
 
+<b>Example:</b>
+
+\image html explode.png "A box, exploded into faces"
+
 */
index 3f3435ca63af7db30460688b174d26850399e8c6..6cc92388cb0980d68a744fa1093005f65828d1d4 100644 (file)
@@ -34,6 +34,16 @@ shell) serving as base object + 2 vertices.
 
 \image html extrusion2.png
 
+\n Finally, you can define the \b Extrusion by the <b>Base Shape</b>
+and the <b>DX, DY, DZ</b> Vector\n
+<b>Both Directions</b> checkbox allows extruding the
+source objects both forward and backward.
+\n <b>TUI Command:</b> <em>geompy.MakePrismDXDYDZ(Base, dx, dy, dz)</em>
+\n <b>Arguments:</b> Name + 1 shape (vertex, edge, planar wire, face or
+shell) serving as base object + 3 axis directions.
+
+\image html extrusion3.png
+
 <b>Examples:</b>
 
 \image html prisms_basessn.png
index 77e453170638ccee3838da3f09a90e6772d2db07..7095d2e59b56f858d7fa0e4925aa419efc8f6d35 100644 (file)
@@ -4,10 +4,15 @@
 
 To generate a \b Pipe in the <b>Main Menu</b> select <b>New Entity - > Generation  - > Extrusion along a path</b>
 
-\n To create an extruded \b Pipe shape, you need to define the <b>Base
+\n Firstly, to create an extruded \b Pipe shape, you can define the <b>Base
 Object</b> (vertex, edge, planar wire, face or shell), which will be extruded
 and the <b>Path Object</b> (edge or wire) along which the <b>Base 
 Object</b> will be extruded.
+\n In this mode the default pipe generation algorithm is used. The pipe
+is created in such a way that the <b>angle between the normal vector</b> to
+the base shape <b>and the tangent to the path</b> wire at any point of the
+given path <b>is kept constant</b>.
+\n Check Box <b>Select unpublished edges</b> - if checked, allows to select an edge of any other shape as the path object. 
 \n The \b Result of the operation will be a GEOM_Object (edge, face, shell,
 solid or compsolid).
 
@@ -20,9 +25,31 @@ definition of the path.
 
 <b>Example:</b>
 
-\image html pipe_wire_edgesn.png
+\image html pipe_wire_edgesn.png "Extrusion of wire"
+
+\n Secondly, you can define the <b>Base
+Object</b> (edge, planar wire or face), which will be extruded, 
+the <b>Path Object</b> (edge or wire) along which the <b>Base 
+Object</b> will be extruded and the <b>Vector</b> (edge or wire).
+\n In contrast to the default mode, in this mode the pipe is generated
+in such a way that the <b>angle between the normal vector</b> to the base
+shape <b>and the BiNormal vector</b> given as the third argument <b>is kept
+constant</b>.
+\n Check Box <b>Select unpublished edges</b> - if checked, allows to select an edge of any other shape as the path object. 
+\n The \b Result of the operation will be a GEOM_Object (edge, face, shell,
+solid or compsolid).
+
+\n <b>TUI Command:</b> <em>geompy.MakePipeBiNormalAlongVector(baseShape, pathShape, binormalShape)</em>
+\n <b>Arguments:</b> Name + 1 shape (edge, planar wire or face) 
+serving as base object + 1 shape (edge or wire) for
+definition of the path + 1 shape (edge or wire) to set a fixed 
+BiNormal direction to perform the extrusion.
+
+\image html pipe2.png
+
+<b>Example:</b>
 
-\image html pipesn.png
+\image html pipebinormalsn.png "Extrusion of face with BiNormal parameter"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of
 \ref tui_creation_pipe "Complex Geometric Objects".
index bdf6164f846f7b9307b32237d89bca6589bf2331..11cd764984b99d6ab5cb2e52bc84139745cff3de 100644 (file)
@@ -30,9 +30,9 @@ face or nothing if it is impossible.
 
 \image html facesn2.png
 
-\image html facesn3.png
+\image html facesn3.png "Examples of faces"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of 
-\ref tui_creation_face "Advanced Geometric Objects".
+\ref tui_creation_squareface "Primitives".
 
 */
index 82d446f2c31c8812b6cc41190c4b47280dca4939..fd4407f1e5a1014599ce60799d1330b86346b098 100644 (file)
@@ -4,25 +4,32 @@
 
 To generate a \b Filling in the <b>Main Menu</b> select <b>New Entity - > Generation  - > Filling</b>
 
-\n To create a curving face using several edges you need to define the
-<b>Edges Compound</b>, \b Minimum and <b>Maximum Degree</b>, \b
-Tolerance for \b 2D and for \b 3D , the <b>Number of Iterations</b>
-and <b>Approximation</b>.
+To create a curving face using several edges you need to define the
+following parameters:
+\n <b>Edges Compound</b> - the list of edges used for creation of the
+surface;
+\n \b Minimum and <b>Maximum Degree</b> of equation of the resulting BSpline or Besier curves describing the surface; 
+\n \b Tolerance for \b 2D and for \b 3D - minimum distance between the
+created surface and the reference edge; 
+\n <b>Number of
+Iterations</b> - defines the maximum number of iterations. The iterations are repeated until the required tolerance is reached. So, a greater number of iterations allows producing a better surface. 
+\n <b>Approximation</b> - if checked, BSpline curves are generated in the process of surface construction (using GeomAPI_PointsToBSplineSurface functionality). By default the surface is created using Besier curves. The usage of <b>Approximation</b> makes the algorithm work slower, but allows building the
+surface for rather complex cases. 
+
 \n The \b Result of the operation will be a GEOM_Object (face).
 
-\n <b>TUI Command:</b> <em>geompy.MakeFilling(Edges, MinDegree,
-MaxDegree, Tol2D, Tol3D, NbIter, isApprox)</em>
+\n <b>TUI Command:</b> <em>geompy.MakeFilling(Edges, MinDegree, MaxDegree, Tol2D, Tol3D, NbIter)</em>
 \n <b>Arguments:</b> Name + 1 List of edges + 6 Parameters
 (Min. degree, Max. degree, Number of iterations, 2D tolerance, 3D
-tolerance, Number of iterations, Approximation).
+tolerance, Number of iterations, Appro).
 
 \image html filling.png
 
 <b>Example:</b>
 
-\image html filling_compoundsn.png
+\image html filling_compoundsn.png "Initial edges"
 
-\image html fillingsn.png
+\image html fillingsn.png "Resulting surface"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of
 \ref tui_creation_filling "Complex Geometric Objects".
index 1c804ae7102c61f018717113b65c0362fff97a3a..ae5dfb8c7b50db5ab09c2b7df1b27bc7db3c238b 100644 (file)
@@ -2,48 +2,26 @@
 
 \page create_geom_obj_page Creating geometrical objects
 
+Salome Geometry module provides the toolset allowing to create a vast
+range of geometrical objects, from points to complex extrusions: 
+
 <ul>
-<li>\subpage create_basic_geom_obj_page</li>
-<ul>
-<li>\ref create_point_page</li>
-<li>\ref create_line_page</li>
-<li>\ref create_circle_page</li>
-<li>\ref create_ellipse_page</li>
-<li>\ref create_arc_page</li>
-<li>\ref create_curve_page</li>
-<li>\ref create_vector_page</li>
-<li>\ref create_plane_page</li>
-<li>\ref create_wplane_page</li>
-<li>\ref create_lcs_page</li>
-</ul>
-<li>\subpage create_primitives_page</li>
-<ul>
-<li>\ref create_box_page</li>
-<li>\ref create_cylinder_page</li>
-<li>\ref create_sphere_page</li>
-<li>\ref create_torus_page </li>
-<li>\ref create_cone_page </li>
-</ul>
-<li>\subpage create_complex_obj_page</li>
-<ul>
-<li>\ref create_extrusion_page</li>
-<li>\ref create_revolution_page</li>
-<li>\ref create_filling_page</li>
-<li>\ref create_extrusion_alongpath_page</li>
-</ul>
-<li>\subpage work_with_groups_page</li>
-<li>\subpage build_by_blocks_page</li>
-<li>\subpage create_sketcher_page</li>
-<li>\subpage create_adv_obj_page</li>
-<ul>
-<li>\ref create_explode_page</li>
-<li>\ref create_edge_page</li>
-<li>\ref create_wire_page</li>
-<li>\ref create_face_page</li>
-<li>\ref create_shell_page</li>
-<li>\ref create_solid_page</li>
-<li>\ref create_compound_page</li>
-</ul>
+<li>create \subpage create_basic_geom_obj_page "Basic objects" - points,
+lines, circles...</li>
+<li>create \subpage create_primitives_page "Primitives" - cubes, spheres, cones...</li>
+<li>create \subpage create_complex_obj_page "Complex objects" by
+extrusion, rotation, interpolation of other objects.</li>
+<li>create and edit \subpage work_with_groups_page "Groups of objects" of
+lower dimension, which belong to the objects of higher dimension.</li>
+<li>\subpage build_by_blocks_page "Build by blocks" faces from
+edges and solids from faces.</li>
+<li>create line segments and arcs using \subpage create_sketcher_page
+"Sketcher".</li>
+<li>create a closed or unclosed 3D wire from a list of points using
+\subpage create_3dsketcher_page "3D Sketcher".</li>
+<li>\subpage create_explode_page "Explode" objects of higher dimension
+into sub-objects of lower dimension.</li> 
+<li>create \subpage create_adv_obj_page "Advanced geometrical objects" - edges, wires, shells...</li>
 </ul>
 
 */
index 106effc00a64c2e810b7621aebbbf7d739a0267b..6b714f9c2f03f06c3a31575dd443ac0762016d3e 100644 (file)
@@ -35,6 +35,6 @@ and in 3D viewer.
 
 <b>Example:</b>
 
-\image html image145.jpg
+\image html image145.jpg "Local Coordinate System"
 
 */
\ No newline at end of file
index fafdfcea9d5760a922d24763e540e12b8e5285cf..3d5eefe0586b9d78a775e98aa07387dc25db7465 100644 (file)
@@ -25,7 +25,7 @@ which are the points through  which the \b Line passes.
 
 <b>Example:</b>
 
-\image html lines.png
+\image html lines.png "Line defined through points"
 
 \b NB! There is another way to create a line, which is currently
 accessible only via \b TUI commands.
index d7c9e8f9fd613d10ed363ba60707a60cf0cf780b..c6116021bf289a98ca52a1aae6cc2176a49e0c0a 100644 (file)
@@ -27,7 +27,8 @@ of the plane).
 \image html plane2.png
 
 \n Finally, you can define a \b Plane by another \b Plane or <b>Local
-Coordinate System</b> and a <b>Size of the Plane</b>.
+Coordinate System</b> and a <b>Size of the Plane</b>. To change selection type cilck the corresponding
+radio button "Face" or "Local Coordinate System".
 \n <b>TUI Command:</b> <em>geompy.MakePlaneFace(Face, TrimSize)</em>
 \n <b>Arguments:</b> Name + 1 face + 1 value (to define the size of
 the plane).
index 5e170327046556b193c2c3e5963f77c341be847b..3c992c8f0d832cd6f055407e2960e6c13c25a7b2 100644 (file)
@@ -5,7 +5,7 @@
 To create a \b Point in the <b>Main Menu</b> select <b>New Entity - >
 Basic - > Point</b>
 
-\n There are four algorithms to create a \b Point in the 3D space.
+\n There are five algorithms to create a \b Point in the 3D space.
 \n Each time the \b Result of the operation will be a GEOM_Object
 (vertex).
 
@@ -34,14 +34,25 @@ position of the point on the given edge.
 
 \image html point3.png
 
-\n Finally, we can define a point by intersection of two \b  Lines.
+\n Fourthly, we can define a point by intersection of two \b  Lines.
 \n <b>TUI Command:</b> <em>geompy.MakePointOnLinesIntersection(myLine1,myLine2).</em>
 \n <b>Arguments:</b> Name + 2 lines
 
 \image html point4.png
 <b>Example:</b>
 
-\image html points.png
+\n Finally, we can define a point by a \b Face and two <b> Parameters: U </b> and \b V
+indicating its position on the Face, ranging from 0.0 to 1.0. For example, (0.5; 0.5) means that the
+point is located in the middle of the face.
+\n <b>TUI Command:</b> <em>geompy.MakeVertexOnSurface(myFace,myUParameter,myVParameter).</em>
+\n <b>Arguments:</b> Name + 1 face + 2 Parameters defining the
+position of the point on the given face.
+
+\image html point5.png
+
+<b>Example:</b>
+
+\image html points.png "Points by edge and parameter and by coordinates"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of 
 \ref tui_creation_point "Basic Geometric Objects".
index d13a5ee18dab04643be4920662046591dd9e5a9e..1800330b51af3a9352d84afdad4b1e9aad28dd5e 100644 (file)
@@ -2,12 +2,17 @@
 
 \page create_primitives_page Creating Primitives
 
+<b>New Entity -> Primitives </b> submenu allows to create voluminal
+geometrical objects, such as: 
+
 <ul>
 <li>\subpage create_box_page</li>
 <li>\subpage create_cylinder_page</li>
 <li>\subpage create_sphere_page</li>
 <li>\subpage create_torus_page</li>
 <li>\subpage create_cone_page</li>
+<li>\subpage create_squareface_page "Face"</li>
+<li>\subpage create_disk_page</li>
 </ul>
 
 */
\ No newline at end of file
index b9d2d7086d871d82fbcdbf07426ee6fb7b7558df..80c7ebc5fde6e0ba186514cc9656825fcf6f4fbd 100644 (file)
@@ -20,7 +20,7 @@ solid or compsolid).
 
 <b>Example:</b>
 
-\image html revolutionsn.png
+\image html revolutionsn.png "Body of revolution"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of
 \ref tui_creation_revolution "Complex Geometric Objects".
index 7c87d3d2295f3b69e4582032ee0436e84b1bddc4..32cc8783ce2d37850828216dc1fb78235dbdf533 100644 (file)
@@ -5,17 +5,17 @@
 To create a \b Shell in the <b>Main Menu</b> select <b>New Entity - >
 Build - > Shell</b>
 
-\n You can create a \b Shell from a list of faces and (or) shells.
+\n You can create a \b Shell from a compound of faces or a list of faces or shells.
 \n The \b Result will be a \b GEOM_Object (shell).
 
 \n <b>TUI Command:</b> <em>geompy.MakeShell(ListOfShape)</em>
-\n <b>Arguments:</b> Name + List of faces having connected edges.
+\n <b>Arguments:</b> Name + Compound of faces or List of faces having connected edges.
 
 \image html neo-obj5.png
 
 \n <b>Example:</b>
 
-\image html shellsn.png
+\image html shellsn.png "Shell"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of 
 \ref tui_creation_shell "Advanced Geometric Objects".
index 88629274f780ddd10016267f573c5e8968457c10..ce1a6e78de71c03db33f6a0ebd8e806cf355f3d9 100644 (file)
@@ -52,6 +52,11 @@ is predefined and is equal to 90 degrees);</li>
 <li>Parameters of an element (for segment : length or target X or Y coordinate value, for arc : radius and angle).</li>
 </ol>
 
+\b Buttons:
+
+<b>"Sketch Validation"</b> button applies the wire, only red part will be built by "Sketch Validation".
+\n <b>"Sketch Closure"</b> will close the Sketch by straight line from last red part and apply it.
+
 \n <b>Dialog Box:</b>
 
 \image html neo-scetcher1.png
@@ -60,9 +65,7 @@ is predefined and is equal to 90 degrees);</li>
 
 \n <b>Example:</b>
 
-\image html image204.jpg
-
-\image html image206.jpg
+\image html image204.jpg "Creation of a circle with sketcher"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_sketcher_page "Sketcher".
index 139dbfe3d05c742e67f09e6af9e89560ddecd96a..48a05750e9d2d56ba4fe96e69f4912e20443cf97 100644 (file)
@@ -17,7 +17,7 @@ ListOfShape is a list of shells from which the solid is constructed.
 
 \n <b>Example:</b>
 
-\image html solidsn.png
+\image html solidsn.png "Solid"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of 
 \ref tui_creation_solid "Advanced Geometric Objects".
index c4437cadc886fb3bb77f52b781f39b98350dee13..b772bdac8a6041dec1f757bbacb08f462db427b9 100644 (file)
@@ -28,7 +28,7 @@ Point</b> and its \b Radius (in this way you don't need to create it in advance)
 
 <b>Example:</b>
 
-\image html spheres.png
+\image html spheres.png "Spheres"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of 
 \ref tui_creation_sphere "Primitives".
diff --git a/doc/salome/gui/GEOM/input/creating_squareface.doc b/doc/salome/gui/GEOM/input/creating_squareface.doc
new file mode 100755 (executable)
index 0000000..4267a40
--- /dev/null
@@ -0,0 +1,43 @@
+/*!
+
+\page create_squareface_page Square Face
+
+A primitive called <b>Square Face</b> is a square plane of certain dimensions and orientation
+
+To create a \b Square Face  in the <b>Main Menu</b> select <b>New Entity - >
+Primitives - > Face</b>
+
+\n There are 2 algorithms to create a \b Square \b Face in the 3D space. 
+\n The \b Result of each operation will be a GEOM_Object (Face).
+
+\n Firstly, you can create a \b Face at the origin 
+of coordinates defining its boundaries by the height and the width and its axis by the orientation
+radio buttons (OXY, OYZ or OZX).This 
+means that the Square Face will lie in "OXY", "OYZ" or "OZX" plane correspondingly.
+\n <b>TUI Command:</b> <em>geompy.MakeFaceHW(Height, Width, Orientation)</em>
+\n <b>Arguments:</b> Name + 3 values (Dimensions at origin: heigth, width and
+orientation).
+
+
+\image html face1.png
+
+\n Secondly, you can define a \b Face by the height and the width sizes and an \b Edge defining the normal to the center of the face.
+\n <b>TUI Command:</b> <em>geompy.MakeFaceObjHW(Vector, Height, Width)</em>
+\n <b>Arguments:</b> Name + 1 Vector (normal to the center) + 2 doubles (to
+describe a face sizes).
+
+\n It is also possible to create a Square Face from another selected face. For this, switch the <b>Object Type</b> button 
+to \b Face, then select a face object and set the values of
+Height and Width for the new face. The created face will lie in the plane of the selected face.
+\n <b>TUI Command:</b> <em>geompy.MakeFaceObjHW(Face, Height, Width)</em>
+\n <b>Arguments:</b> Name + 1 Face + 2 parameters (to describe a face sizes).
+
+\image html face2.png
+
+<b>Example:</b>
+\image html faces.png "Square face"
+
+Our <b>TUI Scripts</b> provide you with useful examples of creating 
+\ref tui_creation_face "Primitives".
+
+*/
index dd8b63412759d13469a34004c2f6cc0b586dd881..3ad048c8529344e181d0b3a29f96f7062900e9b8 100644 (file)
@@ -24,7 +24,7 @@ of coordinates by its Major and Minor \b Radiuses.
 
 <b>Example:</b>
 
-\image html toruses.png
+\image html toruses.png "Toruses"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of 
 \ref tui_creation_torus "Primitives".
index 0a914bea12ed25fbbfdd1d83463163d1e92fe04f..331180e9583e82964a0b7b63369e325b97d7ebf9 100644 (file)
@@ -23,7 +23,7 @@ coordinates</b> by its <b>End Point</b>.
 
 <b>Example:</b>
 
-\image html image34.gif
+\image html image34.gif "A vector by two points and a vector from the origin of coordinates"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of 
 \ref tui_creation_vector "Basic Geometric Objects".
index 34a24b0e26531966f584c7f8590a890d3f6089ad..54cf6c79a7b894322a2a2f54d9c761995cc28a3d 100644 (file)
@@ -19,7 +19,7 @@ button.
 
 \n <b>Example:</b>
 
-\image html wiresn.png
+\image html wiresn.png "Wire"
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of 
 \ref tui_creation_wire "Advanced Geometric Objects".
index 1ccc84b0a2348532e229c71d9dde8f01e84b9d7d..bab9ca7b80b9f837bc954f64e07177cf5d096570 100644 (file)
@@ -7,6 +7,8 @@
 \n This operation cuts a shape with another one.
 \n The \b Result will be any \b GEOM_Object.
 \n <b>Arguments:</b> Name + 2 shapes.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \n <b>Dialog Box:</b>
 
@@ -14,9 +16,9 @@
 
 \n <b>Example:</b>
 
-\image html fusesn1.png
+\image html fusesn1.png "The initial shapes"
 
-\image html cutsn.png
+\image html cutsn.png "The resulting object"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of 
 \ref tui_cut "Boolean Operations".
index 635f7056110a4c87b229bbee565935fc2e420266..abfaf09bdee8f14f4442d9bd476904ef1a4ac1b5 100644 (file)
@@ -24,7 +24,7 @@ faces in the block to be extracted).
 
 \n <b>Example:</b>
 
-\image html block_explodesn.png
+\image html block_explodesn.png "Explode on blocks operation"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_explode_on_blocks "Blocks Operations".
diff --git a/doc/salome/gui/GEOM/input/fillet2d_operation.doc b/doc/salome/gui/GEOM/input/fillet2d_operation.doc
new file mode 100755 (executable)
index 0000000..43701ed
--- /dev/null
@@ -0,0 +1,27 @@
+/*!
+
+\page fillet2d_operation_page Fillet 2D
+
+This operation creates fillets on the corners of a <b>2D Planar Face</b>.
+
+\image html fillet2d_2.png
+
+To produce a \b Fillet 2D in the <b>Main Menu</b> select 
+<b>Operations - > Transformation - > Fillet 2D</b>
+
+Define the <b>Planar Face</b> to create a fillet on, select the necessary 
+vertexes on this face in the OCC Viewer and define the \b Radius of the Fillet.
+
+\b Note: This Operation Works for the <b>Planar 2D</b> Faces Only.
+
+<b>TUI Command:</b> <em>geompy.MakeFillet(Shape, R, ListVertexes)</em>
+\n <b>Arguments:</b> Name + 1 shape + one or several vertexes + 1 value (Fillet radius).
+
+<b>Examples:</b>
+
+\image html fillet2d_1.png
+
+Our <b>TUI Scripts</b> provide you with useful examples of the use of
+\ref tui_fillet2d "Transformation Operations".
+
+*/
index 5eb168bcddb62034a3ed64358c9ef5053d096681..ece199c5c3832c75a4bfce791340b69ceb37a126 100644 (file)
@@ -8,16 +8,18 @@
 \n This operation creates a shape from two shapes.
 
 \n The \b Result will be any \b GEOM_Object.
-\n <b>Arguments:</b> Name + 2 shapes.
 \n <b>TUI Command:</b> <em>geompy.MakeFuse(s1, s2)</em>
+\n <b>Arguments:</b> Name + 2 shapes.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html bool1.png
 
 \n <b>Example:</b>
 
-\image html fusesn1.png
+\image html fusesn1.png "The initial shapes"
 
-\image html fusesn2.png
+\image html fusesn2.png "The resulting fuse"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of 
 \ref tui_fuse "Boolean Operations".
index cde054cb5d8ba9c051fa0e8f43acf9d31e67d42a..90bc578bb15f904e14bf1a9dd426c861cc53301e 100644 (file)
@@ -2,6 +2,43 @@
 
 \page geompy_page Python Interface geompy.py
 
-\n Please, see \ref geompyDC::geompyDC "documentation for geompy.py"
+\n Please, see
+<a href="geompy_doc/modules.html">structured documentation for geompy.py</a>,
+where all package functionality is separated in groups by purpose.
 
-*/
\ No newline at end of file
+\n Also you can find any function in the \ref geompy
+"linear documentation for geompy.py".
+
+By the links below you can find sample scripts for all operations
+provided by Geometry module.
+
+<ul>
+  <li>\subpage tui_viewing_geom_objs_page</li>
+  <li>\subpage tui_creating_geom_objs_page</li>
+  <ul>
+    <li>\ref tui_basic_geom_objs_page</li>
+    <li>\ref tui_primitives_page</li>
+    <li>\ref tui_complex_objs_page</li>
+    <li>\ref tui_working_with_groups_page</li>
+    <li>\ref tui_building_by_blocks_page</li>
+    <li>\ref tui_sketcher_page</li>
+    <li>\ref tui_advanced_geom_objs_page</li>
+  </ul>
+  <li>\subpage tui_transformation_page</li>
+  <ul>
+    <li>\ref tui_basic_operations_page</li>
+    <li>\ref tui_boolean_operations_page</li>
+    <li>\ref tui_transformation_operations_page</li>
+    <li>\ref tui_blocks_operations_page</li>
+    <li>\ref tui_repairing_operations_page</li>
+  </ul>
+  <li>\subpage tui_measurement_tools_page</li>
+  <li>\subpage tui_swig_examples_page</li>
+  <ul>
+    <li>\ref tui_test_others_page</li>
+    <li>\ref tui_test_spanner_page</li>
+    <li>\ref tui_test_all_page</li>
+  </ul>
+</ul>
+
+*/
index 340f4afa73f3f4e2c5f30907afcd03358c818e17..f940075d56fb1fb22191e78330fc2f7860439244 100644 (file)
@@ -9,11 +9,14 @@ given tolerance value.
 
 \n The \b Result will be a \b GEOM_Object.
 
-\n <b>TUI Command:</b> <em>geompy.MakeGlueFaces(theShape,
-theTolerance),</em> where \em theShape is a compound of solids to be
-glued, \em theTolerance is a maximum distance between two faces, which can
-be considered as coincident.
+\n <b>TUI Command:</b>
+ <em>geompy.MakeGlueFaces(theShape,theTolerance)</em>,
+ where \em theShape is a compound of solids to be glued, \em
+ theTolerance is a maximum distance between two faces, which can be
+ considered as coincident.
 \n <b>Arguments:</b> Name + Compound of solids + Tolerance value.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html glue1.png
 
index 8a5219ebee2af6fc6036ace6d9554b9a864dbd9b..1cd5cc459c38372d9d2fd2c707153484dbd36d37 100644 (file)
@@ -22,6 +22,14 @@ Select the required file and click \b Open. Your file will be imported in
 the module and its contents (geometrical object) will be displayed in
 the <b>Object Browser</b>.
 
+\note It is possible to re-open from the initial file a previously imported shape if
+the file has been changed on disk. For this, select
+<b>Reload From Disk</b> in the context menu of the imported
+shape. The reloaded shape will have the same representation parameters
+as before this operation.
+
+\image html geomimport_reopen.png
+
 \n <em>To export geometrical objects into a BREP, IGES, STEP
 file:</em>
 
index 45eb2ac656c7dd711982a4b491946bc5d6e5ed0e..c5121cabb3be28e7c59bbea3fa1f21d9d00fbedd 100644 (file)
 /*!
 
-\mainpage Geometry Module Reference Documentation
+\mainpage Introduction to Geometry
 
-<ul>
-<li>\subpage introduction_page</li>
-<li>\subpage import_export_geom_obj_page</li>
-<li>\subpage create_geom_obj_page</li>
-<ul>
-<li>\ref create_basic_geom_obj_page</li>
-<ul>
-<li>\ref create_point_page</li>
-<li>\ref create_line_page</li>
-<li>\ref create_circle_page</li>
-<li>\ref create_ellipse_page</li>
-<li>\ref create_arc_page</li>
-<li>\ref create_curve_page</li>
-<li>\ref create_vector_page</li>
-<li>\ref create_plane_page</li>
-<li>\ref create_wplane_page</li>
-<li>\ref create_lcs_page</li>
-</ul>
-<li>\ref create_primitives_page</li>
-<ul>
-<li>\ref create_box_page</li>
-<li>\ref create_cylinder_page</li>
-<li>\ref create_sphere_page</li>
-<li>\ref create_torus_page </li>
-<li>\ref create_cone_page </li>
-</ul>
-<li>\ref create_complex_obj_page</li>
-<ul>
-<li>\ref create_extrusion_page</li>
-<li>\ref create_revolution_page</li>
-<li>\ref create_filling_page</li>
-<li>\ref create_extrusion_alongpath_page</li>
-</ul>
-<li>\ref work_with_groups_page</li>
-<li>\ref build_by_blocks_page</li>
-<li>\ref create_sketcher_page</li>
-<li>\ref create_adv_obj_page</li>
-<ul>
-<li>\ref create_explode_page</li>
-<li>\ref create_edge_page</li>
-<li>\ref create_wire_page</li>
-<li>\ref create_face_page</li>
-<li>\ref create_shell_page</li>
-<li>\ref create_solid_page</li>
-<li>\ref create_compound_page</li>
-</ul>
-</ul>
-<li>\subpage view_geom_obj_chapter_page</li>
-<ul>
-<li>\ref view_geom_obj_page</li>
-<li>\ref display_mode_page</li>
-<li>\ref color_page</li>
-<li>\ref transparency_page</li>
-<li>\ref isolines_page</li>
-</ul>
-<li>\subpage transform_geom_obj_page</li>
-<ul>
-<li>\ref basic_operations_page</li>
-<ul>
-<li>\ref partition_page</li>
-<li>\ref archimede_page</li>
-</ul>
-<li>\ref boolean_operations_page</li>
-<ul>
-<li>\ref using_boolean_operations_page</li>
-<li>\ref fuse_operation_page</li>
-<li>\ref common_operation_page</li>
-<li>\ref cut_operation_page</li>
-<li>\ref section_opeartion_page</li>
-</ul>
-<li>\ref transformation_operations_page</li>
-<ul>
-<li>\ref translation_operation_page</li>
-<li>\ref rotation_operation_page</li>
-<li>\ref modify_location_operation_page</li>
-<li>\ref mirror_operation_page</li>
-<li>\ref scale_operation_page</li>
-<li>\ref offset_operation_page</li>
-<li>\ref multi_translation_operation_page</li>
-<li>\ref multi_rotation_operation_page</li>
-<li>\ref fillet_operation_page</li>
-<li>\ref chamfer_operation_page</li>
-</ul>
-<li>\ref blocks_operations_page</li>
-<ul>
-<li>\ref multi_transformation_operation_page</li>
-<li>\ref explode_on_blocks_operation_page</li>
-<li>\ref propagate_operation_page</li>
-</ul>
-<li>\ref repairing_operations_page</li>
-<ul>
-<li>\ref shape_processing_operation_page</li>
-<li>\ref suppress_faces_operation_page</li>
-<li>\ref close_contour_operation_page</li>
-<li>\ref suppress_internal_wires_operation_page</li>
-<li>\ref suppress_holes_operation_page</li>
-<li>\ref sewing_operation_page</li>
-<li>\ref glue_faces_operation_page</li>
-<li>\ref add_point_on_edge_operation_page</li>
-<li>\ref check_free_boundaries_operation_page</li>
-<li>\ref check_free_faces_operation_page</li>
-<li>\ref change_orientation_operation_page</li>
-<li>\ref remove_extra_edges_operation_page</li>
-</ul>
-</ul>
-<li>\subpage using_measurement_tools_page</li>
-<li>\subpage geompy_page</li>
-<li>\subpage tui_scripts_page</li>
-<ul>
-<li>\ref tui_viewing_geom_objs_page</li>
-<li>\ref tui_creating_geom_objs_page</li>
-<ul>
-<li>\ref tui_basic_geom_objs_page</li>
-<li>\ref tui_primitives_page</li>
-<li>\ref tui_complex_objs_page</li>
-<li>\ref tui_working_with_groups_page</li>
-<li>\ref tui_building_by_blocks_page</li>
-<li>\ref tui_sketcher_page</li>
-<li>\ref tui_advanced_geom_objs_page</li>
-</ul>
-<li>\ref tui_transformation_page</li>
-<ul>
-<li>\ref tui_basic_operations_page</li>
-<li>\ref tui_boolean_operations_page</li>
-<li>\ref tui_transformation_operations_page</li>
-<li>\ref tui_blocks_operations_page</li>
-<li>\ref tui_repairing_operations_page</li>
-</ul>
-<li>\ref tui_measurement_tools_page</li>
-</ul>
+\image html geomscreen.png
+
+\b Geometry module of SALOME is destined for: 
+<ul>
+<li>\subpage import_export_geom_obj_page "import and export of geometrical models" in IGES, BREP and STEP formats;</li>
+<li>\subpage create_geom_obj_page "construction of geometrical objects"
+using a wide range of functions;</li>
+<li>\subpage view_geom_obj_page "viewing geometrical objects" in the OCC viewer;</li>
+<li>\subpage transform_geom_obj_page "transformation of geometrical objects" using
+various algorithms;</li>
+<li>\subpage repairing_operations_page "optimization of geometrical objects";</li>
+<li>\subpage using_measurement_tools_page "provision of information about geometrical objects".</li>
+<li>\subpage using_notebook_geom_page.</li>
 </ul>
 
+Almost all geometry module functionalities are accessible via
+\subpage geompy_page "Geometry module Python Interface"
+
+\image html image3.jpg "Example of Geometry module usage for engineering tasks"
+
+
 */
diff --git a/doc/salome/gui/GEOM/input/introduction.doc b/doc/salome/gui/GEOM/input/introduction.doc
deleted file mode 100644 (file)
index e1005c6..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/*!
-
-\page introduction_page Introduction to Geometry
-
-\b Geometry module of SALOME is destined for:
-<ul>
-<li>Import and export of geometrical models in IGES, BREP and STEP formats.</li>
-<li>Construction and optimization of geometrical models using a wide
-range of  CAD functions:</li>
-<ul>
-<li>Creation of basic geometrical objects</li>
-<li>Construction of primitives</li>
-<li>Building shapes</li>
-<li>Generation of complex shapes</li>
-<li>Working with groups</li>
-<li>Geometrical repairing of objects</li>
-<li>Geometrical boolean operations</li>
-<li>Geometrical transformations</li>
-<li>Building by blocks</li>
-</ul>
-</ul>
-
-\image html image3.jpg
-
-
-*/
\ No newline at end of file
index f852902b0c308cd315650d973dc5f6f3f825bc5f..629012f61e8e06385864762d121ecaf3ad13a5ae 100644 (file)
@@ -14,33 +14,39 @@ otherwise it will be removed.
 \n Firstly an \b Object can be mirrored through a \b Point of symmetry
 \n <b>TUI Command:</b> <em>geompy.MakeMirrorByPoint(Object, Point)</em>
 \n <b>Arguments:</b> Name + one or several objects + 1 vertex.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html transformation7.png
 
-\image html mirror_pointsn1.png
+\image html mirror_pointsn1.png "The initial shape and the mirror point"
 
-\image html mirror_pointsn2.png
+\image html mirror_pointsn2.png "The resulting shape (grey)"
 
 \n Secondly an \b Object can be mirrored through an \b Axis of
 symmetry
 \n <b>TUI Command:</b> <em>geompy.MakeMirrorByAxis(Object, Axis)</em>
 \n <b>Arguments:</b> Name + one or several objects + 1 vector.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html transformation8.png
 
-\image html mirror_axissn1.png
+\image html mirror_axissn1.png "The initial shape and the mirror edge"
 
-\image html mirror_axissn2.png
+\image html mirror_axissn2.png "The resulting shape (grey)"
 
 \n Finally an \b Object can be mirrored through a \b Plane of symmetry
 \n <b>TUI Command:</b> <em>geompy.MakeMirrorByPlane(Shape, Plane)</em>
 \n <b>Arguments:</b> Name + one or several objects + 1 plane
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html transformation9.png
 
-\image html mirror_planesn1.png
+\image html mirror_planesn1.png "The initial shape and the mirror plane"
 
-\image html mirror_planesn2.png
+\image html mirror_planesn2.png "The resulting shape (grey)"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_mirror "Transformation Operations".
index c25e0875c7b464a754baf2fb8db0c4030b74e9d1..9ce13b3f8cd07e049ed3204017e8dcab8107f1d8 100644 (file)
@@ -12,6 +12,8 @@ with the origin of the Local Coordinate System.
 \n <b>Create a copy</b> checkbox allows to keep the initial objects, otherwise they
 will be removed.
 \n <b>Arguments:</b> Name + one or several objects + End Coordinate System.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html transformation5.png
 
@@ -31,6 +33,8 @@ the coordinates of the End LSC.
 otherwise it will be removed.
 \n <b>Arguments:</b> Name + one or several objects + Start Coordinate System + End
 Coordinate System.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html transformation6.png
 
@@ -50,12 +54,31 @@ translated cube at the position (-100;0;0)
 
 \image html image4.gif
 
+The third algorithm modifies the location of an object using the Path object (Wire or Edge)
+and the Distance parameter (ranging from 0 to 1) defining  how far the object will move along the path.
+\n <b>Create a copy</b> checkbox allows to keep the initial object,
+otherwise it will be removed.
+\n <b>Select Unpublished edges</b> checkbox allows to select subshape edges on
+the other objects.
+\n <b>Reverse Direction</b> checkbox allows to REVERSE the direction of the object movement along its path.
+
+<b>Arguments:</b> Name + one or several objects + Translation path.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation
+   parameters and subshapes from arguments".
+   
+\image html transformation13.png
+
+\image html transformation12.png
+
+\image html transformation14.png
+
 \n <b>TUI Command:</b> <em>geompy.MakePosition(theObject, theStartLCS,
 theEndLCS),</em>  where \em theObject is a shape, location of which is
 modified, \em theStartLCS is a location to move the shape from, \em
 theEndLCS is a location to move the shape to.
 
 \n Our <b>TUI Scripts</b> provide you with useful examples of the use
-of \ref tui_translation "Transformation Operations".
+of \ref tui_modify_location "Transformation Operations".
 
 */
index 7ad469f890ca6cc92ba05669d52c56c5373bee3c..eff4bac5d7175a82e68b28529fdc01a2c08ab12b 100644 (file)
@@ -24,9 +24,9 @@ the same way, but the Axis is defined  by direction and point.
 
 \image html neo-mrot1.png
 
-\image html multi_rotation1d1.png
+\image html multi_rotation1d1.png "The initial object"
 
-\image html multi_rotation1d2.png
+\image html multi_rotation1d2.png "The result of a simple multi-rotation"
 
 \n <b>Double Multi Rotation</b> (in two dimensions) rotates the given
 \b Object around the given \b Axis on the given \b Angle a given
@@ -46,9 +46,9 @@ but the Axis is defined  by direction and point.
 
 \image html neo-mrot2.png
 
-\image html multi_rotation2d1.png
+\image html multi_rotation2d1.png "The initial object"
 
-\image html multi_rotation2d2.png
+\image html multi_rotation2d2.png "The result of a double multi-rotation"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_multi_rotation "Transformation Operations".
index 2bb30e7f77d8e79b4e6862860ea306c564704517..668f04a0a43466d3467c81d8abc7ad94559ec0ab 100644 (file)
@@ -22,7 +22,7 @@ integer (number of blocks).
 
 \image html mtransf1.png
 
-\image html multi_transformationsn1d.png
+\image html multi_transformationsn1d.png "Single Multi-transformation on a box"
 
 <br><h2>Double Multi Transformation (in two directions)</h2>
 
@@ -38,7 +38,7 @@ integers (number of blocks).
 
 \image html mtransf2.png
 
-\image html multi_transformationsn2d.png
+\image html multi_transformationsn2d.png "Double Multi-transformation on a box"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_multi_transformation "Blocks Operations".
index 5bd20ff659fbf9f99ea6d08d11ba8d733632809c..2bd2ef3fce77050db6378aa2ab5d10b3d44a9644 100644 (file)
@@ -20,9 +20,9 @@ step value + 1 value (repetition).
 
 \image html mtrans1.png
 
-\image html multi_translation_initialsn.png
+\image html multi_translation_initialsn.png "The initial object"
 
-\image html multi_translation1dsn.png
+\image html multi_translation1dsn.png "The result of a simple multi-translation"
 
 \n To produce a <b>Double Multi Translation</b> (in two directions) you need to
 indicate an \b Object to be translated, and, for both axes, a \b
@@ -40,9 +40,9 @@ along \em Dir2.
 
 \image html mtrans2.png
 
-\image html multi_translation_initialsn.png
+\image html multi_translation_initialsn.png "The initial object"
 
-\image html multi_translation2dsn.png
+\image html multi_translation2dsn.png "The result of a double multi-translation"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_multi_translation "Transformation Operations".
index d2b4b676614229fb8de63bd3d86be16614b9c61d..41dd6dc147a8d058232ed89e72c5e530d9952ada 100644 (file)
@@ -15,12 +15,14 @@ where Shape is a shape(s) which has to be an offset, Offset is a value of
 the offset.
 \n <b>Arguments:</b> Name + Object (face(s), shell(s), solid(s)) +
 Offset value
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html transformation11.png
 
 \n <b>Example:</b>
 
-\image html offsetsn.png
+\image html offsetsn.png "The box and its offset surface"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_offset "Transformation Operations".
index 7dfc5310d482e911256372420d5269e11c2e01b4..532f4c375ac6a433ac707b01ae1212e0aee187c2 100644 (file)
@@ -10,7 +10,7 @@
 <br><h2>Intersection of two shapes.</h2>
 
 \n As far as the intersection of two objects can produce any type of
-geometrical objects, <b>Reconstruction Limit</b> box allows choosing the
+geometrical objects, <b>Resulting type</b> box allows choosing the
 preferrable result, i.e. a solid, a shell, a list of faces, etc.
 \n <b>TUI Command:</b> <em>geompy.MakePartition(ListOfShapes,
 ListOfTools, ListOfKeepInside, ListOfRemoveInside, Limit, RemoveWebs,
@@ -23,11 +23,13 @@ only to support the old scripts.
 \n <b>Arguments:</b> Name + 2 lists of shapes (the shapes from the
 first list will be intersected with the shapes from the second list) +
 reconstruction limit.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html partition1.png
 
-<b>Keep nonlimit shapes</b> checkbox allows building geometrical objects of
-all types at the same time i.e. no reconstruction limit is applied.
+<b>Keep shapes of lower type</b> checkbox allows building geometrical objects. 
+Only lower type objects will be preserved without the upper ones.
 
 
 <br><h2>Intersection of a Shape and a Plane.</h2>
@@ -37,16 +39,18 @@ Plane),</em> where \em Shapes are a list of Shapes to be intersected
 and \em Plane is a Tool shape, to intersect the \em Shapes.
 \n <b>Arguments:</b> Name + a list of shapes which will be intersected
 + 1 cutting plane.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html partition2.png
 
 \n <b>Example:</b>
 
-\image html partitionsn1.png
+\image html partitionsn1.png "Box intersected by a plane"
 
-\image html partitionsn2.png
+\image html partitionsn2.png "Result of intersection"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_partition "Basic Operations".
 
-*/
\ No newline at end of file
+*/
index 3882ee75e2ea796813bff31661154d14a3f38109..1c7c3482aca098a0ac802b9a38dd32e0c640bc23 100644 (file)
@@ -18,9 +18,9 @@ is a shape to build propagation groups on.
 
 \n <b>Example:</b>
 
-\image html image15.jpg
+\image html image15.jpg "The initial box"
 
-\image html image16.jpg
+\image html image16.jpg "The resulting edges"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_propagate "Blocks Operations".
index 3be4c4d3b7737b6015f306dab0bc8f953293a0ab..ad32a93b7a013c5e2f1d95e02d3d068b154ee17c 100644 (file)
@@ -10,6 +10,8 @@ shape and unites faces and edges, sharing one surface.
 \n <b>TUI Command:</b> <em>geompy.RemoveExtraEdges(theShape)</em>,
 there <em>theShape</em> is a compound or a single solid to remove irregular edges from.
 \n <b>Arguments:</b> Name + one shape.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html remove_extra_edges.png
 
@@ -21,4 +23,4 @@ there <em>theShape</em> is a compound or a single solid to remove irregular edge
 \image html remove_extra_edges2.png
 <center><em>Improved shape</em></center>
 
-*/
\ No newline at end of file
+*/
index cb41f810223f809b0ba9dbeb39231759a803416f..542f5c25e159b14b7005cffd7f2afc09263e2b7a 100644 (file)
@@ -2,17 +2,27 @@
 
 \page repairing_operations_page Repairing Operations
 
+Repairing operations improve the shapes, processing them with complex algorithms:  
+
 <ul>
-<li>\subpage shape_processing_operation_page</li>
-<li>\subpage suppress_faces_operation_page</li>
-<li>\subpage close_contour_operation_page</li>
-<li>\subpage suppress_internal_wires_operation_page</li>
-<li>\subpage suppress_holes_operation_page</li>
-<li>\subpage sewing_operation_page</li>
-<li>\subpage glue_faces_operation_page</li>
-<li>\subpage add_point_on_edge_operation_page</li>
-<li>\subpage change_orientation_operation_page</li>
-<li>\subpage remove_extra_edges_operation_page</li>
+<li>\subpage shape_processing_operation_page "Shape processing" -
+processes one or more shapes using various operators.</li>
+<li>\subpage suppress_faces_operation_page "Suppress faces" - removes
+chosen faces of a shape.</li>
+<li>\subpage close_contour_operation_page "Close contour" - closes an
+open contour asnd miodifies the underlying face.</li>
+<li>\subpage suppress_internal_wires_operation_page "Suppress internal wires" - removes internal wires from shapes.</li>
+<li>\subpage suppress_holes_operation_page "Suppress holes" - removes
+holes with free boundaries on a selected face.</li>
+<li>\subpage sewing_operation_page "Sewing" - sews faces or shells.</li>
+<li>\subpage glue_faces_operation_page "Glue faces" - unites
+coincident faces within the given tolerance.</li>
+<li>\subpage add_point_on_edge_operation_page "Add point on edge" -
+splits an edge in two.</li>
+<li>\subpage change_orientation_operation_page "Change orientation" -
+reverses the normals of the selected faces.</li>
+<li>\subpage remove_extra_edges_operation_page "Remove extra edges" -
+removes seam and degenerated edges from the given shape.</li>
 </ul>
 
 */
diff --git a/doc/salome/gui/GEOM/input/restore_presentation_parameters.doc b/doc/salome/gui/GEOM/input/restore_presentation_parameters.doc
new file mode 100644 (file)
index 0000000..f97527a
--- /dev/null
@@ -0,0 +1,57 @@
+/*!
+
+\page restore_presentation_parameters_page Restore presentation parameters and a tree of subshapes
+
+\n This functionality allows the operation result to inherit colour
+and subshapes from its arguments.
+
+\n To activate this functionality, check in "Set
+presentation parameters and subshapes from arguments" checkbox in the
+corresponding dialog.
+
+\n For example, there exist two objects: Box_1 with two published
+faces and Cylinder_1 with free published edges.
+
+\image html restore-ss-viewer-before.png "The initial box and cylinder"
+
+First, we examine the case when the resulting shape corresponds to one argument (after transformation, 
+after the boolean operation Cut, or after the partiton with one object shape). 
+
+We create a Cut of Box_1 with Cylinder_1.
+
+\image html restore-ss-cut.png
+
+The resulting shape inherits the subshapes and the colour of Box_1. 
+
+\image html restore-ss-viewer-cut.png "The resulting shape"
+
+Second, we examine the case when the  resulting shape is composed from multiple arguments
+(after all boolean operations, except for Cut, or after the partition with
+several object shapes, or if the resulting shape is a compound).
+
+We create a Common of Box_1 and Cylinder_1.
+
+\image html restore-ss-dialog.png
+
+\n The resulting object is created with several subshapes that correspond to the
+operation arguments and their published subshapes. The resulting shape
+has a default colour, but its subshapes inherit colors corresponding
+to arguments and their subshapes.
+
+\image html restore-ss-viewer-after.png "Thev resulting shape"
+
+
+Please, note that when the resulting shape corresponds to one
+argument, the inherited subshapes depend directly on the resulting shape.
+
+\image html restore-ss-OB-cut.png
+
+When the resulting shape is composed from multiple arguments, the 
+inherited subshapes depend on the arguments.
+
+\image html restore-ss-OB.png
+
+\n You can also call this functionality from your python scripts.
+See our <b>TUI Scripts</b> for \ref tui_restore_prs_params "example".
+
+*/
index e546f002b3b05d759374405429ea1302b84ba632..a2b6d11f426538d943950a88f273331cd1576734 100644 (file)
@@ -12,6 +12,8 @@ be rotated, an \b Axis of rotation and an \b Angle of rotation.
 \n <b>TUI Command:</b> <em>geompy.MakeRotation(Shape, Axis, Angle)</em>
 \n <b>Arguments:</b> Name + one or several objects + 1 vector for direction of rotation + 1
 angle.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html transformation4.png
 
@@ -27,14 +29,16 @@ this case rotation \b Angle is the angle between two vectors directed
 from the first point to the second and to the third.
 \n <b>TUI Command:</b> <em>geompy.MakeRotationThreePoints(Shape, CentralPoint, Point1, Point2)</em>
 \n <b>Arguments:</b> 1 shape + 3 points.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html transformation4a.png
 
 \n <b>Example:</b>
 
-\image html rotationsn1.png
+\image html rotationsn1.png "The initial shape (yellow)"
 
-\image html rotationsn2.png
+\image html rotationsn2.png "The rotated shape (grey)"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_rotation "Transformation Operations".
index 65d8d9583b45cf4561f7df2003fbcb8580dd88a4..12f4bc63dd724db13c6b153f0fec27c822f83433 100644 (file)
@@ -7,20 +7,40 @@
 
 \n This operation creates a scaled shape basing on the initial
 shape. For this, you need to define the \b Shape to be scaled, the
-<b>Central Point</b> of scale and the Scale Factor.
+<b>Central Point</b> of scale and the Scale Factor(s).
 \n The \b Result will be a \b GEOM_Object.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
+
+\image html transformation10.png
 \n <b>TUI Command:</b> <em>geompy.MakeScaleTransform(Shape, CenterOfScale, Factor)</em>
 \n <b>Arguments:</b> Name + 1 shape(s) + 1 vertex + 1 Scale Factor.
 
-\image html transformation10.png
+\image html transformation10a.png
+\n <b>TUI Command:</b> <em>geompy.MakeScaleAlongAxes(Shape, CenterOfScale, FactorX, FactorY, FactorZ)</em>
+\n <b>Arguments:</b> Name + 1 shape(s) + 1 vertex + 3 Scale Factors.
+
+\note If the <b>Central Point</b> is not defined, the scaling will be
+performed relatively the origin of the global coordinate system.
+
+\note Scaling by one factor is a simple transformation, it does not modify the
+geometry of the shape, while scaling by several different factors along axes
+is a general transformation, which can modify the geometry, for example, a
+circle can be transformed into an ellipse.
+
+\n <b>Example of simple scaling:</b>
+
+\image html scale_transformsn1.png "The initial object"
+
+\image html scale_transformsn2.png "The resulting object (resized)"
 
-\n <b>Example:</b>
+\n <b>Example of scaling by different factors along axes:</b>
 
-\image html scale_transformsn1.png
+\image html scale_transformsn3.png "The initial object"
 
-\image html scale_transformsn2.png
+\image html scale_transformsn4.png "The resulting object (resized and distorted)"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
-\ref tui_scale "Transformation Operations".
+\ref tui_scale "Scale Transformation" and of \ref swig_scale "Scale Along Axes Transformation"
 
-*/
\ No newline at end of file
+*/
index 911b76545db3f1d7c83690e7661a15d3e7e6ef6a..c4f450d3071cd9e2f759b172dd2886107be58ccb 100644 (file)
 \n The \b Result will be any \b GEOM_Object (EDGE or WIRE).
 \n <b>TUI Command:</b> <em>geompy.MakeSection(s1, s2)</em>
 \n <b>Arguments:</b> Name + 2 shapes.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html neo-section.png
 
 \n <b>Example:</b>
 
-\image html fusesn1.png
+\image html fusesn1.png "The initial shapes"
 
-\image html sectionsn.png
+\image html sectionsn.png "The resulting object"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of 
 \ref tui_section "Boolean Operations".
index 69da0597c9fb22f168e339932ae709de002d1f65..1c478822e349354ef7491341de9d465e3e4a17ad 100644 (file)
@@ -23,9 +23,9 @@ your shape:
 
 \n <b>Example:</b>
 
-\image html image112.jpg
+\image html image112.jpg "The initial faces"
 
-\image html image113.jpg
+\image html image113.jpg "The sewn faces"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_sewing "Repairing Operations".
diff --git a/doc/salome/gui/GEOM/input/shapesonshape.doc b/doc/salome/gui/GEOM/input/shapesonshape.doc
new file mode 100755 (executable)
index 0000000..b0caaa3
--- /dev/null
@@ -0,0 +1,35 @@
+/*!
+
+\page shapesonshape_page Get Shapes on Shape
+
+This operation is a special case of <b>Explode</b> operation. It produces a group of sub-shapes of the exploded shape, which are located in a definite way relatively another reference shape.
+
+To use this operation, select in the Main Menu <b>Operations -> Get Shapes on Shape.</b> The following dialog box will appear. 
+
+\image html shapesonshape.png
+
+<ul>
+<li> <b>Name</b> is the name of the resulting group of shapes; </li>
+<li> <b>Shape for exploding</b> is the shape that will be exploded; </li>
+<li> <b>Shape for checking</b> is the reference shape; </li>
+<li> <b>Reconstruction Limit</b> is the type of created sub-shapes:
+                      solid, shell, face, wire, edge, vertex; </li>
+<li> <b>State</b> is the position of the created sub-shapes relatively the reference shapes:
+        <ul>
+       <li> IN - the created sub-shapes are located inside the reference shape; </li>
+       <li> OUT - the created sub-shapes are located outside the reference shape; </li>
+       <li> ON - the created sub-shapes lie on the reference shape; </li>
+       <li> ONIN - the created sub-shapes lie on the reference shape or are located inside it; </li>
+       <li> ONOUT - the created sub-shapes lie on the reference shape or are located outside it; </li>
+        </ul> </li>
+</ul>
+
+Example: 
+
+In the images below the box is the exploded shape and the cylinder is the reference shape. In the first image the edge IN the reference cylinder is highlighted in red, in the second the edges OUT of the reference cylinder are highlighted.
+
+\image html shonshex1.png
+\image html shonshex2.png
+
+*/
index 2d7569e03ebf579983047de763a29e19d405e0c4..67dbd6313d71f4edb12c1b6410b9c3348b0781bc 100644 (file)
@@ -20,9 +20,9 @@ select them in the 3D viewer).
 
 \n <b>Example:</b>
 
-\image html suppress_faces1.png
+\image html suppress_faces1.png "The initial box"
 
-\image html suppress_faces2.png
+\image html suppress_faces2.png "The box with suppressed faces"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_suppress_faces "Repairing Operations".
index b9e25e065cb8e8c0c170e403589eff3fb4da9e60..d353f5f4028260fe2ca8cb0b3545daff19116ec0 100644 (file)
@@ -25,9 +25,9 @@ your shape:
 
 \n <b>Example:</b>
 
-\image html image109.jpg
+\image html image109.jpg "The cone with a hole"
 
-\image html image110.jpg
+\image html image110.jpg "The hole has been suppressed"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_suppress_holes "Repairing Operations".
index 8aa245d4cafd608d4be3cdf0194ea7231c485227..e33880de78fa2c0c6b623bd797525f34b596b2a5 100644 (file)
@@ -29,9 +29,9 @@ checked </li>
 
 \n <b>Example:</b>
 
-\image html supp_int_wires1.png
+\image html supp_int_wires1.png "The box with internal wires"
 
-\image html supp_int_wires2.png
+\image html supp_int_wires2.png "The internal wires have been suppressed"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of
 \ref tui_suppress_internal_wires "Repairing Operations".
index efb331f1caf3047e80ac0ea9420486a824353230..faa58dc93a1501daac4133f47b48bb806407b0ba 100644 (file)
@@ -2,17 +2,27 @@
 
 \page transformation_operations_page Transformation Operations
 
+Geometry module provides the following transformation operations,
+which allow to:
+
+
 <ul>
-<li>\subpage translation_operation_page</li>
-<li>\subpage rotation_operation_page</li>
-<li>\subpage modify_location_operation_page</li>
-<li>\subpage mirror_operation_page</li>
-<li>\subpage scale_operation_page</li>
-<li>\subpage offset_operation_page</li>
-<li>\subpage multi_translation_operation_page</li>
-<li>\subpage multi_rotation_operation_page</li>
-<li>\subpage fillet_operation_page</li>
-<li>\subpage chamfer_operation_page</li>
+<li>\subpage translation_operation_page "Translate" an object by a certain vector.</li>
+<li>\subpage rotation_operation_page "Rotate" an object around a
+certain axis by a certain angle.</li>
+<li>\subpage modify_location_operation_page "Move" an object to a new location.</li>
+<li>\subpage mirror_operation_page "Mirror" an object through a point
+an axis or a plane of symmetry.</li>
+<li>\subpage scale_operation_page "Scale" an object by one or several scale
+factors.</li>
+<li>Create an \subpage offset_operation_page "Offset" of the object.</li>
+<li>Create a simultaneous \subpage multi_translation_operation_page "Translation in several directions".</li>
+<li>Create a simultaneous \subpage multi_rotation_operation_page</li> "Rotation in several directions".</li>
+<li>Produce a \subpage fillet_operation_page "Fillet" on the selected
+edges of the object.</li>
+<li>Produce a \subpage fillet2d_operation_page "2D Fillet" on the corners of a Planar Face.</li>
+<li>Produce a \subpage chamfer_operation_page "Chamfer" on the
+selected edges of the object.</li>
 </ul>
 
 */
\ No newline at end of file
index 4873873882236ffdcf5dbcf84ae477c70505edd8..adab40078cd6c0d1a199fb55c324c74a0e692bee 100644 (file)
@@ -2,54 +2,30 @@
 
 \page transform_geom_obj_page Transforming geometrical objects
 
+The objects created in Salome can be processed with Transformation
+operations, which can be classified into:   
+
 <ul>
-<li>\subpage basic_operations_page</li>
-<ul>
-<li>\ref partition_page</li>
-<li>\ref archimede_page</li>
-</ul>
-<li>\subpage boolean_operations_page</li>
-<ul>
-<li>\ref using_boolean_operations_page</li>
-<li>\ref fuse_operation_page</li>
-<li>\ref common_operation_page</li>
-<li>\ref cut_operation_page</li>
-<li>\ref section_opeartion_page</li>
-</ul>
-<li>\subpage transformation_operations_page</li>
-<ul>
-<li>\ref translation_operation_page</li>
-<li>\ref rotation_operation_page</li>
-<li>\ref modify_location_operation_page</li>
-<li>\ref mirror_operation_page</li>
-<li>\ref scale_operation_page</li>
-<li>\ref offset_operation_page</li>
-<li>\ref multi_translation_operation_page</li>
-<li>\ref multi_rotation_operation_page</li>
-<li>\ref fillet_operation_page</li>
-<li>\ref chamfer_operation_page</li>
-</ul>
-<li>\subpage blocks_operations_page</li>
-<ul>
-<li>\ref multi_transformation_operation_page</li>
-<li>\ref explode_on_blocks_operation_page</li>
-<li>\ref propagate_operation_page</li>
-</ul>
-<li>\subpage repairing_operations_page</li>
-<ul>
-<li>\ref shape_processing_operation_page</li>
-<li>\ref suppress_faces_operation_page</li>
-<li>\ref close_contour_operation_page</li>
-<li>\ref suppress_internal_wires_operation_page</li>
-<li>\ref suppress_holes_operation_page</li>
-<li>\ref sewing_operation_page</li>
-<li>\ref glue_faces_operation_page</li>
-<li>\ref add_point_on_edge_operation_page</li>
-<li>\ref check_free_boundaries_operation_page</li>
-<li>\ref check_free_faces_operation_page</li>
-<li>\ref change_orientation_operation_page</li>
-<li>\ref remove_extra_edges_operation_page</li>
-</ul>
+<li>\subpage using_boolean_operations_page  "Boolean operations" using
+Boolean logical operators.</li>
+<li>\subpage transformation_operations_page "Transformation operations", 
+which modify shape or location of the selected object.</li>
+
+<li>\subpage partition_page "Partition" operation, which creates a compound
+by intersection of several shapes with a tool object or a plane.</li>
+<li>\subpage archimede_page "Archimede" operation, which creates a
+plane corresponding to the modelled waterline of the object plunged
+into water.</li>
+<li>\subpage shapesonshape_page "Get shapes on shape" operation, a
+special case of \b Explode operation. </li>
+
+<li>Operations with \subpage blocks_operations_page "Blocks".</li>
+
+
+<li>\subpage restore_presentation_parameters_page "Restore presentation pareameters". 
+This cross-operation functionality allows the resulting shape to
+inherit colors and subshapes from its parent shapes.</li>
 </ul>
 
-*/
\ No newline at end of file
+
+*/
index caf1fd7a8fe9285a6aa6d3077599817c95d132cd..32958367d12e6e75ba2b7ccd233b734f91523f8c 100644 (file)
@@ -17,6 +17,8 @@ axes.
 DZ),</em> where Shape is a shape to be translated, DX, DY, DZ are
 components of translation vector.
 \n <b>Arguments:</b> Name + one or several objects + 3 values (coordinates).
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html transformation1.png
 
@@ -24,20 +26,26 @@ components of translation vector.
 of the vector.
 \n <b>TUI Command:</b> <em>geompy.MakeTranslationTwoPoints(Object, Point1, Point2)</em>
 \n <b>Arguments:</b> Name + one or several objects + 2 vertices
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html transformation2.png
 
-\n Finally you can define an \b Object and the vector  
+\n Finally you can define an \b Object and the vector. The object will be translated by the length of the vector.  
 \n <b>TUI Command:</b> <em>geompy.MakeTranslationVector(Object, Vector)</em>
+\n <b>Activate Distance</b> checkbox and <b>Distance</b> field allow defining the custom distance of translation.
+\n <b>TUI Command </b> for translation by vector and custom distance: <em>geompy.MakeTranslationVectorDistance(Object, Vector, Distance)</em> 
 \n <b>Arguments:</b> Name + one or several objects + 1 vector.
+\n <b>Advanced option:</b>
+   \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments".
 
 \image html transformation3.png
 
 \n <b>Example:</b>
 
-\image html translationsn1.png
+\image html translationsn1.png "The initial shape (grey)"
 
-\image html translationsn2.png
+\image html translationsn2.png "The resulting shape (yellow)"
 
 Our <b>TUI Scripts</b> provide you with useful examples of the use of 
 \ref tui_translation "Transformation Operations".
index 9586c95463942a5f4b0cda40b9effef003090851..c7c0a3ea9b065dc93424858cc8a65605c1db876a 100644 (file)
@@ -2,8 +2,8 @@
 
 \page transparency_page Transparency
 
-\n You can change the transparency of a shape in the range between 0
-(absolutely opaque) and 1 (absolutely transparent and thus invisible)
+\n You can change the transparency of a shape in the range between 0%
+(absolutely transparent and thus invisible) and 100% (absolutely opaque)
 in the following dialog box.
 
 \image html neo-transparency.png
diff --git a/doc/salome/gui/GEOM/input/tui_3dsketcher.doc b/doc/salome/gui/GEOM/input/tui_3dsketcher.doc
new file mode 100755 (executable)
index 0000000..c9760fb
--- /dev/null
@@ -0,0 +1,20 @@
+/*!
+
+\page tui_3dsketcher_page 3D Sketcher
+
+\code
+import geompy
+import salome
+gg = salome.ImportComponentGUI("GEOM")
+
+# create a 3D sketcher (wire) of the given points coordinates
+sketcher1 = geompy.Make3DSketcher([ 0,0,0, 50,50,50, 0,50,0, 50,0,50, 10,20,100, 0,0,0 ])
+
+# add object in the study
+id_sketcher1 = geompy.addToStudy(sketcher1,"Sketcher1")
+
+# display the sketcher
+gg.createAndDisplayGO(id_sketcher1)
+\endcode
+
+*/
\ No newline at end of file
index d9c30a23b4bbdf7bc79237a996866c6cf340823a..89baf140d5ad9bbf223a9951ebc2d15501052812 100644 (file)
@@ -132,6 +132,39 @@ id_ellipse = geompy.addToStudy(ellipse,"Ellipse")
 gg.createAndDisplayGO(id_vector)
 gg.createAndDisplayGO(id_ellipse)
 \endcode
+
+\anchor tui_creation_arc
+<br><h2>Creation of an Arc</h2>
+
+\code
+import geompy
+import salome
+gg = salome.ImportComponentGUI("GEOM")
+
+# create vertices
+p0 = geompy.MakeVertex(0., 0., 0.)
+p1 = geompy.MakeVertex(100., 0., 0.)
+p2 = geompy.MakeVertex(50., 0., 50.)
+
+# create an arc from a three points
+arc1 = geompy.MakeArc(p0, p1, p2)
+
+# create an arc from a center point, a start point and end point
+arc2 = geompy.MakeArcCenter(p0, p1, p2, 1)
+
+# create an arc from a center point, a major point and minor point
+arc3 = geompy.MakeArcOfEllipse(p0, p1, p2)
+
+# add objects in the study
+id_arc1 = geompy.addToStudy(arc1, "Arc 1")
+id_arc2 = geompy.addToStudy(arc2, "Arc 2")
+id_arc3 = geompy.addToStudy(arc3, "Arc 3")
+
+# display the arcs
+gg.createAndDisplayGO(id_arc1)
+gg.createAndDisplayGO(id_arc2)
+gg.createAndDisplayGO(id_arc3)
+\endcode
  
 \anchor tui_creation_curve
 <br><h2>Creation of a Curve</h2>
index 14f7c07f969c0f4a3308d3606b5e6889bf628b77..1250c128d16850a6583e042649ac7c5d14780a4f 100644 (file)
@@ -79,4 +79,62 @@ gg.createAndDisplayGO(id_archimede)
 gg.setDisplayMode(id_archimede,1) 
 \endcode
 
-*/
\ No newline at end of file
+\anchor tui_restore_prs_params
+<br><h2>Restore presentation parameters and subshapes</h2>
+
+\code
+import geompy
+import GEOM
+
+# create a box and a cylinder
+box = geompy.MakeBoxDXDYDZ(200, 200, 200)
+cyl = geompy.MakeCylinderRH(100, 300)
+
+# create translated box
+vec = geompy.MakeVectorDXDYDZ(100, 50, 0)
+tra = geompy.MakeTranslationVector(box, vec)
+
+# create partition objects
+partition1 = geompy.MakePartition([box, cyl])
+partition2 = geompy.MakePartition([box], [cyl])
+partition3 = geompy.MakePartition([box], [tra])
+
+# set colours
+box.SetColor(SALOMEDS.Color(1,0,0))
+cyl.SetColor(SALOMEDS.Color(0,1,0))
+
+# add objects in the study
+geompy.addToStudy(box, "Box")
+geompy.addToStudy(cyl, "Cylinder")
+geompy.addToStudy(vec, "Vector")
+geompy.addToStudy(tra, "Translation")
+geompy.addToStudy(partition1, "Partition_1")
+geompy.addToStudy(partition2, "Partition_2")
+geompy.addToStudy(partition3, "Partition_3")
+
+# Restore presentation parameters and subshapes
+# different methods can be used to find the subshapes in the result:
+# GetInPlace, GetSame, GetInPlaceByHistory, GetShapesOnShape.
+# By default, GetInPlace method is used (GEOM.FSM_GetInPlace)
+geompy.RestoreSubShapes(partition1)
+
+geompy.RestoreSubShapes(partition2, [], GEOM.FSM_GetInPlace)
+
+# The list of arguments can be used to avoid restoring all arguments,
+# but restore only the passed.
+geompy.RestoreSubShapes(partition3, [tra], GEOM.FSM_GetInPlaceByHistory)
+
+# To find subshapes in a transformed shape only one method could be
+# used: pass GEOM.FSM_Transformed for that.
+# True passed for the last argument, means that the transformed shape
+# will inherit colour and subshapes from its first argument (see above
+# MakeTranslation).
+geompy.RestoreSubShapes(tra, [], GEOM.FSM_Transformed, True)
+
+# Also we could do this directly with method addToStudy:
+partition4 = geompy.MakePartition([box, tra])
+geompy.addToStudy(partition4, "Partition_4", True, [],
+                  GEOM.FSM_GetInPlaceByHistory, False)
+\endcode
+
+*/
index f88047f489d1a5664cf19d0c5f4211fa3628b798..60563757c190d2880d09ba7d52a2e7c423ed7107 100644 (file)
@@ -24,20 +24,24 @@ cylinder = geompy.MakeCylinder(p1, v, radius1, height)
 sphere = geompy.MakeSphereR(40)
 
 # fuse
-fuse = geompy.MakeFuse(cylinder, sphere)
+fuse1 = geompy.MakeFuse(cylinder, sphere)
+fuse2 = geompy.MakeBoolean(cylinder, sphere, 3)
 
 # add objects in the study
 id_cylinder = geompy.addToStudy(cylinder, "Cylinder")
 id_sphere = geompy.addToStudy(sphere, "Sphere")
-id_fuse = geompy.addToStudy(fuse, "Fuse")
+id_fuse1 = geompy.addToStudy(fuse1, "Fuse_1")
+id_fuse2 = geompy.addToStudy(fuse2, "Fuse_2")
 
 # display results
 gg.createAndDisplayGO(id_cylinder)
 gg.setDisplayMode(id_cylinder,1)
 gg.createAndDisplayGO(id_sphere)
 gg.setDisplayMode(id_sphere,1)
-gg.createAndDisplayGO(id_fuse)
-gg.setDisplayMode(id_fuse,1)
+gg.createAndDisplayGO(id_fuse1)
+gg.setDisplayMode(id_fuse1,1)
+gg.createAndDisplayGO(id_fuse2)
+gg.setDisplayMode(id_fuse2,1)
 \endcode
 
 \anchor tui_common
@@ -104,7 +108,7 @@ gg.createAndDisplayGO(id_cut)
 gg.setDisplayMode(id_cut,1) 
 \endcode
 
-\anchor tui_section 
+\anchor tui_section
 <br><h2>Section</h2>
 
 \code
@@ -136,4 +140,4 @@ gg.createAndDisplayGO(id_section)
 gg.setDisplayMode(id_section,1) 
 \endcode
 
-*/
\ No newline at end of file
+*/
index 29813a9a6d86e336dba8a07b31571117b7d9dd9d..254846e07db343a1f153c9588a176fa971e824f4 100644 (file)
@@ -45,12 +45,14 @@ face2 = geompy.MakeFace(wire2, isPlanarWanted)
 # create prisms
 prism1 = geompy.MakePrism(face2, p1, p5)
 prism2 = geompy.MakePrismVecH(face1, vector, 50)
+prism3 = geompy.MakePrismVecH2Ways(face1, vector, 50)
 
 # add objects in the study
 id_face1   = geompy.addToStudy(face1,"Face1")
 id_face2   = geompy.addToStudy(face2,"Face2")
 id_prism1 = geompy.addToStudy(prism1,"Prism1")
 id_prism2 = geompy.addToStudy(prism2,"Prism2")
+id_prism3 = geompy.addToStudy(prism3,"Prism3")
 
 # display cylinders
 gg.createAndDisplayGO(id_face1)
@@ -61,6 +63,8 @@ gg.createAndDisplayGO(id_prism1)
 gg.setDisplayMode(id_prism1,1)
 gg.createAndDisplayGO(id_prism2)
 gg.setDisplayMode(id_prism2,1) 
+gg.createAndDisplayGO(id_prism3)
+gg.setDisplayMode(id_prism3,1) 
 \endcode
 
 \anchor tui_creation_revolution
@@ -186,4 +190,437 @@ gg.createAndDisplayGO(id_pipe)
 gg.setDisplayMode(id_pipe,1) 
 \endcode
 
-*/
\ No newline at end of file
+\anchor tui_creation_pipe_with_diff_sec
+<br><h2>Creation of a PipeWithDifferentSections</h2>
+
+\code
+import geompy
+import salome
+gg = salome.ImportComponentGUI("GEOM")
+
+Wire_1 = geompy.MakeSketcher("Sketcher:F 0 0:TT 100 0:R 0:C 100 90:T 0 200", [0, 0, 0, 0, 0, 1, 1, 0, -0])
+edges = geompy.SubShapeAll(Wire_1, geompy.ShapeType["EDGE"])
+vertices = geompy.SubShapeAll(Wire_1, geompy.ShapeType["VERTEX"])
+
+# create sections
+circles=[]
+circles.append(geompy.MakeCircle(vertices[0], edges[0], 20))
+circles.append(geompy.MakeCircle(vertices[1], edges[0], 40))
+circles.append(geompy.MakeCircle(vertices[2], edges[2], 30))
+circles.append(geompy.MakeCircle(vertices[3], edges[2], 20))
+
+# create pipe
+Pipe = geompy.MakePipeWithDifferentSections(circles, vertices, Wire_1, 0, 0)
+
+# add objects in the study
+geompy.addToStudy(circles[0], "circles1")
+geompy.addToStudy(circles[1], "circles2")
+geompy.addToStudy(circles[2], "circles3")
+geompy.addToStudy(circles[3], "circles4")
+id_wire = geompy.addToStudy(Wire_1, "Path")
+id_pipe = geompy.addToStudy(Pipe, "Pipe")
+
+# display the wire(path) and the pipe
+gg.createAndDisplayGO(id_wire)
+gg.createAndDisplayGO(id_pipe)
+gg.setDisplayMode(id_pipe,1) 
+\endcode
+
+\anchor tui_creation_pipe_with_shell_sec
+<br><h2>Creation of a PipeWithShellSections</h2>
+
+\code
+import geompy
+import salome
+gg = salome.ImportComponentGUI("GEOM")
+
+# create path
+WirePath = geompy.MakeSketcher("Sketcher:F 0 0:TT 100 0:R 0:C 100 90:T 0 200", [0, 0, 0, 0, 0, 1, 1, 0, -0])
+
+#=======================================================
+#                 Create shell sections
+#=======================================================
+ps = [Vertex_1,Vertex_2,Vertex_3,Vertex_4]
+theLocations = [Vertex_1, Vertex_2, Vertex_3, Vertex_4]
+VC = geompy.MakeCompound(theLocations)
+geompy.addToStudy(VC,"VC")
+vs = [Edge_1,Edge_1,Edge_3,Edge_3]
+hs = [20,40,30,20]
+shells = []
+subbases = []
+
+# 1 section
+c0 = geompy.PointCoordinates(ps[0])
+c1 = geompy.PointCoordinates(ps[1])
+nx = c1[0] - c0[0]
+ny = c1[1] - c0[1]
+nz = c1[2] - c0[2]
+
+faces = []
+f1 = geompy.MakeSketcher("Sketcher:F 0 0:TT 20 0:TT 20 20:TT 0 20:WF",
+                         [c0[0], c0[1], c0[2], nx, ny, nz, 0, 0, 1])
+f2 = geompy.MakeSketcher("Sketcher:F 0 0:TT 0 20:TT -20 20:TT -20 0:WF",
+                         [c0[0], c0[1], c0[2], nx, ny, nz, 0, 0, 1])
+f3 = geompy.MakeSketcher("Sketcher:F 0 0:TT -20 0:TT -20 -20:TT 0 -20:WF",
+                         [c0[0], c0[1], c0[2], nx, ny, nz, 0, 0, 1])
+f4 = geompy.MakeSketcher("Sketcher:F 0 0:TT 0 -20:TT 20 -20:TT 20 0:WF",
+                         [c0[0], c0[1], c0[2], nx, ny, nz, 0, 0, 1])
+faces.append(f1)
+faces.append(f2)
+faces.append(f3)
+faces.append(f4)
+shell = geompy.MakeSewing(faces,1.e-6)
+shells.append(shell)
+faces = geompy.SubShapeAllSorted(shell, geompy.ShapeType["FACE"])
+subbases.append(faces[0])
+
+# 2 section
+faces = []
+
+w = geompy.MakeSketcher("Sketcher:F 20 20:TT 0 20:TT 0 0:TT 20 0",
+                         [c1[0], c1[1], c1[2], nx, ny, nz, 0, 0, 1])
+[e1,e2,e3] = geompy.SubShapeAll(w, geompy.ShapeType["EDGE"])
+arc = MakeArc(w,3,-1)
+w = geompy.MakeWire([e1,e2,e3,arc])
+f1 = geompy.MakeFace(w,1)
+
+w = geompy.MakeSketcher("Sketcher:F -20 0:TT 0 0:TT 0 20:TT -20 20",
+                         [c1[0], c1[1], c1[2], nx, ny, nz, 0, 0, 1])
+[e1,e2,e3] = geompy.SubShapeAll(w, geompy.ShapeType["EDGE"])
+arc = MakeArc(w,3,-1)
+w = geompy.MakeWire([e1,e2,e3,arc])
+f2 = geompy.MakeFace(w,1)
+
+w = geompy.MakeSketcher("Sketcher:F 20 0:TT 0 0:TT 0 -20:TT 20 -20",
+                         [c1[0], c1[1], c1[2], nx, ny, nz, 0, 0, 1])
+[e1,e2,e3] = geompy.SubShapeAll(w, geompy.ShapeType["EDGE"])
+arc = MakeArc(w,3,-1)
+w = geompy.MakeWire([e1,e2,e3,arc])
+f3 = geompy.MakeFace(w,1)
+
+w = geompy.MakeSketcher("Sketcher:F -20 -20:TT 0 -20:TT 0 0:TT -20 0",
+                         [c1[0], c1[1], c1[2], nx, ny, nz, 0, 0, 1])
+[e1,e2,e3] = geompy.SubShapeAll(w, geompy.ShapeType["EDGE"])
+arc = MakeArc(w,3,-1)
+w = geompy.MakeWire([e1,e2,e3,arc])
+f4 = geompy.MakeFace(w,1)
+
+faces.append(f1)
+faces.append(f2)
+faces.append(f3)
+faces.append(f4)
+shell = geompy.MakeSewing(faces,1.e-6)
+shells.append(shell)
+faces = geompy.SubShapeAllSorted(shell, geompy.ShapeType["FACE"])
+subbases.append(faces[0])
+
+# 3 section
+faces = []
+c2 = geompy.PointCoordinates(ps[2])
+c3 = geompy.PointCoordinates(ps[3])
+nx = c3[0] - c2[0]
+ny = c3[1] - c2[1]
+nz = c3[2] - c2[2]
+
+w = geompy.MakeSketcher("Sketcher:F 20 20:TT 0 20:TT 0 0:TT 20 0",
+                         [c2[0], c2[1], c2[2], nx, ny, nz, 0, 0, 1])
+[e1,e2,e3] = geompy.SubShapeAll(w, geompy.ShapeType["EDGE"])
+arc = MakeArc(w,3,1)
+w = geompy.MakeWire([e1,e2,e3,arc])
+f1 = geompy.MakeFace(w,1)
+
+w = geompy.MakeSketcher("Sketcher:F -20 0:TT 0 0:TT 0 20:TT -20 20",
+                         [c2[0], c2[1], c2[2], nx, ny, nz, 0, 0, 1])
+[e1,e2,e3] = geompy.SubShapeAll(w, geompy.ShapeType["EDGE"])
+arc = MakeArc(w,3,1)
+w = geompy.MakeWire([e1,e2,e3,arc])
+f2 = geompy.MakeFace(w,1)
+
+w = geompy.MakeSketcher("Sketcher:F 20 0:TT 0 0:TT 0 -20:TT 20 -20",
+                         [c2[0], c2[1], c2[2], nx, ny, nz, 0, 0, 1])
+[e1,e2,e3] = geompy.SubShapeAll(w, geompy.ShapeType["EDGE"])
+arc = MakeArc(w,3,1)
+w = geompy.MakeWire([e1,e2,e3,arc])
+f3 = geompy.MakeFace(w,1)
+
+w = geompy.MakeSketcher("Sketcher:F -20 -20:TT 0 -20:TT 0 0:TT -20 0",
+                         [c2[0], c2[1], c2[2], nx, ny, nz, 0, 0, 1])
+[e1,e2,e3] = geompy.SubShapeAll(w, geompy.ShapeType["EDGE"])
+arc = MakeArc(w,3,1)
+w = geompy.MakeWire([e1,e2,e3,arc])
+f4 = geompy.MakeFace(w,1)
+
+faces.append(f1)
+faces.append(f2)
+faces.append(f3)
+faces.append(f4)
+shell = geompy.MakeSewing(faces,1.e-6)
+shells.append(shell)
+faces = geompy.SubShapeAllSorted(shell, geompy.ShapeType["FACE"])
+subbases.append(faces[2])
+
+# 4 section
+faces = []
+
+kk = 4
+dx = c3[0] - nx/kk
+dy = c3[1] - ny/kk
+dz = c3[2] - nz/kk
+rad = math.sqrt(nx*nx+ny*ny+nz*nz)
+vc = geompy.MakeVertex(dx,dy,dz)
+sph = geompy.MakeSpherePntR(vc,rad/kk)
+shellsph = geompy.SubShapeAll(sph, geompy.ShapeType["SHELL"])
+
+fs = []
+vec = geompy.MakeVectorDXDYDZ(0,0,1)
+ff = geompy.MakePlane(ps[3],vec,40)
+fs.append(ff)
+vp = geompy.MakeVertex(c3[0],c3[1],c3[2]+20)
+ff = geompy.MakePlane(vp,vec,40)
+fs.append(ff)
+vp = geompy.MakeVertex(c3[0],c3[1],c3[2]-20)
+ff = geompy.MakePlane(vp,vec,40)
+fs.append(ff)
+vec = geompy.MakeVectorDXDYDZ(1,0,0)
+ff = geompy.MakePlane(ps[3],vec,40)
+fs.append(ff)
+vp = geompy.MakeVertex(c3[0]+20,c3[1],c3[2])
+ff = geompy.MakePlane(vp,vec,40)
+fs.append(ff)
+vp = geompy.MakeVertex(c3[0]-20,c3[1],c3[2])
+ff = geompy.MakePlane(vp,vec,40)
+fs.append(ff)
+aPartition = geompy.MakePartition(shellsph,fs)
+fs = geompy.SubShapeAllSorted(aPartition, geompy.ShapeType["FACE"])
+
+faces.append(fs[0])
+faces.append(fs[1])
+faces.append(fs[2])
+faces.append(fs[3])
+shell = geompy.MakeSewing(faces,1.e-6)
+shells.append(shell)
+faces = geompy.SubShapeAllSorted(shell, geompy.ShapeType["FACE"])
+
+
+#===========================================================
+#                   Create Pipe
+#===========================================================
+subbases = []
+Pipe = geompy.MakePipeWithShellSections(shells, subbases, theLocations, WirePath,
+                                        theWithContact=0, theWithCorrection=0)
+
+# add objects in the study
+resc = geompy.MakeCompound(shells)
+id_sec = geompy.addToStudy(resc,"sections")
+id_wire = geompy.addToStudy(WirePath,"WirePath")
+id_pipe = geompy.addToStudy(Pipe, "Pipe")
+
+# display the wire(path), sections and the pipe
+gg.createAndDisplayGO(id_wire)
+gg.createAndDisplayGO(id_sec)
+gg.createAndDisplayGO(id_pipe)
+gg.setDisplayMode(id_pipe,1) 
+\endcode
+
+
+\anchor tui_creation_pipe_without_path
+<br><h2>Creation of a PipeShellsWithoutPath</h2>
+
+\code
+import geompy
+import math
+import salome
+gg = salome.ImportComponentGUI("GEOM")
+
+# Add a section based on quadrangles
+# ----------------------------------
+def section(s, p1, p2=None, p3=None, p4=None):
+    if p2==None:
+        q = p1
+    else:
+        q = geompy.MakeQuad4Vertices(p1, p2, p3, p4)
+        pass
+    s.append(q)
+    publish(q, "section")
+    return q
+
+
+# find distance between two points
+# -------------------------------
+def Dist(p1,p2):
+    c1 = geompy.PointCoordinates(p1)
+    c2 = geompy.PointCoordinates(p2)
+    return math.sqrt( (c2[0]-c1[0])*(c2[0]-c1[0]) +
+                      (c2[1]-c1[1])*(c2[1]-c1[1]) +
+                      (c2[2]-c1[2])*(c2[2]-c1[2]) )
+
+
+# return middle point
+# -------------------------------
+def MiddleVert(p1,p2):
+    c1 = geompy.PointCoordinates(p1)
+    c2 = geompy.PointCoordinates(p2)
+    return geompy.MakeVertex( (c2[0]+c1[0])/2, (c2[1]+c1[1])/2, (c2[2]+c1[2])/2 )
+
+
+# Complex section
+# result - 16 quads from lines
+# pnt - point from path
+# vec - direction from path
+def MakeComplexSect(pnt,vec,rmax,rmin,nb):
+    dang = 1.0/nb/2
+    cmax = geompy.MakeCircle(pnt,vec,rmax)
+    cmin = geompy.MakeCircle(pnt,vec,rmin)
+    faces = []
+    for i in range(0,2*nb,2):
+        p1 = geompy.MakeVertexOnCurve(cmin,dang*i)
+        p2 = geompy.MakeVertexOnCurve(cmax,dang*(i+1))
+        p3 = geompy.MakeVertexOnCurve(cmin,dang*(i+2))
+        f = geompy.MakeQuad4Vertices(pnt,p1,p2,p3)
+        faces.append(f)
+        pass
+    shell = geompy.MakeSewing(faces,1.e-6)
+    return shell
+
+
+#=======================================================
+#       Create simple path and recieve points
+#              for section creation
+#=======================================================
+WirePath = geompy.MakeSketcher("Sketcher:F 0 0:T 60 0:T 40 0:R 0:C 100 90:",
+                               [0, 0, 0, 0, 0, 1, 1, 0, 0])
+vs = geompy.SubShapeAll(WirePath, geompy.ShapeType["VERTEX"])
+
+#=======================================================
+#                 Create shell sections
+#=======================================================
+shells = []
+subbases = []
+locs = []
+
+# 1 section
+shell = MakeComplexSect(vs[0], geompy.MakeVectorDXDYDZ(1,0,0), 60, 40, 16)
+shells.append(shell)
+vs1 = geompy.SubShapeAllSorted(shell,geompy.ShapeType["VERTEX"])
+locs.append(vs1[17])
+
+# 2 section
+shell = MakeComplexSect(vs[1], geompy.MakeVectorDXDYDZ(1,0,0), 80, 30, 16)
+shells.append(shell)
+vs2 = geompy.SubShapeAllSorted(shell,geompy.ShapeType["VERTEX"])
+locs.append(vs2[17])
+
+# 3 section
+shell = MakeComplexSect(vs[2], geompy.MakeVectorDXDYDZ(1,0,0), 60, 40, 16)
+shells.append(shell)
+vs3 = geompy.SubShapeAllSorted(shell,geompy.ShapeType["VERTEX"])
+locs.append(vs3[17])
+
+# 4 section
+shell = MakeComplexSect(vs[3], geompy.MakeVectorDXDYDZ(0,1,0), 40, 35, 16)
+shells.append(shell)
+vs4 = geompy.SubShapeAllSorted(shell,geompy.ShapeType["VERTEX"])
+locs.append(vs4[17])
+
+
+#===========================================================
+#                   Create Pipe
+#===========================================================
+
+Pipe = geompy.MakePipeShellsWithoutPath(shells,locs)
+
+# add objects in the study
+resc = geompy.MakeCompound(shells)
+id_sec = geompy.addToStudy(resc,"sections")
+resl = geompy.MakeCompound(locs)
+id_loc = geompy.addToStudy(resl,"locations")
+id_pipe = geompy.addToStudy(Pipe, "Pipe")
+
+# display the sections, locations and pipe
+gg.createAndDisplayGO(id_sec)
+gg.createAndDisplayGO(id_loc)
+gg.createAndDisplayGO(id_pipe)
+gg.setDisplayMode(id_pipe,1) 
+\endcode
+
+\anchor tui_creation_pipe_binormal_along_vector
+<br><h2>Creation of a PipeBiNormalAlongVector</h2>
+
+\code
+def MakeHelix(radius, height, rotation, direction):
+    #  - create a helix -
+    radius = 1.0 * radius
+    height = 1.0 * height
+    rotation = 1.0 * rotation
+    if direction > 0:
+        direction = +1
+    else:
+        direction = -1
+        pass
+    from math import sqrt
+    length_z  = height
+    length_xy = radius*rotation
+    length = sqrt(length_z*length_z + length_xy*length_xy)
+    import geompy
+    nb_steps = 1
+    epsilon = 1.0e-6
+    while 1:
+        z_step = height / nb_steps
+        angle_step = rotation / nb_steps
+        z = 0.0
+        angle = 0.0
+        helix_points = []
+        for n in range(nb_steps+1):
+            from math import cos, sin
+            x = radius * cos(angle)
+            y = radius * sin(angle)
+            p = geompy.MakeVertex(x, y, z)
+            helix_points.append( p )
+            z += z_step
+            angle += direction * angle_step
+            pass
+        helix = geompy.MakeInterpol(helix_points)
+        length_test = geompy.BasicProperties(helix)[0]
+        prec = abs(length-length_test)/length
+        # print nb_steps, length_test, prec
+        if prec < epsilon:
+            break
+        nb_steps *= 2
+        pass
+    return helix
+
+def MakeSpring(radius, height, rotation, direction, thread_radius, base_rotation=0.0):
+    #  - create a pipe -
+    thread_radius = 1.0 * thread_radius
+    # create a helix
+    helix = MakeHelix(radius, height, rotation, direction)
+    # base in the (Ox, Oz) plane
+    import geompy
+    p0 = geompy.MakeVertex(radius-3*thread_radius, 0.0, -thread_radius)
+    p1 = geompy.MakeVertex(radius+3*thread_radius, 0.0, -thread_radius)
+    p2 = geompy.MakeVertex(radius+3*thread_radius, 0.0, +thread_radius)
+    p3 = geompy.MakeVertex(radius-3*thread_radius, 0.0, +thread_radius)
+    e0 = geompy.MakeEdge(p0, p1)
+    e1 = geompy.MakeEdge(p1, p2)
+    e2 = geompy.MakeEdge(p2, p3)
+    e3 = geompy.MakeEdge(p3, p0)
+    w = geompy.MakeWire([e0, e1, e2, e3])
+    # create a base face
+    base = geompy.MakeFace(w, True)
+    # create a binormal vector
+    binormal = geompy.MakeVectorDXDYDZ(0.0, 0.0, 10.0)
+    # create a pipe
+    spring = geompy.MakePipeBiNormalAlongVector(base, helix, binormal)
+    # Publish in the study
+    geompy.addToStudy(base, "base")
+    geompy.addToStudy(helix, "helix")
+    geompy.addToStudy(binormal, "binormal")
+    geompy.addToStudy(spring, "spring")
+    return spring
+
+from math import pi
+
+spring = MakeSpring(50, 100, 2*pi, 1, 5, pi/2)
+\endcode
+
+*/
index 27483708dac2f49240bca3a723e325ae7e90c098..ff70d793a218f2a6e7fe758b384197c3893a16e6 100644 (file)
@@ -23,7 +23,7 @@ if IsEqual(coords[0], 15.) and IsEqual(coords[1], 23.) and IsEqual(coords[2], 80
 else :
     print "Coordinates of point must be (15, 23, 80), but returned (",
     print coords[0], ", ", coords[1], ", ", coords[2], ")"
-    pass 
+    pass
 \endcode
 
 <br><h2>Basic Properties</h2>
@@ -68,7 +68,7 @@ else:
     dy = math.sqrt((coords[1] - 15)*(coords[1] - 15))
     dz = math.sqrt((coords[2] - 50)*(coords[2] - 50))
     if dx > 1e-7 or dy > 1e-7 or dz > 1e-7:
-        print "But must be (50, 15, 50)" 
+        print "But must be (50, 15, 50)"
 \endcode
 
 <br><h2>Inertia</h2>
@@ -85,7 +85,7 @@ print " (", In[0], ", ", In[1], ", ", In[2], ")"
 print " (", In[3], ", ", In[4], ", ", In[5], ")"
 print " (", In[6], ", ", In[7], ", ", In[8], ")"
 print "Main moments of inertia of box 100x30x100:"
-print " Ix = ", In[9], ", Iy = ", In[10], ", Iz = ", In[11] 
+print " Ix = ", In[9], ", Iy = ", In[10], ", Iz = ", In[11]
 \endcode
 
 <br><h2>Check Free Boundaries</h2>
@@ -217,7 +217,7 @@ id_cut_without_f_2 = geompy.addToStudy(cut_without_f_2, "Cut without f_2")
 
 # display the results
 gg.createAndDisplayGO(id_cut_without_f_2)
-gg.setDisplayMode(id_cut_without_f_2,1) 
+gg.setDisplayMode(id_cut_without_f_2,1)
 \endcode
 
 
@@ -233,7 +233,7 @@ bb = geompy.BoundingBox(box)
 print "\nBounding Box of box 100x30x100:"
 print " Xmin = ", bb[0], ", Xmax = ", bb[1]
 print " Ymin = ", bb[2], ", Ymax = ", bb[3]
-print " Zmin = ", bb[4], ", Zmax = ", bb[5] 
+print " Zmin = ", bb[4], ", Zmax = ", bb[5]
 \endcode
 
 <br><h2>Minimal Distance</h2>
@@ -245,9 +245,9 @@ import geompy
 box1 = geompy.MakeBoxDXDYDZ(100,30,100)
 box2 = geompy.MakeBox(105,0,0,200,30,100)
 min_dist = geompy.MinDistance(box1,box2)
-print "\nMinimal distance between box1 and box2 = ", min_dist 
+print "\nMinimal distance between box1 and box2 = ", min_dist
 \endcode
+
 <br><h2>Tolerance</h2>
 
 \code
@@ -262,7 +262,7 @@ print " Face max. tolerance: ", Toler[1]
 print " Edge min. tolerance: ", Toler[2]
 print " Edge max. tolerance: ", Toler[3]
 print " Vertex min. tolerance: ", Toler[4]
-print " Vertex max. tolerance: ", Toler[5] 
+print " Vertex max. tolerance: ", Toler[5]
 \endcode
 
 <br><h2>Angle</h2>
@@ -286,6 +286,13 @@ if math.fabs(Angle - 45.0) > 1e-05:
     print "  Error: returned angle is", Angle, "while must be 45.0"
     pass
 
+Angle = geompy.GetAngleRadians(OX, OXY)
+
+print "\nAngle between OX and OXY in radians = ", Angle
+if math.fabs(Angle - math.pi/4) > 1e-05:
+    print "  Error: returned angle is", Angle, "while must be pi/4"
+    pass
+
 # not in one plane
 OXY_shift = geompy.MakeTranslation(OXY,10,-10,20)
 Angle = geompy.GetAngle(OX, OXY_shift)
@@ -309,7 +316,6 @@ if (math.fabs(Angle + 1.0) > 1e-6 or geompy.MeasuOp.IsDone()):
 \endcode
 
 
 <br><h2>What Is</h2>
 
 \code
@@ -319,7 +325,7 @@ import geompy
 box = geompy.MakeBoxDXDYDZ(100,30,100)
 Descr = geompy.WhatIs(box)
 print "\nBox 100x30x100 description:"
-print Descr 
+print Descr
 \endcode
 
 <br><h2>Check Shape</h2>
@@ -333,9 +339,9 @@ IsValid = geompy.CheckShape(box)
 if IsValid == 0:
     raise RuntimeError, "Invalid box created"
 else:
-    print "\nBox is valid" 
+    print "\nBox is valid"
 \endcode
+
 <br><h2>Check Compound of Blocks</h2>
 
 \code
@@ -357,7 +363,7 @@ IsValid = geompy.CheckCompoundOfBlocks(glue)
 if IsValid == 0:
     raise RuntimeError, "Invalid compound created"
 else:
-    print "\nCompound is valid" 
+    print "\nCompound is valid"
 \endcode
 
 */
index 8278256051b2269b8826d55dc0ac48668ed6e9d9..538067c01ce39b360618d9e22ec2d3b8f200260c 100644 (file)
@@ -64,7 +64,7 @@ id_cylinder2 = geompy.addToStudy(cylinder2,"Cylinder2")
 gg.createAndDisplayGO(id_cylinder1)
 gg.setDisplayMode(id_cylinder1,1)
 gg.createAndDisplayGO(id_cylinder2)
-gg.setDisplayMode(id_cylinder2,1) 
+gg.setDisplayMode(id_cylinder2,1)
 \endcode
 
 \anchor tui_creation_sphere
@@ -97,10 +97,10 @@ gg.setDisplayMode(id_sphere1,1)
 gg.createAndDisplayGO(id_sphere2)
 gg.setDisplayMode(id_sphere2,1)
 gg.createAndDisplayGO(id_sphere3)
-gg.setDisplayMode(id_sphere3,1) 
+gg.setDisplayMode(id_sphere3,1)
 \endcode
 
-\anchor tui_creation_torus 
+\anchor tui_creation_torus
 <br><h2>Creation of a Torus</h2>
 
 \code
@@ -125,7 +125,7 @@ id_torus2 = geompy.addToStudy(torus2,"Torus2")
 gg.createAndDisplayGO(id_torus1)
 gg.setDisplayMode(id_torus1,1)
 gg.createAndDisplayGO(id_torus2)
-gg.setDisplayMode(id_torus2,1) 
+gg.setDisplayMode(id_torus2,1)
 \endcode
 
 \anchor tui_creation_cone
@@ -153,7 +153,83 @@ id_cone2 = geompy.addToStudy(cone2,"Cone2")
 gg.createAndDisplayGO(id_cone1)
 gg.setDisplayMode(id_cone1,1)
 gg.createAndDisplayGO(id_cone2)
-gg.setDisplayMode(id_cone2,1) 
+gg.setDisplayMode(id_cone2,1)
 \endcode
 
-*/
\ No newline at end of file
+\anchor tui_creation_disk
+<br><h2>Creation of a Disk</h2>
+
+\code
+import geompy
+import salome
+gg = salome.ImportComponentGUI("GEOM")
+
+# create vertices
+p0 = geompy.MakeVertex(0., 0., 0.)
+px = geompy.MakeVertex(100., 0.  , 0.  )
+py = geompy.MakeVertex(0.  , 100., 0.  )
+pz = geompy.MakeVertex(0.  , 0.  , 100.)
+
+# create a vector on two points
+vxy  = geompy.MakeVector(px, py)
+
+# create a disk in OXY plane
+disk1 = geompy.MakeDiskR(100, 1)
+
+# create a disk from a point, a vector and a radius
+disk2 = geompy.MakeDiskPntVecR(pz, vxy, 30)
+
+#create a circle from three points
+disk3 = geompy.MakeDiskThreePnt(p0, px, py)
+
+# add objects in the study
+id_vxy    = geompy.addToStudy(vxy,  "Vector")
+id_disk1  = geompy.addToStudy(disk1,"Disk1")
+id_disk2  = geompy.addToStudy(disk2,"Disk2")
+id_disk3  = geompy.addToStudy(disk3,"Disk3")
+
+# display disks
+gg.createAndDisplayGO(id_vxy)
+gg.createAndDisplayGO(id_disk1)
+gg.createAndDisplayGO(id_diks2)
+gg.createAndDisplayGO(id_diks3)
+\endcode
+
+\anchor tui_creation_squareface
+<br><h2>Creation of a Face</h2>
+
+\code
+import geompy
+import salome
+gg = salome.ImportComponentGUI("GEOM")
+
+# create vertices
+px = geompy.MakeVertex(100., 0.  , 0.  )
+py = geompy.MakeVertex(0.  , 100., 0.  )
+
+# create a vector on two points
+vxy  = geompy.MakeVector(px, py)
+
+# create a face in OXY plane
+face1 = geompy.MakeFaceHW(100, 100, 1)
+
+# create a disk from a point, a vector and a radius
+face2 = geompy.MakeFaceObjHW(vxy, 50, 150)
+
+#create a circle from three points
+face3 = geompy.MakeFaceObjHW(face2, 150, 50)
+
+# add objects in the study
+id_vxy    = geompy.addToStudy(vxy,  "Vector")
+id_face1  = geompy.addToStudy(face1,"Face1")
+id_face2  = geompy.addToStudy(face2,"Face2")
+id_face3  = geompy.addToStudy(face3,"Face3")
+
+# display disks
+gg.createAndDisplayGO(id_vxy)
+gg.createAndDisplayGO(id_face1)
+gg.createAndDisplayGO(id_face2)
+gg.createAndDisplayGO(id_face3)
+\endcode
+
+*/
diff --git a/doc/salome/gui/GEOM/input/tui_scripts.doc b/doc/salome/gui/GEOM/input/tui_scripts.doc
deleted file mode 100644 (file)
index 08195e6..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*!
-
-\page tui_scripts_page TUI Scripts
-
-<ul>
-<li>\subpage tui_viewing_geom_objs_page</li>
-<li>\subpage tui_creating_geom_objs_page</li>
-<ul>
-<li>\ref tui_basic_geom_objs_page</li>
-<li>\ref tui_primitives_page</li>
-<li>\ref tui_complex_objs_page</li>
-<li>\ref tui_working_with_groups_page</li>
-<li>\ref tui_building_by_blocks_page</li>
-<li>\ref tui_sketcher_page</li>
-<li>\ref tui_advanced_geom_objs_page</li>
-</ul>
-<li>\subpage tui_transformation_page</li>
-<ul>
-<li>\ref tui_basic_operations_page</li>
-<li>\ref tui_boolean_operations_page</li>
-<li>\ref tui_transformation_operations_page</li>
-<li>\ref tui_blocks_operations_page</li>
-<li>\ref tui_repairing_operations_page</li>
-</ul>
-<li>\subpage tui_measurement_tools_page</li>
-</ul>
-
-*/
\ No newline at end of file
diff --git a/doc/salome/gui/GEOM/input/tui_swig_examples.doc b/doc/salome/gui/GEOM/input/tui_swig_examples.doc
new file mode 100644 (file)
index 0000000..43b003d
--- /dev/null
@@ -0,0 +1,11 @@
+/*!
+
+\page tui_swig_examples_page Examples, generated from GEOM_SWIG test scripts
+
+<ul>
+  <li>\subpage tui_test_others_page</li>
+  <li>\subpage tui_test_spanner_page</li>
+  <li>\subpage tui_test_all_page</li>
+</ul>
+
+*/
diff --git a/doc/salome/gui/GEOM/input/tui_test_all.doc b/doc/salome/gui/GEOM/input/tui_test_all.doc
new file mode 100644 (file)
index 0000000..caeae7b
--- /dev/null
@@ -0,0 +1,75 @@
+/*!
+
+\page tui_test_all_page GEOM_TestAll.py
+
+\anchor swig_All
+<br><h2>GEOM_TestAll.py</h2>
+
+\dontinclude GEOM_TestAll.py
+\skipline def TestAll
+
+\until vxyz
+
+\anchor swig_MakeMarker
+\until cs3
+
+\until MakePlaneThreePnt
+
+\anchor swig_MakeArc
+\until MakeArcCenter
+
+\anchor swig_MakeCircle
+\until Circle2
+
+\until MakeVertexOnCurve
+
+\anchor swig_MakeVertexOnLinesIntersection
+\until p_on_l1l2
+
+\anchor swig_MakeTangentOnCurve
+\until tan_on_arc
+
+\until MakeCompound
+
+\anchor swig_MakeVertexOnSurface
+\until p_on_face
+
+\until S = geompy.MakeRotation
+
+\anchor swig_MakeLineTwoFaces
+\until Line3
+
+\anchor swig_all_advanced
+\until MakeSewing
+
+\anchor swig_all_trsf
+\until RotatPnt
+
+\anchor swig_scale
+\until Scale4
+
+\anchor swig_all_trsf_more
+\until MakeOffset
+
+\anchor swig_ChangeOrientation
+\until ChangeOrientation
+
+\anchor swig_FilletChamfer
+\until End of Local operations
+
+\anchor swig_all_patterns
+\until MultiRot2D
+
+\anchor swig_all_measure
+\until "CheckShape(Prism) = "
+
+\anchor swig_all_partition
+\until Partition1
+
+\anchor swig_all_addtostudy
+\until id_Partition1
+
+\anchor swig_all_decompose
+\until print "DONE"
+
+*/
diff --git a/doc/salome/gui/GEOM/input/tui_test_others.doc b/doc/salome/gui/GEOM/input/tui_test_others.doc
new file mode 100644 (file)
index 0000000..32d3c8b
--- /dev/null
@@ -0,0 +1,159 @@
+/*!
+
+\page tui_test_others_page GEOM_TestOthers.py
+
+\anchor swig_TestOthers
+<br><h2>GEOM_TestOthers.py</h2>
+
+\dontinclude GEOM_TestOthers.py
+
+\skipline import os
+
+\anchor swig_Import_Export
+\until print "OK"
+
+\until id_w3
+
+\anchor swig_MakeFaces
+\until id_f12
+
+\until TestExportImport
+
+\anchor swig_OrientationChange
+\until id_Orientation
+
+\anchor swig_MakeCommon
+\until id_Section
+
+\anchor swig_Partition
+\until id_Partition
+
+\anchor swig_MakeMultiRotation
+\until id_MultiRot2D
+
+\anchor swig_MakeFilletAll
+\until id_MakeFilletAll
+
+\anchor swig_MakeChamferAll
+\until id_MakeChamferAll
+
+\anchor swig_MakeChamfer
+\until id_MakeChamfer
+
+\anchor swig_NumberOfFaces
+\until Bad number of faces
+
+\anchor swig_NumberOfEdges
+\until Bad number of edges
+
+\anchor swig_MakeBlockExplode
+\until id_MakeBlockExplode
+
+\anchor swig_CheckCompoundOfBlocks
+\until The Box is VALID
+
+\anchor swig_GetSame
+\until id_Cone_ss
+
+\anchor swig_CreateGroup
+\until id_CreateGroup
+
+\anchor swig_AddObject
+\until Now contains
+
+\anchor swig_UnionList
+\until Now contains
+
+\anchor swig_RemoveObject
+\until Now contains
+
+\anchor swig_DifferenceList
+\until Now contains
+
+\anchor swig_GetObjectIDs
+\until print " ", ObjectID
+
+\anchor swig_GetMainShape
+\until BoxCopy
+
+\anchor swig_DifferenceIDs
+\until Now contains
+
+\anchor swig_UnionIDs
+\until print " ", ObjectID
+
+\anchor swig_GetType
+\until Type of elements
+
+\until freeFaces, "freeFaces"
+
+\anchor swig_RemoveExtraEdges
+\until "freeFacesWithoutExtra"
+
+\anchor swig_GetSharedShapes
+\until "sharedFace"
+
+\anchor swig_CheckAndImprove
+\until "blocksComp"
+
+\anchor swig_Propagate
+\until "propagation chain"
+
+\anchor swig_GetPoint
+\until blocksComp (-50, -50, -50)
+
+\anchor swig_GetEdgeNearPoint
+\until edge near point
+
+\anchor swig_GetBlockByParts
+\until "b0 image"
+
+\anchor swig_GetShapesOnPlane
+\until Face on Plane
+
+\anchor swig_GetShapesOnPlaneIDs
+\until Group of faces
+
+\anchor swig_GetShapesOnPlaneWithLocation
+\until Edge on Plane
+
+\anchor swig_GetShapesOnPlaneWithLocationIDs
+\until group_edges_on_pln, grname
+
+\anchor swig_GetShapesOnCylinder
+\until Edge out of Cylinder
+
+\anchor swig_GetShapesOnCylinderIDs
+\until Group of edges
+
+\anchor swig_GetShapesOnSphere
+\until Vertex on Sphere
+
+\anchor swig_GetShapesOnSphereIDs
+\until Group of vertices
+
+\anchor swig_GetShapesOnQuadrangle
+\until Error in GetShapesOnQuadrangle
+
+\anchor swig_GetShapesOnQuadrangleIDs
+\until Group of vertices
+
+\anchor swig_GetShapesOnBox
+\until "Error in GetShapesOnBox()"
+
+\anchor swig_GetShapesOnBoxIDs
+\until Group of faces
+
+\anchor swig_GetShapesOnShape
+\until "Error in GetShapesOnShape()"
+
+\anchor swig_GetShapesOnShapeAsCompound
+\until (as compound)
+
+\anchor swig_GetShapesOnShapeIDs
+\until "Error in GetShapesOnShapeIDs()"
+
+\anchor swig_GetInPlace
+\until #END
+
+*/
diff --git a/doc/salome/gui/GEOM/input/tui_test_spanner.doc b/doc/salome/gui/GEOM/input/tui_test_spanner.doc
new file mode 100644 (file)
index 0000000..5c9df46
--- /dev/null
@@ -0,0 +1,41 @@
+/*!
+
+\page tui_test_spanner_page GEOM_Spanner.py
+
+\anchor swig_Spanner
+<br><h2>GEOM_Spanner.py</h2>
+
+\dontinclude GEOM_Spanner.py
+\skipline def MakeSpanner
+
+\until vxy
+
+\anchor swig_MakeQuad4Vertices
+\until id_face11
+
+\anchor swig_MakeTranslationTwoPoints
+\until id_face12
+
+\anchor swig_MakeHexa2Faces
+\until id_block1
+
+\until p_15_10_1
+
+\anchor swig_GetFaceNearPoint
+\until id_face31
+
+\until not a hexahedral
+
+\anchor swig_SubShapeAllSorted
+\until ii + 1
+
+\anchor swig_MakeHexa
+\until id_block3
+
+\anchor swig_GetOppositeFace
+\until id_face41
+
+\anchor spanner_continue
+\until return Spanner
+
+*/
index a05846a7904dd23e791f754c2b1332d3aa6936e6..7fd356e7c5980ed864325c1e39ecbd8556139e6b 100644 (file)
@@ -27,12 +27,14 @@ cylinder = geompy.MakeCylinder(p1, v, radius1, height)
 translation1 = geompy.MakeTranslationTwoPoints(cylinder, p1, p3)
 translation2 = geompy.MakeTranslation(cylinder, 40, 40, 0)
 translation3 = geompy.MakeTranslationVector(cylinder, vt)
+translation4 = geompy.MakeTranslationVectorDistance(cylinder, vt, 200)
 
 # add objects in the study
 id_cylinder = geompy.addToStudy(cylinder, "Cylinder")
 id_translation1 = geompy.addToStudy(translation1, "Translation1")
 id_translation2 = geompy.addToStudy(translation2, "Translation2")
 id_translation3 = geompy.addToStudy(translation3, "Translation3")
+id_translation4 = geompy.addToStudy(translation4, "Translation4")
 
 # display the results
 gg.createAndDisplayGO(id_cylinder)
@@ -43,6 +45,8 @@ gg.createAndDisplayGO(id_translation2)
 gg.setDisplayMode(id_translation2,1)
 gg.createAndDisplayGO(id_translation3)
 gg.setDisplayMode(id_translation3,1) 
+gg.createAndDisplayGO(id_translation4)
+gg.setDisplayMode(id_translation4,1) 
 \endcode
 
 \anchor tui_rotation
@@ -111,6 +115,7 @@ v = geompy.MakeVector(p1, p2)
 height = 35
 radius1 = 20
 cylinder = geompy.MakeCylinder(p1, v, radius1, height)
+circle   = geompy.MakeCircle(p2, v, radius1)
 
 # create local coordinate systems
 cs1 = geompy.MakeMarker( 0, 0, 0, 1,0,0, 0,1,0)
@@ -118,18 +123,25 @@ cs2 = geompy.MakeMarker(30,40,40, 1,0,0, 0,1,0)
 
 # modify the location of the given object
 position = geompy.MakePosition(cylinder, cs1, cs2)
+position2 = geompy.PositionAlongPath(position, circle, 0.75, 1, 1)
 
 # add objects in the study
 id_cs1 = geompy.addToStudy(cs1, "Coordinate system 1")
 id_cs2 = geompy.addToStudy(cs2, "Coordinate system 2")
 id_cylinder = geompy.addToStudy(cylinder, "Cylinder")
+id_circle = geompy.addToStudy(circle, "Circle")
 id_position = geompy.addToStudy(position, "Position")
+id_position2 = geompy.addToStudy(position2, "PositionAlongPath")
 
 # display the results
 gg.createAndDisplayGO(id_cylinder)
 gg.setDisplayMode(id_cylinder,1)
 gg.createAndDisplayGO(id_position)
 gg.setDisplayMode(id_position,1)
+gg.createAndDisplayGO(id_circle)
+gg.setDisplayMode(id_circle,1)
+gg.createAndDisplayGO(id_position2)
+gg.setDisplayMode(id_position2,1)
 \endcode
 
 \anchor tui_mirror
@@ -337,6 +349,27 @@ gg.createAndDisplayGO(id_rot2d)
 gg.setDisplayMode(id_rot2d,1) 
 \endcode
 
+\anchor tui_fillet2d
+<br><h2>Fillet 2D</h2>
+
+\code
+import geompy
+import salome
+gg = salome.ImportComponentGUI("GEOM")
+
+# create a face in OXY plane
+face = geompy.MakeFaceHW(100, 100, 1)
+fillet2d = geompy.MakeFillet2D(face, 30, [7, 9])
+
+# add objects in the study
+id_face  = geompy.addToStudy(face,"Face_1")
+id_fillet2d  = geompy.addToStudy(fillet2d,"Fillet 2D_1")
+
+# display disks
+gg.createAndDisplayGO(id_face)
+gg.createAndDisplayGO(id_fillet2d)
+\endcode
+
 \anchor tui_fillet
 <br><h2>Fillet</h2>
 
@@ -461,4 +494,4 @@ gg.createAndDisplayGO(id_chamfer_all)
 gg.setDisplayMode(id_chamfer_all,1) 
 \endcode
 
-*/
\ No newline at end of file
+*/
index 88152d543b6405af60335562b5e4d44b54d5834b..c7fd67b75c75c6365be91f5d3a5e93094952a8b8 100644 (file)
@@ -6,10 +6,12 @@
 complex geometrical objects (2D & 3D elements):
 
 <ul>
-<li>\ref fuse_operation_page "Fuse"</li>
-<li>\ref common_operation_page "Common"</li>
-<li>\ref cut_operation_page "Cut"</li>
-<li>\ref section_opeartion_page "Section"</li>
+<li>\subpage fuse_operation_page "Fuse" - creates a shape from two shapes.</li>
+<li>\subpage common_operation_page "Common" - transforms the common part
+of two objects into an independent object.</li>
+<li>\subpage cut_operation_page "Cut" - cuts one shape with
+another. </li>
+<li>\subpage section_opeartion_page "Section" - creates a section between two shapes.</li>
 </ul>
 
 There is a general TUI command covering all these operations, which
index d7dbee6bfb8b21bc765e6615cd7020f10394a111..ec1a69f0db558a7f0406ef3695d894c89a6557f4 100644 (file)
-/*!
-
-\page using_measurement_tools_page Using measurement tools
-
-\n Measurement tools in GEOM are necessary for getting different data
-concerning created or imported geometrical objects. They are:
-
-<ul>
-<li>\ref point_coord_anchor "Point coordinates"</li>
-<li>\ref basic_prop_anchor "Basic properties"</li>
-<li>\ref center_mass_anchor "Center of mass"</li>
-<li>\ref inertia_anchor "Inertia"</li>
-<li>\ref normale_anchor "Normal to a Face"</li>
-<li>\ref boundaries_anchor "Check Free Boundaries"</li>
-<li>\ref faces_anchor "Check Faces"</li>
-<li>\ref bounding_box_anchor "Bounding box"</li>
-<li>\ref min_distance_anchor "Min. distance"</li>
-<li>\ref angle_anchor "Angle"</li>
-<li>\ref tolerance_anchor "Tolerance"</li>
-<li>\ref whatis_anchor "WhatIs"</li>
-<li>\ref check_anchor "Check"</li>
-<li>\ref check_compound_anchor "Check compound of blocks"</li>
-</ul>
-
-\n Our <b>TUI Scripts</b> show how to use 
-\ref tui_measurement_tools_page "Measurement Tools" with <b>TUI
-commands</b>.
-
-\n <em>To use measurement tools:</em> 
-\par
-In the <b>Main menu</b> select \b Measures submenu.
-
-\anchor point_coord_anchor
-<br><h2>Point coordinates</h2>
-
-\n Returns the coordinates of a point.
-
-\n <b>Result:</b> Point coordinates (X, Y, Z) in 3D space in the form of Python Tuple.
-\n <b>TUI Command:</b> <em>geompy.PointCoordinates(Point),</em> 
-where \em Point is a point whose coordinates are inquired.
-
-\image html measures1.png
-
-\anchor basic_prop_anchor
-<br><h2>Basic properties</h2>
-
-\n Returns the properties (Length, Surface & Volume) for the selected
-geometrical object.
-
-\n <b>Result:</b> Display Length, Surface & Volume in the form of
-Python Tuple.
-\n <b>TUI Command:</b> <em>geompy.BasicProperties(Shape),</em> where
-\em Shape is a shape whose properties are inquired.
-
-\image html neo-basicprop.png
-
-\anchor center_mass_anchor
-<br><h2>Center of mass</h2>
-
-\n Calculates and returns the coordinates of the gravity center for
-the selected geometrical object.
-
-\n <b>Result:</b> GEOM_Object (vertex).
-\n <b>TUI Command:</b> <em> geompy.MakeCDG(Shape),</em> where \em Shape is
-the shape for which a center of gravity is computed.
-
-\image html measures3.png
-
-\anchor inertia_anchor
-<br><h2>Inertia</h2>
-
-Returns the axial moments of inertia for the selected geometrical object.
-
-\n <b>Result:</b> Displays the matrix of the own moments of inertia and
-the relative moments of inertia in the form of Python Tuple
- <center>(I11, I12, I13,</center>
-                     <center>I21, I22, I23,</center>
-                     <center>I31, I32, I33,</center>
-                     <center>Ix, Iy, Iz).</center>
-\n <b>TUI Command:</b> <em>geompy.Inertia(Shape),</em> where \em Shape is
-a shape for which the own matrix of inertia and the relative moments of inertia are
-returned.
-
-\image html measures4.png
-
-\anchor normale_anchor
-<br><h2>Normal to a Face</h2>
-
-\n Calculates the normal vector to the selected \b Face. The \b Point
-is a point of the \Face, where the Normal should be calculated.
-
-\image html normaletoface.png
-
-\anchor boundaries_anchor
-<br><h2>Check Free Boundaries</h2>
-
-\n Detects and highlights  wires and edges that are not shared between
-two faces and are considered a shape's boundary.
-
-\n <b>TUI Command:</b> <em>(NoError, ClosedWires, OpenWires) =
-geompy.GetFreeBoundary(Shape),</em> where \em Shape is a shape to be
-checked, \em NoError is false if an error occurred while checking free
-boundaries, \em ClosedWires is a list of closed free boundary wires,
-\em OpenWires is a list of open free boundary wires.
-
-\image html repair9.png
-
-\anchor faces_anchor
-<br><h2>Check Free Faces</h2>
-
-\n Highlights all free faces of a given shape. A free
-face is a face which is not shared between two objects of the shape.
-
-\n \b NOTE: This functionality works only in VTK viewer.
-
-\n \b Result: a list of IDs of all free faces, containing in the shape.
-\n <b>TUI Command:</b> <em>GetFreeFacesIDs(Shape),</em> where \em Shape is
-a shape to be checked.
-
-\image html repair10.png
-
-\anchor bounding_box_anchor
-<br><h2>Bounding box</h2>
-
-\n Returns the dimensions of the bounding box for the selected
-geometrical object.
-
-\n <b>Result:</b> Displays the dimensions of the bounding box of a
-geometrical object in the form of Python Tuple (Xmin, Xmax, Ymin,
-Ymax, Zmin, Zmax).
-\n <b>TUI Command:</b> <em>geompy.BoundingBox(Shape),</em> where \em Shape
-is a shape for which a bounding box is computed.
-
-\image html measures5.png
-
-\anchor min_distance_anchor
-<br><h2>Min. distance</h2>
-
-\n Returns the minimum distance between two geometrical objects and
-the coordinates of the vector of distance and shows the vector in the viewer.  
-
-\n <b>TUI Command:</b> <em>geompy.MinDistance(Shape1, Shape2),</em>
-where \em Shape1 and \em Shape2 are shapes between which the minimal
-distance is computed.
-
-\image html distance.png
-
-\anchor angle_anchor
-<br><h2>Angle</h2>
-
-\n Returns the angle between two lines or linear edges
-\n <b>TUI Command:</b> <em>geompy.GetAngle(shape1, shape2),</em> where
-Shape1 and Shape2 are shapes between which the angle is computed. 
-
-\image html angle.png
-\anchor tolerance_anchor
-<br><h2>Tolerance</h2>
-
-\n Returns the maximum and the minimum tolerance for the selected
-geometrical object.
-
-\n <b>Result:</b> Displays the tolerance values (FaceMinTol,
-FaceMaxTol, EgdeMinTol, EgdeMaxTol, VertexMinTol, VertexMaxTol).
-\n <b>TUI Command:</b> <em>geompy.Tolerance(Shape),</em> where \em Shape
-is a shape for which minimal and maximal tolerances are returned.
-
-\image html new-tolerance.png
-
-\anchor whatis_anchor
-<br><h2>WhatIs</h2>
-
-\n Displays types and quantities of all elements composing the
-selected geometrical object.
-
-\n <b>TUI Command:</b> <em>geompy.WhatIs(Shape),</em> where \em Shape is a
-shape from which a description is returned.
-
-\image html measures8.png
-
-\anchor check_anchor
-<br><h2>Check</h2>
-
-\n Checks the topology of the selected geometrical object and returns
-True if it is valid. Check also geometry checkbox allows to test the
-geometry as well.
-
-\n <b>Result:</b> Boolean.
-\n <b>TUI Command:</b> <em>geompy.(theShape, theIsCheckGeom = 0),</em>
-where is theShape is the shape checked for validity.
-
-\image html measures9.png
-
-\anchor check_compound_anchor
-<br><h2>Check compound of blocks</h2>
-
-\n 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:
-<ul>
-<li>Each element of the compound should be a Block (6 faces and 12 edges);</li>
-<li>A connection between two Blocks should be an entire quadrangle face or an entire edge;</li>
-<li>The compound should be connected;</li>
-<li>Two quadrangle faces should be glued.</li>
-</ul>
-
-\n Informs of the following possible errors:
-<ul>
-<li>not a block;</li>
-<li>not glued;</li>
-<li>not connected;</li>
-<li>extra or degenerated edge.</li>
-</ul>
-
-\n <b>Result:</b> Boolean; highlight in the viewer.
-\n <b>TUI Command:</b>
-<em>geompy.CheckCompoundOfBlocks(Compound).</em> 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.
-
-\image html measures10.png
-
-*/
+/*!\r
+\r
+\page using_measurement_tools_page Using measurement tools\r
+\r
+\n Measurement tools in GEOM are necessary for getting different data\r
+concerning created or imported geometrical objects. They are:\r
+\r
+<ul>\r
+<li>\ref point_coord_anchor "Point coordinates"</li>\r
+<li>\ref basic_prop_anchor "Basic properties"</li>\r
+<li>\ref center_mass_anchor "Center of mass"</li>\r
+<li>\ref inertia_anchor "Inertia"</li>\r
+<li>\ref normale_anchor "Normal to a Face"</li>\r
+<li>\ref boundaries_anchor "Check Free Boundaries"</li>\r
+<li>\ref faces_anchor "Check Faces"</li>\r
+<li>\ref bounding_box_anchor "Bounding box"</li>\r
+<li>\ref min_distance_anchor "Min. distance"</li>\r
+<li>\ref angle_anchor "Angle"</li>\r
+<li>\ref tolerance_anchor "Tolerance"</li>\r
+<li>\ref whatis_anchor "WhatIs"</li>\r
+<li>\ref check_anchor "Check"</li>\r
+<li>\ref check_compound_anchor "Check compound of blocks"</li>\r
+</ul>\r
+\r
+\n Our <b>TUI Scripts</b> show how to use\r
+\ref tui_measurement_tools_page "Measurement Tools" with <b>TUI\r
+commands</b>.\r
+\r
+\n <em>To use measurement tools:</em>\r
+\par\r
+In the <b>Main menu</b> select \b Measures submenu.\r
+\r
+\anchor point_coord_anchor\r
+<br><h2>Point coordinates</h2>\r
+\r
+\n Returns the coordinates of a point.\r
+\r
+\n <b>Result:</b> Point coordinates (X, Y, Z) in 3D space in the form of Python Tuple.\r
+\n <b>TUI Command:</b> <em>geompy.PointCoordinates(Point),</em>\r
+where \em Point is a point whose coordinates are inquired.\r
+\r
+\image html measures1.png\r
+\r
+\anchor basic_prop_anchor\r
+<br><h2>Basic properties</h2>\r
+\r
+\n Returns the properties (Length, Surface & Volume) for the selected\r
+geometrical object.\r
+\r
+\n <b>Result:</b> Display Length, Surface & Volume in the form of\r
+Python Tuple.\r
+\n <b>TUI Command:</b> <em>geompy.BasicProperties(Shape),</em> where\r
+\em Shape is a shape whose properties are inquired.\r
+\r
+\image html neo-basicprop.png\r
+\r
+\anchor center_mass_anchor\r
+<br><h2>Center of mass</h2>\r
+\r
+\n Calculates and returns the coordinates of the gravity center for\r
+the selected geometrical object.\r
+\r
+\n <b>Result:</b> GEOM_Object (vertex).\r
+\n <b>TUI Command:</b> <em> geompy.MakeCDG(Shape),</em> where \em Shape is\r
+the shape for which a center of gravity is computed.\r
+\r
+\image html measures3.png\r
+\r
+\anchor inertia_anchor\r
+<br><h2>Inertia</h2>\r
+\r
+Returns the axial moments of inertia for the selected geometrical object.\r
+\r
+\n <b>Result:</b> Displays the matrix of the own moments of inertia and\r
+the relative moments of inertia in the form of Python Tuple\r
+ <center>(I11, I12, I13,</center>\r
+                     <center>I21, I22, I23,</center>\r
+                     <center>I31, I32, I33,</center>\r
+                     <center>Ix, Iy, Iz).</center>\r
+\n <b>TUI Command:</b> <em>geompy.Inertia(Shape),</em> where \em Shape is\r
+a shape for which the own matrix of inertia and the relative moments of inertia are\r
+returned.\r
+\r
+\image html measures4.png\r
+\r
+\anchor normale_anchor\r
+<br><h2>Normal to a Face</h2>\r
+\r
+\n Calculates the normal vector to the selected \b Face. The \b Point\r
+is a point of the \b Face, where the Normal should be calculated.\r
+\r
+\image html normaletoface.png\r
+\r
+\anchor boundaries_anchor\r
+<br><h2>Check Free Boundaries</h2>\r
+\r
+\n Detects and highlights  wires and edges that are not shared between\r
+two faces and are considered a shape's boundary.\r
+\r
+\n <b>TUI Command:</b> <em>(NoError, ClosedWires, OpenWires) =\r
+geompy.GetFreeBoundary(Shape),</em> where \em Shape is a shape to be\r
+checked, \em NoError is false if an error occurred while checking free\r
+boundaries, \em ClosedWires is a list of closed free boundary wires,\r
+\em OpenWires is a list of open free boundary wires.\r
+\r
+\image html repair9.png\r
+\r
+\anchor faces_anchor\r
+<br><h2>Check Free Faces</h2>\r
+\r
+\n Highlights all free faces of a given shape. A free\r
+face is a face which is not shared between two objects of the shape.\r
+\r
+\n \b NOTE: This functionality works only in VTK viewer.\r
+\r
+\n \b Result: a list of IDs of all free faces, containing in the shape.\r
+\n <b>TUI Command:</b> <em>GetFreeFacesIDs(Shape),</em> where \em Shape is\r
+a shape to be checked.\r
+\r
+\image html repair10.png\r
+\r
+\anchor bounding_box_anchor\r
+<br><h2>Bounding box</h2>\r
+\r
+\n Returns the dimensions of the bounding box for the selected\r
+geometrical object.\r
+\r
+\n <b>Result:</b> Displays the dimensions of the bounding box of a\r
+geometrical object in the form of Python Tuple (Xmin, Xmax, Ymin,\r
+Ymax, Zmin, Zmax).\r
+\n <b>TUI Command:</b> <em>geompy.BoundingBox(Shape),</em> where \em Shape\r
+is a shape for which a bounding box is computed.\r
+\r
+\image html measures5.png\r
+\r
+\anchor min_distance_anchor\r
+<br><h2>Min. distance</h2>\r
+\r
+\n Returns the minimum distance between two geometrical objects and\r
+the coordinates of the vector of distance and shows the vector in the viewer.\r
+\r
+\n <b>TUI Command:</b> <em>geompy.MinDistance(Shape1, Shape2),</em>\r
+where \em Shape1 and \em Shape2 are shapes between which the minimal\r
+distance is computed.\r
+\r
+\image html distance.png\r
+\r
+\anchor angle_anchor\r
+<br><h2>Angle</h2>\r
+\r
+\n Returns the angle between two lines or linear edges in degrees\r
+\n <b>TUI Command:</b> <em>geompy.GetAngle(shape1, shape2),</em> where\r
+Shape1 and Shape2 are shapes between which the angle is computed. \r
+Another TUI command is <em>geompy.GetAngleRadians(shape1,shape2),</em> \r
+which returns the value of angle in radians.\r
+\r
+\image html angle.png\r
+\r
+\anchor tolerance_anchor\r
+<br><h2>Tolerance</h2>\r
+\r
+\n Returns the maximum and the minimum tolerance for the selected\r
+geometrical object.\r
+\r
+\n <b>Result:</b> Displays the tolerance values (FaceMinTol,\r
+FaceMaxTol, EgdeMinTol, EgdeMaxTol, VertexMinTol, VertexMaxTol).\r
+\n <b>TUI Command:</b> <em>geompy.Tolerance(Shape),</em> where \em Shape\r
+is a shape for which minimal and maximal tolerances are returned.\r
+\r
+\image html new-tolerance.png\r
+\r
+\anchor whatis_anchor\r
+<br><h2>WhatIs</h2>\r
+\r
+\n General information about the selected geometrical object is the\r
+list of types and quantities of all topological entities, composing\r
+the shape.\r
+\r
+\n <b>TUI Command:</b> <em>geompy.WhatIs(Shape),</em> where \em Shape is a\r
+shape from which a description is returned.\r
+\r
+\image html measures8.png\r
+\r
+\n <b>Kind of Shape</b> field characterises the\r
+whole shape. If there is no additional information available for the\r
+shape, <b>Basic Properties</b> button will be disabled, otherwise it\r
+will show a dialog with information about\r
+dimensions, position, orientation and other parameters of the shape.\r
+\r
+\n <b>TUI Command:</b> <em>geompy.KindOfShape(Shape),</em> where \em Shape is a\r
+shape from which a description is returned.\r
+\r
+\image html measures8a.png\r
+\r
+\anchor check_anchor\r
+<br><h2>Check</h2>\r
+\r
+\n Checks the topology of the selected geometrical object and returns\r
+True if it is valid. Check also geometry checkbox allows to test the\r
+geometry as well.\r
+\r
+\n <b>Result:</b> Boolean.\r
+\n <b>TUI Command:</b> <em>geompy.CheckShape(theShape, theIsCheckGeom = 0),</em>\r
+where \em theShape is the shape checked for validity.\r
+\r
+\image html measures9.png\r
+\r
+\anchor check_compound_anchor\r
+<br><h2>Check compound of blocks</h2>\r
+\r
+\n Checks whether a shape is a compound of glued blocks. To be\r
+considered as a compound of blocks, the given shape must satisfy the\r
+following conditions:\r
+<ul>\r
+<li>Each element of the compound should be a Block (6 faces and 12 edges);</li>\r
+<li>A connection between two Blocks should be an entire quadrangle face or an entire edge;</li>\r
+<li>The compound should be connected;</li>\r
+<li>Two quadrangle faces should be glued.</li>\r
+</ul>\r
+\r
+\n Informs of the following possible errors:\r
+<ul>\r
+<li>not a block;</li>\r
+<li>not glued;</li>\r
+<li>not connected;</li>\r
+<li>extra or degenerated edge.</li>\r
+</ul>\r
+\r
+\n <b>Result:</b> Boolean; highlight in the viewer.\r
+\n <b>TUI Command:</b>\r
+<em>geompy.CheckCompoundOfBlocks(Compound).</em> Checks if the shape\r
+is a valid compound of blocks. If it is true, then the validity flag\r
+is returned, and encountered errors are printed in the python console.\r
+\r
+\image html measures10.png\r
+\r
+*/\r
+\r
diff --git a/doc/salome/gui/GEOM/input/using_notebook_geom_page.doc b/doc/salome/gui/GEOM/input/using_notebook_geom_page.doc
new file mode 100644 (file)
index 0000000..d793d55
--- /dev/null
@@ -0,0 +1,18 @@
+/*!
+
+\page using_notebook_geom_page Using SALOME NoteBook
+
+It is possible to use variables defined through <b>SALOME NoteBook</b> for
+creation and modification of objects in the Geometry module with the following
+limitations:
+
+<ul>
+<li> \ref create_lcs_page "Local Coordinate System" dialog box.\n
+     The notebook parameters are correctly applied, but the study
+     update is problematic in case if the LCS is defined using an 
+     object whose dimensions are given by parameters.
+<li> \ref color_page "Select color" dialog box.
+<li> \ref isolines_page "Select Number of Isos" dialog box.
+</ul>
+*/
+
index a9e42b2db1305b956e5e45bb448ce2a6ee7602c1..701502e923bbe27eb870b36fb61c37ce84797c9c 100644 (file)
@@ -1,6 +1,6 @@
 /*!
 
-\page view_geom_obj_page Overview
+\page view_geom_obj_page Viewing geometrical objects
 
 \n Newly created geometrical objects are automatically displayed in
 the <b>OCC 3D Viewer</b>.
@@ -18,25 +18,25 @@ other useful options by right-clicking on the selected object.
 object.</li>
 <li><b>Delete</b> - irreversibly deletes the selected object from the
 viewer and from the Object Browser.</li> 
-<li>\ref display_mode_page "Display Mode" - allows to select between
+<li>\subpage display_mode_page "Display Mode" - allows to select between
 Wireframe and Shading presentation.</li>
-<li>\ref color_page "Color" - allows to change the filling color in
+<li>\subpage color_page "Color" - allows to change the filling color in
 the standard <b>Select Color</b> menu.</li>
-<li>\ref transparency_page "Transparency" - allows to change the
+<li>\subpage transparency_page "Transparency" - allows to change the
 transparency of geometrical objects.</li>
-<li>\ref isolines_page "Isos" - allows to change the number of
+<li>\subpage isolines_page "Isos" - allows to change the number of
 isolines displayed within a shape.</li>
 <li><b>Hide</b> - allows to hide the selected geometrical object from the
 viewer. TUI Command : <em>sg.EraseOnly(ID)</em>
-\n \image html image18.gif
+\n \image html image18.png
 </li>
 <li><b>Hide all</b> - allows to hide all objects from the viewer. TUI
 Command: <em>sg.EraseAll()</em>
-\n \image html image26.gif
+\n \image html image26.png
 </li>
-<li><b>Display Only</b> - allows to display only the selected
+<li><b>Show Only</b> - allows to display only the selected
 geometrical object. TUI Command: <em>sg.DisplayOnly(ID)</em>
-\n \image html image33.gif
+\n \image html image33.png
 </li>
 <li><b>Update</b> - refreshes the presentation of your geometrical object in the
 Object Browser, applying all recent changes.</li>
diff --git a/doc/salome/gui/GEOM/input/viewing_geom_obj_chapter.doc b/doc/salome/gui/GEOM/input/viewing_geom_obj_chapter.doc
deleted file mode 100644 (file)
index c6eec72..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*!
-
-\page view_geom_obj_chapter_page Viewing Geometrical Objects
-
-<ul>
-<li>\subpage view_geom_obj_page</li>
-<li>\subpage display_mode_page</li>
-<li>\subpage color_page</li>
-<li>\subpage transparency_page</li>
-<li>\subpage isolines_page</li>
-</ul>
-
-*/
\ No newline at end of file
index ed0909498f4cfa75195a532a8f25948ba3c3ccce..ef9fe6f95bdefc44cefef7e676e67c95ec37e657 100644 (file)
@@ -8,7 +8,7 @@ viewer only.
 
 <br><h2>Create a group</h2>
 
-\image html image56.gif
+\image html image56.png
 
 To create a group of subshapes of a geometrical object in the main
 menu select <b>New entity > Group > Create</b>
@@ -19,29 +19,45 @@ menu select <b>New entity > Group > Create</b>
 In this Menu:
 
 <ul>
-<li><b>Shape Type</b> radio button define the type of elements for the
+<li><b>Shape Type</b> radio button defines the type of elements for the
 group (points, wires, faces, shells or solids).</li>
-<li><b>Group Name</b> - here you can enter the name of the group, by
+<li><b>Group Name</b> - allows defining the name of the group, by
 default, it is Group_n.</li>
 <li>Then, using the "Select" button, select the <b>Main Shape</b> (a
-geometrical object on which the group will be created). You can select
-the elements of your group in two ways: </li>
+geometrical object on which the group will be created). </li>
+<li> <b>Main Shape Selection restriction</b> button group allows limiting the range
+of available group elements,
+<ul><li> <b>No restriction</b> button enables all sub-shapes of the Main
+Shape.</li>
+<li><b>Geometrical parts of the Second Shape</b> restricts the range of accessible
+elements to the sub-shapes of the Main Shape that geometrically
+coincide with the <b>Second Shape</b>.</li>
+<li><b>Only Sub-Shapes of the Second Shape</b> restricts the range of
+accessible elements to the sub-shapes of the Main Shape that 
+are sub-shapes of the <b>Second Shape</b>. This is useful because 
+sometimes purely geometrical coincidence is not enough and it 
+is necessary to work with shapes, which actually belong both 
+to the main and the second shape.</li>
+</ul>
+<li> You can select the elements of your group in two ways:
 <ul>
-<li>Clicking <b>Select Sub-Shapes</b> button you can select them
-manually in the 3D Viewer, and add to the group by clicking the \b Add
-button (keep down the Shift button on the keyboard to select several
-elements and add all them together). The indexes of the selected
-elements will be displayed in the list. To delete elements from the
-list, select them and click \b Remove button.</li>
+<li>You can select them manually in the 3D Viewer, and add to the
+group by clicking the \b Add button (keep down the Shift button on the
+keyboard to select several elements and add all them together). The
+indexes of the selected elements will be displayed in the list. To
+delete elements from the list, select them and click \b Remove
+button.</li>
 <li>Clicking <b>Select All</b> button you can add all object's
 elements of a certain type in the list of the elements of the
-group. To delete elements from the list, select them and click \b
-Remove button.</li>
-</ul>
-<li>Finally, confirm your selection by clicking \b OK (also closes the
-Menu) or \b Apply (leaves the Menu open for creation of other groups),
-or skip it by clicking \b Close button.</li>
-</ul>
+group. If the <b>Second Shape</b> is used, the elements are added 
+according to <b>Main Shape Selection restriction</b> settings. To delete elements 
+from the list, select them and click \b Remove button.
+</li></ul>
+</li>
+<li>Finally, confirm your selection by clicking <b>Apply and Close
+</b> (also closes the Menu) or \b Apply (leaves the Menu open for 
+creation of other groups), or skip it by clicking \b Close button.
+</li></ul>
 
 \n The Result of the operation will be a \b GEOM_Object.
 
@@ -52,12 +68,12 @@ created, ShapeType is a type of shapes in the created group.
 
 <b>Example:</b>
 
-\image html image193.jpg
+\image html image193.jpg "Groups on a cylinder"
 
 
 <br><h2>Edit a group</h2>
 
-\image html image57.gif
+\image html image57.png
 
 To \b Edit an existing group in the main menu select <b>New entity >
 Group > Edit</b>. This menu is designed in the same way as the
diff --git a/doc/salome/gui/GEOM/pics/angle.png b/doc/salome/gui/GEOM/pics/angle.png
deleted file mode 100755 (executable)
index fbe7538..0000000
Binary files a/doc/salome/gui/GEOM/pics/angle.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/arc.png b/doc/salome/gui/GEOM/pics/arc.png
deleted file mode 100755 (executable)
index 260a5fb..0000000
Binary files a/doc/salome/gui/GEOM/pics/arc.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/arc2.png b/doc/salome/gui/GEOM/pics/arc2.png
deleted file mode 100644 (file)
index 2bced2a..0000000
Binary files a/doc/salome/gui/GEOM/pics/arc2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/archimede.png b/doc/salome/gui/GEOM/pics/archimede.png
deleted file mode 100755 (executable)
index cd62002..0000000
Binary files a/doc/salome/gui/GEOM/pics/archimede.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/archimedesn1.png b/doc/salome/gui/GEOM/pics/archimedesn1.png
deleted file mode 100755 (executable)
index 4020920..0000000
Binary files a/doc/salome/gui/GEOM/pics/archimedesn1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/archimedesn2.png b/doc/salome/gui/GEOM/pics/archimedesn2.png
deleted file mode 100755 (executable)
index b3b84b1..0000000
Binary files a/doc/salome/gui/GEOM/pics/archimedesn2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/archimedesn3.png b/doc/salome/gui/GEOM/pics/archimedesn3.png
deleted file mode 100755 (executable)
index da57c0f..0000000
Binary files a/doc/salome/gui/GEOM/pics/archimedesn3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/arcsn.png b/doc/salome/gui/GEOM/pics/arcsn.png
deleted file mode 100755 (executable)
index 4131e41..0000000
Binary files a/doc/salome/gui/GEOM/pics/arcsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/arcsn1.png b/doc/salome/gui/GEOM/pics/arcsn1.png
deleted file mode 100644 (file)
index 564f12e..0000000
Binary files a/doc/salome/gui/GEOM/pics/arcsn1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/arcsn2.png b/doc/salome/gui/GEOM/pics/arcsn2.png
deleted file mode 100644 (file)
index f2bec5d..0000000
Binary files a/doc/salome/gui/GEOM/pics/arcsn2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/bezier.png b/doc/salome/gui/GEOM/pics/bezier.png
deleted file mode 100755 (executable)
index 3c0e8df..0000000
Binary files a/doc/salome/gui/GEOM/pics/bezier.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/block1.png b/doc/salome/gui/GEOM/pics/block1.png
deleted file mode 100755 (executable)
index 71a93b0..0000000
Binary files a/doc/salome/gui/GEOM/pics/block1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/block2.png b/doc/salome/gui/GEOM/pics/block2.png
deleted file mode 100755 (executable)
index c66dd7f..0000000
Binary files a/doc/salome/gui/GEOM/pics/block2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/block3.png b/doc/salome/gui/GEOM/pics/block3.png
deleted file mode 100755 (executable)
index 61aad9b..0000000
Binary files a/doc/salome/gui/GEOM/pics/block3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/block4.png b/doc/salome/gui/GEOM/pics/block4.png
deleted file mode 100755 (executable)
index d0661b6..0000000
Binary files a/doc/salome/gui/GEOM/pics/block4.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/block5.png b/doc/salome/gui/GEOM/pics/block5.png
deleted file mode 100755 (executable)
index 9810f6f..0000000
Binary files a/doc/salome/gui/GEOM/pics/block5.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/block_explodesn.png b/doc/salome/gui/GEOM/pics/block_explodesn.png
deleted file mode 100755 (executable)
index 372de3f..0000000
Binary files a/doc/salome/gui/GEOM/pics/block_explodesn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/bool1.png b/doc/salome/gui/GEOM/pics/bool1.png
deleted file mode 100755 (executable)
index 3f997a7..0000000
Binary files a/doc/salome/gui/GEOM/pics/bool1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/bool2.png b/doc/salome/gui/GEOM/pics/bool2.png
deleted file mode 100755 (executable)
index 4e9b968..0000000
Binary files a/doc/salome/gui/GEOM/pics/bool2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/bool3.png b/doc/salome/gui/GEOM/pics/bool3.png
deleted file mode 100755 (executable)
index af409a1..0000000
Binary files a/doc/salome/gui/GEOM/pics/bool3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/box1.png b/doc/salome/gui/GEOM/pics/box1.png
deleted file mode 100755 (executable)
index 812027d..0000000
Binary files a/doc/salome/gui/GEOM/pics/box1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/box2.png b/doc/salome/gui/GEOM/pics/box2.png
deleted file mode 100755 (executable)
index 85a737a..0000000
Binary files a/doc/salome/gui/GEOM/pics/box2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/boxes.png b/doc/salome/gui/GEOM/pics/boxes.png
deleted file mode 100755 (executable)
index f2fad49..0000000
Binary files a/doc/salome/gui/GEOM/pics/boxes.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/chamfer1.png b/doc/salome/gui/GEOM/pics/chamfer1.png
deleted file mode 100755 (executable)
index fdbe02f..0000000
Binary files a/doc/salome/gui/GEOM/pics/chamfer1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/chamfer2.png b/doc/salome/gui/GEOM/pics/chamfer2.png
deleted file mode 100755 (executable)
index 24d6e12..0000000
Binary files a/doc/salome/gui/GEOM/pics/chamfer2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/chamfer3.png b/doc/salome/gui/GEOM/pics/chamfer3.png
deleted file mode 100755 (executable)
index 801f8db..0000000
Binary files a/doc/salome/gui/GEOM/pics/chamfer3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/chamfer4.png b/doc/salome/gui/GEOM/pics/chamfer4.png
deleted file mode 100755 (executable)
index 14476b4..0000000
Binary files a/doc/salome/gui/GEOM/pics/chamfer4.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/chamfer_all.png b/doc/salome/gui/GEOM/pics/chamfer_all.png
deleted file mode 100755 (executable)
index c398cb0..0000000
Binary files a/doc/salome/gui/GEOM/pics/chamfer_all.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/chamfer_edge.png b/doc/salome/gui/GEOM/pics/chamfer_edge.png
deleted file mode 100755 (executable)
index 8ed8fc0..0000000
Binary files a/doc/salome/gui/GEOM/pics/chamfer_edge.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/chamfer_faces.png b/doc/salome/gui/GEOM/pics/chamfer_faces.png
deleted file mode 100755 (executable)
index 961cf03..0000000
Binary files a/doc/salome/gui/GEOM/pics/chamfer_faces.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/changeorientation.png b/doc/salome/gui/GEOM/pics/changeorientation.png
deleted file mode 100755 (executable)
index 95322ed..0000000
Binary files a/doc/salome/gui/GEOM/pics/changeorientation.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/circle1.png b/doc/salome/gui/GEOM/pics/circle1.png
deleted file mode 100755 (executable)
index 840a259..0000000
Binary files a/doc/salome/gui/GEOM/pics/circle1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/circle2.png b/doc/salome/gui/GEOM/pics/circle2.png
deleted file mode 100755 (executable)
index 7500eaf..0000000
Binary files a/doc/salome/gui/GEOM/pics/circle2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/circle3.png b/doc/salome/gui/GEOM/pics/circle3.png
deleted file mode 100755 (executable)
index 39aa5b1..0000000
Binary files a/doc/salome/gui/GEOM/pics/circle3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/circles.png b/doc/salome/gui/GEOM/pics/circles.png
deleted file mode 100755 (executable)
index dc367ce..0000000
Binary files a/doc/salome/gui/GEOM/pics/circles.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/colorsn.png b/doc/salome/gui/GEOM/pics/colorsn.png
deleted file mode 100755 (executable)
index f0c4401..0000000
Binary files a/doc/salome/gui/GEOM/pics/colorsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/commonsn.png b/doc/salome/gui/GEOM/pics/commonsn.png
deleted file mode 100755 (executable)
index e5c0c41..0000000
Binary files a/doc/salome/gui/GEOM/pics/commonsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/compoundsn.png b/doc/salome/gui/GEOM/pics/compoundsn.png
deleted file mode 100755 (executable)
index 33e1012..0000000
Binary files a/doc/salome/gui/GEOM/pics/compoundsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/cone1.png b/doc/salome/gui/GEOM/pics/cone1.png
deleted file mode 100755 (executable)
index f5a9592..0000000
Binary files a/doc/salome/gui/GEOM/pics/cone1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/cone2.png b/doc/salome/gui/GEOM/pics/cone2.png
deleted file mode 100755 (executable)
index 1b05821..0000000
Binary files a/doc/salome/gui/GEOM/pics/cone2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/cones.png b/doc/salome/gui/GEOM/pics/cones.png
deleted file mode 100755 (executable)
index 4c8108c..0000000
Binary files a/doc/salome/gui/GEOM/pics/cones.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/curve.png b/doc/salome/gui/GEOM/pics/curve.png
deleted file mode 100755 (executable)
index a9541de..0000000
Binary files a/doc/salome/gui/GEOM/pics/curve.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/cutsn.png b/doc/salome/gui/GEOM/pics/cutsn.png
deleted file mode 100755 (executable)
index eda9bb7..0000000
Binary files a/doc/salome/gui/GEOM/pics/cutsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/cylinder1.png b/doc/salome/gui/GEOM/pics/cylinder1.png
deleted file mode 100755 (executable)
index 71b619d..0000000
Binary files a/doc/salome/gui/GEOM/pics/cylinder1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/cylinder2.png b/doc/salome/gui/GEOM/pics/cylinder2.png
deleted file mode 100755 (executable)
index ee6ed12..0000000
Binary files a/doc/salome/gui/GEOM/pics/cylinder2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/cylinders.png b/doc/salome/gui/GEOM/pics/cylinders.png
deleted file mode 100755 (executable)
index fc0d432..0000000
Binary files a/doc/salome/gui/GEOM/pics/cylinders.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/dialog.png b/doc/salome/gui/GEOM/pics/dialog.png
deleted file mode 100755 (executable)
index 63f984b..0000000
Binary files a/doc/salome/gui/GEOM/pics/dialog.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/disp_mode1sn.png b/doc/salome/gui/GEOM/pics/disp_mode1sn.png
deleted file mode 100755 (executable)
index b5b7e8f..0000000
Binary files a/doc/salome/gui/GEOM/pics/disp_mode1sn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/disp_mode2sn.png b/doc/salome/gui/GEOM/pics/disp_mode2sn.png
deleted file mode 100755 (executable)
index 3622327..0000000
Binary files a/doc/salome/gui/GEOM/pics/disp_mode2sn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/distance.png b/doc/salome/gui/GEOM/pics/distance.png
deleted file mode 100755 (executable)
index 141ec8e..0000000
Binary files a/doc/salome/gui/GEOM/pics/distance.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/edgesn.png b/doc/salome/gui/GEOM/pics/edgesn.png
deleted file mode 100755 (executable)
index 9de8df9..0000000
Binary files a/doc/salome/gui/GEOM/pics/edgesn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/editgroup.png b/doc/salome/gui/GEOM/pics/editgroup.png
deleted file mode 100755 (executable)
index db3e235..0000000
Binary files a/doc/salome/gui/GEOM/pics/editgroup.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/ellipse.png b/doc/salome/gui/GEOM/pics/ellipse.png
deleted file mode 100755 (executable)
index 0888b50..0000000
Binary files a/doc/salome/gui/GEOM/pics/ellipse.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/ellipsesn.png b/doc/salome/gui/GEOM/pics/ellipsesn.png
deleted file mode 100755 (executable)
index 1c42154..0000000
Binary files a/doc/salome/gui/GEOM/pics/ellipsesn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/extrusion1.png b/doc/salome/gui/GEOM/pics/extrusion1.png
deleted file mode 100755 (executable)
index 673e863..0000000
Binary files a/doc/salome/gui/GEOM/pics/extrusion1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/extrusion2.png b/doc/salome/gui/GEOM/pics/extrusion2.png
deleted file mode 100755 (executable)
index b56dc5d..0000000
Binary files a/doc/salome/gui/GEOM/pics/extrusion2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/facesn1.png b/doc/salome/gui/GEOM/pics/facesn1.png
deleted file mode 100755 (executable)
index c78703a..0000000
Binary files a/doc/salome/gui/GEOM/pics/facesn1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/facesn2.png b/doc/salome/gui/GEOM/pics/facesn2.png
deleted file mode 100755 (executable)
index 59403a0..0000000
Binary files a/doc/salome/gui/GEOM/pics/facesn2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/facesn3.png b/doc/salome/gui/GEOM/pics/facesn3.png
deleted file mode 100755 (executable)
index 7c95d11..0000000
Binary files a/doc/salome/gui/GEOM/pics/facesn3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/fillet1.png b/doc/salome/gui/GEOM/pics/fillet1.png
deleted file mode 100755 (executable)
index 7fd3db5..0000000
Binary files a/doc/salome/gui/GEOM/pics/fillet1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/fillet2.png b/doc/salome/gui/GEOM/pics/fillet2.png
deleted file mode 100755 (executable)
index 2eab875..0000000
Binary files a/doc/salome/gui/GEOM/pics/fillet2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/fillet3.png b/doc/salome/gui/GEOM/pics/fillet3.png
deleted file mode 100755 (executable)
index 6e46e05..0000000
Binary files a/doc/salome/gui/GEOM/pics/fillet3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/fillet_all.png b/doc/salome/gui/GEOM/pics/fillet_all.png
deleted file mode 100755 (executable)
index c1650b9..0000000
Binary files a/doc/salome/gui/GEOM/pics/fillet_all.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/fillet_edge.png b/doc/salome/gui/GEOM/pics/fillet_edge.png
deleted file mode 100755 (executable)
index 9572abb..0000000
Binary files a/doc/salome/gui/GEOM/pics/fillet_edge.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/fillet_prism.png b/doc/salome/gui/GEOM/pics/fillet_prism.png
deleted file mode 100755 (executable)
index 3a44a07..0000000
Binary files a/doc/salome/gui/GEOM/pics/fillet_prism.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/filling.png b/doc/salome/gui/GEOM/pics/filling.png
deleted file mode 100755 (executable)
index 418c224..0000000
Binary files a/doc/salome/gui/GEOM/pics/filling.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/filling_compoundsn.png b/doc/salome/gui/GEOM/pics/filling_compoundsn.png
deleted file mode 100755 (executable)
index 9d3846b..0000000
Binary files a/doc/salome/gui/GEOM/pics/filling_compoundsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/fillingsn.png b/doc/salome/gui/GEOM/pics/fillingsn.png
deleted file mode 100755 (executable)
index 2446e89..0000000
Binary files a/doc/salome/gui/GEOM/pics/fillingsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/free_boudaries1.png b/doc/salome/gui/GEOM/pics/free_boudaries1.png
deleted file mode 100755 (executable)
index 20c29f9..0000000
Binary files a/doc/salome/gui/GEOM/pics/free_boudaries1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/free_boudaries2.png b/doc/salome/gui/GEOM/pics/free_boudaries2.png
deleted file mode 100755 (executable)
index 1523fe9..0000000
Binary files a/doc/salome/gui/GEOM/pics/free_boudaries2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/free_faces1.png b/doc/salome/gui/GEOM/pics/free_faces1.png
deleted file mode 100755 (executable)
index 530d844..0000000
Binary files a/doc/salome/gui/GEOM/pics/free_faces1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/free_faces2.png b/doc/salome/gui/GEOM/pics/free_faces2.png
deleted file mode 100755 (executable)
index 7526bd1..0000000
Binary files a/doc/salome/gui/GEOM/pics/free_faces2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/fusesn1.png b/doc/salome/gui/GEOM/pics/fusesn1.png
deleted file mode 100755 (executable)
index e0118cb..0000000
Binary files a/doc/salome/gui/GEOM/pics/fusesn1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/fusesn2.png b/doc/salome/gui/GEOM/pics/fusesn2.png
deleted file mode 100755 (executable)
index f8a2b01..0000000
Binary files a/doc/salome/gui/GEOM/pics/fusesn2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/geomcreategroup.png b/doc/salome/gui/GEOM/pics/geomcreategroup.png
deleted file mode 100755 (executable)
index f51ab22..0000000
Binary files a/doc/salome/gui/GEOM/pics/geomcreategroup.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/geomexport.png b/doc/salome/gui/GEOM/pics/geomexport.png
deleted file mode 100755 (executable)
index c377139..0000000
Binary files a/doc/salome/gui/GEOM/pics/geomexport.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/geomimport.png b/doc/salome/gui/GEOM/pics/geomimport.png
deleted file mode 100755 (executable)
index 516a819..0000000
Binary files a/doc/salome/gui/GEOM/pics/geomimport.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/glue_faces1.png b/doc/salome/gui/GEOM/pics/glue_faces1.png
deleted file mode 100755 (executable)
index 787c9b0..0000000
Binary files a/doc/salome/gui/GEOM/pics/glue_faces1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/glue_faces2.png b/doc/salome/gui/GEOM/pics/glue_faces2.png
deleted file mode 100755 (executable)
index d336613..0000000
Binary files a/doc/salome/gui/GEOM/pics/glue_faces2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/interpol.png b/doc/salome/gui/GEOM/pics/interpol.png
deleted file mode 100755 (executable)
index ac77ddf..0000000
Binary files a/doc/salome/gui/GEOM/pics/interpol.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/isos_u12_v12sn.png b/doc/salome/gui/GEOM/pics/isos_u12_v12sn.png
deleted file mode 100755 (executable)
index 10a13ce..0000000
Binary files a/doc/salome/gui/GEOM/pics/isos_u12_v12sn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/line.png b/doc/salome/gui/GEOM/pics/line.png
deleted file mode 100755 (executable)
index 3c931a1..0000000
Binary files a/doc/salome/gui/GEOM/pics/line.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/lines.png b/doc/salome/gui/GEOM/pics/lines.png
deleted file mode 100755 (executable)
index de12c11..0000000
Binary files a/doc/salome/gui/GEOM/pics/lines.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/measures1.png b/doc/salome/gui/GEOM/pics/measures1.png
deleted file mode 100755 (executable)
index 6d5d698..0000000
Binary files a/doc/salome/gui/GEOM/pics/measures1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/measures10.png b/doc/salome/gui/GEOM/pics/measures10.png
deleted file mode 100755 (executable)
index 33023cc..0000000
Binary files a/doc/salome/gui/GEOM/pics/measures10.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/measures3.png b/doc/salome/gui/GEOM/pics/measures3.png
deleted file mode 100755 (executable)
index 9a55aad..0000000
Binary files a/doc/salome/gui/GEOM/pics/measures3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/measures4.png b/doc/salome/gui/GEOM/pics/measures4.png
deleted file mode 100755 (executable)
index ea243e8..0000000
Binary files a/doc/salome/gui/GEOM/pics/measures4.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/measures5.png b/doc/salome/gui/GEOM/pics/measures5.png
deleted file mode 100755 (executable)
index a323426..0000000
Binary files a/doc/salome/gui/GEOM/pics/measures5.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/measures8.png b/doc/salome/gui/GEOM/pics/measures8.png
deleted file mode 100755 (executable)
index 94bed32..0000000
Binary files a/doc/salome/gui/GEOM/pics/measures8.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/measures9.png b/doc/salome/gui/GEOM/pics/measures9.png
deleted file mode 100755 (executable)
index 7d42d29..0000000
Binary files a/doc/salome/gui/GEOM/pics/measures9.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/mirror_axissn1.png b/doc/salome/gui/GEOM/pics/mirror_axissn1.png
deleted file mode 100755 (executable)
index 86be83e..0000000
Binary files a/doc/salome/gui/GEOM/pics/mirror_axissn1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/mirror_axissn2.png b/doc/salome/gui/GEOM/pics/mirror_axissn2.png
deleted file mode 100755 (executable)
index 6009fa7..0000000
Binary files a/doc/salome/gui/GEOM/pics/mirror_axissn2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/mirror_planesn1.png b/doc/salome/gui/GEOM/pics/mirror_planesn1.png
deleted file mode 100755 (executable)
index 969f0e0..0000000
Binary files a/doc/salome/gui/GEOM/pics/mirror_planesn1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/mirror_planesn2.png b/doc/salome/gui/GEOM/pics/mirror_planesn2.png
deleted file mode 100755 (executable)
index e9eb496..0000000
Binary files a/doc/salome/gui/GEOM/pics/mirror_planesn2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/mirror_pointsn1.png b/doc/salome/gui/GEOM/pics/mirror_pointsn1.png
deleted file mode 100755 (executable)
index 675b0bf..0000000
Binary files a/doc/salome/gui/GEOM/pics/mirror_pointsn1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/mirror_pointsn2.png b/doc/salome/gui/GEOM/pics/mirror_pointsn2.png
deleted file mode 100755 (executable)
index ab62359..0000000
Binary files a/doc/salome/gui/GEOM/pics/mirror_pointsn2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/mtrans1.png b/doc/salome/gui/GEOM/pics/mtrans1.png
deleted file mode 100755 (executable)
index 7dfe730..0000000
Binary files a/doc/salome/gui/GEOM/pics/mtrans1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/mtrans2.png b/doc/salome/gui/GEOM/pics/mtrans2.png
deleted file mode 100755 (executable)
index 62b35bb..0000000
Binary files a/doc/salome/gui/GEOM/pics/mtrans2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/mtransf1.png b/doc/salome/gui/GEOM/pics/mtransf1.png
deleted file mode 100755 (executable)
index 207e920..0000000
Binary files a/doc/salome/gui/GEOM/pics/mtransf1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/mtransf2.png b/doc/salome/gui/GEOM/pics/mtransf2.png
deleted file mode 100755 (executable)
index 3435f0f..0000000
Binary files a/doc/salome/gui/GEOM/pics/mtransf2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/mtransf3.png b/doc/salome/gui/GEOM/pics/mtransf3.png
deleted file mode 100755 (executable)
index 628d8b0..0000000
Binary files a/doc/salome/gui/GEOM/pics/mtransf3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/mtransf4.png b/doc/salome/gui/GEOM/pics/mtransf4.png
deleted file mode 100755 (executable)
index cbe9044..0000000
Binary files a/doc/salome/gui/GEOM/pics/mtransf4.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/multi_rotation1d1.png b/doc/salome/gui/GEOM/pics/multi_rotation1d1.png
deleted file mode 100755 (executable)
index 4085f43..0000000
Binary files a/doc/salome/gui/GEOM/pics/multi_rotation1d1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/multi_rotation1d2.png b/doc/salome/gui/GEOM/pics/multi_rotation1d2.png
deleted file mode 100755 (executable)
index 8089092..0000000
Binary files a/doc/salome/gui/GEOM/pics/multi_rotation1d2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/multi_rotation2d1.png b/doc/salome/gui/GEOM/pics/multi_rotation2d1.png
deleted file mode 100755 (executable)
index 1bdd253..0000000
Binary files a/doc/salome/gui/GEOM/pics/multi_rotation2d1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/multi_rotation2d2.png b/doc/salome/gui/GEOM/pics/multi_rotation2d2.png
deleted file mode 100755 (executable)
index aa61ca6..0000000
Binary files a/doc/salome/gui/GEOM/pics/multi_rotation2d2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/multi_transformationsn1d.png b/doc/salome/gui/GEOM/pics/multi_transformationsn1d.png
deleted file mode 100755 (executable)
index dfcc440..0000000
Binary files a/doc/salome/gui/GEOM/pics/multi_transformationsn1d.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/multi_transformationsn2d.png b/doc/salome/gui/GEOM/pics/multi_transformationsn2d.png
deleted file mode 100755 (executable)
index f0fc127..0000000
Binary files a/doc/salome/gui/GEOM/pics/multi_transformationsn2d.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/multi_translation1dsn.png b/doc/salome/gui/GEOM/pics/multi_translation1dsn.png
deleted file mode 100755 (executable)
index 436a816..0000000
Binary files a/doc/salome/gui/GEOM/pics/multi_translation1dsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/multi_translation2dsn.png b/doc/salome/gui/GEOM/pics/multi_translation2dsn.png
deleted file mode 100755 (executable)
index f44c852..0000000
Binary files a/doc/salome/gui/GEOM/pics/multi_translation2dsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/multi_translation_initialsn.png b/doc/salome/gui/GEOM/pics/multi_translation_initialsn.png
deleted file mode 100755 (executable)
index 0b7b70a..0000000
Binary files a/doc/salome/gui/GEOM/pics/multi_translation_initialsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-basicprop.png b/doc/salome/gui/GEOM/pics/neo-basicprop.png
deleted file mode 100755 (executable)
index 2a9d7ca..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-basicprop.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-detect2.png b/doc/salome/gui/GEOM/pics/neo-detect2.png
deleted file mode 100755 (executable)
index f0dabe3..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-detect2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-isos.png b/doc/salome/gui/GEOM/pics/neo-isos.png
deleted file mode 100755 (executable)
index dbbcf8e..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-isos.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-localcs1.png b/doc/salome/gui/GEOM/pics/neo-localcs1.png
deleted file mode 100755 (executable)
index 9bdacaf..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-localcs1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-localcs2.png b/doc/salome/gui/GEOM/pics/neo-localcs2.png
deleted file mode 100755 (executable)
index 3fc54a6..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-localcs2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-localcs3.png b/doc/salome/gui/GEOM/pics/neo-localcs3.png
deleted file mode 100755 (executable)
index 01c8e24..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-localcs3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-materials.png b/doc/salome/gui/GEOM/pics/neo-materials.png
deleted file mode 100755 (executable)
index 6691749..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-materials.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-mrot1.png b/doc/salome/gui/GEOM/pics/neo-mrot1.png
deleted file mode 100755 (executable)
index 6cf2ab9..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-mrot1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-mrot2.png b/doc/salome/gui/GEOM/pics/neo-mrot2.png
deleted file mode 100755 (executable)
index e2f37e0..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-mrot2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-obj1.png b/doc/salome/gui/GEOM/pics/neo-obj1.png
deleted file mode 100755 (executable)
index 88a7a8b..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-obj1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-obj2.png b/doc/salome/gui/GEOM/pics/neo-obj2.png
deleted file mode 100755 (executable)
index c940eaa..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-obj2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-obj3.png b/doc/salome/gui/GEOM/pics/neo-obj3.png
deleted file mode 100755 (executable)
index d773938..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-obj3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-obj4.png b/doc/salome/gui/GEOM/pics/neo-obj4.png
deleted file mode 100755 (executable)
index db5d497..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-obj4.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-obj5.png b/doc/salome/gui/GEOM/pics/neo-obj5.png
deleted file mode 100755 (executable)
index e1579f0..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-obj5.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-obj6.png b/doc/salome/gui/GEOM/pics/neo-obj6.png
deleted file mode 100755 (executable)
index b6b3be4..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-obj6.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-obj7.png b/doc/salome/gui/GEOM/pics/neo-obj7.png
deleted file mode 100755 (executable)
index 15dfa23..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-obj7.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-point2.png b/doc/salome/gui/GEOM/pics/neo-point2.png
deleted file mode 100755 (executable)
index 3bc59b8..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-point2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-scetcher1.png b/doc/salome/gui/GEOM/pics/neo-scetcher1.png
deleted file mode 100755 (executable)
index 7130e8b..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-scetcher1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-scetcher2.png b/doc/salome/gui/GEOM/pics/neo-scetcher2.png
deleted file mode 100755 (executable)
index 330e1e3..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-scetcher2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-section.png b/doc/salome/gui/GEOM/pics/neo-section.png
deleted file mode 100755 (executable)
index 0d58ad2..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-section.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/neo-transparency.png b/doc/salome/gui/GEOM/pics/neo-transparency.png
deleted file mode 100755 (executable)
index ec1fb7f..0000000
Binary files a/doc/salome/gui/GEOM/pics/neo-transparency.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/new-tolerance.png b/doc/salome/gui/GEOM/pics/new-tolerance.png
deleted file mode 100755 (executable)
index 796115b..0000000
Binary files a/doc/salome/gui/GEOM/pics/new-tolerance.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/normaletoface.png b/doc/salome/gui/GEOM/pics/normaletoface.png
deleted file mode 100755 (executable)
index 51bc43a..0000000
Binary files a/doc/salome/gui/GEOM/pics/normaletoface.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/offsetsn.png b/doc/salome/gui/GEOM/pics/offsetsn.png
deleted file mode 100755 (executable)
index 6404310..0000000
Binary files a/doc/salome/gui/GEOM/pics/offsetsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/partition1.png b/doc/salome/gui/GEOM/pics/partition1.png
deleted file mode 100755 (executable)
index 20b22d2..0000000
Binary files a/doc/salome/gui/GEOM/pics/partition1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/partition2.png b/doc/salome/gui/GEOM/pics/partition2.png
deleted file mode 100755 (executable)
index a67ec9d..0000000
Binary files a/doc/salome/gui/GEOM/pics/partition2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/partitionsn1.png b/doc/salome/gui/GEOM/pics/partitionsn1.png
deleted file mode 100755 (executable)
index fa8404d..0000000
Binary files a/doc/salome/gui/GEOM/pics/partitionsn1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/partitionsn2.png b/doc/salome/gui/GEOM/pics/partitionsn2.png
deleted file mode 100755 (executable)
index b7480a4..0000000
Binary files a/doc/salome/gui/GEOM/pics/partitionsn2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/pipe.png b/doc/salome/gui/GEOM/pics/pipe.png
deleted file mode 100755 (executable)
index e773731..0000000
Binary files a/doc/salome/gui/GEOM/pics/pipe.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/pipe_wire_edgesn.png b/doc/salome/gui/GEOM/pics/pipe_wire_edgesn.png
deleted file mode 100755 (executable)
index 4424b6b..0000000
Binary files a/doc/salome/gui/GEOM/pics/pipe_wire_edgesn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/pipesn.png b/doc/salome/gui/GEOM/pics/pipesn.png
deleted file mode 100755 (executable)
index 11ac109..0000000
Binary files a/doc/salome/gui/GEOM/pics/pipesn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/plane1.png b/doc/salome/gui/GEOM/pics/plane1.png
deleted file mode 100755 (executable)
index 47a9b8b..0000000
Binary files a/doc/salome/gui/GEOM/pics/plane1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/plane2.png b/doc/salome/gui/GEOM/pics/plane2.png
deleted file mode 100755 (executable)
index f4b880b..0000000
Binary files a/doc/salome/gui/GEOM/pics/plane2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/plane3.png b/doc/salome/gui/GEOM/pics/plane3.png
deleted file mode 100755 (executable)
index 1727e3b..0000000
Binary files a/doc/salome/gui/GEOM/pics/plane3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/plane_on_face.png b/doc/salome/gui/GEOM/pics/plane_on_face.png
deleted file mode 100755 (executable)
index 5df8823..0000000
Binary files a/doc/salome/gui/GEOM/pics/plane_on_face.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/planes1.png b/doc/salome/gui/GEOM/pics/planes1.png
deleted file mode 100755 (executable)
index c9a594c..0000000
Binary files a/doc/salome/gui/GEOM/pics/planes1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/point1.png b/doc/salome/gui/GEOM/pics/point1.png
deleted file mode 100755 (executable)
index 39bca25..0000000
Binary files a/doc/salome/gui/GEOM/pics/point1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/point3.png b/doc/salome/gui/GEOM/pics/point3.png
deleted file mode 100755 (executable)
index 0a2e325..0000000
Binary files a/doc/salome/gui/GEOM/pics/point3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/points.png b/doc/salome/gui/GEOM/pics/points.png
deleted file mode 100755 (executable)
index 547b277..0000000
Binary files a/doc/salome/gui/GEOM/pics/points.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/polyline.png b/doc/salome/gui/GEOM/pics/polyline.png
deleted file mode 100755 (executable)
index bd259e1..0000000
Binary files a/doc/salome/gui/GEOM/pics/polyline.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/prisms_basessn.png b/doc/salome/gui/GEOM/pics/prisms_basessn.png
deleted file mode 100755 (executable)
index d6a0700..0000000
Binary files a/doc/salome/gui/GEOM/pics/prisms_basessn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/prismssn.png b/doc/salome/gui/GEOM/pics/prismssn.png
deleted file mode 100755 (executable)
index 80c9af3..0000000
Binary files a/doc/salome/gui/GEOM/pics/prismssn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/repair1.png b/doc/salome/gui/GEOM/pics/repair1.png
deleted file mode 100755 (executable)
index 2b47fa5..0000000
Binary files a/doc/salome/gui/GEOM/pics/repair1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/repair10.png b/doc/salome/gui/GEOM/pics/repair10.png
deleted file mode 100755 (executable)
index c3c7716..0000000
Binary files a/doc/salome/gui/GEOM/pics/repair10.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/repair2.png b/doc/salome/gui/GEOM/pics/repair2.png
deleted file mode 100755 (executable)
index 488a6a4..0000000
Binary files a/doc/salome/gui/GEOM/pics/repair2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/repair3.png b/doc/salome/gui/GEOM/pics/repair3.png
deleted file mode 100755 (executable)
index 4c2a41f..0000000
Binary files a/doc/salome/gui/GEOM/pics/repair3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/repair4.png b/doc/salome/gui/GEOM/pics/repair4.png
deleted file mode 100755 (executable)
index 2af7cba..0000000
Binary files a/doc/salome/gui/GEOM/pics/repair4.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/repair5.png b/doc/salome/gui/GEOM/pics/repair5.png
deleted file mode 100755 (executable)
index b99fbcb..0000000
Binary files a/doc/salome/gui/GEOM/pics/repair5.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/repair6.png b/doc/salome/gui/GEOM/pics/repair6.png
deleted file mode 100755 (executable)
index 5123d1f..0000000
Binary files a/doc/salome/gui/GEOM/pics/repair6.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/repair7.png b/doc/salome/gui/GEOM/pics/repair7.png
deleted file mode 100755 (executable)
index 2b553b9..0000000
Binary files a/doc/salome/gui/GEOM/pics/repair7.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/repair8.png b/doc/salome/gui/GEOM/pics/repair8.png
deleted file mode 100755 (executable)
index f001683..0000000
Binary files a/doc/salome/gui/GEOM/pics/repair8.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/repair9.png b/doc/salome/gui/GEOM/pics/repair9.png
deleted file mode 100755 (executable)
index 7f5d4f5..0000000
Binary files a/doc/salome/gui/GEOM/pics/repair9.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/revolution.png b/doc/salome/gui/GEOM/pics/revolution.png
deleted file mode 100755 (executable)
index c02c859..0000000
Binary files a/doc/salome/gui/GEOM/pics/revolution.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/revolutionsn.png b/doc/salome/gui/GEOM/pics/revolutionsn.png
deleted file mode 100755 (executable)
index 7242c67..0000000
Binary files a/doc/salome/gui/GEOM/pics/revolutionsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/rotationsn1.png b/doc/salome/gui/GEOM/pics/rotationsn1.png
deleted file mode 100755 (executable)
index 697dcde..0000000
Binary files a/doc/salome/gui/GEOM/pics/rotationsn1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/rotationsn2.png b/doc/salome/gui/GEOM/pics/rotationsn2.png
deleted file mode 100755 (executable)
index 741d00c..0000000
Binary files a/doc/salome/gui/GEOM/pics/rotationsn2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/scale_transformsn1.png b/doc/salome/gui/GEOM/pics/scale_transformsn1.png
deleted file mode 100755 (executable)
index 5af3909..0000000
Binary files a/doc/salome/gui/GEOM/pics/scale_transformsn1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/scale_transformsn2.png b/doc/salome/gui/GEOM/pics/scale_transformsn2.png
deleted file mode 100755 (executable)
index fa76d41..0000000
Binary files a/doc/salome/gui/GEOM/pics/scale_transformsn2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/sectionsn.png b/doc/salome/gui/GEOM/pics/sectionsn.png
deleted file mode 100755 (executable)
index 8e636ee..0000000
Binary files a/doc/salome/gui/GEOM/pics/sectionsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/shellsn.png b/doc/salome/gui/GEOM/pics/shellsn.png
deleted file mode 100755 (executable)
index c7f22f3..0000000
Binary files a/doc/salome/gui/GEOM/pics/shellsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/solidsn.png b/doc/salome/gui/GEOM/pics/solidsn.png
deleted file mode 100755 (executable)
index 297fc06..0000000
Binary files a/doc/salome/gui/GEOM/pics/solidsn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/sphere1.png b/doc/salome/gui/GEOM/pics/sphere1.png
deleted file mode 100755 (executable)
index 377f1c9..0000000
Binary files a/doc/salome/gui/GEOM/pics/sphere1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/sphere2.png b/doc/salome/gui/GEOM/pics/sphere2.png
deleted file mode 100755 (executable)
index dd2cadb..0000000
Binary files a/doc/salome/gui/GEOM/pics/sphere2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/spheres.png b/doc/salome/gui/GEOM/pics/spheres.png
deleted file mode 100755 (executable)
index 2b79050..0000000
Binary files a/doc/salome/gui/GEOM/pics/spheres.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/supp_int_wires1.png b/doc/salome/gui/GEOM/pics/supp_int_wires1.png
deleted file mode 100755 (executable)
index 5f76056..0000000
Binary files a/doc/salome/gui/GEOM/pics/supp_int_wires1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/supp_int_wires2.png b/doc/salome/gui/GEOM/pics/supp_int_wires2.png
deleted file mode 100755 (executable)
index e6dc314..0000000
Binary files a/doc/salome/gui/GEOM/pics/supp_int_wires2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/suppress_faces1.png b/doc/salome/gui/GEOM/pics/suppress_faces1.png
deleted file mode 100755 (executable)
index 7534ebe..0000000
Binary files a/doc/salome/gui/GEOM/pics/suppress_faces1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/suppress_faces2.png b/doc/salome/gui/GEOM/pics/suppress_faces2.png
deleted file mode 100755 (executable)
index d38a4ad..0000000
Binary files a/doc/salome/gui/GEOM/pics/suppress_faces2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/torus1.png b/doc/salome/gui/GEOM/pics/torus1.png
deleted file mode 100755 (executable)
index 28e18af..0000000
Binary files a/doc/salome/gui/GEOM/pics/torus1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/torus2.png b/doc/salome/gui/GEOM/pics/torus2.png
deleted file mode 100755 (executable)
index 8877f1c..0000000
Binary files a/doc/salome/gui/GEOM/pics/torus2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/toruses.png b/doc/salome/gui/GEOM/pics/toruses.png
deleted file mode 100755 (executable)
index 721bae2..0000000
Binary files a/doc/salome/gui/GEOM/pics/toruses.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/transformation1.png b/doc/salome/gui/GEOM/pics/transformation1.png
deleted file mode 100755 (executable)
index 8dbf8fe..0000000
Binary files a/doc/salome/gui/GEOM/pics/transformation1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/transformation10.png b/doc/salome/gui/GEOM/pics/transformation10.png
deleted file mode 100755 (executable)
index 0847a5e..0000000
Binary files a/doc/salome/gui/GEOM/pics/transformation10.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/transformation11.png b/doc/salome/gui/GEOM/pics/transformation11.png
deleted file mode 100755 (executable)
index b78acec..0000000
Binary files a/doc/salome/gui/GEOM/pics/transformation11.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/transformation2.png b/doc/salome/gui/GEOM/pics/transformation2.png
deleted file mode 100755 (executable)
index 5697527..0000000
Binary files a/doc/salome/gui/GEOM/pics/transformation2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/transformation3.png b/doc/salome/gui/GEOM/pics/transformation3.png
deleted file mode 100755 (executable)
index 96a1f1e..0000000
Binary files a/doc/salome/gui/GEOM/pics/transformation3.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/transformation4.png b/doc/salome/gui/GEOM/pics/transformation4.png
deleted file mode 100755 (executable)
index 323c3d0..0000000
Binary files a/doc/salome/gui/GEOM/pics/transformation4.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/transformation4a.png b/doc/salome/gui/GEOM/pics/transformation4a.png
deleted file mode 100644 (file)
index 64d2d41..0000000
Binary files a/doc/salome/gui/GEOM/pics/transformation4a.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/transformation5.png b/doc/salome/gui/GEOM/pics/transformation5.png
deleted file mode 100755 (executable)
index 8d1cf92..0000000
Binary files a/doc/salome/gui/GEOM/pics/transformation5.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/transformation6.png b/doc/salome/gui/GEOM/pics/transformation6.png
deleted file mode 100755 (executable)
index 3e3828b..0000000
Binary files a/doc/salome/gui/GEOM/pics/transformation6.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/transformation7.png b/doc/salome/gui/GEOM/pics/transformation7.png
deleted file mode 100755 (executable)
index 03a16fe..0000000
Binary files a/doc/salome/gui/GEOM/pics/transformation7.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/transformation8.png b/doc/salome/gui/GEOM/pics/transformation8.png
deleted file mode 100755 (executable)
index 77d0303..0000000
Binary files a/doc/salome/gui/GEOM/pics/transformation8.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/transformation9.png b/doc/salome/gui/GEOM/pics/transformation9.png
deleted file mode 100755 (executable)
index c7f6194..0000000
Binary files a/doc/salome/gui/GEOM/pics/transformation9.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/translationsn1.png b/doc/salome/gui/GEOM/pics/translationsn1.png
deleted file mode 100755 (executable)
index 42e008c..0000000
Binary files a/doc/salome/gui/GEOM/pics/translationsn1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/translationsn2.png b/doc/salome/gui/GEOM/pics/translationsn2.png
deleted file mode 100755 (executable)
index 01d6959..0000000
Binary files a/doc/salome/gui/GEOM/pics/translationsn2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/transparencysn.png b/doc/salome/gui/GEOM/pics/transparencysn.png
deleted file mode 100755 (executable)
index 0b3638e..0000000
Binary files a/doc/salome/gui/GEOM/pics/transparencysn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/vector1.png b/doc/salome/gui/GEOM/pics/vector1.png
deleted file mode 100755 (executable)
index 46e3b20..0000000
Binary files a/doc/salome/gui/GEOM/pics/vector1.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/vector2.png b/doc/salome/gui/GEOM/pics/vector2.png
deleted file mode 100755 (executable)
index bb5c64c..0000000
Binary files a/doc/salome/gui/GEOM/pics/vector2.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/vectors.png b/doc/salome/gui/GEOM/pics/vectors.png
deleted file mode 100755 (executable)
index bb8e7c5..0000000
Binary files a/doc/salome/gui/GEOM/pics/vectors.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/wiresn.png b/doc/salome/gui/GEOM/pics/wiresn.png
deleted file mode 100755 (executable)
index 623ae3b..0000000
Binary files a/doc/salome/gui/GEOM/pics/wiresn.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/workplane4.png b/doc/salome/gui/GEOM/pics/workplane4.png
deleted file mode 100755 (executable)
index 00835eb..0000000
Binary files a/doc/salome/gui/GEOM/pics/workplane4.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/workplane5.png b/doc/salome/gui/GEOM/pics/workplane5.png
deleted file mode 100755 (executable)
index 925ac57..0000000
Binary files a/doc/salome/gui/GEOM/pics/workplane5.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/pics/workplane6.png b/doc/salome/gui/GEOM/pics/workplane6.png
deleted file mode 100755 (executable)
index 1f65862..0000000
Binary files a/doc/salome/gui/GEOM/pics/workplane6.png and /dev/null differ
index 56d52a61ad5a331e8853efcfe4e67584805c2b96..9211d570fa977e8749aadf7eed6497d7bad3e1f8 100755 (executable)
@@ -4,7 +4,7 @@
 </head>
 <body>
 <hr style="width: 100%; height: 2px;">
-<div style="text-align: center;">Copyright &copy; 2003-2007 CEA, EDF<br>
+<div style="text-align: center;">Copyright &copy; 2003-2009 CEA, EDF<br>
 </div>
 </body>
 </html>
diff --git a/doc/salome/gui/GEOM/whdata/whftdata.js b/doc/salome/gui/GEOM/whdata/whftdata.js
deleted file mode 100755 (executable)
index addf262..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-//     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
deleted file mode 100755 (executable)
index acfb3af..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<html>
-<head>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-</head>
-<body>
-<script language="javascript" src="whftdata.js"></script>
-<script language="javascript">
-<!--
-//-->
-</script>
-<script language="javascript">
-<!--
-aTE("Add Point on Edge","add_point_on_edge.htm");
-aTE("Arc","arc.htm");
-aTE("Archimede","archimede.htm");
-aTE("Basic Geometrical Objects","basic_geometrical_objects.htm");
-aTE("Basic Operations","basic_operations.htm");
-aTE("Blocks Operations","blocks_operations.htm");
-aTE("Boolean Operations","boolean_operations.htm");
-aTE("Box","box.htm");
-aTE("Building by Blocks","building_by_blocks.htm");
-aTE("Chamfer","chamfer.htm");
-aTE("Change Orientation","change_orientation.htm");
-aTE("Changing Display Parameters","changing_display_parameters.htm");
-aTE("Check Free Boundaries","check_free_boundaries.htm");
-aTE("Check Free Faces","check_free_faces.htm");
-aTE("Circle","circle.htm");
-aTE("Close Contour","close_contour.htm");
-aTE("Color","color.htm");
-aTE("Common","common.htm");
-aTE("Complex Objects","complex_objects.htm");
-aTE("Compound","compound.htm");
-aTE("Cone","cone.htm");
-aTE("Curve","curve.htm");
-aTE("Cut","cut.htm");
-aTE("Cylinder","cylinder.htm");
-aTE("Edge","edge.htm");
-aTE("Ellipse","ellipse.htm");
-aTE("Explode","explode.htm");
-aTE("Explode on Blocks","explode_on_blocks.htm");
-aTE("Extrusion","extrusion.htm");
-aTE("Face","face.htm");
-aTE("Introduction to GEOM","files/introduction_to_geom.htm");
-aTE("Using Boolean Operations","files/salome2_sp3_booleangui_functions.htm");
-aTE("Importing and exporting geometrical objects","files/salome2_sp3_geomtoolsgui_functions.htm");
-aTE("Using Measurement Tools","files/salome2_sp3_measuregui_functions.htm");
-aTE("Fillet","fillet.htm");
-aTE("Filling","filling.htm");
-aTE("Fuse","fuse.htm");
-aTE("Geometrical Objects","geometrical_objects.htm");
-aTE("geometry","geometry.htm");
-aTE("Glue Faces","glue_faces.htm");
-aTE("Groups","groups.htm");
-aTE("Isos","isos.htm");
-aTE("Line","line.htm");
-aTE("Local Coordinate System","local_coordinate_system.htm");
-aTE("Measurement Tools","measurement_tools.htm");
-aTE("Mirror Image","mirror_image.htm");
-aTE("Modify the Location","modify_the_location.htm");
-aTE("Multi Rotation","multi_rotation.htm");
-aTE("Multi Transformation","multi_transformation.htm");
-aTE("Multi Translation","multi_translation.htm");
-aTE("Blocks","newentity_blocks.htm");
-aTE("OCC_Viewer","occ_viewer.htm");
-aTE("Offset Surface","offset_surface.htm");
-aTE("Partition","partition.htm");
-aTE("Pipe Creation","pipe_creation.htm");
-aTE("Plane","plane.htm");
-aTE("Point","point.htm");
-aTE("Primitives","primitives.htm");
-aTE("Propagate","propagate.htm");
-aTE("Repairing Operations","repairing_operations.htm");
-aTE("Revolution","revolution.htm");
-aTE("Rotation","rotation.htm");
-aTE("Scale Transform","scale_transform.htm");
-aTE("Section","section.htm");
-aTE("Sewing","sewing.htm");
-aTE("Shape Processing","shape_processing.htm");
-aTE("Shell","shell.htm");
-aTE("Sketcher","sketcher.htm");
-aTE("Sketcher","sketcher_tui.htm");
-aTE("Solid","solid.htm");
-aTE("Sphere","sphere.htm");
-aTE("Suppress Faces","suppress_faces.htm");
-aTE("Suppress Holes","suppress_holes.htm");
-aTE("Suppress Internal Wires","suppress_internal_wires.htm");
-aTE("Transformation Operations","transformation_operations.htm");
-aTE("Translation","translation.htm");
-aTE("Transparency","transparency.htm");
-aTE("Turus","turus.htm");
-aTE("Vector","vector.htm");
-aTE("Viewing Geometrical Objects","viewing_geometrical_objects.htm");
-aTE("Wire","wire.htm");
-aTE("Wireframe and Shading","wireframe_and_shading.htm");
-aTE("Working Plane","working_plane.htm");
-aTE("Working with groups","working_with_groups.htm");
-
-//-->
-</script>
-</html>
diff --git a/doc/salome/gui/GEOM/whdata/whfts.htm b/doc/salome/gui/GEOM/whdata/whfts.htm
deleted file mode 100755 (executable)
index 292e304..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<head>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-</head>
-<body>
-<script language="javascript" src="whfts.js"></script>
-<script language="javascript">
-<!--
-iWM("0","zoom","whfwdata0.htm");
-
-iTM(0,82,"whftdata0.htm");
-
-//-->
-</script>
-</body>
-</html>
diff --git a/doc/salome/gui/GEOM/whdata/whfts.js b/doc/salome/gui/GEOM/whdata/whfts.js
deleted file mode 100755 (executable)
index 54246f6..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-//     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
deleted file mode 100755 (executable)
index 8340b59..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//     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
deleted file mode 100755 (executable)
index 290ddb8..0000000
+++ /dev/null
@@ -1,1379 +0,0 @@
-<html>
-<head>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-</head>
-<body>
-<script language="javascript" src="whfwdata.js"></script>
-<script language="javascript">
-<!--
-//-->
-</script>
-<script language="javascript">
-<!--
-aWE("0",0,3,4,5,6,8,11,18,37,40,44,46,56,57,59,65,68,74,76,33);
-aWE("00001",59);
-aWE("0001",18);
-aWE("01",4);
-aWE("07",44);
-aWE("1",0,2,3,4,5,6,8,9,10,11,14,15,18,20,23,25,26,27,28,29,34,35,37,39,40,43,44,45,46,47,48,49,53,54,55,56,57,58,59,60,61,62,64,65,67,68,70,72,74,75,76,77,31,82,83);
-aWE("10",3,18,37,44,57,68,74);
-aWE("100",3,4,5,18,37,44,46,59,68,74);
-aWE("1000",3,74);
-aWE("1000000",4);
-aWE("100x30x100",44);
-aWE("105",44);
-aWE("11",44);
-aWE("12",33);
-aWE("120",8);
-aWE("130",59);
-aWE("140",59);
-aWE("15",8,18,44,57,68);
-aWE("150",3,8,37,59,68);
-aWE("165",11);
-aWE("17",57);
-aWE("170",3);
-aWE("180",59,65,68);
-aWE("1840",44);
-aWE("1d",5,74);
-aWE("1e",44,59);
-aWE("2",50,5,7,14,17,18,21,22,23,24,27,28,36,37,40,41,42,44,47,48,49,53,59,63,67,74,75,77,31,78,82);
-aWE("20",3,6,18,37,57,59,68,74);
-aWE("200",3,4,5,40,44,46,59,74);
-aWE("210",74);
-aWE("218",11);
-aWE("220",74);
-aWE("23",44);
-aWE("25",3,5,6,57,74);
-aWE("250",37,44,59,68);
-aWE("2d",5,35,59,65,74,31);
-aWE("3",1,2,5,7,11,14,18,20,37,40,44,48,55,56,59,61,67,74,75,31,78);
-aWE("30",3,8,11,18,37,44,57,59,68,74);
-aWE("300",37,68);
-aWE("300000",44);
-aWE("31",11);
-aWE("32",59);
-aWE("32000",44);
-aWE("35",6,8,57,59,74);
-aWE("3d",14,21,35,43,51,55,56,59,65,71,31,33,78,79,81,83);
-aWE("4",50,37,40,44,48,67,74,31);
-aWE("40",6,8,18,37,57,59,74);
-aWE("41",59);
-aWE("45",57,59);
-aWE("5",0,3,11,18,35,37,40,32,44,56,59,67,68,74);
-aWE("50",3,5,8,11,18,37,44,59,68,74,76);
-aWE("500",4);
-aWE("55",6,57,59);
-aWE("6",50,5,44,33);
-aWE("60",18,37,59,74);
-aWE("65",59);
-aWE("7",37,44,59);
-aWE("70",3,8,37,57,59,68,74);
-aWE("8",44);
-aWE("80",44,59,68,74);
-aWE("9",37,44,67);
-aWE("90",65,67);
-aWE("abl",51,67);
-aWE("absolut",67);
-aWE("absolute",76);
-aWE("acces",51,79);
-aWE("accessibl",7,16,29,42,70);
-aWE("accord",0);
-aWE("accordanc",0,15);
-aWE("ad",15,40,32,83);
-aWE("add",0,3,4,5,6,8,18,37,40,57,59,68,74,83);
-aWE("addobject",40,83);
-aWE("addtostudy",3,4,5,6,8,11,18,37,40,57,59,68,74);
-aWE("addtostudyinfath",5,59);
-aWE("advanc",7,19,24,28,29,37,66,69,70,80);
-aWE("algorithm",7,14,20,21,23,28,43,46,55,56,61,67,70,77,78,82);
-aWE("all_fac",59);
-aWE("allow",50,9,26,43,45,46,47,51,53,61,64,65,67,72,75,33,79);
-aWE("along",7,9,46,49,52,54,74,75);
-aWE("alongsid",31);
-aWE("already",40);
-aWE("although",46);
-aWE("angl",47,59,60,61,65,67,74);
-aWE("anoth",22,42,55,56,70,74);
-aWE("any",43,53,61,65,75);
-aWE("ap",43,74,83);
-aWE("appear",79,83);
-aWE("append",18,37,74);
-aWE("appli",9,65);
-aWE("applicabl",52);
-aWE("apply",65,79);
-aWE("approximation",65);
-aWE("arc",1,3,18,37,59,67,68,74);
-aWE("arc1",18);
-aWE("arc2",18);
-aWE("archimed",2,4);
-aWE("area",44,51);
-aWE("argument",0,1,2,50,7,9,10,14,15,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,41,42,43,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,66,67,69,70,71,72,73,75,77,31,78,80,82,83);
-aWE("around",47,51,60,74);
-aWE("automatical",50,43,79);
-aWE("availabl",0,50,15,32,51,67,71,72,73,83);
-aWE("ax",7,43,49,51,75);
-aWE("axi",18,20,23,43,45,46,47,60,61,74,33);
-aWE("b",3,21,65);
-aWE("background",79);
-aWE("bas",20,23,28,43,47,51,54,59,60,62,65,75,77);
-aWE("baseshap",54);
-aWE("basi",28,51);
-aWE("basic",1,2,3,4,14,21,25,38,30,42,43,44,53,55,56,67,33,78,82);
-aWE("basicproperti",44,33);
-aWE("bb",44);
-aWE("be",24);
-aWE("befor",59,65,67);
-aWE("begin",59);
-aWE("belong",9);
-aWE("below",50);
-aWE("besi",21);
-aWE("bezi",3,21,65);
-aWE("black",79);
-aWE("block",50,5,8,27,38,30,44,48,58,33);
-aWE("bmp",51,79);
-aWE("boolean",6,17,22,36,38,30,63,31,33);
-aWE("both",7,20,48,49,65);
-aWE("boudari",59);
-aWE("bound",8,37,44,51,33);
-aWE("boundari",12,59,64,72);
-aWE("boundary",12,59,73);
-aWE("boundingbox",44,33);
-aWE("box",4,50,5,7,11,16,22,27,40,32,44,51,53,57,59,65,67,73,74,76,33,80,83);
-aWE("box_tr1",5);
-aWE("box_tr2",5);
-aWE("box1",44,57,59);
-aWE("box2",44,57,59);
-aWE("box3",57);
-aWE("bracket",65);
-aWE("break",58);
-aWE("brep",38,32,30,59);
-aWE("brows",32,43,79,80);
-aWE("bsplin",65);
-aWE("bsplinerestriction",65);
-aWE("build",50,5,8,19,24,29,38,30,53,58,66,69,80);
-aWE("button",43,51,54,64,72,80,83);
-aWE("bypas",50);
-aWE("c",37,65,68);
-aWE("c0",65);
-aWE("c1",65);
-aWE("c2",65);
-aWE("cad",38,30);
-aWE("calculat",43,33);
-aWE("camera",82);
-aWE("cas",50,43,48,61,73);
-aWE("cascad",51);
-aWE("catia",32);
-aWE("cc",51);
-aWE("cent",7,14,20,25,44,46,47,51,67,70,74,77,33);
-aWE("center",26);
-aWE("centerofscal",62);
-aWE("central",20,23,61,62,65);
-aWE("centralpoint",61);
-aWE("certain",65,83);
-aWE("chain",5);
-aWE("chamf",9,74);
-aWE("chamfer_",74);
-aWE("chamfer_all",74);
-aWE("chamfer_f",74);
-aWE("chamfer_f1",74);
-aWE("chang",10,11,16,41,51,76,79,81);
-aWE("changeorientation",10);
-aWE("check",12,13,27,29,44,59,65,73,33);
-aWE("check_box",5);
-aWE("checkbox",10,45,46,47,61,72,75,33);
-aWE("checkcompoundofblock",44,33);
-aWE("checkshap",44,59,33);
-aWE("choic",21);
-aWE("choos",27,32,43,51,53);
-aWE("circl",3,14,67);
-aWE("circle1",3);
-aWE("circle2",3);
-aWE("click",16,32,51,54,79,81,83);
-aWE("clip",51);
-aWE("clon",51);
-aWE("clos",12,15,59,65,69,83);
-aWE("closecontour",15,59);
-aWE("closedwir",12,59);
-aWE("closur",15);
-aWE("cm",44);
-aWE("cn",65);
-aWE("coincid",46);
-aWE("coincident",39);
-aWE("coincidental",65);
-aWE("collinear",20,23);
-aWE("color",11,16,79,81);
-aWE("command",0,1,2,50,7,9,10,12,13,14,15,16,17,19,20,21,23,24,25,26,27,28,29,34,35,36,39,42,43,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,76,77,31,33,78,79,80,81,83);
-aWE("common",6,9,15,17,74,31);
-aWE("complex",18,28,35,38,30,54,60,31);
-aWE("component",3,18,67,75);
-aWE("compos",50,10,33);
-aWE("compound",50,5,17,18,19,22,26,27,35,36,37,39,44,47,49,52,59,63,33);
-aWE("compsolid",26,28,54,60);
-aWE("compund",37);
-aWE("comput",2,33);
-aWE("con",20,57,59);
-aWE("concern",33);
-aWE("condition",33);
-aWE("cone1",57);
-aWE("cone2",57);
-aWE("confirm",32,83);
-aWE("conical",65);
-aWE("connect",9,29,66,33,80);
-aWE("connection",33);
-aWE("consequent",74);
-aWE("consider",15,39,33);
-aWE("consol",33);
-aWE("constraint",50);
-aWE("construct",50,69);
-aWE("construction",21,38,30,43,51,31);
-aWE("contain",0,13,15,58);
-aWE("content",40,32,51);
-aWE("continuiti",65);
-aWE("continuity",65);
-aWE("continuity2d",65);
-aWE("continuity3d",65);
-aWE("continuou",65);
-aWE("contour",15,59);
-aWE("conversion",65);
-aWE("convert",65);
-aWE("coord",44);
-aWE("coordinat",7,20,23,26,43,44,46,51,55,56,67,70,74,75,77,33,78,82);
-aWE("copy",10,45,46,61,75);
-aWE("corn",65);
-aWE("corner",7,8);
-aWE("correct",65);
-aWE("correction",65);
-aWE("correspond",2,12,21,24,27);
-aWE("count",59);
-aWE("coupl",67);
-aWE("cover",31);
-aWE("creat",1,2,3,4,50,5,6,7,8,9,10,14,15,18,19,20,21,23,24,25,26,28,29,34,35,36,37,40,42,43,44,45,46,47,51,54,55,56,57,59,60,61,62,63,66,67,68,69,70,74,75,77,33,78,79,80,82,83);
-aWE("createanddisplaygo",3,4,5,6,8,11,18,37,40,57,59,68,74);
-aWE("creategroup",40,83);
-aWE("creation",1,3,7,14,15,18,19,20,21,23,24,25,28,29,35,37,38,40,30,42,54,55,56,57,59,60,66,69,70,77,78,80,83);
-aWE("criteria",5);
-aWE("cros",51);
-aWE("cs1",74);
-aWE("cs2",74);
-aWE("cub",46);
-aWE("current",7,42,51,53,67,70);
-aWE("curv",3,21,35,65,67);
-aWE("curvatur",65);
-aWE("curve2dmod",65);
-aWE("curve3dmod",65);
-aWE("curvecontinuity",65);
-aWE("cut",6,17,22,53,59,31);
-aWE("cut_without_f_2",59);
-aWE("cylind",6,20,23,57,59,74);
-aWE("cylinder",18,57);
-aWE("cylinder1",57);
-aWE("cylinder2",57);
-aWE("cylindrical",65);
-aWE("d",9,59,65);
-aWE("d1",9,74);
-aWE("d2",9,74);
-aWE("data",33);
-aWE("data_dir",59);
-aWE("def",44);
-aWE("default",51,56,67,79,83);
-aWE("defin",1,7,9,14,20,21,23,25,26,27,28,34,35,32,42,43,47,48,49,51,54,55,56,60,61,62,65,67,70,75,77,78,82,83);
-aWE("definit",72);
-aWE("definition",54);
-aWE("deflection",2);
-aWE("defn",61);
-aWE("degenerat",33);
-aWE("degre",35,60,65,67);
-aWE("delet",83);
-aWE("density",2);
-aWE("depend",48,65);
-aWE("derivativ",65);
-aWE("descr",44);
-aWE("describ",79);
-aWE("description",50,44,67,68,33);
-aWE("design",83);
-aWE("destin",38,30);
-aWE("destination",67);
-aWE("detail",79);
-aWE("detect",12,64,72);
-aWE("detection",65);
-aWE("develop",51);
-aWE("dialog",50,22,32,65,67,76,80,83);
-aWE("differencelist",40);
-aWE("different",45,33);
-aWE("dimension",7,9,23,28,47,33);
-aWE("dir",47,49);
-aWE("dir1",49);
-aWE("dir2",49);
-aWE("direct",43,61);
-aWE("direction",2,14,20,25,28,43,47,48,49,51,60,61,65,67,77);
-aWE("dirfaceid1",48);
-aWE("dirfaceid1u",48);
-aWE("dirfaceid1v",48);
-aWE("dirfaceid2",48);
-aWE("dirfaceid2u",48);
-aWE("dirfaceid2v",48);
-aWE("display",3,4,5,6,8,11,16,18,37,40,32,41,51,57,59,64,68,72,74,76,33,79,81,83);
-aWE("displayon",79);
-aWE("distanc",39,44,52,65,33);
-aWE("divid",0,59);
-aWE("divideedg",0,59);
-aWE("documentation",79);
-aWE("doesn",40,51);
-aWE("don",7,10,15,28,49,51,70);
-aWE("doubl",47,48,49,67,76);
-aWE("down",83);
-aWE("downward",51);
-aWE("drag",51);
-aWE("drawn",51);
-aWE("drop",65);
-aWE("dropsmalledg",65);
-aWE("du",65);
-aWE("dump",51,79);
-aWE("duplicat",51);
-aWE("dx",7,44,67,75,78);
-aWE("dy",7,44,67,75,78);
-aWE("dz",7,44,75,78);
-aWE("e",44,53,65);
-aWE("e1",50);
-aWE("e2",50);
-aWE("e3",50);
-aWE("e4",50);
-aWE("easi",83);
-aWE("edg",0,1,50,7,8,9,12,14,15,18,21,24,25,26,28,34,35,37,42,44,54,56,58,59,60,65,66,67,74,33,78,80,81);
-aWE("edge_ind",59);
-aWE("edge_point",59);
-aWE("edge1",8);
-aWE("edge2",8);
-aWE("edge3",8);
-aWE("edge4",8);
-aWE("edgeid",0);
-aWE("edit",83);
-aWE("egdemaxtol",33);
-aWE("egdemintol",33);
-aWE("eith",50,46);
-aWE("element",15,29,67,31,33,79,83);
-aWE("elementary",50);
-aWE("ellips",3,25);
-aWE("els",44,59);
-aWE("empty",72,73);
-aWE("encounter",33);
-aWE("end",1,15,28,46,59,65,67,74,75,78);
-aWE("ent",83);
-aWE("entir",33);
-aWE("entity",1,50,7,14,19,20,21,23,24,25,26,28,29,35,42,43,54,55,56,60,66,67,69,70,77,78,80,82,83);
-aWE("equal",20,65,67);
-aWE("eras",79);
-aWE("eraseall",79);
-aWE("eraseon",79);
-aWE("error",12,40,33);
-aWE("etc",26,53,65);
-aWE("exampl",0,1,2,50,7,9,10,12,13,14,15,16,17,19,20,21,22,23,24,25,27,28,29,34,35,36,39,32,41,42,43,45,46,47,48,49,52,53,54,55,56,58,59,60,61,62,63,64,65,66,67,69,70,71,72,73,75,76,77,31,78,80,81,83);
-aWE("except",73);
-aWE("exist",67,83);
-aWE("expand",32);
-aWE("explod",5,26,27,37);
-aWE("export",38,32,30,51,79);
-aWE("exportation",32);
-aWE("extend",51);
-aWE("extra",33);
-aWE("extract",27);
-aWE("extrud",54,60);
-aWE("extrusion",28,54);
-aWE("f",37,68);
-aWE("f_2",59);
-aWE("f_ind_1",74);
-aWE("f_ind_2",74);
-aWE("f1",50);
-aWE("f1_id",59);
-aWE("f2",50);
-aWE("f3",50);
-aWE("f4",50);
-aWE("f5",50);
-aWE("f6",50);
-aWE("fab",44);
-aWE("fac",2,3,50,5,8,9,10,13,15,18,26,27,28,29,34,35,37,39,40,44,48,52,53,54,55,59,60,65,66,67,68,71,73,74,33,82);
-aWE("face_nam",59);
-aWE("face_rot",59);
-aWE("face1",9,18,37);
-aWE("face2",9,18,37);
-aWE("face3",37);
-aWE("faceid",40);
-aWE("facemaxtol",33);
-aWE("facemintol",33);
-aWE("factor",62,74);
-aWE("fail",44,59);
-aWE("fals",12);
-aWE("far",53);
-aWE("field",10);
-aWE("fil",16,18,35,32,79,81);
-aWE("fill",72);
-aWE("fillet",9,34,74);
-aWE("filletall",74);
-aWE("final",45,46,55,56,75,82,83);
-aWE("first",7,14,20,23,24,28,43,45,46,48,49,53,55,56,61,65,68,70,75,77,31,78,82);
-aWE("fit",51);
-aWE("fix",65);
-aWE("fixfacesiz",65);
-aWE("fixshap",59,65);
-aWE("flag",33);
-aWE("flight_solid",59);
-aWE("follow",65,67,68,76,31,33,83);
-aWE("format",38,32,30,51,79);
-aWE("four",50,8,65);
-aWE("fram",51);
-aWE("fre",12,13,59,64,72);
-aWE("function",38,30,51,74);
-aWE("functionaliti",50);
-aWE("functionality",51,53,67,83);
-aWE("fus",6,11,36,31);
-aWE("fuse_id",11);
-aWE("g1",65);
-aWE("g2",65);
-aWE("gap",15);
-aWE("gc",46);
-aWE("general",50,31);
-aWE("generat",28,35,54);
-aWE("generation",28,35,38,30,54,60);
-aWE("geom",3,4,5,6,8,11,18,37,40,44,57,58,59,68,74,33);
-aWE("geom_object",0,1,2,50,7,9,12,13,14,15,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,42,45,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,77,33,78,80,83);
-aWE("geometric",1,50,14,19,21,24,25,28,29,35,42,54,55,56,60,65,66,69,78,79,80);
-aWE("geometrical",3,11,17,37,38,32,30,47,51,53,31,33,79,81,83);
-aWE("geometry",38,32,30,51,59,65,33);
-aWE("geompy",0,1,2,3,4,50,5,6,7,8,9,10,11,12,14,15,17,18,19,20,21,23,24,25,26,27,28,29,34,35,36,37,39,40,42,43,44,45,46,47,48,49,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,77,31,33,78,80,83);
-aWE("get",5,44,59,74,33);
-aWE("getenv",59);
-aWE("getfacenearpoint",5);
-aWE("getfreeboundary",12,59);
-aWE("getfreefacesid",13,59);
-aWE("getobjectid",83);
-aWE("getsubshap",59);
-aWE("getsubshapeid",5,40,59,74);
-aWE("gg",3,4,5,6,8,11,16,18,37,40,44,57,59,68,74,76,81);
-aWE("giv",14,25,32,55,65);
-aWE("given",3,5,8,9,13,18,23,26,27,29,34,37,39,42,47,52,56,59,65,68,74,77,33);
-aWE("global",46,51);
-aWE("glu",5,39,44,59,33);
-aWE("good",51);
-aWE("gravity",26,44,47,33);
-aWE("great",51);
-aWE("group",5,38,40,30,51,58,83);
-aWE("group_n",83);
-aWE("group1",40);
-aWE("gui",79);
-aWE("handl",83);
-aWE("hav",65,66);
-aWE("height",6,20,23,28,57,59,74);
-aWE("her",83);
-aWE("hexagonal",8);
-aWE("hexahedral",50,8,48);
-aWE("hexahedron",50);
-aWE("hid",51,79);
-aWE("highlight",12,33);
-aWE("hol",59,72);
-aWE("hold",80);
-aWE("how",33);
-aWE("i",18,37,40,53,59,65);
-aWE("i11",33);
-aWE("i12",33);
-aWE("i13",33);
-aWE("i21",33);
-aWE("i22",33);
-aWE("i23",33);
-aWE("i31",33);
-aWE("i32",33);
-aWE("i33",33);
-aWE("id",0,13,15,16,26,48,59,71,72,73,74,76,79,81,83);
-aWE("id_arc",3);
-aWE("id_archimed",4);
-aWE("id_axi",74);
-aWE("id_bezi",3);
-aWE("id_box",4,5,59,74);
-aWE("id_box_tr1",5);
-aWE("id_box_tr2",5);
-aWE("id_box1",57,59);
-aWE("id_box2",57,59);
-aWE("id_box3",57);
-aWE("id_chamfer_",74);
-aWE("id_chamfer_all",74);
-aWE("id_chamfer_f",74);
-aWE("id_chamfer_f1",74);
-aWE("id_circle1",3);
-aWE("id_circle2",3);
-aWE("id_common",6);
-aWE("id_compound",5,18,37,59);
-aWE("id_cone1",57);
-aWE("id_cone2",57);
-aWE("id_cs1",74);
-aWE("id_cs2",74);
-aWE("id_cut",6,59);
-aWE("id_cut_without_f_2",59);
-aWE("id_cylind",6,74);
-aWE("id_cylinder1",57);
-aWE("id_cylinder2",57);
-aWE("id_divid",59);
-aWE("id_edg",18,37,59);
-aWE("id_edge1",8);
-aWE("id_edge2",8);
-aWE("id_edge3",8);
-aWE("id_edge4",8);
-aWE("id_ellips",3);
-aWE("id_fac",3,59,68);
-aWE("id_face_rot",59);
-aWE("id_face1",18,37);
-aWE("id_face2",18,37);
-aWE("id_face3",37);
-aWE("id_fil",18);
-aWE("id_fillet",74);
-aWE("id_filletall",74);
-aWE("id_fus",6);
-aWE("id_glu",59);
-aWE("id_group1",40);
-aWE("id_importbrep",59);
-aWE("id_interpol",3);
-aWE("id_line1",3);
-aWE("id_line2",3);
-aWE("id_make_block_explod",5);
-aWE("id_mirror1",74);
-aWE("id_mirror2",74);
-aWE("id_mirror3",74);
-aWE("id_offset",74);
-aWE("id_p",59);
-aWE("id_p_on_arc",3);
-aWE("id_p0",3);
-aWE("id_p1",3,8,74);
-aWE("id_p100",3);
-aWE("id_p2",3,8,74);
-aWE("id_p3",3,8);
-aWE("id_p4",3,8,74);
-aWE("id_partition1",4);
-aWE("id_partition2",4);
-aWE("id_partition3",4);
-aWE("id_pip",18);
-aWE("id_plan",4,74);
-aWE("id_plane1",3);
-aWE("id_plane2",3);
-aWE("id_plane3",3);
-aWE("id_polylin",3);
-aWE("id_position",74);
-aWE("id_prism",74);
-aWE("id_prism1",18);
-aWE("id_prism2",18);
-aWE("id_px",3);
-aWE("id_py",3);
-aWE("id_pz",3);
-aWE("id_qface1",8);
-aWE("id_qface2",8);
-aWE("id_qface3",8);
-aWE("id_result",59);
-aWE("id_revolution",18);
-aWE("id_rot1d",74);
-aWE("id_rot2d",74);
-aWE("id_rotation1",74);
-aWE("id_rotation2",74);
-aWE("id_scal",74);
-aWE("id_section",6);
-aWE("id_sew",59);
-aWE("id_shap",59);
-aWE("id_shell",37);
-aWE("id_sketcher1",68);
-aWE("id_sketcher2",68);
-aWE("id_solid",37);
-aWE("id_solid1",8);
-aWE("id_solid2",8);
-aWE("id_spher",6);
-aWE("id_sphere1",57);
-aWE("id_sphere2",57);
-aWE("id_sphere3",57);
-aWE("id_torus1",57);
-aWE("id_torus2",57);
-aWE("id_tr1d",74);
-aWE("id_tr2d",74);
-aWE("id_translation1",74);
-aWE("id_translation2",74);
-aWE("id_translation3",74);
-aWE("id_vector",3);
-aWE("id_vector1",3);
-aWE("id_vector2",3);
-aWE("id_vector3",18);
-aWE("id_vr",74);
-aWE("id_vxy",3);
-aWE("id_wir",18,37,59);
-aWE("id_wire_clos",59);
-aWE("idlist",59,74);
-aWE("idlist_",74);
-aWE("idlist_f",74);
-aWE("if",0,10,12,15,20,29,40,44,51,59,65,72,73,33);
-aWE("ig",38,32,30);
-aWE("ignor",53);
-aWE("ii",5);
-aWE("imag",45,51,74,79);
-aWE("imp",65);
-aWE("implement",32);
-aWE("implementation",53);
-aWE("impli",65);
-aWE("import",3,4,5,6,8,11,18,37,38,40,32,30,44,57,59,68,74,33);
-aWE("importation",32);
-aWE("importbrep",59);
-aWE("importcomponentgui",3,4,5,6,8,11,18,37,40,44,57,59,68,74);
-aWE("impossibl",29);
-aWE("in",32,52);
-aWE("includ",40);
-aWE("increas",15);
-aWE("independent",17);
-aWE("index",26,83);
-aWE("indic",9,26,59);
-aWE("indicat",49,56);
-aWE("inertia",44,33);
-aWE("inform",33);
-aWE("initial",10,45,46,47,61,62,75);
-aWE("inquir",33);
-aWE("insert",15);
-aWE("instead",20);
-aWE("integ",48);
-aWE("integer",27,48);
-aWE("interactive",27);
-aWE("intermediat",50);
-aWE("internal",59,73);
-aWE("interpol",3);
-aWE("interpolat",21);
-aWE("intersect",53);
-aWE("intersection",53);
-aWE("introduction",50,38,30);
-aWE("invalid",44,59,65);
-aWE("invert",51);
-aWE("invisibl",76);
-aWE("inward",10);
-aWE("isbyparamet",0);
-aWE("iscommonvertex",15);
-aWE("isequal",44);
-aWE("iso",79);
-aWE("isolin",41,79);
-aWE("isometric",51);
-aWE("isplanarfac",37);
-aWE("isplanarwant",3,18,29,68);
-aWE("issucces",59);
-aWE("isvalid",44,59);
-aWE("iteration",35);
-aWE("itself",15);
-aWE("ix",44,33);
-aWE("iy",44,33);
-aWE("iz",44,33);
-aWE("join",65);
-aWE("jpeg",51,79);
-aWE("jpg",51,79);
-aWE("junction",65);
-aWE("just",50);
-aWE("k",65);
-aWE("keep",45,46,61,75,83);
-aWE("keyboard",83);
-aWE("ko",59);
-aWE("l",37,68);
-aWE("last",24,43);
-aWE("lc",43,46);
-aWE("lcs1",46);
-aWE("lcs2",46);
-aWE("least",21);
-aWE("leav",10,83);
-aWE("left",46,51,79);
-aWE("len",59);
-aWE("length",0,44,67,33);
-aWE("li",1,14);
-aWE("limit",53);
-aWE("lin",2,3,42,43,67,83);
-aWE("line1",3);
-aWE("line2",3);
-aWE("linear",67);
-aWE("list",3,9,12,13,15,19,21,26,29,35,40,53,58,59,64,65,66,67,69,71,72,73,74,80,83);
-aWE("listchain",5);
-aWE("listoffaceid",9);
-aWE("listofgeomshap",71);
-aWE("listofid",71);
-aWE("listofind",26);
-aWE("listofkeepinsid",53);
-aWE("listofmaterial",53);
-aWE("listofremoveinsid",53);
-aWE("listofshap",19,21,53,64,66,69,80);
-aWE("listoftool",53);
-aWE("listofwireid",72);
-aWE("listshap",34);
-aWE("ll",51);
-aWE("local",43,46,52,55,67,74,82);
-aWE("localcs1",46);
-aWE("localcs2",46);
-aWE("locat",51,56);
-aWE("location",32,43,46,74);
-aWE("lock",10,51);
-aWE("lsc",46);
-aWE("ly",67,73);
-aWE("magnitud",65);
-aWE("main",0,1,2,50,7,9,10,12,13,14,15,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,42,43,44,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,77,33,78,80,82,83);
-aWE("mainshap",83);
-aWE("major",25,77);
-aWE("mak",5,6,9,44,48,49,59,74,75,83);
-aWE("make_block_explod",5);
-aWE("makearc",1,3,18,37,59,68,74);
-aWE("makebezi",3,21);
-aWE("makeblockexplod",5,27);
-aWE("makeboolean",11,31);
-aWE("makebox",7,11,44,57,59,74);
-aWE("makeboxdxdydz",5,7,44,57,59,74);
-aWE("makeboxtwopnt",4,7,40,57);
-aWE("makecdg",44,33);
-aWE("makechamf",74);
-aWE("makechamferall",9,74);
-aWE("makechamferedg",9,74);
-aWE("makechamferfac",9,74);
-aWE("makecircl",3,14);
-aWE("makecirclethreepnt",3,14);
-aWE("makecommon",6,17);
-aWE("makecompound",5,18,19,37,44,59);
-aWE("makecon",20,57,59);
-aWE("makeconer1r2h",20,57);
-aWE("makecut",6,59);
-aWE("makecylind",6,23,57,59,74);
-aWE("makecylinderrh",23,57);
-aWE("makeedg",8,18,24,37,59);
-aWE("makeellips",3,25);
-aWE("makefac",3,18,29,37,59,68,74);
-aWE("makefacewir",29,37);
-aWE("makefil",18,35);
-aWE("makefillet",34,74);
-aWE("makefilletall",34,74);
-aWE("makefus",6,36);
-aWE("makegluefac",39,44,59);
-aWE("makehalfpartition",4,53);
-aWE("makehexa",50,8);
-aWE("makehexa2fac",50,8);
-aWE("makeinterpol",3,21);
-aWE("makelin",3,42);
-aWE("makelinetwopnt",3,42);
-aWE("makemark",43,74);
-aWE("makemirrorbyaxi",45,74);
-aWE("makemirrorbyplan",45,74);
-aWE("makemirrorbypoint",45,74);
-aWE("makemultirotation1d",47);
-aWE("makemultirotation2d",47);
-aWE("makemultitransformation1d",5,48);
-aWE("makemultitransformation2d",5,48);
-aWE("makemultitranslation1d",49,74);
-aWE("makemultitranslation2d",49,74);
-aWE("makeoffset",52,74);
-aWE("makepartition",4,53);
-aWE("makepip",18,54);
-aWE("makeplan",3,4,55);
-aWE("makeplanefac",3,55);
-aWE("makeplanethreepnt",3,55,74);
-aWE("makepolylin",3,21);
-aWE("makeposition",46,74);
-aWE("makeprism",18,28,37);
-aWE("makeprismvech",18,28,59,74);
-aWE("makequad",50,8);
-aWE("makequad2edg",50,8);
-aWE("makequad4vertic",50,8);
-aWE("makerevolution",18,60);
-aWE("makerotation",59,61,74);
-aWE("makerotationthreepoint",61,74);
-aWE("makescaletransform",62,74);
-aWE("makesection",6,63);
-aWE("makesew",59,64);
-aWE("makeshell",37,66);
-aWE("makesketch",37,67,68);
-aWE("makesketcheronplan",68);
-aWE("makesolid",37,69);
-aWE("makespher",5,6,11,57,70);
-aWE("makespherepntr",57);
-aWE("maketoru",57,77);
-aWE("maketorusrr",57,77);
-aWE("maketranslation",18,37,74,75);
-aWE("maketranslationtwopoint",74,75);
-aWE("maketranslationvector",74,75);
-aWE("makevector",3,6,18,37,57,59,68,74,78);
-aWE("makevectordxdydz",3,4,18,78);
-aWE("makevertex",3,4,5,6,8,18,37,40,44,56,57,59,68,74);
-aWE("makevertexoncurv",3,56);
-aWE("makevertexwithref",3,56);
-aWE("makewir",3,18,37,59,68,74,80);
-aWE("manual",51,83);
-aWE("mark",51);
-aWE("mas",44,33);
-aWE("math",44,59,74);
-aWE("matrix",44,33);
-aWE("max",27,35,44,65);
-aWE("max_nb_fac",5);
-aWE("maxdeg",18);
-aWE("maxdegre",35);
-aWE("maximal",27,65,33);
-aWE("maximum",27,35,39,65,33);
-aWE("maxnbfac",27);
-aWE("maxtoleranc",65);
-aWE("maxtolerance3d",65);
-aWE("mean",52,56,67,81);
-aWE("measur",33);
-aWE("measurement",44,33);
-aWE("mechanism",32);
-aWE("meet",65);
-aWE("memoris",51);
-aWE("mention",50);
-aWE("menu",0,1,2,50,7,9,10,12,13,14,15,16,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,32,41,42,43,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,77,33,78,79,80,81,82,83);
-aWE("merg",65);
-aWE("mesh",2,50,51,79);
-aWE("meshingdeflection",2,4);
-aWE("method",46);
-aWE("middl",1,56);
-aWE("min",27,35,44,33);
-aWE("min_dist",44);
-aWE("min_nb_fac",5);
-aWE("mindeg",18);
-aWE("mindegre",35);
-aWE("mindistanc",44,33);
-aWE("minimal",27,29,44,33);
-aWE("minimum",27,35,65,33);
-aWE("minnbfac",27);
-aWE("minor",25,77);
-aWE("mirror",45,74);
-aWE("mirror1",74);
-aWE("mirror2",74);
-aWE("mirror3",74);
-aWE("mod",0,11,15,65,79,81);
-aWE("model",2,38,30);
-aWE("modifi",15,46);
-aWE("modify",46,74);
-aWE("modul",38,32,30,51,79);
-aWE("moment",44,33);
-aWE("mous",51,79);
-aWE("mov",46,49);
-aWE("much",83);
-aWE("multi",5,47,48,49,74);
-aWE("multirotate1d",47,74);
-aWE("multirotate2d",47,74);
-aWE("multitud",58);
-aWE("must",44,47,49,72,33);
-aWE("n",65);
-aWE("nam",0,1,2,50,7,9,10,14,15,17,19,20,21,22,23,24,25,28,29,34,35,36,39,32,42,43,45,46,47,48,49,52,53,54,55,56,60,62,63,64,65,66,69,70,71,72,73,75,77,78,79,80,82,83);
-aWE("nb",5,7,42,70);
-aWE("nb_sub",26);
-aWE("nbit",18,35);
-aWE("nbound",44);
-aWE("nbox",44);
-aWE("nbsplitpoint",65);
-aWE("nbtim",47,48,49);
-aWE("nbtimes1",47,49);
-aWE("nbtimes2",47,49);
-aWE("nbtimesu",48);
-aWE("nbtimesv",48);
-aWE("ncentr",44);
-aWE("ncompound",44);
-aWE("ne",7,9,26,28,29,34,35,47,49,54,60,62,65,70,75);
-aWE("necessari",65);
-aWE("necessary",9,34,65,67,33);
-aWE("need",15,61);
-aWE("negativ",52);
-aWE("neighbour",65);
-aWE("new",1,50,7,14,15,19,20,21,23,24,25,26,28,29,35,42,43,51,53,54,55,56,60,66,67,69,70,74,77,78,79,80,82,83);
-aWE("ninertia",44);
-aWE("nminimal",44);
-aWE("nod",21);
-aWE("noerror",12);
-aWE("non",44);
-aWE("normal",3,10,14,25,52,55,77);
-aWE("not",20);
-aWE("noth",29);
-aWE("notion",50);
-aWE("nth",65);
-aWE("numb",27,35,41,47,48,49,52,59,64,65,72,74,79);
-aWE("number",48);
-aWE("object",1,2,3,4,5,6,8,9,10,11,14,16,17,18,19,21,24,25,26,28,29,34,35,37,38,40,32,30,42,43,45,46,47,51,52,53,54,55,56,57,58,59,60,61,65,66,68,69,73,74,75,31,33,78,79,80,81,83);
-aWE("obtain",26,44,46,65);
-aWE("occ",0,9,15,34,51,71,72,73,79,83);
-aWE("occur",12);
-aWE("offset",52,74);
-aWE("ok",43,44,59,83);
-aWE("old",53,56);
-aWE("on",0,15,22,47,48,49,56,59,65,67,82);
-aWE("opaqu",76);
-aWE("open",12,15,32,51,59,83);
-aWE("openwir",12,59);
-aWE("operation",0,1,2,4,50,5,6,7,9,10,12,13,14,15,17,20,21,22,23,25,26,27,28,34,35,36,38,39,30,42,45,46,47,48,49,52,53,54,55,56,58,59,60,61,62,63,64,65,67,70,71,72,73,74,75,77,31,78,83);
-aWE("operator",59,65);
-aWE("opportunity",32);
-aWE("opposit",7);
-aWE("optimization",38,30);
-aWE("option",79,81);
-aWE("ord",65);
-aWE("orient",50);
-aWE("orientat",51);
-aWE("orientation",10,51);
-aWE("origin",7,20,23,43,51,70,77,78);
-aWE("orthogonal",61);
-aWE("os",59);
-aWE("otherwis",0,15,45,46,61,75);
-aWE("our",0,1,2,50,7,9,12,13,14,15,16,17,19,20,21,22,23,24,25,27,28,29,34,35,36,39,42,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,76,77,31,33,78,80,81,83);
-aWE("out",51,65);
-aWE("outward",10);
-aWE("ox",43,67);
-aWE("oy",43);
-aWE("oz",20,23,43,67);
-aWE("p",57);
-aWE("p_25_25_50",5);
-aWE("p_25_50_25",5);
-aWE("p_50_25_25",5);
-aWE("p_on_arc",3);
-aWE("p0",3,4,8,18,37,40,57,59,74);
-aWE("p1",3,6,8,18,37,57,59,68,74);
-aWE("p10",8);
-aWE("p100",3);
-aWE("p11",8);
-aWE("p2",3,6,8,18,37,57,59,68,74);
-aWE("p200",4,40);
-aWE("p3",3,8,18,37,59,68,74);
-aWE("p4",3,8,18,74);
-aWE("p5",3,8,18,74);
-aWE("p50",3);
-aWE("p6",8,18);
-aWE("p7",8,18);
-aWE("p70",57);
-aWE("p8",8,18);
-aWE("p9",8);
-aWE("pan",51);
-aWE("parallel",7,42,65);
-aWE("paramet",0,15,56,65);
-aWE("parameter",4,16,35,53,59,65,67,76,79,81);
-aWE("parameterization",65);
-aWE("parametric",65);
-aWE("paramt",0);
-aWE("part",17,20,51);
-aWE("partition",4,53);
-aWE("partition1",4);
-aWE("partition2",4);
-aWE("partition3",4);
-aWE("partitionalgo",53);
-aWE("pas",5,21,42,44,47,55,61,67);
-aWE("path",18,54);
-aWE("pathshap",54);
-aWE("perform",4,26,51,74);
-aWE("perpendicular",67);
-aWE("pi",47,59,74);
-aWE("pictur",46);
-aWE("pip",18,54);
-aWE("plac",46,51,65);
-aWE("plan",2,3,4,45,51,53,55,61,67,74,82,83);
-aWE("planar",29,67,68,74,82);
-aWE("plane1",3);
-aWE("plane2",3);
-aWE("plane3",3);
-aWE("plug",32);
-aWE("plung",2);
-aWE("png",51,79);
-aWE("point",0,1,3,4,50,7,8,14,15,18,20,21,23,24,25,28,37,40,42,43,44,45,47,51,52,55,56,59,61,62,65,67,68,70,74,75,77,33,78,83);
-aWE("point1",1,3,7,8,14,24,28,42,55,61,75,78);
-aWE("point2",1,3,7,8,14,24,28,42,55,61,75,78);
-aWE("point3",1,3,8,14,55);
-aWE("point4",3,8);
-aWE("point5",3);
-aWE("pointcoordinat",44,33);
-aWE("polylin",3,21);
-aWE("pop",16,81);
-aWE("position",0,46,51,56,65,74,82);
-aWE("positional",65);
-aWE("possibiliti",29);
-aWE("possibility",65);
-aWE("possibl",5,21,58,65,33);
-aWE("precision",59,64);
-aWE("predefin",67);
-aWE("preferrabl",53);
-aWE("pres",43,51);
-aWE("presentation",79);
-aWE("preview",51);
-aWE("previou",65,67);
-aWE("primitiv",7,20,23,38,30,57,70,77);
-aWE("print",44,59,33);
-aWE("prism",18,28,37,59,74);
-aWE("prism_edg",74);
-aWE("prism_fac",37,74);
-aWE("prism1",18);
-aWE("prism2",18);
-aWE("problem",65);
-aWE("proces",15,59,65,71);
-aWE("processshap",59,65);
-aWE("produc",2,9,15,17,22,27,34,36,45,47,48,49,52,53,58,61,62,63,64,65,71,74,75);
-aWE("program",40);
-aWE("project",10);
-aWE("projection",47,82);
-aWE("prop",44);
-aWE("propagat",5,58);
-aWE("propagation",5,58);
-aWE("properti",44,33);
-aWE("proportional",65);
-aWE("provid",0,1,2,50,7,9,12,13,14,15,16,17,19,20,21,22,23,24,25,27,28,29,34,35,36,39,42,45,46,47,48,49,51,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,76,77,31,78,80,81,83);
-aWE("ps",59);
-aWE("put",2);
-aWE("px",3,18,37,59,74);
-aWE("pxy",74);
-aWE("pxyz",18,37,74);
-aWE("py",3,18,37,59,74);
-aWE("py1",59);
-aWE("python",33);
-aWE("pz",3,4,18,37,59,74);
-aWE("qface1",8);
-aWE("qface2",8);
-aWE("qface3",8);
-aWE("qface4",8);
-aWE("qface5",8);
-aWE("qface6",8);
-aWE("qface7",8);
-aWE("quadrangl",50,8,55,33);
-aWE("quantiti",33);
-aWE("r",34,37,68);
-aWE("radio",83);
-aWE("radiu",3,9,14,20,23,25,34,67,70,74,77);
-aWE("radius",3,20,25,77);
-aWE("radius1",6,20,57,59,74);
-aWE("radius2",20,57);
-aWE("radius3",57);
-aWE("radiusmajor",25,77);
-aWE("radiusminor",25,77);
-aWE("rais",40,44,59);
-aWE("rang",0,26,38,32,30,76);
-aWE("recent",79);
-aWE("reconstruction",53);
-aWE("redefin",79);
-aWE("reduc",65);
-aWE("referenc",43,56);
-aWE("refresh",79);
-aWE("regard",56);
-aWE("relativ",67);
-aWE("relevant",81);
-aWE("remain",51,53,81);
-aWE("remaind",46);
-aWE("remot",51);
-aWE("remov",40,45,46,51,59,61,65,71,72,73,75,83);
-aWE("removeobject",40,83);
-aWE("removeweb",53);
-aWE("renam",79);
-aWE("repair",0,10,12,13,15,38,39,30,59,64,65,71,72,73);
-aWE("repetition",47,49);
-aWE("represent",51,55);
-aWE("representation",51);
-aWE("requir",32,65);
-aWE("requireddegre",65);
-aWE("requirednbsegment",65);
-aWE("res",59);
-aWE("reset",51);
-aWE("resiz",51);
-aWE("respect",39,67);
-aWE("restor",51);
-aWE("restriction",65);
-aWE("result",0,1,2,4,50,5,6,7,9,10,12,13,14,15,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,42,45,47,48,49,51,52,53,54,55,56,58,59,60,61,62,63,64,65,66,67,69,70,71,72,73,74,75,77,33,78,80,83);
-aWE("resultant",65);
-aWE("retriev",13);
-aWE("return",26,27,44,51,33,83);
-aWE("revers",10,47,61);
-aWE("revolution",18,60,65);
-aWE("right",16,46,79,81);
-aWE("ris",65);
-aWE("rot1d",74);
-aWE("rot2d",74);
-aWE("rotat",47,51,60,61,74);
-aWE("rotation",47,51,59,61,74);
-aWE("rotation1",74);
-aWE("rotation2",74);
-aWE("rul",65);
-aWE("runtimeerror",44,59);
-aWE("s",12,14,15,18,37,48,59,62,71,72,73,83);
-aWE("s1",17,36,63);
-aWE("s2",17,36,63);
-aWE("salom",3,4,5,6,8,11,18,37,38,40,30,44,57,59,68,74);
-aWE("sam",47,65,67,74,83);
-aWE("sameparamet",65);
-aWE("satisfy",33);
-aWE("sav",32,51);
-aWE("scal",62,74);
-aWE("scen",51);
-aWE("script",0,1,2,50,7,9,12,13,14,15,16,17,19,20,21,22,23,24,25,27,28,29,34,35,36,39,42,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,76,77,31,33,78,80,81,83);
-aWE("se",46,51,81);
-aWE("search",32);
-aWE("second",7,14,20,23,28,43,45,46,48,49,53,55,56,61,65,68,70,75,77,31,78,82);
-aWE("section",2,6,51,63,31);
-aWE("seem",59);
-aWE("segment",65,67);
-aWE("select",0,1,2,4,7,9,10,12,13,14,15,16,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,40,32,42,43,45,46,47,48,49,51,52,53,54,55,56,58,59,60,61,62,63,64,65,66,67,69,70,71,72,73,75,77,33,78,79,80,81,82,83);
-aWE("selection",34,67,82,83);
-aWE("separat",31);
-aWE("serv",21,28,54,60);
-aWE("set",0,15,27,29,37,47,51,52,56,82);
-aWE("setcolor",11,16);
-aWE("setdisplaymod",3,4,5,6,8,11,18,37,57,59,68,74,81);
-aWE("settransparency",3,11,37,68,74,76);
-aWE("sew",59,64);
-aWE("sg",5,40,59,79);
-aWE("shad",79,81);
-aWE("shap",0,2,4,9,10,12,13,15,17,19,22,26,28,34,35,36,37,38,39,40,30,41,44,45,46,47,49,51,52,53,54,58,59,60,61,62,63,64,65,71,72,73,74,75,76,33,79,83);
-aWE("shape1",31,33);
-aWE("shape2",31,33);
-aWE("shapelistcompound",18,37);
-aWE("shapes_of_given_typ",26);
-aWE("shapetyp",34,37,40,59,74,83);
-aWE("shapetypeedg",74);
-aWE("shapetypefac",74);
-aWE("shar",13);
-aWE("sharp",65);
-aWE("shel",13,19,37,52,66,69,81);
-aWE("shell",50,10,28,37,52,53,54,60,66,69);
-aWE("shift",46,56,80,83);
-aWE("short",16,81);
-aWE("shortcut",29);
-aWE("should",42,71,72,33);
-aWE("show",51,33);
-aWE("shown",43);
-aWE("sid",55);
-aWE("sign",52);
-aWE("simp",43);
-aWE("simpl",47,48,49);
-aWE("sinc",53);
-aWE("singl",29);
-aWE("six",50,8);
-aWE("siz",9,55,65);
-aWE("sketch",37,67,68);
-aWE("sketcher",37);
-aWE("sketcher1",37,68);
-aWE("sketcher2",37,68);
-aWE("sketcher3",37);
-aWE("skip",83);
-aWE("small",51,65);
-aWE("so",29,46);
-aWE("solid",50,7,8,20,23,26,28,37,48,52,53,54,60,69,70,77);
-aWE("solid1",8);
-aWE("solid2",8);
-aWE("sort",26);
-aWE("sourc",60);
-aWE("spac",14,21,55,56,33,78);
-aWE("specifi",0,7,9,15,34,43,48,59,65,73,74);
-aWE("specific",50);
-aWE("specify",0,61);
-aWE("spher",5,6,11,57,70,74);
-aWE("sphere1",57);
-aWE("sphere2",57);
-aWE("sphere3",57);
-aWE("splin",3,21);
-aWE("split",0,65);
-aWE("splitangl",65);
-aWE("splitclosedfac",65);
-aWE("splitcontinuity",65);
-aWE("spot",65);
-aWE("sqrt",44);
-aWE("stag",50);
-aWE("standard",16,79);
-aWE("start",1,28,46,67,75,78);
-aWE("step",38,32,30,47,49);
-aWE("step1",49);
-aWE("step2",49);
-aWE("still",65);
-aWE("str",67);
-aWE("strict",51);
-aWE("strip",65);
-aWE("study",3,4,5,6,8,18,37,57,59,68,74);
-aWE("sub",26,51,59,72,83);
-aWE("sub_shape_id",59);
-aWE("subfacelist",40);
-aWE("submenu",33);
-aWE("subshap",26,83);
-aWE("subshapeall",26);
-aWE("subshapeallid",26);
-aWE("subshapeallsort",26,37,40,59,74);
-aWE("subshapeallsortedid",26);
-aWE("subshapeid",83);
-aWE("subshapesort",26);
-aWE("subtraction",46);
-aWE("successful",44);
-aWE("sup_fac",59);
-aWE("support",53);
-aWE("suppres",59,71,72,73);
-aWE("suppressfac",59,71);
-aWE("suppresshol",59,72);
-aWE("suppressinternalwir",59,73);
-aWE("surfac",29,35,44,52,65,74,33);
-aWE("surfacecontinuity",65);
-aWE("surfacemod",65);
-aWE("symmetric",74);
-aWE("symmetrical",45,74);
-aWE("symmetry",45);
-aWE("system",20,23,43,46,55,70,74,82);
-aWE("t",7,10,28,40,51,70);
-aWE("tak",65);
-aWE("tangent",65,67);
-aWE("tangential",65);
-aWE("target",27,67);
-aWE("technology",51);
-aWE("test",33);
-aWE("tetrahedral",50);
-aWE("textual",67,68);
-aWE("th",65);
-aWE("theendlc",46);
-aWE("theischeckgeom",33);
-aWE("them",7,26,51,65,71,80,83);
-aWE("theobject",46);
-aWE("therefor",67);
-aWE("theshap",39,59,33);
-aWE("thestartlc",46);
-aWE("thetoleranc",39);
-aWE("third",7,61);
-aWE("thre",1,3,14,18,21,37,43,45,55,56,61,68,74,82);
-aWE("thu",65,76);
-aWE("tim",21,47,49,56,74);
-aWE("tobezi",65);
-aWE("togeth",83);
-aWE("tol",44);
-aWE("tol2d",18,35);
-aWE("tol3d",18,35);
-aWE("toleranc",15,35,39,44,59,65,33);
-aWE("tolerance2d",65);
-aWE("tolerance3d",59,65);
-aWE("tool",44,53,33);
-aWE("toolbar",51,54);
-aWE("top_fac",5);
-aWE("top_face_ind",5);
-aWE("topology",33);
-aWE("toru",57,77);
-aWE("torus",57);
-aWE("torus1",57);
-aWE("torus2",57);
-aWE("tr1d",74);
-aWE("tr2d",74);
-aWE("transform",5,17,48,62,74);
-aWE("transformat",5);
-aWE("transformation",5,9,34,38,30,45,46,47,48,49,51,52,61,62,74,75);
-aWE("translat",46,47,49,52,74,75);
-aWE("translation",47,48,49,74,75);
-aWE("translation1",74);
-aWE("translation2",74);
-aWE("translation3",74);
-aWE("transparency",11,76,79);
-aWE("transparent",76,81);
-aWE("triangl",51);
-aWE("trihedron",51);
-aWE("trimsiz",3,4,55);
-aWE("tru",0,15,59,33);
-aWE("truncat",20);
-aWE("try",29);
-aWE("tt",37,68);
-aWE("tui",0,1,2,50,7,9,10,12,13,14,15,16,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,42,43,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,76,77,31,33,78,79,80,81,83);
-aWE("tupl",33);
-aWE("two",0,3,4,50,7,8,9,13,17,18,20,24,36,37,39,40,46,47,48,49,53,61,65,68,70,74,77,33,82,83);
-aWE("typ",21,26,27,53,65,67,31,33,83);
-aWE("u",65);
-aWE("uncheck",10,51);
-aWE("underly",15,65);
-aWE("unionlist",40);
-aWE("up",16,20,81);
-aWE("updat",79);
-aWE("updateobjbrows",5,40,59);
-aWE("us",2,50,15,26,27,35,38,30,46,48,51,65,67,73,76,31,33,83);
-aWE("useful",0,1,2,50,7,9,12,13,14,15,16,17,19,20,21,22,23,24,25,27,28,29,34,35,36,39,42,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,76,77,31,78,79,80,81,83);
-aWE("v",6,57,59,74);
-aWE("v1",50);
-aWE("v2",50);
-aWE("v3",50);
-aWE("v4",50);
-aWE("val",0);
-aWE("val1",44);
-aWE("val2",44);
-aWE("valid",44,59,33);
-aWE("validity",33);
-aWE("valu",0,2,7,9,15,20,23,28,34,39,41,43,44,46,47,49,52,55,59,60,64,65,67,70,75,77,33,78);
-aWE("variety",26);
-aWE("variou",65);
-aWE("vector",3,4,6,14,18,20,23,25,28,37,42,43,45,47,49,55,57,59,60,61,65,67,68,74,75,77,78,82);
-aWE("vector_arc",3,68);
-aWE("vector1",3,18);
-aWE("vector1_arc1",18);
-aWE("vector1_arc2",18);
-aWE("vector2",3,18);
-aWE("vector2_arc1",18);
-aWE("vector2_arc2",18);
-aWE("vector3",18);
-aWE("versa",65);
-aWE("version",53);
-aWE("vertex",3,4,6,14,15,18,20,23,24,25,28,37,44,45,54,55,56,57,59,60,62,70,74,77,33);
-aWE("vertex_n",56);
-aWE("vertex1",24);
-aWE("vertex2",24);
-aWE("vertexmaxtol",33);
-aWE("vertexmintol",33);
-aWE("vertic",1,3,50,5,7,8,15,18,24,26,28,37,40,42,55,57,59,68,74,75,78);
-aWE("via",50,7,29,32,42,51,67,70);
-aWE("vic",65);
-aWE("view",0,9,11,15,34,43,51,71,72,73,33,79,80,81,83);
-aWE("visibl",51);
-aWE("visualiz",51);
-aWE("volum",44,33);
-aWE("vr",74);
-aWE("vrot1d",74);
-aWE("vt",74);
-aWE("vtr1d",74);
-aWE("vtr2d",74);
-aWE("vxy",3,18,37,59,74);
-aWE("vxyz",4);
-aWE("vz",74);
-aWE("w_0",59);
-aWE("wantplanarfac",59);
-aWE("wat",2);
-aWE("waterdensity",2,4);
-aWE("way",7,26,28,42,45,47,70,83);
-aWE("weight",2,4);
-aWE("well",65,33);
-aWE("wf",68);
-aWE("what",44);
-aWE("whati",44,33);
-aWE("wheth",33);
-aWE("whil",12,18,37,44,65,81);
-aWE("whos",29,33);
-aWE("wid",38,30);
-aWE("will",0,1,2,50,7,9,10,12,13,14,15,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,32,42,45,46,47,48,49,51,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,77,78,80,83);
-aWE("wir",3,50,12,15,18,26,28,29,37,44,54,59,60,67,68,72,73,74,80);
-aWE("wire_clos",59);
-aWE("wire_nam",59);
-aWE("wire1",18);
-aWE("wire2",18);
-aWE("wirefram",79,81);
-aWE("wish",10,26,32,51);
-aWE("within",15,41,79);
-aWE("without",59);
-aWE("work",38,30,47,51,65,67,82,83);
-aWE("workingplan",67);
-aWE("ww",37,68);
-aWE("x",3,7,25,43,46,56,67,70,33);
-aWE("x1",7);
-aWE("x2",7);
-aWE("xdx",43);
-aWE("xdy",43);
-aWE("xdz",43);
-aWE("xmax",44,33);
-aWE("xmin",44,33);
-aWE("xoy",67);
-aWE("xyz",82);
-aWE("xz_fac",5);
-aWE("xz_face_ind",5);
-aWE("y",3,7,25,43,56,67,70,33);
-aWE("y1",7);
-aWE("y2",7);
-aWE("ydx",43);
-aWE("ydy",43);
-aWE("ydz",43);
-aWE("ymax",44,33);
-aWE("ymin",44,33);
-aWE("your",16,32,64,72,79,82,83);
-aWE("yz_fac",5);
-aWE("yz_face_ind",5);
-aWE("z",2,3,7,43,56,70,33);
-aWE("z1",7);
-aWE("z2",7);
-aWE("zero",20);
-aWE("zmax",44,33);
-aWE("zmin",44,33);
-aWE("zoom",51);
-
-//-->
-</script>
-</html>
diff --git a/doc/salome/gui/GEOM/whdata/whgdata.js b/doc/salome/gui/GEOM/whdata/whgdata.js
deleted file mode 100755 (executable)
index e38a107..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-//     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
deleted file mode 100755 (executable)
index 3865725..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<head>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-</head>
-<body>
-<script language="javascript" src="whgdata.js"></script>
-<script language="javascript">
-<!--
- aGE("Cell","Element of a mesh. Cells are determined by their connectivity. They can have 0,1,2 or 3 dimension.");
- aGE("Component","One integer or real value can correspond to each component of a field and to each entity of a mesh");
- aGE("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.");
- aGE("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).");
- aGE("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.");
- aGE("Equivalence","Equivalence represents a list of correspondance 2 by 2 of the entities of the same dimension.");
- aGE("Face","Face of a volumetrical cell (triangle, quadrangle).");
- aGE("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.");
- aGE("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.");
- aGE("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.");
- aGE("Group","Unordered set of entities of a mesh. One entity can belong to   several groups.");
- aGE("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).");
- aGE("Nodal connectivity","It is a description of an entity of the mesh by an ordered list of nodes constituting this entity.");
- aGE("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.");
- aGE("Point","Geometrical entity determined by its coordinates in the space.");
- aGE("Reference connectivity","For each type of entity of a mesh, reference connectivity define the topology of an entity.");
- aGE("Result","List of fields referring to one mesh.");
- aGE("Study","Study represents a chain of sequences of calculations.");
-
-//-->
-</script>
-</body>
-</html>
diff --git a/doc/salome/gui/GEOM/whdata/whglo.htm b/doc/salome/gui/GEOM/whdata/whglo.htm
deleted file mode 100755 (executable)
index 9d7ac79..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-</head>
-<body>
-<script language="javascript" src="whglo.js"></script>
-<script language="javascript">
-<!--
-iFM("Cell","Study","whgdata0.htm",18);
-
-//-->
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/doc/salome/gui/GEOM/whdata/whglo.js b/doc/salome/gui/GEOM/whdata/whglo.js
deleted file mode 100755 (executable)
index c34fb24..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//     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
deleted file mode 100755 (executable)
index a921847..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-//     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
deleted file mode 100755 (executable)
index a049a96..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-</head>
-<body>
-<script language="javascript" src="whidx.js"></script>
-<script language="javascript">
-<!--
-
-//-->
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/doc/salome/gui/GEOM/whdata/whidx.js b/doc/salome/gui/GEOM/whdata/whidx.js
deleted file mode 100755 (executable)
index c34fb24..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//     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
deleted file mode 100755 (executable)
index 0558e19..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-//     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
deleted file mode 100755 (executable)
index 159c80a..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-<html>
-<head>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-</head>
-<body>
-<script language="javascript" src="whtdata.js"></script>
-<script language="javascript">
-<!--
- aTE(1,97,"Geometry module");
-   aTE(2,0,"Introduction to Geometry","geometry.htm");
-   aTE(2,0,"Importing/exporting geometrical objects","files/salome2_sp3_geomtoolsgui_functions.htm");
-   aTE(1,33,"Creating geometrical objects");
-     aTE(1,10,"Creating Basic Geometric Objects");
-       aTE(2,0,"Point","point.htm");
-       aTE(2,0,"Line","line.htm");
-       aTE(2,0,"Circle","circle.htm");
-       aTE(2,0,"Ellipse","ellipse.htm");
-       aTE(2,0,"Arc","arc.htm");
-       aTE(2,0,"Curve","curve.htm");
-       aTE(2,0,"Vector","vector.htm");
-       aTE(2,0,"Plane","plane.htm");
-       aTE(2,0,"Working Plane","working_plane.htm");
-       aTE(2,0,"Local Coordinate System","local_coordinate_system.htm");
-     aTE(1,5,"Creating Primitives");
-       aTE(2,0,"Box","box.htm");
-       aTE(2,0,"Cylinder","cylinder.htm");
-       aTE(2,0,"Sphere","sphere.htm");
-       aTE(2,0,"Torus","turus.htm");
-       aTE(2,0,"Cone","cone.htm");
-     aTE(1,4,"Creating Complex Objects");
-       aTE(2,0,"Extrusion","extrusion.htm");
-       aTE(2,0,"Revolution","revolution.htm");
-       aTE(2,0,"Filling","filling.htm");
-       aTE(2,0,"Extrusion along a path","pipe_creation.htm");
-     aTE(2,0,"Working with groups","working_with_groups.htm");
-     aTE(2,0,"Building by blocks","newentity_blocks.htm");
-     aTE(2,0,"Sketcher","sketcher.htm");
-     aTE(1,7,"Creating Advanced Geometrical Objects");
-       aTE(2,0,"Explode","explode.htm");
-       aTE(2,0,"Edge","edge.htm");
-       aTE(2,0,"Wire","wire.htm");
-       aTE(2,0,"Face","face.htm");
-       aTE(2,0,"Shell","shell.htm");
-       aTE(2,0,"Solid","solid.htm");
-       aTE(2,0,"Compound","compound.htm");
-   aTE(1,5,"Viewing geometrical objects");
-     aTE(2,0,"Viewing Geometrical Objects","viewing_geometrical_objects.htm");
-     aTE(2,0,"Display Mode","wireframe_and_shading.htm");
-     aTE(2,0,"Color","color.htm");
-     aTE(2,0,"Transparency","transparency.htm");
-     aTE(2,0,"Isolines","isos.htm");
-   aTE(1,36,"Transforming geometrical objects");
-     aTE(1,2,"Basic Operations");
-       aTE(2,0,"Partition","partition.htm");
-       aTE(2,0,"Archimede","archimede.htm");
-     aTE(1,5,"Boolean Operations");
-       aTE(2,0,"Using boolean operations","files/salome2_sp3_booleangui_functions.htm");
-       aTE(2,0,"Fuse","fuse.htm");
-       aTE(2,0,"Common","common.htm");
-       aTE(2,0,"Cut","cut.htm");
-       aTE(2,0,"Section","section.htm");
-     aTE(1,10,"Transformation Operations");
-       aTE(2,0,"Translation","translation.htm");
-       aTE(2,0,"Rotation","rotation.htm");
-       aTE(2,0,"Modify the Location","modify_the_location.htm");
-       aTE(2,0,"Mirror Image","mirror_image.htm");
-       aTE(2,0,"Scale Transform","scale_transform.htm");
-       aTE(2,0,"Offset Surface","offset_surface.htm");
-       aTE(2,0,"Multi Translation","multi_translation.htm");
-       aTE(2,0,"Multi Rotation","multi_rotation.htm");
-       aTE(2,0,"Fillet","fillet.htm");
-       aTE(2,0,"Chamfer","chamfer.htm");
-     aTE(1,3,"Blocks Operations");
-       aTE(2,0,"Multi Transformation","multi_transformation.htm");
-       aTE(2,0,"Explode on Blocks","explode_on_blocks.htm");
-       aTE(2,0,"Propagate","propagate.htm");
-     aTE(1,11,"Repairing Operations");
-       aTE(2,0,"Shape Processing","shape_processing.htm");
-       aTE(2,0,"Suppress Faces","suppress_faces.htm");
-       aTE(2,0,"Close Contour","close_contour.htm");
-       aTE(2,0,"Suppress Internal Wires","suppress_internal_wires.htm");
-       aTE(2,0,"Suppress Holes","suppress_holes.htm");
-       aTE(2,0,"Sewing","sewing.htm");
-       aTE(2,0,"Glue Faces","glue_faces.htm");
-       aTE(2,0,"Add Point on Edge","add_point_on_edge.htm");
-       aTE(2,0,"Check Free Boundaries","check_free_boundaries.htm");
-       aTE(2,0,"Check Free Faces","check_free_faces.htm");
-       aTE(2,0,"Change Orientation","change_orientation.htm");
-   aTE(2,0,"Using measurement tools","files/salome2_sp3_measuregui_functions.htm");
- aTE(2,0,"Python interface geompy.py" , geompy_doc/namespacegeompy.html");
-  aTE(1,16,"TUI Scripts");
-     aTE(2,0,"Viewing Geometrical Objects","changing_display_parameters.htm");
-     aTE(1,7,"Creating Geometric Objects");
-       aTE(2,0,"Basic Geometrical Objects","basic_geometrical_objects.htm");
-       aTE(2,0,"Primitives","primitives.htm");
-       aTE(2,0,"Complex Objects","complex_objects.htm");
-       aTE(2,0,"Working with Groups","groups.htm");
-       aTE(2,0,"Building by Blocks","building_by_blocks.htm");
-       aTE(2,0,"Sketcher","sketcher_tui.htm");
-       aTE(2,0,"Advanced Geometrical Objects","geometrical_objects.htm");
-     aTE(1,5,"Transformation");
-       aTE(2,0,"Basic Operations","basic_operations.htm");
-       aTE(2,0,"Boolean Operations","boolean_operations.htm");
-       aTE(2,0,"Transformation Operations","transformation_operations.htm");
-       aTE(2,0,"Blocks Operations","blocks_operations.htm");
-       aTE(2,0,"Repairing Operations","repairing_operations.htm");
-     aTE(2,0,"Measurement Tools","measurement_tools.htm");
-
-//-->
-</script>
-</body>
-</html>
diff --git a/doc/salome/gui/GEOM/whdata/whtoc.htm b/doc/salome/gui/GEOM/whdata/whtoc.htm
deleted file mode 100755 (executable)
index 459c3e3..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-</head>
-<body>
-<script language="javascript" src="whtoc.js"></script>
-<script language="javascript">
-<!--
-  setRoot("whtdata0.htm");
-
-//-->
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/doc/salome/gui/GEOM/whdata/whtoc.js b/doc/salome/gui/GEOM/whdata/whtoc.js
deleted file mode 100755 (executable)
index 62de5a1..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-//     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/whexpbar.gif b/doc/salome/gui/GEOM/whgdata/whexpbar.gif
deleted file mode 100755 (executable)
index e677dc6..0000000
Binary files a/doc/salome/gui/GEOM/whgdata/whexpbar.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/whgdata/whlstf0.htm b/doc/salome/gui/GEOM/whgdata/whlstf0.htm
deleted file mode 100755 (executable)
index cda4090..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-<head>
-<title>Search Words List</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsbody" >
-
-
-<a name="bm_{"></a><a name="subkey_{{"></a><a href="../measurement_tools.htm"><b>100x30x100</b></a> <br><nobr><a name="bms_{D"></a><a name="subkey_{D"></a>1d <a href="../blocks_operations.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_{E"></a><a name="subkey_{E"></a>1e <a href="../measurement_tools.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_{D"></a><a name="subkey_{D"></a>2d <a href="../blocks_operations.htm"><b>1</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>2</b></a> <a href="../filling.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> <a href="../shape_processing.htm"><b>6</b></a> </nobr><br><nobr>3d <a href="../circle.htm"><b>1</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>2</b></a> <a href="../curve.htm"><b>3</b></a> <a href="../local_coordinate_system.htm"><b>4</b></a> <a href="../filling.htm"><b>5</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>6</b></a> <a href="../repairing_operations.htm"><b>7</b></a> <a href="../point.htm"><b>8</b></a> <a href="../plane.htm"><b>9</b></a> <a href="../partition.htm"><b>10</b></a> <a href="../occ_viewer.htm"><b>11</b></a> <a href="../viewing_geometrical_objects.htm"><b>12</b></a> <a href="../vector.htm"><b>13</b></a> <a href="../suppress_faces.htm"><b>14</b></a> <a href="../shape_processing.htm"><b>15</b></a> <a href="../working_with_groups.htm"><b>16</b></a> <a href="../wireframe_and_shading.htm"><b>17</b></a> </nobr><br>
-<br><br>
-<nobr><a name="bm_A"></a><a name="subkey_AB"></a>able <a href="../occ_viewer.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> </nobr><br><a href="../sketcher.htm"><b>absolute</b></a> <br><a href="../transparency.htm"><b>absolutely</b></a> <br><a name="bms_AC"></a><a name="subkey_AC"></a><a href="../viewing_geometrical_objects.htm"><b>access</b></a> <br><a href="../occ_viewer.htm"><b>accessed</b></a> <br><nobr>accessible <a href="../color.htm"><b>1</b></a> <a href="../box.htm"><b>2</b></a> <a href="../face.htm"><b>3</b></a> <a href="../extrusion.htm"><b>4</b></a> <a href="../line.htm"><b>5</b></a> <a href="../sphere.htm"><b>6</b></a> </nobr><br><nobr>accordance <a href="../close_contour.htm"><b>1</b></a> <a href="../add_point_on_edge.htm"><b>2</b></a> </nobr><br><a href="../add_point_on_edge.htm"><b>according</b></a> <br><nobr><a name="bms_AD"></a><a name="subkey_AD"></a>add <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../boolean_operations.htm"><b>2</b></a> <a href="../blocks_operations.htm"><b>3</b></a> <a href="../basic_operations.htm"><b>4</b></a> <a href="../basic_geometrical_objects.htm"><b>5</b></a> <a href="../add_point_on_edge.htm"><b>6</b></a> <a href="../complex_objects.htm"><b>7</b></a> <a href="../groups.htm"><b>8</b></a> <a href="../geometrical_objects.htm"><b>9</b></a> <a href="../repairing_operations.htm"><b>10</b></a> <a href="../primitives.htm"><b>11</b></a> <a href="../transformation_operations.htm"><b>12</b></a> <a href="../sketcher_tui.htm"><b>13</b></a> <a href="../working_with_groups.htm"><b>14</b></a> </nobr><br><nobr>added <a href="../close_contour.htm"><b>1</b></a> <a href="../working_with_groups.htm"><b>2</b></a> </nobr><br><nobr>adding <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../groups.htm"><b>2</b></a> </nobr><br><nobr>addobject <a href="../groups.htm"><b>1</b></a> <a href="../working_with_groups.htm"><b>2</b></a> </nobr><br><nobr>addtostudy <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../building_by_blocks.htm"><b>2</b></a> <a href="../boolean_operations.htm"><b>3</b></a> <a href="../blocks_operations.htm"><b>4</b></a> <a href="../basic_operations.htm"><b>5</b></a> <a href="../basic_geometrical_objects.htm"><b>6</b></a> <a href="../complex_objects.htm"><b>7</b></a> <a href="../groups.htm"><b>8</b></a> <a href="../geometrical_objects.htm"><b>9</b></a> <a href="../repairing_operations.htm"><b>10</b></a> <a href="../primitives.htm"><b>11</b></a> <a href="../transformation_operations.htm"><b>12</b></a> <a href="../sketcher_tui.htm"><b>13</b></a> </nobr><br><nobr>addtostudyinfather <a href="../blocks_operations.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><nobr>advance <a href="../box.htm"><b>1</b></a> <a href="../extrusion.htm"><b>2</b></a> <a href="../sphere.htm"><b>3</b></a> </nobr><br><nobr>advanced <a href="../face.htm"><b>1</b></a> <a href="../edge.htm"><b>2</b></a> <a href="../compound.htm"><b>3</b></a> <a href="../geometrical_objects.htm"><b>4</b></a> <a href="../wire.htm"><b>5</b></a> <a href="../solid.htm"><b>6</b></a> <a href="../shell.htm"><b>7</b></a> </nobr><br><nobr><a name="bms_AL"></a><a name="subkey_AL"></a>algorithm <a href="../modify_the_location.htm"><b>1</b></a> <a href="../local_coordinate_system.htm"><b>2</b></a> <a href="../partition.htm"><b>3</b></a> <a href="../sketcher.htm"><b>4</b></a> </nobr><br><nobr>algorithms <a href="../circle.htm"><b>1</b></a> <a href="../box.htm"><b>2</b></a> <a href="../cylinder.htm"><b>3</b></a> <a href="../curve.htm"><b>4</b></a> <a href="../cone.htm"><b>5</b></a> <a href="../local_coordinate_system.htm"><b>6</b></a> <a href="../point.htm"><b>7</b></a> <a href="../plane.htm"><b>8</b></a> <a href="../vector.htm"><b>9</b></a> <a href="../turus.htm"><b>10</b></a> <a href="../sphere.htm"><b>11</b></a> <a href="../working_plane.htm"><b>12</b></a> </nobr><br><a href="../repairing_operations.htm"><b>all_faces</b></a> <br><a href="../occ_viewer.htm"><b>allow</b></a> <br><nobr>allows <a href="../chamfer.htm"><b>1</b></a> <a href="../explode.htm"><b>2</b></a> <a href="../multi_rotation.htm"><b>3</b></a> <a href="../modify_the_location.htm"><b>4</b></a> <a href="../mirror_image.htm"><b>5</b></a> <a href="../sewing.htm"><b>6</b></a> <a href="../rotation.htm"><b>7</b></a> <a href="../occ_viewer.htm"><b>8</b></a> <a href="../newentity_blocks.htm"><b>9</b></a> <a href="../viewing_geometrical_objects.htm"><b>10</b></a> <a href="../translation.htm"><b>11</b></a> <a href="../suppress_holes.htm"><b>12</b></a> <a href="../sketcher.htm"><b>13</b></a> <a href="../shape_processing.htm"><b>14</b></a> </nobr><br><nobr>along <a href="../chamfer.htm"><b>1</b></a> <a href="../box.htm"><b>2</b></a> <a href="../modify_the_location.htm"><b>3</b></a> <a href="../pipe_creation.htm"><b>4</b></a> <a href="../offset_surface.htm"><b>5</b></a> <a href="../multi_translation.htm"><b>6</b></a> <a href="../translation.htm"><b>7</b></a> <a href="../transformation_operations.htm"><b>8</b></a> </nobr><br><a href="../files/salome2_sp3_booleangui_functions.htm"><b>alongside</b></a> <br><a href="../groups.htm"><b>already</b></a> <br><a href="../modify_the_location.htm"><b>although</b></a> <br><nobr><a name="bms_AN"></a><a name="subkey_AN"></a>angle <a href="../multi_rotation.htm"><b>1</b></a> <a href="../rotation.htm"><b>2</b></a> <a href="../revolution.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> <a href="../sketcher.htm"><b>6</b></a> <a href="../shape_processing.htm"><b>7</b></a> </nobr><br><nobr>another <a href="../extrusion.htm"><b>1</b></a> <a href="../cut.htm"><b>2</b></a> <a href="../line.htm"><b>3</b></a> <a href="../point.htm"><b>4</b></a> <a href="../plane.htm"><b>5</b></a> <a href="../sphere.htm"><b>6</b></a> </nobr><br><nobr>any <a href="../archimede.htm"><b>1</b></a> <a href="../rotation.htm"><b>2</b></a> <a href="../partition.htm"><b>3</b></a> <a href="../translation.htm"><b>4</b></a> <a href="../shape_processing.htm"><b>5</b></a> </nobr><br><a name="bms_AP"></a><a name="subkey_AP"></a><a href="../working_with_groups.htm"><b>appear</b></a> <br><a href="../viewing_geometrical_objects.htm"><b>appeared</b></a> <br><nobr>append <a href="../complex_objects.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><a href="../offset_surface.htm"><b>applicable</b></a> <br><nobr>applied <a href="../chamfer.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><nobr>apply <a href="../local_coordinate_system.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> <a href="../working_with_groups.htm"><b>3</b></a> </nobr><br><nobr>applying <a href="../viewing_geometrical_objects.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><a href="../shape_processing.htm"><b>approximation</b></a> <br><nobr><a name="bms_AR"></a><a name="subkey_AR"></a>arc <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../arc.htm"><b>2</b></a> <a href="../complex_objects.htm"><b>3</b></a> <a href="../geometrical_objects.htm"><b>4</b></a> <a href="../repairing_operations.htm"><b>5</b></a> <a href="../transformation_operations.htm"><b>6</b></a> <a href="../sketcher_tui.htm"><b>7</b></a> <a href="../sketcher.htm"><b>8</b></a> </nobr><br><a href="../complex_objects.htm"><b>arc1</b></a> <br><a href="../complex_objects.htm"><b>arc2</b></a> <br><nobr>archimede <a href="../basic_operations.htm"><b>1</b></a> <a href="../archimede.htm"><b>2</b></a> </nobr><br><nobr>arcs <a href="../complex_objects.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> </nobr><br><nobr>area <a href="../measurement_tools.htm"><b>1</b></a> <a href="../occ_viewer.htm"><b>2</b></a> </nobr><br><nobr>argument <a href="../files/salome2_sp3_booleangui_functions.htm"><b>1</b></a> <a href="../face.htm"><b>2</b></a> <a href="../sketcher.htm"><b>3</b></a> </nobr><br><nobr>arguments <a href="../close_contour.htm"><b>1</b></a> <a href="../circle.htm"><b>2</b></a> <a href="../chamfer.htm"><b>3</b></a> <a href="../box.htm"><b>4</b></a> <a href="../archimede.htm"><b>5</b></a> <a href="../arc.htm"><b>6</b></a> <a href="../add_point_on_edge.htm"><b>7</b></a> <a href="../face.htm"><b>8</b></a> <a href="../extrusion.htm"><b>9</b></a> <a href="../explode_on_blocks.htm"><b>10</b></a> <a href="../explode.htm"><b>11</b></a> <a href="../ellipse.htm"><b>12</b></a> <a href="../edge.htm"><b>13</b></a> <a href="../cylinder.htm"><b>14</b></a> <a href="../cut.htm"><b>15</b></a> <a href="../curve.htm"><b>16</b></a> <a href="../cone.htm"><b>17</b></a> <a href="../compound.htm"><b>18</b></a> <a href="../common.htm"><b>19</b></a> <a href="../multi_transformation.htm"><b>20</b></a> <a href="../multi_rotation.htm"><b>21</b></a> <a href="../modify_the_location.htm"><b>22</b></a> <a href="../mirror_image.htm"><b>23</b></a> <a href="../local_coordinate_system.htm"><b>24</b></a> <a href="../line.htm"><b>25</b></a> <a href="../isos.htm"><b>26</b></a> <a href="../glue_faces.htm"><b>27</b></a> <a href="../fuse.htm"><b>28</b></a> <a href="../filling.htm"><b>29</b></a> <a href="../fillet.htm"><b>30</b></a> <a href="../sewing.htm"><b>31</b></a> <a href="../section.htm"><b>32</b></a> <a href="../scale_transform.htm"><b>33</b></a> <a href="../rotation.htm"><b>34</b></a> <a href="../revolution.htm"><b>35</b></a> <a href="../propagate.htm"><b>36</b></a> <a href="../point.htm"><b>37</b></a> <a href="../plane.htm"><b>38</b></a> <a href="../pipe_creation.htm"><b>39</b></a> <a href="../partition.htm"><b>40</b></a> <a href="../offset_surface.htm"><b>41</b></a> <a href="../newentity_blocks.htm"><b>42</b></a> <a href="../multi_translation.htm"><b>43</b></a> <a href="../wire.htm"><b>44</b></a> <a href="../vector.htm"><b>45</b></a> <a href="../turus.htm"><b>46</b></a> <a href="../translation.htm"><b>47</b></a> <a href="../suppress_internal_wires.htm"><b>48</b></a> <a href="../suppress_holes.htm"><b>49</b></a> <a href="../suppress_faces.htm"><b>50</b></a> <a href="../sphere.htm"><b>51</b></a> <a href="../solid.htm"><b>52</b></a> <a href="../sketcher.htm"><b>53</b></a> <a href="../shell.htm"><b>54</b></a> <a href="../working_with_groups.htm"><b>55</b></a> <a href="../working_plane.htm"><b>56</b></a> </nobr><br><nobr>around <a href="../multi_rotation.htm"><b>1</b></a> <a href="../revolution.htm"><b>2</b></a> <a href="../transformation_operations.htm"><b>3</b></a> </nobr><br><nobr><a name="bms_AU"></a><a name="subkey_AU"></a>automatically <a href="../local_coordinate_system.htm"><b>1</b></a> <a href="../newentity_blocks.htm"><b>2</b></a> <a href="../viewing_geometrical_objects.htm"><b>3</b></a> </nobr><br><nobr><a name="bms_AV"></a><a name="subkey_AV"></a>available <a href="../close_contour.htm"><b>1</b></a> <a href="../add_point_on_edge.htm"><b>2</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>3</b></a> <a href="../occ_viewer.htm"><b>4</b></a> <a href="../newentity_blocks.htm"><b>5</b></a> <a href="../suppress_internal_wires.htm"><b>6</b></a> <a href="../suppress_holes.htm"><b>7</b></a> <a href="../suppress_faces.htm"><b>8</b></a> <a href="../sketcher.htm"><b>9</b></a> <a href="../working_with_groups.htm"><b>10</b></a> </nobr><br><nobr><a name="bms_AX"></a><a name="subkey_AX"></a>axes <a href="../box.htm"><b>1</b></a> <a href="../local_coordinate_system.htm"><b>2</b></a> <a href="../occ_viewer.htm"><b>3</b></a> <a href="../translation.htm"><b>4</b></a> </nobr><br><nobr>axis <a href="../cylinder.htm"><b>1</b></a> <a href="../cone.htm"><b>2</b></a> <a href="../complex_objects.htm"><b>3</b></a> <a href="../multi_rotation.htm"><b>4</b></a> <a href="../modify_the_location.htm"><b>5</b></a> <a href="../mirror_image.htm"><b>6</b></a> <a href="../local_coordinate_system.htm"><b>7</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>8</b></a> <a href="../rotation.htm"><b>9</b></a> <a href="../revolution.htm"><b>10</b></a> <a href="../multi_translation.htm"><b>11</b></a> <a href="../transformation_operations.htm"><b>12</b></a> </nobr><br>
-<br><br>
-<nobr><a name="bm_B"></a><a name="subkey_B{"></a>b <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../curve.htm"><b>2</b></a> <a href="../shape_processing.htm"><b>3</b></a> </nobr><br><a name="bms_BA"></a><a name="subkey_BA"></a><a href="../viewing_geometrical_objects.htm"><b>background</b></a> <br><nobr>base <a href="../extrusion.htm"><b>1</b></a> <a href="../cylinder.htm"><b>2</b></a> <a href="../cone.htm"><b>3</b></a> <a href="../revolution.htm"><b>4</b></a> <a href="../repairing_operations.htm"><b>5</b></a> <a href="../pipe_creation.htm"><b>6</b></a> <a href="../occ_viewer.htm"><b>7</b></a> <a href="../turus.htm"><b>8</b></a> <a href="../translation.htm"><b>9</b></a> </nobr><br><a href="../shape_processing.htm"><b>based</b></a> <br><a href="../pipe_creation.htm"><b>baseshape</b></a> <br><nobr>basic <a href="../circle.htm"><b>1</b></a> <a href="../basic_operations.htm"><b>2</b></a> <a href="../basic_geometrical_objects.htm"><b>3</b></a> <a href="../archimede.htm"><b>4</b></a> <a href="../arc.htm"><b>5</b></a> <a href="../files/introduction_to_geom.htm"><b>6</b></a> <a href="../ellipse.htm"><b>7</b></a> <a href="../curve.htm"><b>8</b></a> <a href="../measurement_tools.htm"><b>9</b></a> <a href="../local_coordinate_system.htm"><b>10</b></a> <a href="../line.htm"><b>11</b></a> <a href="../geometry.htm"><b>12</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>13</b></a> <a href="../point.htm"><b>14</b></a> <a href="../plane.htm"><b>15</b></a> <a href="../partition.htm"><b>16</b></a> <a href="../vector.htm"><b>17</b></a> <a href="../sketcher.htm"><b>18</b></a> <a href="../working_plane.htm"><b>19</b></a> </nobr><br><nobr>basicproperties <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr>basing <a href="../multi_rotation.htm"><b>1</b></a> <a href="../scale_transform.htm"><b>2</b></a> </nobr><br><nobr>basis <a href="../extrusion.htm"><b>1</b></a> <a href="../occ_viewer.htm"><b>2</b></a> </nobr><br><a name="bms_BB"></a><a name="subkey_BB"></a><a href="../measurement_tools.htm"><b>bb</b></a> <br><nobr><a name="bms_BE"></a><a name="subkey_BE"></a>before <a href="../repairing_operations.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> <a href="../shape_processing.htm"><b>3</b></a> </nobr><br><a href="../repairing_operations.htm"><b>beginning</b></a> <br><a href="../edge.htm"><b>being</b></a> <br><a href="../chamfer.htm"><b>belongs</b></a> <br><a href="../newentity_blocks.htm"><b>below</b></a> <br><a href="../curve.htm"><b>besier</b></a> <br><nobr>bezier <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../curve.htm"><b>2</b></a> <a href="../shape_processing.htm"><b>3</b></a> </nobr><br><a name="bms_BL"></a><a name="subkey_BL"></a><a href="../viewing_geometrical_objects.htm"><b>black</b></a> <br><nobr>block <a href="../blocks_operations.htm"><b>1</b></a> <a href="../explode_on_blocks.htm"><b>2</b></a> <a href="../multi_transformation.htm"><b>3</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>4</b></a> <a href="../newentity_blocks.htm"><b>5</b></a> </nobr><br><nobr>blocks <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../blocks_operations.htm"><b>2</b></a> <a href="../files/introduction_to_geom.htm"><b>3</b></a> <a href="../explode_on_blocks.htm"><b>4</b></a> <a href="../multi_transformation.htm"><b>5</b></a> <a href="../measurement_tools.htm"><b>6</b></a> <a href="../geometry.htm"><b>7</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>8</b></a> <a href="../propagate.htm"><b>9</b></a> <a href="../newentity_blocks.htm"><b>10</b></a> </nobr><br><nobr><a name="bms_BM"></a><a name="subkey_BM"></a>bmp <a href="../occ_viewer.htm"><b>1</b></a> <a href="../viewing_geometrical_objects.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_BO"></a><a name="subkey_BO"></a>boolean <a href="../boolean_operations.htm"><b>1</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>2</b></a> <a href="../files/introduction_to_geom.htm"><b>3</b></a> <a href="../cut.htm"><b>4</b></a> <a href="../common.htm"><b>5</b></a> <a href="../geometry.htm"><b>6</b></a> <a href="../fuse.htm"><b>7</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>8</b></a> <a href="../section.htm"><b>9</b></a> </nobr><br><nobr>both <a href="../box.htm"><b>1</b></a> <a href="../cone.htm"><b>2</b></a> <a href="../multi_transformation.htm"><b>3</b></a> <a href="../shape_processing.htm"><b>4</b></a> </nobr><br><a href="../repairing_operations.htm"><b>boudaries</b></a> <br><nobr>boundaries <a href="../check_free_boundaries.htm"><b>1</b></a> <a href="../sewing.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> <a href="../suppress_holes.htm"><b>4</b></a> </nobr><br><nobr>boundary <a href="../check_free_boundaries.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../suppress_internal_wires.htm"><b>3</b></a> </nobr><br><nobr>bounded <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../geometrical_objects.htm"><b>2</b></a> </nobr><br><nobr>bounding <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr>boundingbox <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr>box <a href="../color.htm"><b>1</b></a> <a href="../changing_display_parameters.htm"><b>2</b></a> <a href="../box.htm"><b>3</b></a> <a href="../blocks_operations.htm"><b>4</b></a> <a href="../basic_operations.htm"><b>5</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>6</b></a> <a href="../explode_on_blocks.htm"><b>7</b></a> <a href="../cut.htm"><b>8</b></a> <a href="../measurement_tools.htm"><b>9</b></a> <a href="../groups.htm"><b>10</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>11</b></a> <a href="../repairing_operations.htm"><b>12</b></a> <a href="../primitives.htm"><b>13</b></a> <a href="../newentity_blocks.htm"><b>14</b></a> <a href="../wire.htm"><b>15</b></a> <a href="../transparency.htm"><b>16</b></a> <a href="../transformation_operations.htm"><b>17</b></a> <a href="../suppress_internal_wires.htm"><b>18</b></a> <a href="../sketcher.htm"><b>19</b></a> <a href="../shape_processing.htm"><b>20</b></a> <a href="../working_with_groups.htm"><b>21</b></a> </nobr><br><a href="../blocks_operations.htm"><b>box_tr1</b></a> <br><a href="../blocks_operations.htm"><b>box_tr2</b></a> <br><nobr>box1 <a href="../measurement_tools.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../primitives.htm"><b>3</b></a> </nobr><br><nobr>box2 <a href="../measurement_tools.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../primitives.htm"><b>3</b></a> </nobr><br><a href="../primitives.htm"><b>box3</b></a> <br><nobr>boxes <a href="../measurement_tools.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../primitives.htm"><b>3</b></a> </nobr><br><br><br></p><p class="ftsbody" align="center"><a href="whlstf1.htm" target="_self" title="previous search group"><b>&gt;&gt;</b></a>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstf1.htm b/doc/salome/gui/GEOM/whgdata/whlstf1.htm
deleted file mode 100755 (executable)
index a8e27ed..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<html>
-<head>
-<title>Search Words List</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsbody" align="center"><a href="whlstf0.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
-<p class="ftsbody" >
-<a name="bms_BR"></a><a name="subkey_BR"></a><a href="../shape_processing.htm"><b>brackets</b></a> <br><a href="../propagate.htm"><b>breaks</b></a> <br><nobr>brep <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../files/introduction_to_geom.htm"><b>2</b></a> <a href="../geometry.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> </nobr><br><nobr>browser <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../local_coordinate_system.htm"><b>2</b></a> <a href="../wire.htm"><b>3</b></a> <a href="../viewing_geometrical_objects.htm"><b>4</b></a> </nobr><br><a name="bms_BS"></a><a name="subkey_BS"></a><a href="../shape_processing.htm"><b>bspline</b></a> <br><a href="../shape_processing.htm"><b>bsplinerestriction</b></a> <br><a href="../shape_processing.htm"><b>bsplines</b></a> <br><nobr><a name="bms_BU"></a><a name="subkey_BU"></a>build <a href="../blocks_operations.htm"><b>1</b></a> <a href="../face.htm"><b>2</b></a> <a href="../edge.htm"><b>3</b></a> <a href="../compound.htm"><b>4</b></a> <a href="../propagate.htm"><b>5</b></a> <a href="../newentity_blocks.htm"><b>6</b></a> <a href="../wire.htm"><b>7</b></a> <a href="../solid.htm"><b>8</b></a> <a href="../shell.htm"><b>9</b></a> </nobr><br><nobr>building <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../files/introduction_to_geom.htm"><b>2</b></a> <a href="../geometry.htm"><b>3</b></a> <a href="../newentity_blocks.htm"><b>4</b></a> </nobr><br><nobr>builds <a href="../propagate.htm"><b>1</b></a> <a href="../partition.htm"><b>2</b></a> <a href="../newentity_blocks.htm"><b>3</b></a> </nobr><br><nobr>button <a href="../local_coordinate_system.htm"><b>1</b></a> <a href="../sewing.htm"><b>2</b></a> <a href="../occ_viewer.htm"><b>3</b></a> <a href="../wire.htm"><b>4</b></a> <a href="../suppress_holes.htm"><b>5</b></a> <a href="../working_with_groups.htm"><b>6</b></a> </nobr><br><a href="../occ_viewer.htm"><b>buttons</b></a> <br><a name="bms_BY"></a><a name="subkey_BY"></a><a href="../newentity_blocks.htm"><b>bypassing</b></a> <br>
-<br><br>
-<nobr><a name="bm_C"></a><a name="subkey_C{"></a>c <a href="../geometrical_objects.htm"><b>1</b></a> <a href="../sketcher_tui.htm"><b>2</b></a> <a href="../shape_processing.htm"><b>3</b></a> </nobr><br><a href="../shape_processing.htm"><b>c0</b></a> <br><a href="../shape_processing.htm"><b>c1</b></a> <br><a href="../shape_processing.htm"><b>c2</b></a> <br><nobr><a name="bms_CA"></a><a name="subkey_CA"></a>cad <a href="../files/introduction_to_geom.htm"><b>1</b></a> <a href="../geometry.htm"><b>2</b></a> </nobr><br><a href="../working_plane.htm"><b>camera</b></a> <br><a href="../occ_viewer.htm"><b>cascade</b></a> <br><nobr>case <a href="../local_coordinate_system.htm"><b>1</b></a> <a href="../newentity_blocks.htm"><b>2</b></a> <a href="../suppress_internal_wires.htm"><b>3</b></a> </nobr><br><a href="../multi_transformation.htm"><b>cases</b></a> <br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>catia</b></a> <br><nobr><a name="bms_CE"></a><a name="subkey_CE"></a>center <a href="../circle.htm"><b>1</b></a> <a href="../box.htm"><b>2</b></a> <a href="../ellipse.htm"><b>3</b></a> <a href="../cone.htm"><b>4</b></a> <a href="../multi_rotation.htm"><b>5</b></a> <a href="../modify_the_location.htm"><b>6</b></a> <a href="../measurement_tools.htm"><b>7</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>8</b></a> <a href="../occ_viewer.htm"><b>9</b></a> <a href="../turus.htm"><b>10</b></a> <a href="../sphere.htm"><b>11</b></a> <a href="../sketcher.htm"><b>12</b></a> </nobr><br><a href="../scale_transform.htm"><b>centerofscale</b></a> <br><a href="../explode.htm"><b>centers</b></a> <br><nobr>central <a href="../cylinder.htm"><b>1</b></a> <a href="../cone.htm"><b>2</b></a> <a href="../scale_transform.htm"><b>3</b></a> <a href="../shape_processing.htm"><b>4</b></a> </nobr><br><nobr>certain <a href="../shape_processing.htm"><b>1</b></a> <a href="../working_with_groups.htm"><b>2</b></a> </nobr><br><a name="bms_CH"></a><a name="subkey_CH"></a><a href="../blocks_operations.htm"><b>chain</b></a> <br><nobr>chamfer <a href="../chamfer.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><a href="../transformation_operations.htm"><b>chamfer_all</b></a> <br><a href="../transformation_operations.htm"><b>chamfer_e</b></a> <br><a href="../transformation_operations.htm"><b>chamfer_f</b></a> <br><a href="../transformation_operations.htm"><b>chamfer_f1</b></a> <br><nobr>change <a href="../color.htm"><b>1</b></a> <a href="../isos.htm"><b>2</b></a> <a href="../viewing_geometrical_objects.htm"><b>3</b></a> <a href="../transparency.htm"><b>4</b></a> <a href="../wireframe_and_shading.htm"><b>5</b></a> </nobr><br><a href="../viewing_geometrical_objects.htm"><b>changes</b></a> <br><nobr>changing <a href="../color.htm"><b>1</b></a> <a href="../changing_display_parameters.htm"><b>2</b></a> <a href="../transparency.htm"><b>3</b></a> <a href="../wireframe_and_shading.htm"><b>4</b></a> </nobr><br><nobr>check <a href="../check_free_faces.htm"><b>1</b></a> <a href="../check_free_boundaries.htm"><b>2</b></a> <a href="../blocks_operations.htm"><b>3</b></a> <a href="../face.htm"><b>4</b></a> <a href="../measurement_tools.htm"><b>5</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>6</b></a> <a href="../repairing_operations.htm"><b>7</b></a> </nobr><br><a href="../blocks_operations.htm"><b>check_box</b></a> <br><a href="../blocks_operations.htm"><b>checkandimprove</b></a> <br><nobr>checkbox <a href="../multi_rotation.htm"><b>1</b></a> <a href="../modify_the_location.htm"><b>2</b></a> <a href="../mirror_image.htm"><b>3</b></a> <a href="../rotation.htm"><b>4</b></a> <a href="../translation.htm"><b>5</b></a> <a href="../suppress_holes.htm"><b>6</b></a> </nobr><br><nobr>checkcompoundofblocks <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr>checked <a href="../check_free_faces.htm"><b>1</b></a> <a href="../check_free_boundaries.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> <a href="../suppress_internal_wires.htm"><b>4</b></a> <a href="../shape_processing.htm"><b>5</b></a> </nobr><br><nobr>checking <a href="../check_free_boundaries.htm"><b>1</b></a> <a href="../explode_on_blocks.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>checks</b></a> <br><nobr>checkshape <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> </nobr><br><a href="../curve.htm"><b>choices</b></a> <br><nobr>choose <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../explode_on_blocks.htm"><b>2</b></a> <a href="../local_coordinate_system.htm"><b>3</b></a> </nobr><br><nobr><a name="bms_CI"></a><a name="subkey_CI"></a>circle <a href="../circle.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> </nobr><br><a href="../basic_geometrical_objects.htm"><b>circle1</b></a> <br><a href="../basic_geometrical_objects.htm"><b>circle2</b></a> <br><nobr>circles <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_CL"></a><a name="subkey_CL"></a>click <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../occ_viewer.htm"><b>2</b></a> <a href="../viewing_geometrical_objects.htm"><b>3</b></a> <a href="../working_with_groups.htm"><b>4</b></a> <a href="../wireframe_and_shading.htm"><b>5</b></a> </nobr><br><nobr>clicking <a href="../color.htm"><b>1</b></a> <a href="../viewing_geometrical_objects.htm"><b>2</b></a> <a href="../working_with_groups.htm"><b>3</b></a> </nobr><br><a href="../occ_viewer.htm"><b>clipping</b></a> <br><a href="../occ_viewer.htm"><b>clone</b></a> <br><nobr>close <a href="../close_contour.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../working_with_groups.htm"><b>3</b></a> </nobr><br><nobr>closecontour <a href="../close_contour.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><nobr>closed <a href="../close_contour.htm"><b>1</b></a> <a href="../check_free_boundaries.htm"><b>2</b></a> <a href="../solid.htm"><b>3</b></a> <a href="../shape_processing.htm"><b>4</b></a> </nobr><br><nobr>closedwires <a href="../check_free_boundaries.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><nobr>closes <a href="../close_contour.htm"><b>1</b></a> <a href="../working_with_groups.htm"><b>2</b></a> </nobr><br><a href="../close_contour.htm"><b>closure</b></a> <br><a name="bms_CM"></a><a name="subkey_CM"></a><a href="../measurement_tools.htm"><b>cm</b></a> <br><a name="bms_CN"></a><a name="subkey_CN"></a><a href="../shape_processing.htm"><b>cn</b></a> <br><a name="bms_CO"></a><a name="subkey_CO"></a><a href="../modify_the_location.htm"><b>coincide</b></a> <br><a href="../glue_faces.htm"><b>coincident</b></a> <br><a href="../shape_processing.htm"><b>coincidental</b></a> <br><a href="../modify_the_location.htm"><b>coincides</b></a> <br><nobr>collinear <a href="../cylinder.htm"><b>1</b></a> <a href="../cone.htm"><b>2</b></a> </nobr><br><nobr>color <a href="../color.htm"><b>1</b></a> <a href="../changing_display_parameters.htm"><b>2</b></a> <a href="../viewing_geometrical_objects.htm"><b>3</b></a> <a href="../wireframe_and_shading.htm"><b>4</b></a> </nobr><br><nobr>command <a href="../color.htm"><b>1</b></a> <a href="../close_contour.htm"><b>2</b></a> <a href="../circle.htm"><b>3</b></a> <a href="../check_free_faces.htm"><b>4</b></a> <a href="../check_free_boundaries.htm"><b>5</b></a> <a href="../chamfer.htm"><b>6</b></a> <a href="../box.htm"><b>7</b></a> <a href="../archimede.htm"><b>8</b></a> <a href="../arc.htm"><b>9</b></a> <a href="../add_point_on_edge.htm"><b>10</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>11</b></a> <a href="../face.htm"><b>12</b></a> <a href="../extrusion.htm"><b>13</b></a> <a href="../explode_on_blocks.htm"><b>14</b></a> <a href="../ellipse.htm"><b>15</b></a> <a href="../edge.htm"><b>16</b></a> <a href="../cylinder.htm"><b>17</b></a> <a href="../cone.htm"><b>18</b></a> <a href="../compound.htm"><b>19</b></a> <a href="../common.htm"><b>20</b></a> <a href="../multi_transformation.htm"><b>21</b></a> <a href="../multi_rotation.htm"><b>22</b></a> <a href="../modify_the_location.htm"><b>23</b></a> <a href="../mirror_image.htm"><b>24</b></a> <a href="../local_coordinate_system.htm"><b>25</b></a> <a href="../line.htm"><b>26</b></a> <a href="../glue_faces.htm"><b>27</b></a> <a href="../fuse.htm"><b>28</b></a> <a href="../filling.htm"><b>29</b></a> <a href="../fillet.htm"><b>30</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>31</b></a> <a href="../sewing.htm"><b>32</b></a> <a href="../section.htm"><b>33</b></a> <a href="../scale_transform.htm"><b>34</b></a> <a href="../rotation.htm"><b>35</b></a> <a href="../revolution.htm"><b>36</b></a> <a href="../propagate.htm"><b>37</b></a> <a href="../point.htm"><b>38</b></a> <a href="../plane.htm"><b>39</b></a> <a href="../pipe_creation.htm"><b>40</b></a> <a href="../partition.htm"><b>41</b></a> <a href="../offset_surface.htm"><b>42</b></a> <a href="../newentity_blocks.htm"><b>43</b></a> <a href="../multi_translation.htm"><b>44</b></a> <a href="../wire.htm"><b>45</b></a> <a href="../viewing_geometrical_objects.htm"><b>46</b></a> <a href="../vector.htm"><b>47</b></a> <a href="../turus.htm"><b>48</b></a> <a href="../transparency.htm"><b>49</b></a> <a href="../translation.htm"><b>50</b></a> <a href="../suppress_internal_wires.htm"><b>51</b></a> <a href="../suppress_holes.htm"><b>52</b></a> <a href="../suppress_faces.htm"><b>53</b></a> <a href="../sphere.htm"><b>54</b></a> <a href="../solid.htm"><b>55</b></a> <a href="../sketcher.htm"><b>56</b></a> <a href="../shell.htm"><b>57</b></a> <a href="../shape_processing.htm"><b>58</b></a> <a href="../working_with_groups.htm"><b>59</b></a> <a href="../wireframe_and_shading.htm"><b>60</b></a> </nobr><br><nobr>commands <a href="../box.htm"><b>1</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>2</b></a> <a href="../face.htm"><b>3</b></a> <a href="../extrusion.htm"><b>4</b></a> <a href="../explode.htm"><b>5</b></a> <a href="../curve.htm"><b>6</b></a> <a href="../line.htm"><b>7</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>8</b></a> <a href="../sphere.htm"><b>9</b></a> </nobr><br><nobr>common <a href="../close_contour.htm"><b>1</b></a> <a href="../chamfer.htm"><b>2</b></a> <a href="../boolean_operations.htm"><b>3</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>4</b></a> <a href="../common.htm"><b>5</b></a> <a href="../transformation_operations.htm"><b>6</b></a> </nobr><br><nobr>complex <a href="../files/salome2_sp3_booleangui_functions.htm"><b>1</b></a> <a href="../files/introduction_to_geom.htm"><b>2</b></a> <a href="../extrusion.htm"><b>3</b></a> <a href="../complex_objects.htm"><b>4</b></a> <a href="../geometry.htm"><b>5</b></a> <a href="../filling.htm"><b>6</b></a> <a href="../revolution.htm"><b>7</b></a> <a href="../pipe_creation.htm"><b>8</b></a> </nobr><br><nobr>components <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> <a href="../filling.htm"><b>3</b></a> <a href="../translation.htm"><b>4</b></a> <a href="../sketcher.htm"><b>5</b></a> </nobr><br><a href="../newentity_blocks.htm"><b>composed</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>composing</b></a> <br><nobr>compound <a href="../blocks_operations.htm"><b>1</b></a> <a href="../explode_on_blocks.htm"><b>2</b></a> <a href="../explode.htm"><b>3</b></a> <a href="../cut.htm"><b>4</b></a> <a href="../compound.htm"><b>5</b></a> <a href="../complex_objects.htm"><b>6</b></a> <a href="../common.htm"><b>7</b></a> <a href="../multi_rotation.htm"><b>8</b></a> <a href="../measurement_tools.htm"><b>9</b></a> <a href="../glue_faces.htm"><b>10</b></a> <a href="../geometrical_objects.htm"><b>11</b></a> <a href="../fuse.htm"><b>12</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>13</b></a> <a href="../section.htm"><b>14</b></a> <a href="../repairing_operations.htm"><b>15</b></a> <a href="../offset_surface.htm"><b>16</b></a> <a href="../newentity_blocks.htm"><b>17</b></a> <a href="../multi_translation.htm"><b>18</b></a> </nobr><br><nobr>compsolid <a href="../extrusion.htm"><b>1</b></a> <a href="../revolution.htm"><b>2</b></a> <a href="../pipe_creation.htm"><b>3</b></a> </nobr><br><a href="../explode.htm"><b>compsolids</b></a> <br><a href="../archimede.htm"><b>compute</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>computed</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>concerning</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>conditions</b></a> <br><nobr>cone <a href="../cone.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../primitives.htm"><b>3</b></a> </nobr><br><a href="../primitives.htm"><b>cone1</b></a> <br><a href="../primitives.htm"><b>cone2</b></a> <br><a href="../primitives.htm"><b>cones</b></a> <br><nobr>confirm <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../working_with_groups.htm"><b>2</b></a> </nobr><br><a href="../shape_processing.htm"><b>conical</b></a> <br><nobr>connected <a href="../chamfer.htm"><b>1</b></a> <a href="../face.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> <a href="../wire.htm"><b>4</b></a> <a href="../shell.htm"><b>5</b></a> </nobr><br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>connection</b></a> <br><a href="../transformation_operations.htm"><b>consequently</b></a> <br><nobr>considered <a href="../close_contour.htm"><b>1</b></a> <a href="../glue_faces.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>console</b></a> <br><a href="../newentity_blocks.htm"><b>constraints</b></a> <br><nobr>constructed <a href="../newentity_blocks.htm"><b>1</b></a> <a href="../solid.htm"><b>2</b></a> </nobr><br><nobr>construction <a href="../files/salome2_sp3_booleangui_functions.htm"><b>1</b></a> <a href="../files/introduction_to_geom.htm"><b>2</b></a> <a href="../curve.htm"><b>3</b></a> <a href="../geometry.htm"><b>4</b></a> <a href="../pipe_creation.htm"><b>5</b></a> <a href="../occ_viewer.htm"><b>6</b></a> </nobr><br><a href="../propagate.htm"><b>contain</b></a> <br><a href="../blocks_operations.htm"><b>contained</b></a> <br><a href="../check_free_faces.htm"><b>containing</b></a> <br><nobr>contains <a href="../close_contour.htm"><b>1</b></a> <a href="../add_point_on_edge.htm"><b>2</b></a> </nobr><br><nobr>contents <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../groups.htm"><b>2</b></a> <a href="../occ_viewer.htm"><b>3</b></a> </nobr><br><a href="../shape_processing.htm"><b>continuities</b></a> <br><a href="../shape_processing.htm"><b>continuity</b></a> <br><a href="../shape_processing.htm"><b>continuity2d</b></a> <br><a href="../shape_processing.htm"><b>continuity3d</b></a> <br><a href="../shape_processing.htm"><b>continuous</b></a> <br><nobr>contour <a href="../close_contour.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><a href="../shape_processing.htm"><b>conversion</b></a> <br><a href="../shape_processing.htm"><b>converts</b></a> <br><nobr>coordinate <a href="../box.htm"><b>1</b></a> <a href="../cylinder.htm"><b>2</b></a> <a href="../cone.htm"><b>3</b></a> <a href="../modify_the_location.htm"><b>4</b></a> <a href="../local_coordinate_system.htm"><b>5</b></a> <a href="../occ_viewer.htm"><b>6</b></a> <a href="../transformation_operations.htm"><b>7</b></a> <a href="../sphere.htm"><b>8</b></a> <a href="../sketcher.htm"><b>9</b></a> <a href="../working_plane.htm"><b>10</b></a> </nobr><br><nobr>coordinates <a href="../box.htm"><b>1</b></a> <a href="../explode.htm"><b>2</b></a> <a href="../cone.htm"><b>3</b></a> <a href="../modify_the_location.htm"><b>4</b></a> <a href="../measurement_tools.htm"><b>5</b></a> <a href="../local_coordinate_system.htm"><b>6</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>7</b></a> <a href="../point.htm"><b>8</b></a> <a href="../occ_viewer.htm"><b>9</b></a> <a href="../vector.htm"><b>10</b></a> <a href="../turus.htm"><b>11</b></a> <a href="../translation.htm"><b>12</b></a> <a href="../sphere.htm"><b>13</b></a> <a href="../sketcher.htm"><b>14</b></a> </nobr><br><a href="../measurement_tools.htm"><b>coords</b></a> <br><nobr>copy <a href="../modify_the_location.htm"><b>1</b></a> <a href="../mirror_image.htm"><b>2</b></a> <a href="../rotation.htm"><b>3</b></a> <a href="../translation.htm"><b>4</b></a> </nobr><br><a href="../shape_processing.htm"><b>corner</b></a> <br><nobr>corners <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../box.htm"><b>2</b></a> </nobr><br><a href="../shape_processing.htm"><b>correction</b></a> <br><a href="../shape_processing.htm"><b>corrects</b></a> <br><nobr>correspond <a href="../check_free_boundaries.htm"><b>1</b></a> <a href="../curve.htm"><b>2</b></a> </nobr><br><nobr>corresponding <a href="../archimede.htm"><b>1</b></a> <a href="../explode_on_blocks.htm"><b>2</b></a> </nobr><br><nobr>correspondingly <a href="../explode_on_blocks.htm"><b>1</b></a> <a href="../edge.htm"><b>2</b></a> </nobr><br><a href="../repairing_operations.htm"><b>count</b></a> <br><a href="../sketcher.htm"><b>coupled</b></a> <br><a href="../files/salome2_sp3_booleangui_functions.htm"><b>covering</b></a> <br><br><br></p><p class="ftsbody" align="center"><a href="whlstf2.htm" target="_self" title="previous search group"><b>&gt;&gt;</b></a>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstf10.htm b/doc/salome/gui/GEOM/whgdata/whlstf10.htm
deleted file mode 100755 (executable)
index 537af78..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<html>
-<head>
-<title>Search Words List</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsbody" align="center"><a href="whlstf9.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
-<p class="ftsbody" >
-<nobr><a name="bms_RI"></a><a name="subkey_RI"></a>right <a href="../color.htm"><b>1</b></a> <a href="../modify_the_location.htm"><b>2</b></a> <a href="../viewing_geometrical_objects.htm"><b>3</b></a> <a href="../wireframe_and_shading.htm"><b>4</b></a> </nobr><br><a href="../shape_processing.htm"><b>rise</b></a> <br><a name="bms_RO"></a><a name="subkey_RO"></a><a href="../transformation_operations.htm"><b>rot1d</b></a> <br><a href="../transformation_operations.htm"><b>rot2d</b></a> <br><nobr>rotate <a href="../revolution.htm"><b>1</b></a> <a href="../occ_viewer.htm"><b>2</b></a> <a href="../transformation_operations.htm"><b>3</b></a> </nobr><br><nobr>rotated <a href="../multi_rotation.htm"><b>1</b></a> <a href="../rotation.htm"><b>2</b></a> <a href="../revolution.htm"><b>3</b></a> </nobr><br><nobr>rotates <a href="../multi_rotation.htm"><b>1</b></a> <a href="../rotation.htm"><b>2</b></a> </nobr><br><nobr>rotation <a href="../multi_rotation.htm"><b>1</b></a> <a href="../rotation.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> <a href="../occ_viewer.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> </nobr><br><a name="bms_RU"></a><a name="subkey_RU"></a><a href="../shape_processing.htm"><b>ruling</b></a> <br><nobr>runtimeerror <a href="../measurement_tools.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br>
-<br><br>
-<nobr><a name="bm_S"></a><a name="subkey_S{"></a>s <a href="../close_contour.htm"><b>1</b></a> <a href="../circle.htm"><b>2</b></a> <a href="../check_free_boundaries.htm"><b>3</b></a> <a href="../complex_objects.htm"><b>4</b></a> <a href="../multi_transformation.htm"><b>5</b></a> <a href="../scale_transform.htm"><b>6</b></a> <a href="../repairing_operations.htm"><b>7</b></a> <a href="../suppress_internal_wires.htm"><b>8</b></a> <a href="../suppress_holes.htm"><b>9</b></a> <a href="../suppress_faces.htm"><b>10</b></a> <a href="../working_with_groups.htm"><b>11</b></a> </nobr><br><nobr>s1 <a href="../common.htm"><b>1</b></a> <a href="../fuse.htm"><b>2</b></a> <a href="../section.htm"><b>3</b></a> </nobr><br><nobr>s2 <a href="../common.htm"><b>1</b></a> <a href="../fuse.htm"><b>2</b></a> <a href="../section.htm"><b>3</b></a> </nobr><br><nobr><a name="bms_SA"></a><a name="subkey_SA"></a>salome <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../building_by_blocks.htm"><b>2</b></a> <a href="../boolean_operations.htm"><b>3</b></a> <a href="../blocks_operations.htm"><b>4</b></a> <a href="../basic_operations.htm"><b>5</b></a> <a href="../basic_geometrical_objects.htm"><b>6</b></a> <a href="../files/introduction_to_geom.htm"><b>7</b></a> <a href="../complex_objects.htm"><b>8</b></a> <a href="../measurement_tools.htm"><b>9</b></a> <a href="../groups.htm"><b>10</b></a> <a href="../geometry.htm"><b>11</b></a> <a href="../geometrical_objects.htm"><b>12</b></a> <a href="../repairing_operations.htm"><b>13</b></a> <a href="../primitives.htm"><b>14</b></a> <a href="../transformation_operations.htm"><b>15</b></a> <a href="../sketcher_tui.htm"><b>16</b></a> </nobr><br><nobr>same <a href="../multi_rotation.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> <a href="../sketcher.htm"><b>3</b></a> <a href="../shape_processing.htm"><b>4</b></a> <a href="../working_with_groups.htm"><b>5</b></a> </nobr><br><a href="../shape_processing.htm"><b>sameparameter</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>satisfy</b></a> <br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>save</b></a> <br><a href="../occ_viewer.htm"><b>saved</b></a> <br><a href="../occ_viewer.htm"><b>saves</b></a> <br><nobr><a name="bms_SC"></a><a name="subkey_SC"></a>scale <a href="../scale_transform.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><a href="../scale_transform.htm"><b>scaled</b></a> <br><a href="../occ_viewer.htm"><b>scene</b></a> <br><nobr>scripts <a href="../color.htm"><b>1</b></a> <a href="../close_contour.htm"><b>2</b></a> <a href="../circle.htm"><b>3</b></a> <a href="../check_free_faces.htm"><b>4</b></a> <a href="../check_free_boundaries.htm"><b>5</b></a> <a href="../chamfer.htm"><b>6</b></a> <a href="../box.htm"><b>7</b></a> <a href="../archimede.htm"><b>8</b></a> <a href="../arc.htm"><b>9</b></a> <a href="../add_point_on_edge.htm"><b>10</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>11</b></a> <a href="../face.htm"><b>12</b></a> <a href="../extrusion.htm"><b>13</b></a> <a href="../explode_on_blocks.htm"><b>14</b></a> <a href="../ellipse.htm"><b>15</b></a> <a href="../edge.htm"><b>16</b></a> <a href="../cylinder.htm"><b>17</b></a> <a href="../cut.htm"><b>18</b></a> <a href="../curve.htm"><b>19</b></a> <a href="../cone.htm"><b>20</b></a> <a href="../compound.htm"><b>21</b></a> <a href="../common.htm"><b>22</b></a> <a href="../multi_transformation.htm"><b>23</b></a> <a href="../multi_rotation.htm"><b>24</b></a> <a href="../modify_the_location.htm"><b>25</b></a> <a href="../mirror_image.htm"><b>26</b></a> <a href="../line.htm"><b>27</b></a> <a href="../glue_faces.htm"><b>28</b></a> <a href="../fuse.htm"><b>29</b></a> <a href="../filling.htm"><b>30</b></a> <a href="../fillet.htm"><b>31</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>32</b></a> <a href="../sewing.htm"><b>33</b></a> <a href="../section.htm"><b>34</b></a> <a href="../scale_transform.htm"><b>35</b></a> <a href="../rotation.htm"><b>36</b></a> <a href="../revolution.htm"><b>37</b></a> <a href="../propagate.htm"><b>38</b></a> <a href="../point.htm"><b>39</b></a> <a href="../plane.htm"><b>40</b></a> <a href="../pipe_creation.htm"><b>41</b></a> <a href="../partition.htm"><b>42</b></a> <a href="../offset_surface.htm"><b>43</b></a> <a href="../newentity_blocks.htm"><b>44</b></a> <a href="../multi_translation.htm"><b>45</b></a> <a href="../wire.htm"><b>46</b></a> <a href="../vector.htm"><b>47</b></a> <a href="../turus.htm"><b>48</b></a> <a href="../transparency.htm"><b>49</b></a> <a href="../translation.htm"><b>50</b></a> <a href="../suppress_internal_wires.htm"><b>51</b></a> <a href="../suppress_holes.htm"><b>52</b></a> <a href="../suppress_faces.htm"><b>53</b></a> <a href="../sphere.htm"><b>54</b></a> <a href="../solid.htm"><b>55</b></a> <a href="../sketcher.htm"><b>56</b></a> <a href="../shell.htm"><b>57</b></a> <a href="../shape_processing.htm"><b>58</b></a> <a href="../working_with_groups.htm"><b>59</b></a> <a href="../wireframe_and_shading.htm"><b>60</b></a> </nobr><br><a name="bms_SE"></a><a name="subkey_SE"></a><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>search</b></a> <br><nobr>second <a href="../files/salome2_sp3_booleangui_functions.htm"><b>1</b></a> <a href="../cone.htm"><b>2</b></a> <a href="../multi_transformation.htm"><b>3</b></a> <a href="../modify_the_location.htm"><b>4</b></a> <a href="../partition.htm"><b>5</b></a> <a href="../multi_translation.htm"><b>6</b></a> <a href="../sketcher_tui.htm"><b>7</b></a> <a href="../shape_processing.htm"><b>8</b></a> </nobr><br><nobr>secondly <a href="../circle.htm"><b>1</b></a> <a href="../box.htm"><b>2</b></a> <a href="../cylinder.htm"><b>3</b></a> <a href="../cone.htm"><b>4</b></a> <a href="../mirror_image.htm"><b>5</b></a> <a href="../local_coordinate_system.htm"><b>6</b></a> <a href="../point.htm"><b>7</b></a> <a href="../plane.htm"><b>8</b></a> <a href="../vector.htm"><b>9</b></a> <a href="../turus.htm"><b>10</b></a> <a href="../translation.htm"><b>11</b></a> <a href="../sphere.htm"><b>12</b></a> <a href="../working_plane.htm"><b>13</b></a> </nobr><br><nobr>section <a href="../boolean_operations.htm"><b>1</b></a> <a href="../archimede.htm"><b>2</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>3</b></a> <a href="../section.htm"><b>4</b></a> <a href="../occ_viewer.htm"><b>5</b></a> </nobr><br><nobr>see <a href="../modify_the_location.htm"><b>1</b></a> <a href="../occ_viewer.htm"><b>2</b></a> <a href="../wireframe_and_shading.htm"><b>3</b></a> </nobr><br><a href="../repairing_operations.htm"><b>seems</b></a> <br><a href="../sketcher.htm"><b>segment</b></a> <br><nobr>segments <a href="../sketcher.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><nobr>select <a href="../color.htm"><b>1</b></a> <a href="../close_contour.htm"><b>2</b></a> <a href="../circle.htm"><b>3</b></a> <a href="../check_free_faces.htm"><b>4</b></a> <a href="../check_free_boundaries.htm"><b>5</b></a> <a href="../chamfer.htm"><b>6</b></a> <a href="../box.htm"><b>7</b></a> <a href="../archimede.htm"><b>8</b></a> <a href="../arc.htm"><b>9</b></a> <a href="../add_point_on_edge.htm"><b>10</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>11</b></a> <a href="../face.htm"><b>12</b></a> <a href="../extrusion.htm"><b>13</b></a> <a href="../explode_on_blocks.htm"><b>14</b></a> <a href="../explode.htm"><b>15</b></a> <a href="../ellipse.htm"><b>16</b></a> <a href="../edge.htm"><b>17</b></a> <a href="../cylinder.htm"><b>18</b></a> <a href="../cut.htm"><b>19</b></a> <a href="../curve.htm"><b>20</b></a> <a href="../cone.htm"><b>21</b></a> <a href="../compound.htm"><b>22</b></a> <a href="../common.htm"><b>23</b></a> <a href="../multi_transformation.htm"><b>24</b></a> <a href="../multi_rotation.htm"><b>25</b></a> <a href="../modify_the_location.htm"><b>26</b></a> <a href="../mirror_image.htm"><b>27</b></a> <a href="../local_coordinate_system.htm"><b>28</b></a> <a href="../line.htm"><b>29</b></a> <a href="../glue_faces.htm"><b>30</b></a> <a href="../fuse.htm"><b>31</b></a> <a href="../filling.htm"><b>32</b></a> <a href="../fillet.htm"><b>33</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>34</b></a> <a href="../sewing.htm"><b>35</b></a> <a href="../section.htm"><b>36</b></a> <a href="../scale_transform.htm"><b>37</b></a> <a href="../rotation.htm"><b>38</b></a> <a href="../revolution.htm"><b>39</b></a> <a href="../propagate.htm"><b>40</b></a> <a href="../point.htm"><b>41</b></a> <a href="../plane.htm"><b>42</b></a> <a href="../pipe_creation.htm"><b>43</b></a> <a href="../partition.htm"><b>44</b></a> <a href="../offset_surface.htm"><b>45</b></a> <a href="../occ_viewer.htm"><b>46</b></a> <a href="../multi_translation.htm"><b>47</b></a> <a href="../wire.htm"><b>48</b></a> <a href="../viewing_geometrical_objects.htm"><b>49</b></a> <a href="../vector.htm"><b>50</b></a> <a href="../turus.htm"><b>51</b></a> <a href="../translation.htm"><b>52</b></a> <a href="../suppress_internal_wires.htm"><b>53</b></a> <a href="../suppress_holes.htm"><b>54</b></a> <a href="../suppress_faces.htm"><b>55</b></a> <a href="../sphere.htm"><b>56</b></a> <a href="../solid.htm"><b>57</b></a> <a href="../sketcher.htm"><b>58</b></a> <a href="../shell.htm"><b>59</b></a> <a href="../shape_processing.htm"><b>60</b></a> <a href="../working_with_groups.htm"><b>61</b></a> <a href="../working_plane.htm"><b>62</b></a> <a href="../wireframe_and_shading.htm"><b>63</b></a> </nobr><br><nobr>selected <a href="../basic_operations.htm"><b>1</b></a> <a href="../add_point_on_edge.htm"><b>2</b></a> <a href="../explode.htm"><b>3</b></a> <a href="../local_coordinate_system.htm"><b>4</b></a> <a href="../groups.htm"><b>5</b></a> <a href="../repairing_operations.htm"><b>6</b></a> <a href="../occ_viewer.htm"><b>7</b></a> <a href="../viewing_geometrical_objects.htm"><b>8</b></a> <a href="../suppress_holes.htm"><b>9</b></a> <a href="../working_with_groups.htm"><b>10</b></a> </nobr><br><nobr>selecting <a href="../color.htm"><b>1</b></a> <a href="../modify_the_location.htm"><b>2</b></a> <a href="../wire.htm"><b>3</b></a> </nobr><br><nobr>selection <a href="../fillet.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> <a href="../working_with_groups.htm"><b>3</b></a> <a href="../working_plane.htm"><b>4</b></a> </nobr><br><a href="../partition.htm"><b>sense</b></a> <br><a href="../files/salome2_sp3_booleangui_functions.htm"><b>separate</b></a> <br><a href="../curve.htm"><b>serve</b></a> <br><nobr>serving <a href="../extrusion.htm"><b>1</b></a> <a href="../revolution.htm"><b>2</b></a> <a href="../pipe_creation.htm"><b>3</b></a> </nobr><br><nobr>set <a href="../close_contour.htm"><b>1</b></a> <a href="../face.htm"><b>2</b></a> <a href="../multi_rotation.htm"><b>3</b></a> <a href="../geometrical_objects.htm"><b>4</b></a> <a href="../offset_surface.htm"><b>5</b></a> <a href="../working_plane.htm"><b>6</b></a> </nobr><br><nobr>setcolor <a href="../color.htm"><b>1</b></a> <a href="../changing_display_parameters.htm"><b>2</b></a> </nobr><br><nobr>setdisplaymode <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../building_by_blocks.htm"><b>2</b></a> <a href="../boolean_operations.htm"><b>3</b></a> <a href="../blocks_operations.htm"><b>4</b></a> <a href="../basic_operations.htm"><b>5</b></a> <a href="../basic_geometrical_objects.htm"><b>6</b></a> <a href="../complex_objects.htm"><b>7</b></a> <a href="../geometrical_objects.htm"><b>8</b></a> <a href="../repairing_operations.htm"><b>9</b></a> <a href="../primitives.htm"><b>10</b></a> <a href="../transformation_operations.htm"><b>11</b></a> <a href="../sketcher_tui.htm"><b>12</b></a> <a href="../wireframe_and_shading.htm"><b>13</b></a> </nobr><br><nobr>setting <a href="../add_point_on_edge.htm"><b>1</b></a> <a href="../explode_on_blocks.htm"><b>2</b></a> <a href="../point.htm"><b>3</b></a> </nobr><br><nobr>settransparency <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../geometrical_objects.htm"><b>3</b></a> <a href="../transparency.htm"><b>4</b></a> <a href="../sketcher_tui.htm"><b>5</b></a> </nobr><br><a href="../sewing.htm"><b>sew</b></a> <br><a href="../sewing.htm"><b>sewed</b></a> <br><nobr>sewing <a href="../sewing.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_SG"></a><a name="subkey_SG"></a>sg <a href="../blocks_operations.htm"><b>1</b></a> <a href="../groups.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> <a href="../viewing_geometrical_objects.htm"><b>4</b></a> </nobr><br><nobr><a name="bms_SH"></a><a name="subkey_SH"></a>shading <a href="../viewing_geometrical_objects.htm"><b>1</b></a> <a href="../wireframe_and_shading.htm"><b>2</b></a> </nobr><br><nobr>shape <a href="../close_contour.htm"><b>1</b></a> <a href="../check_free_faces.htm"><b>2</b></a> <a href="../check_free_boundaries.htm"><b>3</b></a> <a href="../chamfer.htm"><b>4</b></a> <a href="../basic_operations.htm"><b>5</b></a> <a href="../archimede.htm"><b>6</b></a> <a href="../add_point_on_edge.htm"><b>7</b></a> <a href="../extrusion.htm"><b>8</b></a> <a href="../explode.htm"><b>9</b></a> <a href="../cut.htm"><b>10</b></a> <a href="../multi_rotation.htm"><b>11</b></a> <a href="../modify_the_location.htm"><b>12</b></a> <a href="../mirror_image.htm"><b>13</b></a> <a href="../measurement_tools.htm"><b>14</b></a> <a href="../isos.htm"><b>15</b></a> <a href="../fuse.htm"><b>16</b></a> <a href="../filling.htm"><b>17</b></a> <a href="../fillet.htm"><b>18</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>19</b></a> <a href="../sewing.htm"><b>20</b></a> <a href="../scale_transform.htm"><b>21</b></a> <a href="../rotation.htm"><b>22</b></a> <a href="../revolution.htm"><b>23</b></a> <a href="../repairing_operations.htm"><b>24</b></a> <a href="../propagate.htm"><b>25</b></a> <a href="../pipe_creation.htm"><b>26</b></a> <a href="../partition.htm"><b>27</b></a> <a href="../offset_surface.htm"><b>28</b></a> <a href="../multi_translation.htm"><b>29</b></a> <a href="../viewing_geometrical_objects.htm"><b>30</b></a> <a href="../transparency.htm"><b>31</b></a> <a href="../translation.htm"><b>32</b></a> <a href="../transformation_operations.htm"><b>33</b></a> <a href="../suppress_internal_wires.htm"><b>34</b></a> <a href="../suppress_holes.htm"><b>35</b></a> <a href="../suppress_faces.htm"><b>36</b></a> <a href="../shape_processing.htm"><b>37</b></a> <a href="../working_with_groups.htm"><b>38</b></a> </nobr><br><nobr>shape1 <a href="../files/salome2_sp3_booleangui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr>shape2 <a href="../files/salome2_sp3_booleangui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><a href="../complex_objects.htm"><b>shapelistcompound</b></a> <br><nobr>shapes <a href="../files/introduction_to_geom.htm"><b>1</b></a> <a href="../explode.htm"><b>2</b></a> <a href="../cut.htm"><b>3</b></a> <a href="../compound.htm"><b>4</b></a> <a href="../common.htm"><b>5</b></a> <a href="../groups.htm"><b>6</b></a> <a href="../glue_faces.htm"><b>7</b></a> <a href="../geometry.htm"><b>8</b></a> <a href="../fuse.htm"><b>9</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>10</b></a> <a href="../sewing.htm"><b>11</b></a> <a href="../section.htm"><b>12</b></a> <a href="../repairing_operations.htm"><b>13</b></a> <a href="../partition.htm"><b>14</b></a> <a href="../occ_viewer.htm"><b>15</b></a> <a href="../suppress_holes.htm"><b>16</b></a> <a href="../shape_processing.htm"><b>17</b></a> <a href="../working_with_groups.htm"><b>18</b></a> </nobr><br><a href="../explode.htm"><b>shapes_of_given_type</b></a> <br><nobr>shapetype <a href="../groups.htm"><b>1</b></a> <a href="../geometrical_objects.htm"><b>2</b></a> <a href="../fillet.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> <a href="../working_with_groups.htm"><b>6</b></a> </nobr><br><a href="../transformation_operations.htm"><b>shapetypeedge</b></a> <br><a href="../transformation_operations.htm"><b>shapetypeface</b></a> <br><a href="../check_free_faces.htm"><b>shared</b></a> <br><a href="../shape_processing.htm"><b>sharp</b></a> <br><nobr>shell <a href="../extrusion.htm"><b>1</b></a> <a href="../geometrical_objects.htm"><b>2</b></a> <a href="../revolution.htm"><b>3</b></a> <a href="../pipe_creation.htm"><b>4</b></a> <a href="../offset_surface.htm"><b>5</b></a> <a href="../newentity_blocks.htm"><b>6</b></a> <a href="../solid.htm"><b>7</b></a> <a href="../shell.htm"><b>8</b></a> </nobr><br><nobr>shells <a href="../check_free_faces.htm"><b>1</b></a> <a href="../compound.htm"><b>2</b></a> <a href="../geometrical_objects.htm"><b>3</b></a> <a href="../offset_surface.htm"><b>4</b></a> <a href="../solid.htm"><b>5</b></a> <a href="../shell.htm"><b>6</b></a> <a href="../wireframe_and_shading.htm"><b>7</b></a> </nobr><br><nobr>shift <a href="../point.htm"><b>1</b></a> <a href="../wire.htm"><b>2</b></a> <a href="../working_with_groups.htm"><b>3</b></a> </nobr><br><a href="../modify_the_location.htm"><b>shifted</b></a> <br><nobr>short <a href="../color.htm"><b>1</b></a> <a href="../wireframe_and_shading.htm"><b>2</b></a> </nobr><br><a href="../face.htm"><b>shortcut</b></a> <br><nobr>should <a href="../extrusion.htm"><b>1</b></a> <a href="../line.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> <a href="../suppress_holes.htm"><b>4</b></a> <a href="../suppress_faces.htm"><b>5</b></a> </nobr><br><nobr>show <a href="../files/salome2_sp3_measuregui_functions.htm"><b>1</b></a> <a href="../occ_viewer.htm"><b>2</b></a> </nobr><br><a href="../local_coordinate_system.htm"><b>shown</b></a> <br><a href="../occ_viewer.htm"><b>shows</b></a> <br><br><br></p><p class="ftsbody" align="center"><a href="whlstf11.htm" target="_self" title="previous search group"><b>&gt;&gt;</b></a>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstf11.htm b/doc/salome/gui/GEOM/whgdata/whlstf11.htm
deleted file mode 100755 (executable)
index e03381b..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<html>
-<head>
-<title>Search Words List</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsbody" align="center"><a href="whlstf10.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
-<p class="ftsbody" >
-<a name="bms_SI"></a><a name="subkey_SI"></a><a href="../plane.htm"><b>side</b></a> <br><a href="../offset_surface.htm"><b>signed</b></a> <br><a href="../plane.htm"><b>similar</b></a> <br><nobr>simple <a href="../multi_transformation.htm"><b>1</b></a> <a href="../multi_rotation.htm"><b>2</b></a> <a href="../multi_translation.htm"><b>3</b></a> </nobr><br><a href="../local_coordinate_system.htm"><b>simply</b></a> <br><a href="../face.htm"><b>single</b></a> <br><nobr>six <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../newentity_blocks.htm"><b>2</b></a> </nobr><br><nobr>size <a href="../chamfer.htm"><b>1</b></a> <a href="../plane.htm"><b>2</b></a> <a href="../shape_processing.htm"><b>3</b></a> </nobr><br><a name="bms_SK"></a><a name="subkey_SK"></a><a href="../sketcher.htm"><b>sketch</b></a> <br><nobr>sketcher <a href="../geometrical_objects.htm"><b>1</b></a> <a href="../sketcher_tui.htm"><b>2</b></a> <a href="../sketcher.htm"><b>3</b></a> </nobr><br><nobr>sketcher1 <a href="../geometrical_objects.htm"><b>1</b></a> <a href="../sketcher_tui.htm"><b>2</b></a> </nobr><br><nobr>sketcher2 <a href="../geometrical_objects.htm"><b>1</b></a> <a href="../sketcher_tui.htm"><b>2</b></a> </nobr><br><a href="../geometrical_objects.htm"><b>sketcher3</b></a> <br><a href="../geometrical_objects.htm"><b>sketchers</b></a> <br><a href="../working_with_groups.htm"><b>skip</b></a> <br><nobr><a name="bms_SM"></a><a name="subkey_SM"></a>small <a href="../occ_viewer.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_SO"></a><a name="subkey_SO"></a>so <a href="../face.htm"><b>1</b></a> <a href="../modify_the_location.htm"><b>2</b></a> </nobr><br><nobr>solid <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../box.htm"><b>2</b></a> <a href="../extrusion.htm"><b>3</b></a> <a href="../cylinder.htm"><b>4</b></a> <a href="../cone.htm"><b>5</b></a> <a href="../multi_transformation.htm"><b>6</b></a> <a href="../geometrical_objects.htm"><b>7</b></a> <a href="../revolution.htm"><b>8</b></a> <a href="../pipe_creation.htm"><b>9</b></a> <a href="../offset_surface.htm"><b>10</b></a> <a href="../newentity_blocks.htm"><b>11</b></a> <a href="../turus.htm"><b>12</b></a> <a href="../sphere.htm"><b>13</b></a> <a href="../solid.htm"><b>14</b></a> </nobr><br><a href="../building_by_blocks.htm"><b>solid1</b></a> <br><a href="../building_by_blocks.htm"><b>solid2</b></a> <br><nobr>solids <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../explode.htm"><b>2</b></a> <a href="../offset_surface.htm"><b>3</b></a> </nobr><br><a href="../explode.htm"><b>sorted</b></a> <br><a href="../explode.htm"><b>sorts</b></a> <br><a href="../revolution.htm"><b>source</b></a> <br><nobr><a name="bms_SP"></a><a name="subkey_SP"></a>space <a href="../circle.htm"><b>1</b></a> <a href="../curve.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> <a href="../point.htm"><b>4</b></a> <a href="../plane.htm"><b>5</b></a> <a href="../vector.htm"><b>6</b></a> </nobr><br><a href="../newentity_blocks.htm"><b>specific</b></a> <br><nobr>specified <a href="../close_contour.htm"><b>1</b></a> <a href="../chamfer.htm"><b>2</b></a> <a href="../box.htm"><b>3</b></a> <a href="../add_point_on_edge.htm"><b>4</b></a> <a href="../multi_transformation.htm"><b>5</b></a> <a href="../local_coordinate_system.htm"><b>6</b></a> <a href="../fillet.htm"><b>7</b></a> <a href="../repairing_operations.htm"><b>8</b></a> <a href="../transformation_operations.htm"><b>9</b></a> <a href="../suppress_internal_wires.htm"><b>10</b></a> <a href="../shape_processing.htm"><b>11</b></a> </nobr><br><a href="../rotation.htm"><b>specify</b></a> <br><a href="../add_point_on_edge.htm"><b>specifying</b></a> <br><nobr>sphere <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../boolean_operations.htm"><b>2</b></a> <a href="../blocks_operations.htm"><b>3</b></a> <a href="../primitives.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> <a href="../sphere.htm"><b>6</b></a> </nobr><br><a href="../primitives.htm"><b>sphere1</b></a> <br><a href="../primitives.htm"><b>sphere2</b></a> <br><a href="../primitives.htm"><b>sphere3</b></a> <br><a href="../primitives.htm"><b>spheres</b></a> <br><nobr>spline <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../curve.htm"><b>2</b></a> </nobr><br><a href="../shape_processing.htm"><b>split</b></a> <br><a href="../shape_processing.htm"><b>splitangle</b></a> <br><a href="../shape_processing.htm"><b>splitclosedfaces</b></a> <br><a href="../shape_processing.htm"><b>splitcontinuity</b></a> <br><nobr>splits <a href="../add_point_on_edge.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><a href="../shape_processing.htm"><b>splitting</b></a> <br><a href="../shape_processing.htm"><b>spots</b></a> <br><a name="bms_SQ"></a><a name="subkey_SQ"></a><a href="../measurement_tools.htm"><b>sqrt</b></a> <br><a name="bms_ST"></a><a name="subkey_ST"></a><a href="../newentity_blocks.htm"><b>stage</b></a> <br><nobr>standard <a href="../color.htm"><b>1</b></a> <a href="../viewing_geometrical_objects.htm"><b>2</b></a> </nobr><br><nobr>start <a href="../extrusion.htm"><b>1</b></a> <a href="../modify_the_location.htm"><b>2</b></a> <a href="../vector.htm"><b>3</b></a> <a href="../translation.htm"><b>4</b></a> </nobr><br><a href="../sketcher.htm"><b>started</b></a> <br><nobr>starting <a href="../arc.htm"><b>1</b></a> <a href="../vector.htm"><b>2</b></a> <a href="../sketcher.htm"><b>3</b></a> </nobr><br><nobr>step <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../files/introduction_to_geom.htm"><b>2</b></a> <a href="../multi_rotation.htm"><b>3</b></a> <a href="../geometry.htm"><b>4</b></a> <a href="../multi_translation.htm"><b>5</b></a> </nobr><br><a href="../multi_translation.htm"><b>step1</b></a> <br><a href="../multi_translation.htm"><b>step2</b></a> <br><a href="../shape_processing.htm"><b>still</b></a> <br><a href="../occ_viewer.htm"><b>strictly</b></a> <br><a href="../sketcher.htm"><b>string</b></a> <br><a href="../shape_processing.htm"><b>strips</b></a> <br><nobr>study <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../boolean_operations.htm"><b>2</b></a> <a href="../blocks_operations.htm"><b>3</b></a> <a href="../basic_operations.htm"><b>4</b></a> <a href="../basic_geometrical_objects.htm"><b>5</b></a> <a href="../complex_objects.htm"><b>6</b></a> <a href="../geometrical_objects.htm"><b>7</b></a> <a href="../repairing_operations.htm"><b>8</b></a> <a href="../primitives.htm"><b>9</b></a> <a href="../transformation_operations.htm"><b>10</b></a> <a href="../sketcher_tui.htm"><b>11</b></a> </nobr><br><nobr><a name="bms_SU"></a><a name="subkey_SU"></a>sub <a href="../explode.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../occ_viewer.htm"><b>3</b></a> <a href="../suppress_holes.htm"><b>4</b></a> <a href="../working_with_groups.htm"><b>5</b></a> </nobr><br><a href="../repairing_operations.htm"><b>sub_shape_id</b></a> <br><a href="../groups.htm"><b>subfacelist</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>submenu</b></a> <br><nobr>subshape <a href="../explode.htm"><b>1</b></a> <a href="../working_with_groups.htm"><b>2</b></a> </nobr><br><a href="../explode.htm"><b>subshapeall</b></a> <br><a href="../explode.htm"><b>subshapeallids</b></a> <br><nobr>subshapeallsorted <a href="../explode.htm"><b>1</b></a> <a href="../groups.htm"><b>2</b></a> <a href="../geometrical_objects.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> </nobr><br><a href="../explode.htm"><b>subshapeallsortedids</b></a> <br><a href="../working_with_groups.htm"><b>subshapeid</b></a> <br><nobr>subshapes <a href="../explode.htm"><b>1</b></a> <a href="../working_with_groups.htm"><b>2</b></a> </nobr><br><a href="../explode.htm"><b>subshapesorted</b></a> <br><a href="../modify_the_location.htm"><b>subtraction</b></a> <br><a href="../measurement_tools.htm"><b>successfully</b></a> <br><a href="../repairing_operations.htm"><b>sup_faces</b></a> <br><nobr>suppress <a href="../repairing_operations.htm"><b>1</b></a> <a href="../suppress_internal_wires.htm"><b>2</b></a> <a href="../suppress_holes.htm"><b>3</b></a> <a href="../suppress_faces.htm"><b>4</b></a> </nobr><br><a href="../suppress_faces.htm"><b>suppresses</b></a> <br><nobr>suppressfaces <a href="../repairing_operations.htm"><b>1</b></a> <a href="../suppress_faces.htm"><b>2</b></a> </nobr><br><nobr>suppressholes <a href="../repairing_operations.htm"><b>1</b></a> <a href="../suppress_holes.htm"><b>2</b></a> </nobr><br><nobr>suppressinternalwires <a href="../repairing_operations.htm"><b>1</b></a> <a href="../suppress_internal_wires.htm"><b>2</b></a> </nobr><br><nobr>surface <a href="../face.htm"><b>1</b></a> <a href="../measurement_tools.htm"><b>2</b></a> <a href="../filling.htm"><b>3</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>4</b></a> <a href="../offset_surface.htm"><b>5</b></a> <a href="../transformation_operations.htm"><b>6</b></a> <a href="../shape_processing.htm"><b>7</b></a> </nobr><br><a href="../shape_processing.htm"><b>surfacecontinuity</b></a> <br><a href="../shape_processing.htm"><b>surfacemode</b></a> <br><a href="../shape_processing.htm"><b>surfaces</b></a> <br><a name="bms_SY"></a><a name="subkey_SY"></a><a href="../transformation_operations.htm"><b>symmetric</b></a> <br><nobr>symmetrical <a href="../mirror_image.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><a href="../mirror_image.htm"><b>symmetry</b></a> <br><nobr>system <a href="../cylinder.htm"><b>1</b></a> <a href="../cone.htm"><b>2</b></a> <a href="../modify_the_location.htm"><b>3</b></a> <a href="../local_coordinate_system.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> <a href="../sphere.htm"><b>6</b></a> <a href="../working_plane.htm"><b>7</b></a> </nobr><br><nobr>systems <a href="../modify_the_location.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br>
-<br><br>
-<nobr><a name="bm_T"></a><a name="subkey_T{"></a>t <a href="../box.htm"><b>1</b></a> <a href="../extrusion.htm"><b>2</b></a> <a href="../groups.htm"><b>3</b></a> <a href="../occ_viewer.htm"><b>4</b></a> <a href="../sphere.htm"><b>5</b></a> </nobr><br><a name="bms_TA"></a><a name="subkey_TA"></a><a href="../shape_processing.htm"><b>take</b></a> <br><a href="../sketcher.htm"><b>tangent</b></a> <br><a href="../shape_processing.htm"><b>tangential</b></a> <br><a href="../shape_processing.htm"><b>tangents</b></a> <br><nobr>target <a href="../explode_on_blocks.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> </nobr><br><a name="bms_TE"></a><a name="subkey_TE"></a><a href="../occ_viewer.htm"><b>technology</b></a> <br><a href="../newentity_blocks.htm"><b>tetrahedral</b></a> <br><nobr>textual <a href="../sketcher_tui.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> </nobr><br><a name="bms_TH"></a><a name="subkey_TH"></a><a href="../shape_processing.htm"><b>th</b></a> <br><a href="../modify_the_location.htm"><b>theendlcs</b></a> <br><nobr>them <a href="../box.htm"><b>1</b></a> <a href="../explode.htm"><b>2</b></a> <a href="../occ_viewer.htm"><b>3</b></a> <a href="../wire.htm"><b>4</b></a> <a href="../suppress_faces.htm"><b>5</b></a> <a href="../shape_processing.htm"><b>6</b></a> <a href="../working_with_groups.htm"><b>7</b></a> </nobr><br><a href="../modify_the_location.htm"><b>theobject</b></a> <br><a href="../sketcher.htm"><b>therefore</b></a> <br><nobr>theshape <a href="../glue_faces.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><a href="../modify_the_location.htm"><b>thestartlcs</b></a> <br><a href="../glue_faces.htm"><b>thetolerance</b></a> <br><a href="../box.htm"><b>third</b></a> <br><nobr>three <a href="../circle.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../arc.htm"><b>3</b></a> <a href="../curve.htm"><b>4</b></a> <a href="../complex_objects.htm"><b>5</b></a> <a href="../mirror_image.htm"><b>6</b></a> <a href="../local_coordinate_system.htm"><b>7</b></a> <a href="../geometrical_objects.htm"><b>8</b></a> <a href="../point.htm"><b>9</b></a> <a href="../plane.htm"><b>10</b></a> <a href="../transformation_operations.htm"><b>11</b></a> <a href="../sketcher_tui.htm"><b>12</b></a> <a href="../working_plane.htm"><b>13</b></a> </nobr><br><nobr>thus <a href="../transparency.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_TI"></a><a name="subkey_TI"></a>time <a href="../curve.htm"><b>1</b></a> <a href="../point.htm"><b>2</b></a> </nobr><br><nobr>times <a href="../multi_rotation.htm"><b>1</b></a> <a href="../multi_translation.htm"><b>2</b></a> <a href="../transformation_operations.htm"><b>3</b></a> </nobr><br><a name="bms_TO"></a><a name="subkey_TO"></a><a href="../shape_processing.htm"><b>tobezier</b></a> <br><a href="../working_with_groups.htm"><b>together</b></a> <br><nobr>tol2d <a href="../complex_objects.htm"><b>1</b></a> <a href="../filling.htm"><b>2</b></a> </nobr><br><nobr>tol3d <a href="../complex_objects.htm"><b>1</b></a> <a href="../filling.htm"><b>2</b></a> </nobr><br><a href="../measurement_tools.htm"><b>toler</b></a> <br><nobr>tolerance <a href="../close_contour.htm"><b>1</b></a> <a href="../measurement_tools.htm"><b>2</b></a> <a href="../glue_faces.htm"><b>3</b></a> <a href="../filling.htm"><b>4</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>5</b></a> <a href="../repairing_operations.htm"><b>6</b></a> <a href="../shape_processing.htm"><b>7</b></a> </nobr><br><a href="../shape_processing.htm"><b>tolerance2d</b></a> <br><nobr>tolerance3d <a href="../repairing_operations.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>tolerances</b></a> <br><a href="../partition.htm"><b>tool</b></a> <br><a href="../occ_viewer.htm"><b>toolbar</b></a> <br><nobr>tools <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><a href="../blocks_operations.htm"><b>top_face</b></a> <br><a href="../blocks_operations.htm"><b>top_face_ind</b></a> <br><nobr>torus <a href="../primitives.htm"><b>1</b></a> <a href="../turus.htm"><b>2</b></a> </nobr><br><a href="../primitives.htm"><b>torus1</b></a> <br><a href="../primitives.htm"><b>torus2</b></a> <br><a href="../primitives.htm"><b>toruses</b></a> <br><a name="bms_TR"></a><a name="subkey_TR"></a><a href="../transformation_operations.htm"><b>tr1d</b></a> <br><a href="../transformation_operations.htm"><b>tr2d</b></a> <br><nobr>transform <a href="../scale_transform.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><a href="../blocks_operations.htm"><b>transformate</b></a> <br><nobr>transformation <a href="../chamfer.htm"><b>1</b></a> <a href="../blocks_operations.htm"><b>2</b></a> <a href="../multi_transformation.htm"><b>3</b></a> <a href="../multi_rotation.htm"><b>4</b></a> <a href="../modify_the_location.htm"><b>5</b></a> <a href="../mirror_image.htm"><b>6</b></a> <a href="../fillet.htm"><b>7</b></a> <a href="../scale_transform.htm"><b>8</b></a> <a href="../rotation.htm"><b>9</b></a> <a href="../offset_surface.htm"><b>10</b></a> <a href="../occ_viewer.htm"><b>11</b></a> <a href="../multi_translation.htm"><b>12</b></a> <a href="../translation.htm"><b>13</b></a> <a href="../transformation_operations.htm"><b>14</b></a> </nobr><br><nobr>transformations <a href="../files/introduction_to_geom.htm"><b>1</b></a> <a href="../multi_transformation.htm"><b>2</b></a> <a href="../geometry.htm"><b>3</b></a> </nobr><br><nobr>transformed <a href="../blocks_operations.htm"><b>1</b></a> <a href="../multi_transformation.htm"><b>2</b></a> </nobr><br><a href="../common.htm"><b>transforms</b></a> <br><nobr>translate <a href="../translation.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>translated <a href="../modify_the_location.htm"><b>1</b></a> <a href="../multi_translation.htm"><b>2</b></a> <a href="../translation.htm"><b>3</b></a> </nobr><br><nobr>translates <a href="../multi_rotation.htm"><b>1</b></a> <a href="../offset_surface.htm"><b>2</b></a> </nobr><br><nobr>translation <a href="../multi_rotation.htm"><b>1</b></a> <a href="../multi_translation.htm"><b>2</b></a> <a href="../translation.htm"><b>3</b></a> <a href="../transformation_operations.htm"><b>4</b></a> </nobr><br><a href="../transformation_operations.htm"><b>translation1</b></a> <br><a href="../transformation_operations.htm"><b>translation2</b></a> <br><a href="../transformation_operations.htm"><b>translation3</b></a> <br><nobr>translations <a href="../multi_transformation.htm"><b>1</b></a> <a href="../multi_translation.htm"><b>2</b></a> <a href="../transformation_operations.htm"><b>3</b></a> </nobr><br><nobr>transparency <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../viewing_geometrical_objects.htm"><b>2</b></a> <a href="../transparency.htm"><b>3</b></a> </nobr><br><nobr>transparent <a href="../transparency.htm"><b>1</b></a> <a href="../wireframe_and_shading.htm"><b>2</b></a> </nobr><br><a href="../occ_viewer.htm"><b>triangles</b></a> <br><a href="../occ_viewer.htm"><b>trihedron</b></a> <br><nobr>trimsize <a href="../basic_operations.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../plane.htm"><b>3</b></a> </nobr><br><nobr>true <a href="../close_contour.htm"><b>1</b></a> <a href="../add_point_on_edge.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../partition.htm"><b>5</b></a> </nobr><br><a href="../cone.htm"><b>truncated</b></a> <br><a href="../face.htm"><b>try</b></a> <br><br><br></p><p class="ftsbody" align="center"><a href="whlstf12.htm" target="_self" title="previous search group"><b>&gt;&gt;</b></a>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstf12.htm b/doc/salome/gui/GEOM/whgdata/whlstf12.htm
deleted file mode 100755 (executable)
index 18c0991..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<html>
-<head>
-<title>Search Words List</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsbody" align="center"><a href="whlstf11.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
-<p class="ftsbody" >
-<nobr><a name="bms_TT"></a><a name="subkey_TT"></a>tt <a href="../geometrical_objects.htm"><b>1</b></a> <a href="../sketcher_tui.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_TU"></a><a name="subkey_TU"></a>tui <a href="../color.htm"><b>1</b></a> <a href="../close_contour.htm"><b>2</b></a> <a href="../circle.htm"><b>3</b></a> <a href="../check_free_faces.htm"><b>4</b></a> <a href="../check_free_boundaries.htm"><b>5</b></a> <a href="../chamfer.htm"><b>6</b></a> <a href="../box.htm"><b>7</b></a> <a href="../archimede.htm"><b>8</b></a> <a href="../arc.htm"><b>9</b></a> <a href="../add_point_on_edge.htm"><b>10</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>11</b></a> <a href="../face.htm"><b>12</b></a> <a href="../extrusion.htm"><b>13</b></a> <a href="../explode_on_blocks.htm"><b>14</b></a> <a href="../explode.htm"><b>15</b></a> <a href="../ellipse.htm"><b>16</b></a> <a href="../edge.htm"><b>17</b></a> <a href="../cylinder.htm"><b>18</b></a> <a href="../cut.htm"><b>19</b></a> <a href="../curve.htm"><b>20</b></a> <a href="../cone.htm"><b>21</b></a> <a href="../compound.htm"><b>22</b></a> <a href="../common.htm"><b>23</b></a> <a href="../multi_transformation.htm"><b>24</b></a> <a href="../multi_rotation.htm"><b>25</b></a> <a href="../modify_the_location.htm"><b>26</b></a> <a href="../mirror_image.htm"><b>27</b></a> <a href="../local_coordinate_system.htm"><b>28</b></a> <a href="../line.htm"><b>29</b></a> <a href="../glue_faces.htm"><b>30</b></a> <a href="../fuse.htm"><b>31</b></a> <a href="../filling.htm"><b>32</b></a> <a href="../fillet.htm"><b>33</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>34</b></a> <a href="../sewing.htm"><b>35</b></a> <a href="../section.htm"><b>36</b></a> <a href="../scale_transform.htm"><b>37</b></a> <a href="../rotation.htm"><b>38</b></a> <a href="../revolution.htm"><b>39</b></a> <a href="../propagate.htm"><b>40</b></a> <a href="../point.htm"><b>41</b></a> <a href="../plane.htm"><b>42</b></a> <a href="../pipe_creation.htm"><b>43</b></a> <a href="../partition.htm"><b>44</b></a> <a href="../offset_surface.htm"><b>45</b></a> <a href="../newentity_blocks.htm"><b>46</b></a> <a href="../multi_translation.htm"><b>47</b></a> <a href="../wire.htm"><b>48</b></a> <a href="../viewing_geometrical_objects.htm"><b>49</b></a> <a href="../vector.htm"><b>50</b></a> <a href="../turus.htm"><b>51</b></a> <a href="../transparency.htm"><b>52</b></a> <a href="../translation.htm"><b>53</b></a> <a href="../suppress_internal_wires.htm"><b>54</b></a> <a href="../suppress_holes.htm"><b>55</b></a> <a href="../suppress_faces.htm"><b>56</b></a> <a href="../sphere.htm"><b>57</b></a> <a href="../solid.htm"><b>58</b></a> <a href="../sketcher.htm"><b>59</b></a> <a href="../shell.htm"><b>60</b></a> <a href="../shape_processing.htm"><b>61</b></a> <a href="../working_with_groups.htm"><b>62</b></a> <a href="../wireframe_and_shading.htm"><b>63</b></a> </nobr><br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>tuple</b></a> <br><nobr><a name="bms_TW"></a><a name="subkey_TW"></a>two <a href="../check_free_faces.htm"><b>1</b></a> <a href="../chamfer.htm"><b>2</b></a> <a href="../building_by_blocks.htm"><b>3</b></a> <a href="../box.htm"><b>4</b></a> <a href="../basic_operations.htm"><b>5</b></a> <a href="../basic_geometrical_objects.htm"><b>6</b></a> <a href="../add_point_on_edge.htm"><b>7</b></a> <a href="../edge.htm"><b>8</b></a> <a href="../cone.htm"><b>9</b></a> <a href="../complex_objects.htm"><b>10</b></a> <a href="../common.htm"><b>11</b></a> <a href="../multi_transformation.htm"><b>12</b></a> <a href="../multi_rotation.htm"><b>13</b></a> <a href="../modify_the_location.htm"><b>14</b></a> <a href="../groups.htm"><b>15</b></a> <a href="../glue_faces.htm"><b>16</b></a> <a href="../geometrical_objects.htm"><b>17</b></a> <a href="../fuse.htm"><b>18</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>19</b></a> <a href="../partition.htm"><b>20</b></a> <a href="../newentity_blocks.htm"><b>21</b></a> <a href="../multi_translation.htm"><b>22</b></a> <a href="../turus.htm"><b>23</b></a> <a href="../transformation_operations.htm"><b>24</b></a> <a href="../sphere.htm"><b>25</b></a> <a href="../sketcher_tui.htm"><b>26</b></a> <a href="../shape_processing.htm"><b>27</b></a> <a href="../working_with_groups.htm"><b>28</b></a> <a href="../working_plane.htm"><b>29</b></a> </nobr><br><nobr><a name="bms_TY"></a><a name="subkey_TY"></a>type <a href="../files/salome2_sp3_booleangui_functions.htm"><b>1</b></a> <a href="../explode_on_blocks.htm"><b>2</b></a> <a href="../explode.htm"><b>3</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>4</b></a> <a href="../partition.htm"><b>5</b></a> <a href="../sketcher.htm"><b>6</b></a> <a href="../shape_processing.htm"><b>7</b></a> <a href="../working_with_groups.htm"><b>8</b></a> </nobr><br><nobr>types <a href="../curve.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> </nobr><br>
-<br><br>
-<a name="bm_U"></a><a name="subkey_U{"></a><a href="../shape_processing.htm"><b>u</b></a> <br><nobr><a name="bms_UN"></a><a name="subkey_UN"></a>underlying <a href="../close_contour.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><a href="../groups.htm"><b>unionlist</b></a> <br><nobr><a name="bms_UP"></a><a name="subkey_UP"></a>up <a href="../color.htm"><b>1</b></a> <a href="../wireframe_and_shading.htm"><b>2</b></a> </nobr><br><a href="../viewing_geometrical_objects.htm"><b>update</b></a> <br><nobr>updateobjbrowser <a href="../blocks_operations.htm"><b>1</b></a> <a href="../groups.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> </nobr><br><a href="../cone.htm"><b>upper</b></a> <br><nobr><a name="bms_US"></a><a name="subkey_US"></a>used <a href="../files/salome2_sp3_booleangui_functions.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> </nobr><br><nobr>useful <a href="../color.htm"><b>1</b></a> <a href="../close_contour.htm"><b>2</b></a> <a href="../circle.htm"><b>3</b></a> <a href="../check_free_faces.htm"><b>4</b></a> <a href="../check_free_boundaries.htm"><b>5</b></a> <a href="../chamfer.htm"><b>6</b></a> <a href="../box.htm"><b>7</b></a> <a href="../archimede.htm"><b>8</b></a> <a href="../arc.htm"><b>9</b></a> <a href="../add_point_on_edge.htm"><b>10</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>11</b></a> <a href="../face.htm"><b>12</b></a> <a href="../extrusion.htm"><b>13</b></a> <a href="../explode_on_blocks.htm"><b>14</b></a> <a href="../ellipse.htm"><b>15</b></a> <a href="../edge.htm"><b>16</b></a> <a href="../cylinder.htm"><b>17</b></a> <a href="../cut.htm"><b>18</b></a> <a href="../curve.htm"><b>19</b></a> <a href="../cone.htm"><b>20</b></a> <a href="../compound.htm"><b>21</b></a> <a href="../common.htm"><b>22</b></a> <a href="../multi_transformation.htm"><b>23</b></a> <a href="../multi_rotation.htm"><b>24</b></a> <a href="../modify_the_location.htm"><b>25</b></a> <a href="../mirror_image.htm"><b>26</b></a> <a href="../line.htm"><b>27</b></a> <a href="../glue_faces.htm"><b>28</b></a> <a href="../fuse.htm"><b>29</b></a> <a href="../filling.htm"><b>30</b></a> <a href="../fillet.htm"><b>31</b></a> <a href="../sewing.htm"><b>32</b></a> <a href="../section.htm"><b>33</b></a> <a href="../scale_transform.htm"><b>34</b></a> <a href="../rotation.htm"><b>35</b></a> <a href="../revolution.htm"><b>36</b></a> <a href="../propagate.htm"><b>37</b></a> <a href="../point.htm"><b>38</b></a> <a href="../plane.htm"><b>39</b></a> <a href="../pipe_creation.htm"><b>40</b></a> <a href="../partition.htm"><b>41</b></a> <a href="../offset_surface.htm"><b>42</b></a> <a href="../newentity_blocks.htm"><b>43</b></a> <a href="../multi_translation.htm"><b>44</b></a> <a href="../wire.htm"><b>45</b></a> <a href="../viewing_geometrical_objects.htm"><b>46</b></a> <a href="../vector.htm"><b>47</b></a> <a href="../turus.htm"><b>48</b></a> <a href="../transparency.htm"><b>49</b></a> <a href="../translation.htm"><b>50</b></a> <a href="../suppress_internal_wires.htm"><b>51</b></a> <a href="../suppress_holes.htm"><b>52</b></a> <a href="../suppress_faces.htm"><b>53</b></a> <a href="../sphere.htm"><b>54</b></a> <a href="../solid.htm"><b>55</b></a> <a href="../sketcher.htm"><b>56</b></a> <a href="../shell.htm"><b>57</b></a> <a href="../shape_processing.htm"><b>58</b></a> <a href="../working_with_groups.htm"><b>59</b></a> <a href="../wireframe_and_shading.htm"><b>60</b></a> </nobr><br><nobr>user <a href="../close_contour.htm"><b>1</b></a> <a href="../explode_on_blocks.htm"><b>2</b></a> <a href="../multi_transformation.htm"><b>3</b></a> <a href="../suppress_internal_wires.htm"><b>4</b></a> </nobr><br><nobr>using <a href="../archimede.htm"><b>1</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>2</b></a> <a href="../files/introduction_to_geom.htm"><b>3</b></a> <a href="../explode.htm"><b>4</b></a> <a href="../modify_the_location.htm"><b>5</b></a> <a href="../geometry.htm"><b>6</b></a> <a href="../filling.htm"><b>7</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>8</b></a> <a href="../occ_viewer.htm"><b>9</b></a> <a href="../newentity_blocks.htm"><b>10</b></a> <a href="../transparency.htm"><b>11</b></a> <a href="../shape_processing.htm"><b>12</b></a> <a href="../working_with_groups.htm"><b>13</b></a> </nobr><br>
-<br><br>
-<nobr><a name="bm_V"></a><a name="subkey_V{"></a>v <a href="../boolean_operations.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../primitives.htm"><b>3</b></a> <a href="../transformation_operations.htm"><b>4</b></a> </nobr><br><a href="../newentity_blocks.htm"><b>v1</b></a> <br><a href="../newentity_blocks.htm"><b>v2</b></a> <br><a href="../newentity_blocks.htm"><b>v3</b></a> <br><a href="../newentity_blocks.htm"><b>v4</b></a> <br><a name="bms_VA"></a><a name="subkey_VA"></a><a href="../add_point_on_edge.htm"><b>val</b></a> <br><nobr>valid <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>validity</b></a> <br><nobr>value <a href="../close_contour.htm"><b>1</b></a> <a href="../chamfer.htm"><b>2</b></a> <a href="../add_point_on_edge.htm"><b>3</b></a> <a href="../extrusion.htm"><b>4</b></a> <a href="../multi_rotation.htm"><b>5</b></a> <a href="../modify_the_location.htm"><b>6</b></a> <a href="../glue_faces.htm"><b>7</b></a> <a href="../fillet.htm"><b>8</b></a> <a href="../sewing.htm"><b>9</b></a> <a href="../revolution.htm"><b>10</b></a> <a href="../plane.htm"><b>11</b></a> <a href="../offset_surface.htm"><b>12</b></a> <a href="../multi_translation.htm"><b>13</b></a> <a href="../sphere.htm"><b>14</b></a> <a href="../sketcher.htm"><b>15</b></a> </nobr><br><nobr>values <a href="../box.htm"><b>1</b></a> <a href="../archimede.htm"><b>2</b></a> <a href="../cylinder.htm"><b>3</b></a> <a href="../cone.htm"><b>4</b></a> <a href="../measurement_tools.htm"><b>5</b></a> <a href="../local_coordinate_system.htm"><b>6</b></a> <a href="../isos.htm"><b>7</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>8</b></a> <a href="../repairing_operations.htm"><b>9</b></a> <a href="../multi_translation.htm"><b>10</b></a> <a href="../vector.htm"><b>11</b></a> <a href="../turus.htm"><b>12</b></a> <a href="../translation.htm"><b>13</b></a> <a href="../shape_processing.htm"><b>14</b></a> </nobr><br><a href="../explode.htm"><b>variety</b></a> <br><a href="../shape_processing.htm"><b>various</b></a> <br><nobr><a name="bms_VE"></a><a name="subkey_VE"></a>vector <a href="../circle.htm"><b>1</b></a> <a href="../boolean_operations.htm"><b>2</b></a> <a href="../basic_operations.htm"><b>3</b></a> <a href="../basic_geometrical_objects.htm"><b>4</b></a> <a href="../extrusion.htm"><b>5</b></a> <a href="../ellipse.htm"><b>6</b></a> <a href="../cylinder.htm"><b>7</b></a> <a href="../cone.htm"><b>8</b></a> <a href="../complex_objects.htm"><b>9</b></a> <a href="../multi_rotation.htm"><b>10</b></a> <a href="../mirror_image.htm"><b>11</b></a> <a href="../local_coordinate_system.htm"><b>12</b></a> <a href="../line.htm"><b>13</b></a> <a href="../geometrical_objects.htm"><b>14</b></a> <a href="../rotation.htm"><b>15</b></a> <a href="../revolution.htm"><b>16</b></a> <a href="../repairing_operations.htm"><b>17</b></a> <a href="../primitives.htm"><b>18</b></a> <a href="../plane.htm"><b>19</b></a> <a href="../multi_translation.htm"><b>20</b></a> <a href="../vector.htm"><b>21</b></a> <a href="../turus.htm"><b>22</b></a> <a href="../translation.htm"><b>23</b></a> <a href="../transformation_operations.htm"><b>24</b></a> <a href="../sketcher_tui.htm"><b>25</b></a> <a href="../sketcher.htm"><b>26</b></a> </nobr><br><nobr>vector_arc <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../sketcher_tui.htm"><b>2</b></a> </nobr><br><nobr>vector1 <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> </nobr><br><a href="../complex_objects.htm"><b>vector1_arc1</b></a> <br><a href="../complex_objects.htm"><b>vector1_arc2</b></a> <br><nobr>vector2 <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> </nobr><br><a href="../complex_objects.htm"><b>vector2_arc1</b></a> <br><a href="../complex_objects.htm"><b>vector2_arc2</b></a> <br><a href="../complex_objects.htm"><b>vector3</b></a> <br><nobr>vectors <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> <a href="../multi_translation.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> <a href="../shape_processing.htm"><b>6</b></a> <a href="../working_plane.htm"><b>7</b></a> </nobr><br><a href="../shape_processing.htm"><b>versa</b></a> <br><nobr>vertex <a href="../close_contour.htm"><b>1</b></a> <a href="../circle.htm"><b>2</b></a> <a href="../boolean_operations.htm"><b>3</b></a> <a href="../basic_operations.htm"><b>4</b></a> <a href="../basic_geometrical_objects.htm"><b>5</b></a> <a href="../extrusion.htm"><b>6</b></a> <a href="../ellipse.htm"><b>7</b></a> <a href="../edge.htm"><b>8</b></a> <a href="../cylinder.htm"><b>9</b></a> <a href="../cone.htm"><b>10</b></a> <a href="../complex_objects.htm"><b>11</b></a> <a href="../mirror_image.htm"><b>12</b></a> <a href="../measurement_tools.htm"><b>13</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>14</b></a> <a href="../scale_transform.htm"><b>15</b></a> <a href="../revolution.htm"><b>16</b></a> <a href="../repairing_operations.htm"><b>17</b></a> <a href="../primitives.htm"><b>18</b></a> <a href="../point.htm"><b>19</b></a> <a href="../plane.htm"><b>20</b></a> <a href="../pipe_creation.htm"><b>21</b></a> <a href="../turus.htm"><b>22</b></a> <a href="../transformation_operations.htm"><b>23</b></a> <a href="../sphere.htm"><b>24</b></a> </nobr><br><a href="../point.htm"><b>vertex_n</b></a> <br><a href="../edge.htm"><b>vertex1</b></a> <br><a href="../edge.htm"><b>vertex2</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>vertexmaxtol</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>vertexmintol</b></a> <br><nobr>vertices <a href="../close_contour.htm"><b>1</b></a> <a href="../building_by_blocks.htm"><b>2</b></a> <a href="../box.htm"><b>3</b></a> <a href="../blocks_operations.htm"><b>4</b></a> <a href="../basic_geometrical_objects.htm"><b>5</b></a> <a href="../arc.htm"><b>6</b></a> <a href="../explode.htm"><b>7</b></a> <a href="../edge.htm"><b>8</b></a> <a href="../complex_objects.htm"><b>9</b></a> <a href="../line.htm"><b>10</b></a> <a href="../groups.htm"><b>11</b></a> <a href="../geometrical_objects.htm"><b>12</b></a> <a href="../repairing_operations.htm"><b>13</b></a> <a href="../primitives.htm"><b>14</b></a> <a href="../plane.htm"><b>15</b></a> <a href="../newentity_blocks.htm"><b>16</b></a> <a href="../vector.htm"><b>17</b></a> <a href="../translation.htm"><b>18</b></a> <a href="../transformation_operations.htm"><b>19</b></a> <a href="../sketcher_tui.htm"><b>20</b></a> </nobr><br><nobr><a name="bms_VI"></a><a name="subkey_VI"></a>via <a href="../box.htm"><b>1</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>2</b></a> <a href="../face.htm"><b>3</b></a> <a href="../extrusion.htm"><b>4</b></a> <a href="../line.htm"><b>5</b></a> <a href="../occ_viewer.htm"><b>6</b></a> <a href="../newentity_blocks.htm"><b>7</b></a> <a href="../sphere.htm"><b>8</b></a> <a href="../sketcher.htm"><b>9</b></a> </nobr><br><a href="../shape_processing.htm"><b>vice</b></a> <br><nobr>view <a href="../occ_viewer.htm"><b>1</b></a> <a href="../viewing_geometrical_objects.htm"><b>2</b></a> </nobr><br><nobr>viewer <a href="../close_contour.htm"><b>1</b></a> <a href="../chamfer.htm"><b>2</b></a> <a href="../add_point_on_edge.htm"><b>3</b></a> <a href="../local_coordinate_system.htm"><b>4</b></a> <a href="../fillet.htm"><b>5</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>6</b></a> <a href="../occ_viewer.htm"><b>7</b></a> <a href="../wire.htm"><b>8</b></a> <a href="../viewing_geometrical_objects.htm"><b>9</b></a> <a href="../suppress_internal_wires.htm"><b>10</b></a> <a href="../suppress_holes.htm"><b>11</b></a> <a href="../suppress_faces.htm"><b>12</b></a> <a href="../working_with_groups.htm"><b>13</b></a> <a href="../wireframe_and_shading.htm"><b>14</b></a> </nobr><br><nobr>viewing <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../viewing_geometrical_objects.htm"><b>2</b></a> <a href="../wireframe_and_shading.htm"><b>3</b></a> </nobr><br><a href="../occ_viewer.htm"><b>views</b></a> <br><a href="../occ_viewer.htm"><b>visible</b></a> <br><a href="../occ_viewer.htm"><b>visualize</b></a> <br><nobr><a name="bms_VO"></a><a name="subkey_VO"></a>volume <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><a name="bms_VR"></a><a name="subkey_VR"></a><a href="../transformation_operations.htm"><b>vr</b></a> <br><a href="../transformation_operations.htm"><b>vrot1d</b></a> <br><a name="bms_VT"></a><a name="subkey_VT"></a><a href="../transformation_operations.htm"><b>vt</b></a> <br><a href="../transformation_operations.htm"><b>vtr1d</b></a> <br><a href="../transformation_operations.htm"><b>vtr2d</b></a> <br><nobr><a name="bms_VX"></a><a name="subkey_VX"></a>vxy <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> <a href="../geometrical_objects.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> </nobr><br><a href="../basic_operations.htm"><b>vxyz</b></a> <br><a name="bms_VZ"></a><a name="subkey_VZ"></a><a href="../transformation_operations.htm"><b>vz</b></a> <br>
-<br><br>
-<a name="bm_W"></a><a name="subkey_W{"></a><a href="../repairing_operations.htm"><b>w_0</b></a> <br><br><br></p><p class="ftsbody" align="center"><a href="whlstf13.htm" target="_self" title="previous search group"><b>&gt;&gt;</b></a>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstf13.htm b/doc/salome/gui/GEOM/whgdata/whlstf13.htm
deleted file mode 100755 (executable)
index 355c2d7..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-<head>
-<title>Search Words List</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsbody" align="center"><a href="whlstf12.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
-<p class="ftsbody" >
-<a name="bms_WA"></a><a name="subkey_WA"></a><a href="../repairing_operations.htm"><b>wantplanarface</b></a> <br><a href="../archimede.htm"><b>water</b></a> <br><nobr>waterdensity <a href="../basic_operations.htm"><b>1</b></a> <a href="../archimede.htm"><b>2</b></a> </nobr><br><nobr>way <a href="../box.htm"><b>1</b></a> <a href="../extrusion.htm"><b>2</b></a> <a href="../multi_rotation.htm"><b>3</b></a> <a href="../line.htm"><b>4</b></a> <a href="../sphere.htm"><b>5</b></a> <a href="../working_with_groups.htm"><b>6</b></a> </nobr><br><nobr>ways <a href="../explode.htm"><b>1</b></a> <a href="../mirror_image.htm"><b>2</b></a> <a href="../working_with_groups.htm"><b>3</b></a> </nobr><br><nobr><a name="bms_WE"></a><a name="subkey_WE"></a>weight <a href="../basic_operations.htm"><b>1</b></a> <a href="../archimede.htm"><b>2</b></a> </nobr><br><a href="../shape_processing.htm"><b>well</b></a> <br><a name="bms_WF"></a><a name="subkey_WF"></a><a href="../sketcher_tui.htm"><b>wf</b></a> <br><a name="bms_WH"></a><a name="subkey_WH"></a><a href="../measurement_tools.htm"><b>what</b></a> <br><nobr>whatis <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>whether</b></a> <br><nobr>while <a href="../check_free_boundaries.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> <a href="../measurement_tools.htm"><b>3</b></a> <a href="../shape_processing.htm"><b>4</b></a> <a href="../wireframe_and_shading.htm"><b>5</b></a> </nobr><br><nobr>whose <a href="../face.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_WI"></a><a name="subkey_WI"></a>wide <a href="../files/introduction_to_geom.htm"><b>1</b></a> <a href="../geometry.htm"><b>2</b></a> </nobr><br><nobr>will <a href="../close_contour.htm"><b>1</b></a> <a href="../circle.htm"><b>2</b></a> <a href="../check_free_faces.htm"><b>3</b></a> <a href="../check_free_boundaries.htm"><b>4</b></a> <a href="../chamfer.htm"><b>5</b></a> <a href="../box.htm"><b>6</b></a> <a href="../archimede.htm"><b>7</b></a> <a href="../arc.htm"><b>8</b></a> <a href="../add_point_on_edge.htm"><b>9</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>10</b></a> <a href="../face.htm"><b>11</b></a> <a href="../extrusion.htm"><b>12</b></a> <a href="../explode_on_blocks.htm"><b>13</b></a> <a href="../explode.htm"><b>14</b></a> <a href="../ellipse.htm"><b>15</b></a> <a href="../edge.htm"><b>16</b></a> <a href="../cylinder.htm"><b>17</b></a> <a href="../cut.htm"><b>18</b></a> <a href="../curve.htm"><b>19</b></a> <a href="../cone.htm"><b>20</b></a> <a href="../compound.htm"><b>21</b></a> <a href="../common.htm"><b>22</b></a> <a href="../multi_transformation.htm"><b>23</b></a> <a href="../multi_rotation.htm"><b>24</b></a> <a href="../modify_the_location.htm"><b>25</b></a> <a href="../mirror_image.htm"><b>26</b></a> <a href="../local_coordinate_system.htm"><b>27</b></a> <a href="../line.htm"><b>28</b></a> <a href="../glue_faces.htm"><b>29</b></a> <a href="../fuse.htm"><b>30</b></a> <a href="../filling.htm"><b>31</b></a> <a href="../fillet.htm"><b>32</b></a> <a href="../sewing.htm"><b>33</b></a> <a href="../section.htm"><b>34</b></a> <a href="../scale_transform.htm"><b>35</b></a> <a href="../rotation.htm"><b>36</b></a> <a href="../revolution.htm"><b>37</b></a> <a href="../propagate.htm"><b>38</b></a> <a href="../point.htm"><b>39</b></a> <a href="../plane.htm"><b>40</b></a> <a href="../pipe_creation.htm"><b>41</b></a> <a href="../partition.htm"><b>42</b></a> <a href="../offset_surface.htm"><b>43</b></a> <a href="../occ_viewer.htm"><b>44</b></a> <a href="../newentity_blocks.htm"><b>45</b></a> <a href="../multi_translation.htm"><b>46</b></a> <a href="../wire.htm"><b>47</b></a> <a href="../vector.htm"><b>48</b></a> <a href="../turus.htm"><b>49</b></a> <a href="../translation.htm"><b>50</b></a> <a href="../suppress_internal_wires.htm"><b>51</b></a> <a href="../suppress_holes.htm"><b>52</b></a> <a href="../suppress_faces.htm"><b>53</b></a> <a href="../sphere.htm"><b>54</b></a> <a href="../solid.htm"><b>55</b></a> <a href="../sketcher.htm"><b>56</b></a> <a href="../shell.htm"><b>57</b></a> <a href="../shape_processing.htm"><b>58</b></a> <a href="../working_with_groups.htm"><b>59</b></a> </nobr><br><nobr>wire <a href="../close_contour.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../face.htm"><b>3</b></a> <a href="../extrusion.htm"><b>4</b></a> <a href="../complex_objects.htm"><b>5</b></a> <a href="../geometrical_objects.htm"><b>6</b></a> <a href="../revolution.htm"><b>7</b></a> <a href="../repairing_operations.htm"><b>8</b></a> <a href="../pipe_creation.htm"><b>9</b></a> <a href="../wire.htm"><b>10</b></a> <a href="../transformation_operations.htm"><b>11</b></a> <a href="../suppress_holes.htm"><b>12</b></a> <a href="../sketcher_tui.htm"><b>13</b></a> <a href="../sketcher.htm"><b>14</b></a> </nobr><br><a href="../repairing_operations.htm"><b>wire_close</b></a> <br><a href="../repairing_operations.htm"><b>wire_name</b></a> <br><a href="../complex_objects.htm"><b>wire1</b></a> <br><a href="../complex_objects.htm"><b>wire2</b></a> <br><nobr>wireframe <a href="../viewing_geometrical_objects.htm"><b>1</b></a> <a href="../wireframe_and_shading.htm"><b>2</b></a> </nobr><br><nobr>wires <a href="../close_contour.htm"><b>1</b></a> <a href="../check_free_boundaries.htm"><b>2</b></a> <a href="../face.htm"><b>3</b></a> <a href="../explode.htm"><b>4</b></a> <a href="../complex_objects.htm"><b>5</b></a> <a href="../measurement_tools.htm"><b>6</b></a> <a href="../geometrical_objects.htm"><b>7</b></a> <a href="../repairing_operations.htm"><b>8</b></a> <a href="../newentity_blocks.htm"><b>9</b></a> <a href="../wire.htm"><b>10</b></a> <a href="../suppress_internal_wires.htm"><b>11</b></a> <a href="../suppress_holes.htm"><b>12</b></a> </nobr><br><nobr>wish <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../explode.htm"><b>2</b></a> <a href="../occ_viewer.htm"><b>3</b></a> </nobr><br><nobr>within <a href="../close_contour.htm"><b>1</b></a> <a href="../isos.htm"><b>2</b></a> <a href="../viewing_geometrical_objects.htm"><b>3</b></a> </nobr><br><a href="../repairing_operations.htm"><b>without</b></a> <br><nobr><a name="bms_WO"></a><a name="subkey_WO"></a>work <a href="../occ_viewer.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><nobr>working <a href="../files/introduction_to_geom.htm"><b>1</b></a> <a href="../geometry.htm"><b>2</b></a> <a href="../sketcher.htm"><b>3</b></a> <a href="../working_with_groups.htm"><b>4</b></a> <a href="../working_plane.htm"><b>5</b></a> </nobr><br><a href="../sketcher.htm"><b>workingplane</b></a> <br><a href="../multi_rotation.htm"><b>works</b></a> <br><nobr><a name="bms_WW"></a><a name="subkey_WW"></a>ww <a href="../geometrical_objects.htm"><b>1</b></a> <a href="../sketcher_tui.htm"><b>2</b></a> </nobr><br>
-<br><br>
-<nobr><a name="bm_X"></a><a name="subkey_X{"></a>x <a href="../box.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../ellipse.htm"><b>3</b></a> <a href="../modify_the_location.htm"><b>4</b></a> <a href="../local_coordinate_system.htm"><b>5</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>6</b></a> <a href="../point.htm"><b>7</b></a> <a href="../sphere.htm"><b>8</b></a> <a href="../sketcher.htm"><b>9</b></a> </nobr><br><a href="../box.htm"><b>x1</b></a> <br><a href="../box.htm"><b>x2</b></a> <br><a name="bms_XD"></a><a name="subkey_XD"></a><a href="../local_coordinate_system.htm"><b>xdx</b></a> <br><a href="../local_coordinate_system.htm"><b>xdy</b></a> <br><a href="../local_coordinate_system.htm"><b>xdz</b></a> <br><nobr><a name="bms_XM"></a><a name="subkey_XM"></a>xmax <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr>xmin <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><a name="bms_XO"></a><a name="subkey_XO"></a><a href="../sketcher.htm"><b>xoy</b></a> <br><a name="bms_XY"></a><a name="subkey_XY"></a><a href="../working_plane.htm"><b>xyz</b></a> <br><a name="bms_XZ"></a><a name="subkey_XZ"></a><a href="../blocks_operations.htm"><b>xz_face</b></a> <br><a href="../blocks_operations.htm"><b>xz_face_ind</b></a> <br>
-<br><br>
-<nobr><a name="bm_Y"></a><a name="subkey_Y{"></a>y <a href="../box.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../ellipse.htm"><b>3</b></a> <a href="../local_coordinate_system.htm"><b>4</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>5</b></a> <a href="../point.htm"><b>6</b></a> <a href="../sphere.htm"><b>7</b></a> <a href="../sketcher.htm"><b>8</b></a> </nobr><br><a href="../box.htm"><b>y1</b></a> <br><a href="../box.htm"><b>y2</b></a> <br><a name="bms_YD"></a><a name="subkey_YD"></a><a href="../local_coordinate_system.htm"><b>ydx</b></a> <br><a href="../local_coordinate_system.htm"><b>ydy</b></a> <br><a href="../local_coordinate_system.htm"><b>ydz</b></a> <br><nobr><a name="bms_YM"></a><a name="subkey_YM"></a>ymax <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr>ymin <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_YO"></a><a name="subkey_YO"></a>your <a href="../color.htm"><b>1</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>2</b></a> <a href="../filling.htm"><b>3</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>4</b></a> <a href="../sewing.htm"><b>5</b></a> <a href="../viewing_geometrical_objects.htm"><b>6</b></a> <a href="../suppress_holes.htm"><b>7</b></a> <a href="../working_with_groups.htm"><b>8</b></a> <a href="../working_plane.htm"><b>9</b></a> </nobr><br><a href="../local_coordinate_system.htm"><b>yourselves</b></a> <br><a name="bms_YZ"></a><a name="subkey_YZ"></a><a href="../blocks_operations.htm"><b>yz_face</b></a> <br><a href="../blocks_operations.htm"><b>yz_face_ind</b></a> <br>
-<br><br>
-<nobr><a name="bm_Z"></a><a name="subkey_Z{"></a>z <a href="../box.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../archimede.htm"><b>3</b></a> <a href="../local_coordinate_system.htm"><b>4</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>5</b></a> <a href="../point.htm"><b>6</b></a> <a href="../sphere.htm"><b>7</b></a> </nobr><br><a href="../box.htm"><b>z1</b></a> <br><a href="../box.htm"><b>z2</b></a> <br><a name="bms_ZE"></a><a name="subkey_ZE"></a><a href="../cone.htm"><b>zero</b></a> <br><nobr><a name="bms_ZM"></a><a name="subkey_ZM"></a>zmax <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr>zmin <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><a name="bms_ZO"></a><a name="subkey_ZO"></a><a href="../occ_viewer.htm"><b>zoom</b></a> <br><br><br></p>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstf2.htm b/doc/salome/gui/GEOM/whgdata/whlstf2.htm
deleted file mode 100755 (executable)
index 66be356..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<html>
-<head>
-<title>Search Words List</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsbody" align="center"><a href="whlstf1.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
-<p class="ftsbody" >
-<nobr><a name="bms_CR"></a><a name="subkey_CR"></a>create <a href="../circle.htm"><b>1</b></a> <a href="../chamfer.htm"><b>2</b></a> <a href="../building_by_blocks.htm"><b>3</b></a> <a href="../box.htm"><b>4</b></a> <a href="../boolean_operations.htm"><b>5</b></a> <a href="../blocks_operations.htm"><b>6</b></a> <a href="../basic_operations.htm"><b>7</b></a> <a href="../basic_geometrical_objects.htm"><b>8</b></a> <a href="../arc.htm"><b>9</b></a> <a href="../face.htm"><b>10</b></a> <a href="../extrusion.htm"><b>11</b></a> <a href="../explode.htm"><b>12</b></a> <a href="../ellipse.htm"><b>13</b></a> <a href="../edge.htm"><b>14</b></a> <a href="../cylinder.htm"><b>15</b></a> <a href="../curve.htm"><b>16</b></a> <a href="../cone.htm"><b>17</b></a> <a href="../compound.htm"><b>18</b></a> <a href="../complex_objects.htm"><b>19</b></a> <a href="../modify_the_location.htm"><b>20</b></a> <a href="../mirror_image.htm"><b>21</b></a> <a href="../measurement_tools.htm"><b>22</b></a> <a href="../local_coordinate_system.htm"><b>23</b></a> <a href="../line.htm"><b>24</b></a> <a href="../groups.htm"><b>25</b></a> <a href="../geometrical_objects.htm"><b>26</b></a> <a href="../filling.htm"><b>27</b></a> <a href="../fillet.htm"><b>28</b></a> <a href="../rotation.htm"><b>29</b></a> <a href="../revolution.htm"><b>30</b></a> <a href="../repairing_operations.htm"><b>31</b></a> <a href="../primitives.htm"><b>32</b></a> <a href="../point.htm"><b>33</b></a> <a href="../plane.htm"><b>34</b></a> <a href="../pipe_creation.htm"><b>35</b></a> <a href="../occ_viewer.htm"><b>36</b></a> <a href="../wire.htm"><b>37</b></a> <a href="../vector.htm"><b>38</b></a> <a href="../turus.htm"><b>39</b></a> <a href="../translation.htm"><b>40</b></a> <a href="../transformation_operations.htm"><b>41</b></a> <a href="../sphere.htm"><b>42</b></a> <a href="../solid.htm"><b>43</b></a> <a href="../sketcher_tui.htm"><b>44</b></a> <a href="../sketcher.htm"><b>45</b></a> <a href="../shell.htm"><b>46</b></a> <a href="../working_with_groups.htm"><b>47</b></a> <a href="../working_plane.htm"><b>48</b></a> </nobr><br><nobr>createanddisplaygo <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../building_by_blocks.htm"><b>2</b></a> <a href="../boolean_operations.htm"><b>3</b></a> <a href="../blocks_operations.htm"><b>4</b></a> <a href="../basic_operations.htm"><b>5</b></a> <a href="../basic_geometrical_objects.htm"><b>6</b></a> <a href="../complex_objects.htm"><b>7</b></a> <a href="../groups.htm"><b>8</b></a> <a href="../geometrical_objects.htm"><b>9</b></a> <a href="../repairing_operations.htm"><b>10</b></a> <a href="../primitives.htm"><b>11</b></a> <a href="../transformation_operations.htm"><b>12</b></a> <a href="../sketcher_tui.htm"><b>13</b></a> </nobr><br><nobr>created <a href="../close_contour.htm"><b>1</b></a> <a href="../cone.htm"><b>2</b></a> <a href="../measurement_tools.htm"><b>3</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>4</b></a> <a href="../plane.htm"><b>5</b></a> <a href="../newentity_blocks.htm"><b>6</b></a> <a href="../viewing_geometrical_objects.htm"><b>7</b></a> <a href="../sketcher.htm"><b>8</b></a> <a href="../working_with_groups.htm"><b>9</b></a> </nobr><br><nobr>creategroup <a href="../groups.htm"><b>1</b></a> <a href="../working_with_groups.htm"><b>2</b></a> </nobr><br><nobr>creates <a href="../archimede.htm"><b>1</b></a> <a href="../face.htm"><b>2</b></a> <a href="../multi_rotation.htm"><b>3</b></a> <a href="../mirror_image.htm"><b>4</b></a> <a href="../fuse.htm"><b>5</b></a> <a href="../fillet.htm"><b>6</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>7</b></a> <a href="../section.htm"><b>8</b></a> <a href="../scale_transform.htm"><b>9</b></a> <a href="../sketcher.htm"><b>10</b></a> </nobr><br><nobr>creation <a href="../close_contour.htm"><b>1</b></a> <a href="../circle.htm"><b>2</b></a> <a href="../box.htm"><b>3</b></a> <a href="../basic_geometrical_objects.htm"><b>4</b></a> <a href="../arc.htm"><b>5</b></a> <a href="../files/introduction_to_geom.htm"><b>6</b></a> <a href="../face.htm"><b>7</b></a> <a href="../extrusion.htm"><b>8</b></a> <a href="../ellipse.htm"><b>9</b></a> <a href="../edge.htm"><b>10</b></a> <a href="../cylinder.htm"><b>11</b></a> <a href="../curve.htm"><b>12</b></a> <a href="../cone.htm"><b>13</b></a> <a href="../compound.htm"><b>14</b></a> <a href="../complex_objects.htm"><b>15</b></a> <a href="../line.htm"><b>16</b></a> <a href="../groups.htm"><b>17</b></a> <a href="../geometry.htm"><b>18</b></a> <a href="../geometrical_objects.htm"><b>19</b></a> <a href="../filling.htm"><b>20</b></a> <a href="../revolution.htm"><b>21</b></a> <a href="../repairing_operations.htm"><b>22</b></a> <a href="../primitives.htm"><b>23</b></a> <a href="../point.htm"><b>24</b></a> <a href="../plane.htm"><b>25</b></a> <a href="../pipe_creation.htm"><b>26</b></a> <a href="../wire.htm"><b>27</b></a> <a href="../vector.htm"><b>28</b></a> <a href="../turus.htm"><b>29</b></a> <a href="../sphere.htm"><b>30</b></a> <a href="../solid.htm"><b>31</b></a> <a href="../shell.htm"><b>32</b></a> <a href="../working_with_groups.htm"><b>33</b></a> </nobr><br><a href="../occ_viewer.htm"><b>cross</b></a> <br><a name="bms_CS"></a><a name="subkey_CS"></a><a href="../local_coordinate_system.htm"><b>cs</b></a> <br><a href="../transformation_operations.htm"><b>cs1</b></a> <br><a href="../transformation_operations.htm"><b>cs2</b></a> <br><a name="bms_CU"></a><a name="subkey_CU"></a><a href="../modify_the_location.htm"><b>cube</b></a> <br><nobr>current <a href="../occ_viewer.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> </nobr><br><nobr>currently <a href="../box.htm"><b>1</b></a> <a href="../extrusion.htm"><b>2</b></a> <a href="../line.htm"><b>3</b></a> <a href="../sphere.htm"><b>4</b></a> </nobr><br><a href="../shape_processing.htm"><b>curvature</b></a> <br><nobr>curve <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../curve.htm"><b>2</b></a> <a href="../sketcher.htm"><b>3</b></a> <a href="../shape_processing.htm"><b>4</b></a> </nobr><br><a href="../shape_processing.htm"><b>curve2dmode</b></a> <br><a href="../shape_processing.htm"><b>curve3dmode</b></a> <br><a href="../shape_processing.htm"><b>curvecontinuity</b></a> <br><nobr>curves <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../curve.htm"><b>2</b></a> <a href="../filling.htm"><b>3</b></a> <a href="../sketcher.htm"><b>4</b></a> <a href="../shape_processing.htm"><b>5</b></a> </nobr><br><a href="../filling.htm"><b>curving</b></a> <br><nobr>cut <a href="../boolean_operations.htm"><b>1</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>2</b></a> <a href="../cut.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> </nobr><br><a href="../repairing_operations.htm"><b>cut_without_f_2</b></a> <br><nobr>cuts <a href="../cut.htm"><b>1</b></a> <a href="../common.htm"><b>2</b></a> </nobr><br><a href="../partition.htm"><b>cutting</b></a> <br><nobr><a name="bms_CY"></a><a name="subkey_CY"></a>cylinder <a href="../boolean_operations.htm"><b>1</b></a> <a href="../cylinder.htm"><b>2</b></a> <a href="../cone.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../primitives.htm"><b>5</b></a> <a href="../transformation_operations.htm"><b>6</b></a> </nobr><br><a href="../complex_objects.htm"><b>cylinders</b></a> <br><a href="../shape_processing.htm"><b>cylindrical</b></a> <br>
-<br><br>
-<nobr><a name="bm_D"></a><a name="subkey_D{"></a>d <a href="../chamfer.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../shape_processing.htm"><b>3</b></a> </nobr><br><nobr>d1 <a href="../chamfer.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>d2 <a href="../chamfer.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><a name="bms_DA"></a><a name="subkey_DA"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>data</b></a> <br><a href="../repairing_operations.htm"><b>data_dir</b></a> <br><nobr><a name="bms_DE"></a><a name="subkey_DE"></a>default <a href="../point.htm"><b>1</b></a> <a href="../occ_viewer.htm"><b>2</b></a> <a href="../viewing_geometrical_objects.htm"><b>3</b></a> <a href="../sketcher.htm"><b>4</b></a> <a href="../working_with_groups.htm"><b>5</b></a> </nobr><br><nobr>define <a href="../circle.htm"><b>1</b></a> <a href="../chamfer.htm"><b>2</b></a> <a href="../box.htm"><b>3</b></a> <a href="../arc.htm"><b>4</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>5</b></a> <a href="../extrusion.htm"><b>6</b></a> <a href="../explode_on_blocks.htm"><b>7</b></a> <a href="../explode.htm"><b>8</b></a> <a href="../ellipse.htm"><b>9</b></a> <a href="../cylinder.htm"><b>10</b></a> <a href="../curve.htm"><b>11</b></a> <a href="../cone.htm"><b>12</b></a> <a href="../multi_transformation.htm"><b>13</b></a> <a href="../multi_rotation.htm"><b>14</b></a> <a href="../local_coordinate_system.htm"><b>15</b></a> <a href="../line.htm"><b>16</b></a> <a href="../filling.htm"><b>17</b></a> <a href="../fillet.htm"><b>18</b></a> <a href="../scale_transform.htm"><b>19</b></a> <a href="../rotation.htm"><b>20</b></a> <a href="../revolution.htm"><b>21</b></a> <a href="../point.htm"><b>22</b></a> <a href="../plane.htm"><b>23</b></a> <a href="../pipe_creation.htm"><b>24</b></a> <a href="../occ_viewer.htm"><b>25</b></a> <a href="../vector.htm"><b>26</b></a> <a href="../turus.htm"><b>27</b></a> <a href="../translation.htm"><b>28</b></a> <a href="../sphere.htm"><b>29</b></a> <a href="../shape_processing.htm"><b>30</b></a> <a href="../working_with_groups.htm"><b>31</b></a> <a href="../working_plane.htm"><b>32</b></a> </nobr><br><nobr>defined <a href="../multi_rotation.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> </nobr><br><nobr>defines <a href="../multi_transformation.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><nobr>defining <a href="../point.htm"><b>1</b></a> <a href="../multi_translation.htm"><b>2</b></a> <a href="../sketcher.htm"><b>3</b></a> </nobr><br><nobr>definite <a href="../files/salome2_sp3_measuregui_functions.htm"><b>1</b></a> <a href="../suppress_holes.htm"><b>2</b></a> </nobr><br><a href="../pipe_creation.htm"><b>definition</b></a> <br><a href="../archimede.htm"><b>deflection</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>degenerated</b></a> <br><nobr>degree <a href="../filling.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><nobr>degrees <a href="../revolution.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> </nobr><br><a href="../working_with_groups.htm"><b>delete</b></a> <br><a href="../partition.htm"><b>deleted</b></a> <br><a href="../archimede.htm"><b>density</b></a> <br><a href="../multi_transformation.htm"><b>depending</b></a> <br><a href="../shape_processing.htm"><b>depends</b></a> <br><a href="../shape_processing.htm"><b>derivatives</b></a> <br><a href="../measurement_tools.htm"><b>descr</b></a> <br><nobr>description <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../newentity_blocks.htm"><b>3</b></a> <a href="../sketcher_tui.htm"><b>4</b></a> <a href="../sketcher.htm"><b>5</b></a> </nobr><br><a href="../working_with_groups.htm"><b>designed</b></a> <br><a href="../sketcher.htm"><b>destination</b></a> <br><nobr>destined <a href="../files/introduction_to_geom.htm"><b>1</b></a> <a href="../geometry.htm"><b>2</b></a> </nobr><br><nobr>detect <a href="../sewing.htm"><b>1</b></a> <a href="../suppress_holes.htm"><b>2</b></a> </nobr><br><a href="../shape_processing.htm"><b>detection</b></a> <br><a href="../check_free_boundaries.htm"><b>detects</b></a> <br><a href="../occ_viewer.htm"><b>developed</b></a> <br><nobr><a name="bms_DI"></a><a name="subkey_DI"></a>dialog <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../cut.htm"><b>2</b></a> <a href="../newentity_blocks.htm"><b>3</b></a> <a href="../wire.htm"><b>4</b></a> <a href="../transparency.htm"><b>5</b></a> <a href="../sketcher.htm"><b>6</b></a> <a href="../shape_processing.htm"><b>7</b></a> <a href="../working_with_groups.htm"><b>8</b></a> </nobr><br><a href="../groups.htm"><b>differencelist</b></a> <br><nobr>different <a href="../mirror_image.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr>dimension <a href="../chamfer.htm"><b>1</b></a> <a href="../extrusion.htm"><b>2</b></a> <a href="../multi_rotation.htm"><b>3</b></a> </nobr><br><nobr>dimensions <a href="../box.htm"><b>1</b></a> <a href="../cylinder.htm"><b>2</b></a> <a href="../multi_rotation.htm"><b>3</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>4</b></a> </nobr><br><nobr>dir <a href="../multi_rotation.htm"><b>1</b></a> <a href="../multi_translation.htm"><b>2</b></a> </nobr><br><a href="../multi_translation.htm"><b>dir1</b></a> <br><a href="../multi_translation.htm"><b>dir2</b></a> <br><nobr>direction <a href="../circle.htm"><b>1</b></a> <a href="../archimede.htm"><b>2</b></a> <a href="../extrusion.htm"><b>3</b></a> <a href="../ellipse.htm"><b>4</b></a> <a href="../cone.htm"><b>5</b></a> <a href="../multi_transformation.htm"><b>6</b></a> <a href="../multi_rotation.htm"><b>7</b></a> <a href="../local_coordinate_system.htm"><b>8</b></a> <a href="../rotation.htm"><b>9</b></a> <a href="../revolution.htm"><b>10</b></a> <a href="../occ_viewer.htm"><b>11</b></a> <a href="../multi_translation.htm"><b>12</b></a> <a href="../turus.htm"><b>13</b></a> <a href="../sketcher.htm"><b>14</b></a> <a href="../shape_processing.htm"><b>15</b></a> </nobr><br><nobr>directions <a href="../multi_transformation.htm"><b>1</b></a> <a href="../local_coordinate_system.htm"><b>2</b></a> <a href="../multi_translation.htm"><b>3</b></a> </nobr><br><a href="../local_coordinate_system.htm"><b>directly</b></a> <br><a href="../multi_transformation.htm"><b>dirfaceid1</b></a> <br><a href="../multi_transformation.htm"><b>dirfaceid1u</b></a> <br><a href="../multi_transformation.htm"><b>dirfaceid1v</b></a> <br><a href="../multi_transformation.htm"><b>dirfaceid2</b></a> <br><a href="../multi_transformation.htm"><b>dirfaceid2u</b></a> <br><a href="../multi_transformation.htm"><b>dirfaceid2v</b></a> <br><nobr>display <a href="../color.htm"><b>1</b></a> <a href="../changing_display_parameters.htm"><b>2</b></a> <a href="../building_by_blocks.htm"><b>3</b></a> <a href="../boolean_operations.htm"><b>4</b></a> <a href="../blocks_operations.htm"><b>5</b></a> <a href="../basic_operations.htm"><b>6</b></a> <a href="../basic_geometrical_objects.htm"><b>7</b></a> <a href="../complex_objects.htm"><b>8</b></a> <a href="../groups.htm"><b>9</b></a> <a href="../geometrical_objects.htm"><b>10</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>11</b></a> <a href="../sewing.htm"><b>12</b></a> <a href="../repairing_operations.htm"><b>13</b></a> <a href="../primitives.htm"><b>14</b></a> <a href="../viewing_geometrical_objects.htm"><b>15</b></a> <a href="../transparency.htm"><b>16</b></a> <a href="../transformation_operations.htm"><b>17</b></a> <a href="../suppress_holes.htm"><b>18</b></a> <a href="../sketcher_tui.htm"><b>19</b></a> <a href="../wireframe_and_shading.htm"><b>20</b></a> </nobr><br><nobr>displayed <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../isos.htm"><b>2</b></a> <a href="../occ_viewer.htm"><b>3</b></a> <a href="../viewing_geometrical_objects.htm"><b>4</b></a> <a href="../working_with_groups.htm"><b>5</b></a> </nobr><br><a href="../viewing_geometrical_objects.htm"><b>displayonly</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>displays</b></a> <br><nobr>distance <a href="../measurement_tools.htm"><b>1</b></a> <a href="../glue_faces.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> <a href="../offset_surface.htm"><b>4</b></a> <a href="../shape_processing.htm"><b>5</b></a> </nobr><br><a href="../repairing_operations.htm"><b>divide</b></a> <br><nobr>divided <a href="../add_point_on_edge.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><nobr>divideedge <a href="../add_point_on_edge.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_DO"></a><a name="subkey_DO"></a>doesn <a href="../groups.htm"><b>1</b></a> <a href="../occ_viewer.htm"><b>2</b></a> </nobr><br><nobr>don <a href="../box.htm"><b>1</b></a> <a href="../extrusion.htm"><b>2</b></a> <a href="../occ_viewer.htm"><b>3</b></a> <a href="../sphere.htm"><b>4</b></a> </nobr><br><nobr>done <a href="../close_contour.htm"><b>1</b></a> <a href="../multi_translation.htm"><b>2</b></a> </nobr><br><nobr>double <a href="../multi_transformation.htm"><b>1</b></a> <a href="../multi_rotation.htm"><b>2</b></a> <a href="../multi_translation.htm"><b>3</b></a> <a href="../transparency.htm"><b>4</b></a> </nobr><br><a href="../sketcher.htm"><b>doubles</b></a> <br><a href="../working_with_groups.htm"><b>down</b></a> <br><a href="../occ_viewer.htm"><b>downward</b></a> <br><a name="bms_DR"></a><a name="subkey_DR"></a><a href="../occ_viewer.htm"><b>drag</b></a> <br><a href="../occ_viewer.htm"><b>drawn</b></a> <br><a href="../shape_processing.htm"><b>drop</b></a> <br><a href="../shape_processing.htm"><b>dropsmalledges</b></a> <br><br><br></p><p class="ftsbody" align="center"><a href="whlstf3.htm" target="_self" title="previous search group"><b>&gt;&gt;</b></a>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstf3.htm b/doc/salome/gui/GEOM/whgdata/whlstf3.htm
deleted file mode 100755 (executable)
index 8c65384..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words List</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsbody" align="center"><a href="whlstf2.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
-<p class="ftsbody" >
-<a name="bms_DU"></a><a name="subkey_DU"></a><a href="../shape_processing.htm"><b>du</b></a> <br><nobr>dump <a href="../occ_viewer.htm"><b>1</b></a> <a href="../viewing_geometrical_objects.htm"><b>2</b></a> </nobr><br><a href="../occ_viewer.htm"><b>duplicate</b></a> <br><nobr><a name="bms_DX"></a><a name="subkey_DX"></a>dx <a href="../box.htm"><b>1</b></a> <a href="../measurement_tools.htm"><b>2</b></a> <a href="../vector.htm"><b>3</b></a> <a href="../translation.htm"><b>4</b></a> <a href="../sketcher.htm"><b>5</b></a> </nobr><br><nobr><a name="bms_DY"></a><a name="subkey_DY"></a>dy <a href="../box.htm"><b>1</b></a> <a href="../measurement_tools.htm"><b>2</b></a> <a href="../vector.htm"><b>3</b></a> <a href="../translation.htm"><b>4</b></a> <a href="../sketcher.htm"><b>5</b></a> </nobr><br><nobr><a name="bms_DZ"></a><a name="subkey_DZ"></a>dz <a href="../box.htm"><b>1</b></a> <a href="../measurement_tools.htm"><b>2</b></a> <a href="../vector.htm"><b>3</b></a> <a href="../translation.htm"><b>4</b></a> </nobr><br>
-<br><br>
-<a name="bm_E"></a><a name="subkey_E{"></a><a href="../shape_processing.htm"><b>e</b></a> <br><a href="../newentity_blocks.htm"><b>e1</b></a> <br><a href="../newentity_blocks.htm"><b>e2</b></a> <br><a href="../newentity_blocks.htm"><b>e3</b></a> <br><a href="../newentity_blocks.htm"><b>e4</b></a> <br><a name="bms_EA"></a><a name="subkey_EA"></a><a href="../working_with_groups.htm"><b>easier</b></a> <br><nobr><a name="bms_ED"></a><a name="subkey_ED"></a>edge <a href="../close_contour.htm"><b>1</b></a> <a href="../circle.htm"><b>2</b></a> <a href="../chamfer.htm"><b>3</b></a> <a href="../arc.htm"><b>4</b></a> <a href="../add_point_on_edge.htm"><b>5</b></a> <a href="../extrusion.htm"><b>6</b></a> <a href="../ellipse.htm"><b>7</b></a> <a href="../edge.htm"><b>8</b></a> <a href="../curve.htm"><b>9</b></a> <a href="../complex_objects.htm"><b>10</b></a> <a href="../measurement_tools.htm"><b>11</b></a> <a href="../line.htm"><b>12</b></a> <a href="../geometrical_objects.htm"><b>13</b></a> <a href="../fillet.htm"><b>14</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>15</b></a> <a href="../revolution.htm"><b>16</b></a> <a href="../repairing_operations.htm"><b>17</b></a> <a href="../point.htm"><b>18</b></a> <a href="../pipe_creation.htm"><b>19</b></a> <a href="../vector.htm"><b>20</b></a> <a href="../transformation_operations.htm"><b>21</b></a> <a href="../shape_processing.htm"><b>22</b></a> </nobr><br><a href="../repairing_operations.htm"><b>edge_ind</b></a> <br><a href="../repairing_operations.htm"><b>edge_points</b></a> <br><a href="../building_by_blocks.htm"><b>edge1</b></a> <br><a href="../building_by_blocks.htm"><b>edge2</b></a> <br><a href="../building_by_blocks.htm"><b>edge3</b></a> <br><a href="../building_by_blocks.htm"><b>edge4</b></a> <br><a href="../add_point_on_edge.htm"><b>edgeid</b></a> <br><nobr>edges <a href="../close_contour.htm"><b>1</b></a> <a href="../check_free_boundaries.htm"><b>2</b></a> <a href="../chamfer.htm"><b>3</b></a> <a href="../building_by_blocks.htm"><b>4</b></a> <a href="../box.htm"><b>5</b></a> <a href="../explode.htm"><b>6</b></a> <a href="../filling.htm"><b>7</b></a> <a href="../fillet.htm"><b>8</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>9</b></a> <a href="../propagate.htm"><b>10</b></a> <a href="../newentity_blocks.htm"><b>11</b></a> <a href="../wire.htm"><b>12</b></a> <a href="../transformation_operations.htm"><b>13</b></a> <a href="../sketcher.htm"><b>14</b></a> <a href="../shell.htm"><b>15</b></a> <a href="../shape_processing.htm"><b>16</b></a> <a href="../wireframe_and_shading.htm"><b>17</b></a> </nobr><br><a href="../working_with_groups.htm"><b>edit</b></a> <br><a href="../working_with_groups.htm"><b>editing</b></a> <br><a name="bms_EG"></a><a name="subkey_EG"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>egdemaxtol</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>egdemintol</b></a> <br><nobr><a name="bms_EI"></a><a name="subkey_EI"></a>either <a href="../modify_the_location.htm"><b>1</b></a> <a href="../newentity_blocks.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_EL"></a><a name="subkey_EL"></a>element <a href="../close_contour.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../sketcher.htm"><b>3</b></a> </nobr><br><a href="../newentity_blocks.htm"><b>elementary</b></a> <br><nobr>elements <a href="../files/salome2_sp3_booleangui_functions.htm"><b>1</b></a> <a href="../face.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> <a href="../viewing_geometrical_objects.htm"><b>4</b></a> <a href="../working_with_groups.htm"><b>5</b></a> </nobr><br><nobr>ellipse <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../ellipse.htm"><b>2</b></a> </nobr><br><nobr>else <a href="../measurement_tools.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_EM"></a><a name="subkey_EM"></a>empty <a href="../suppress_internal_wires.htm"><b>1</b></a> <a href="../suppress_holes.htm"><b>2</b></a> </nobr><br><a name="bms_EN"></a><a name="subkey_EN"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>encountered</b></a> <br><nobr>end <a href="../close_contour.htm"><b>1</b></a> <a href="../extrusion.htm"><b>2</b></a> <a href="../modify_the_location.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../vector.htm"><b>5</b></a> <a href="../translation.htm"><b>6</b></a> <a href="../transformation_operations.htm"><b>7</b></a> <a href="../sketcher.htm"><b>8</b></a> <a href="../shape_processing.htm"><b>9</b></a> </nobr><br><a href="../arc.htm"><b>ending</b></a> <br><nobr>ends <a href="../close_contour.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><a href="../working_with_groups.htm"><b>enter</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>entire</b></a> <br><nobr>entity <a href="../circle.htm"><b>1</b></a> <a href="../box.htm"><b>2</b></a> <a href="../arc.htm"><b>3</b></a> <a href="../face.htm"><b>4</b></a> <a href="../extrusion.htm"><b>5</b></a> <a href="../explode.htm"><b>6</b></a> <a href="../ellipse.htm"><b>7</b></a> <a href="../edge.htm"><b>8</b></a> <a href="../cylinder.htm"><b>9</b></a> <a href="../curve.htm"><b>10</b></a> <a href="../cone.htm"><b>11</b></a> <a href="../compound.htm"><b>12</b></a> <a href="../local_coordinate_system.htm"><b>13</b></a> <a href="../line.htm"><b>14</b></a> <a href="../filling.htm"><b>15</b></a> <a href="../revolution.htm"><b>16</b></a> <a href="../point.htm"><b>17</b></a> <a href="../plane.htm"><b>18</b></a> <a href="../pipe_creation.htm"><b>19</b></a> <a href="../newentity_blocks.htm"><b>20</b></a> <a href="../wire.htm"><b>21</b></a> <a href="../vector.htm"><b>22</b></a> <a href="../turus.htm"><b>23</b></a> <a href="../sphere.htm"><b>24</b></a> <a href="../solid.htm"><b>25</b></a> <a href="../sketcher.htm"><b>26</b></a> <a href="../shell.htm"><b>27</b></a> <a href="../working_with_groups.htm"><b>28</b></a> <a href="../working_plane.htm"><b>29</b></a> </nobr><br><nobr><a name="bms_EQ"></a><a name="subkey_EQ"></a>equal <a href="../cone.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> <a href="../shape_processing.htm"><b>3</b></a> </nobr><br><a name="bms_ER"></a><a name="subkey_ER"></a><a href="../viewing_geometrical_objects.htm"><b>erase</b></a> <br><a href="../viewing_geometrical_objects.htm"><b>eraseall</b></a> <br><a href="../viewing_geometrical_objects.htm"><b>eraseonly</b></a> <br><nobr>error <a href="../check_free_boundaries.htm"><b>1</b></a> <a href="../groups.htm"><b>2</b></a> </nobr><br><nobr>errors <a href="../groups.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_ET"></a><a name="subkey_ET"></a>etc <a href="../explode.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_EX"></a><a name="subkey_EX"></a>example <a href="../check_free_boundaries.htm"><b>1</b></a> <a href="../box.htm"><b>2</b></a> <a href="../archimede.htm"><b>3</b></a> <a href="../arc.htm"><b>4</b></a> <a href="../add_point_on_edge.htm"><b>5</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>6</b></a> <a href="../face.htm"><b>7</b></a> <a href="../explode_on_blocks.htm"><b>8</b></a> <a href="../ellipse.htm"><b>9</b></a> <a href="../edge.htm"><b>10</b></a> <a href="../cylinder.htm"><b>11</b></a> <a href="../cut.htm"><b>12</b></a> <a href="../cone.htm"><b>13</b></a> <a href="../compound.htm"><b>14</b></a> <a href="../common.htm"><b>15</b></a> <a href="../local_coordinate_system.htm"><b>16</b></a> <a href="../line.htm"><b>17</b></a> <a href="../isos.htm"><b>18</b></a> <a href="../glue_faces.htm"><b>19</b></a> <a href="../fuse.htm"><b>20</b></a> <a href="../filling.htm"><b>21</b></a> <a href="../fillet.htm"><b>22</b></a> <a href="../sewing.htm"><b>23</b></a> <a href="../section.htm"><b>24</b></a> <a href="../scale_transform.htm"><b>25</b></a> <a href="../rotation.htm"><b>26</b></a> <a href="../revolution.htm"><b>27</b></a> <a href="../repairing_operations.htm"><b>28</b></a> <a href="../propagate.htm"><b>29</b></a> <a href="../point.htm"><b>30</b></a> <a href="../pipe_creation.htm"><b>31</b></a> <a href="../partition.htm"><b>32</b></a> <a href="../offset_surface.htm"><b>33</b></a> <a href="../newentity_blocks.htm"><b>34</b></a> <a href="../wire.htm"><b>35</b></a> <a href="../turus.htm"><b>36</b></a> <a href="../translation.htm"><b>37</b></a> <a href="../suppress_internal_wires.htm"><b>38</b></a> <a href="../suppress_holes.htm"><b>39</b></a> <a href="../suppress_faces.htm"><b>40</b></a> <a href="../sphere.htm"><b>41</b></a> <a href="../solid.htm"><b>42</b></a> <a href="../sketcher.htm"><b>43</b></a> <a href="../shell.htm"><b>44</b></a> <a href="../shape_processing.htm"><b>45</b></a> <a href="../working_with_groups.htm"><b>46</b></a> </nobr><br><nobr>examples <a href="../color.htm"><b>1</b></a> <a href="../close_contour.htm"><b>2</b></a> <a href="../circle.htm"><b>3</b></a> <a href="../check_free_faces.htm"><b>4</b></a> <a href="../check_free_boundaries.htm"><b>5</b></a> <a href="../chamfer.htm"><b>6</b></a> <a href="../box.htm"><b>7</b></a> <a href="../archimede.htm"><b>8</b></a> <a href="../arc.htm"><b>9</b></a> <a href="../add_point_on_edge.htm"><b>10</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>11</b></a> <a href="../face.htm"><b>12</b></a> <a href="../extrusion.htm"><b>13</b></a> <a href="../explode_on_blocks.htm"><b>14</b></a> <a href="../ellipse.htm"><b>15</b></a> <a href="../edge.htm"><b>16</b></a> <a href="../cylinder.htm"><b>17</b></a> <a href="../cut.htm"><b>18</b></a> <a href="../curve.htm"><b>19</b></a> <a href="../cone.htm"><b>20</b></a> <a href="../compound.htm"><b>21</b></a> <a href="../common.htm"><b>22</b></a> <a href="../multi_transformation.htm"><b>23</b></a> <a href="../multi_rotation.htm"><b>24</b></a> <a href="../modify_the_location.htm"><b>25</b></a> <a href="../mirror_image.htm"><b>26</b></a> <a href="../line.htm"><b>27</b></a> <a href="../glue_faces.htm"><b>28</b></a> <a href="../fuse.htm"><b>29</b></a> <a href="../filling.htm"><b>30</b></a> <a href="../fillet.htm"><b>31</b></a> <a href="../sewing.htm"><b>32</b></a> <a href="../section.htm"><b>33</b></a> <a href="../scale_transform.htm"><b>34</b></a> <a href="../rotation.htm"><b>35</b></a> <a href="../revolution.htm"><b>36</b></a> <a href="../propagate.htm"><b>37</b></a> <a href="../point.htm"><b>38</b></a> <a href="../plane.htm"><b>39</b></a> <a href="../pipe_creation.htm"><b>40</b></a> <a href="../partition.htm"><b>41</b></a> <a href="../offset_surface.htm"><b>42</b></a> <a href="../newentity_blocks.htm"><b>43</b></a> <a href="../multi_translation.htm"><b>44</b></a> <a href="../wire.htm"><b>45</b></a> <a href="../vector.htm"><b>46</b></a> <a href="../turus.htm"><b>47</b></a> <a href="../transparency.htm"><b>48</b></a> <a href="../translation.htm"><b>49</b></a> <a href="../suppress_internal_wires.htm"><b>50</b></a> <a href="../suppress_holes.htm"><b>51</b></a> <a href="../suppress_faces.htm"><b>52</b></a> <a href="../sphere.htm"><b>53</b></a> <a href="../solid.htm"><b>54</b></a> <a href="../sketcher.htm"><b>55</b></a> <a href="../shell.htm"><b>56</b></a> <a href="../shape_processing.htm"><b>57</b></a> <a href="../working_with_groups.htm"><b>58</b></a> <a href="../wireframe_and_shading.htm"><b>59</b></a> </nobr><br><a href="../suppress_internal_wires.htm"><b>except</b></a> <br><nobr>existing <a href="../plane.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> <a href="../working_with_groups.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>expand</b></a> <br><nobr>explode <a href="../blocks_operations.htm"><b>1</b></a> <a href="../explode_on_blocks.htm"><b>2</b></a> <a href="../explode.htm"><b>3</b></a> <a href="../geometrical_objects.htm"><b>4</b></a> </nobr><br><nobr>exploded <a href="../explode_on_blocks.htm"><b>1</b></a> <a href="../explode.htm"><b>2</b></a> </nobr><br><a href="../explode.htm"><b>explodes</b></a> <br><nobr>export <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../files/introduction_to_geom.htm"><b>2</b></a> <a href="../geometry.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>exportation</b></a> <br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>exporting</b></a> <br><nobr>exports <a href="../occ_viewer.htm"><b>1</b></a> <a href="../viewing_geometrical_objects.htm"><b>2</b></a> </nobr><br><a href="../occ_viewer.htm"><b>extended</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>extra</b></a> <br><a href="../explode_on_blocks.htm"><b>extracted</b></a> <br><nobr>extruded <a href="../revolution.htm"><b>1</b></a> <a href="../pipe_creation.htm"><b>2</b></a> </nobr><br><a href="../extrusion.htm"><b>extrusion</b></a> <br>
-<br><br>
-<nobr><a name="bm_F"></a><a name="subkey_F{"></a>f <a href="../geometrical_objects.htm"><b>1</b></a> <a href="../sketcher_tui.htm"><b>2</b></a> </nobr><br><a href="../repairing_operations.htm"><b>f_2</b></a> <br><a href="../transformation_operations.htm"><b>f_ind_1</b></a> <br><a href="../transformation_operations.htm"><b>f_ind_2</b></a> <br><a href="../newentity_blocks.htm"><b>f1</b></a> <br><a href="../repairing_operations.htm"><b>f1_id</b></a> <br><a href="../newentity_blocks.htm"><b>f2</b></a> <br><a href="../newentity_blocks.htm"><b>f3</b></a> <br><a href="../newentity_blocks.htm"><b>f4</b></a> <br><a href="../newentity_blocks.htm"><b>f5</b></a> <br><a href="../newentity_blocks.htm"><b>f6</b></a> <br><nobr><a name="bms_FA"></a><a name="subkey_FA"></a>face <a href="../close_contour.htm"><b>1</b></a> <a href="../check_free_faces.htm"><b>2</b></a> <a href="../chamfer.htm"><b>3</b></a> <a href="../building_by_blocks.htm"><b>4</b></a> <a href="../basic_geometrical_objects.htm"><b>5</b></a> <a href="../face.htm"><b>6</b></a> <a href="../extrusion.htm"><b>7</b></a> <a href="../multi_transformation.htm"><b>8</b></a> <a href="../measurement_tools.htm"><b>9</b></a> <a href="../groups.htm"><b>10</b></a> <a href="../geometrical_objects.htm"><b>11</b></a> <a href="../filling.htm"><b>12</b></a> <a href="../fillet.htm"><b>13</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>14</b></a> <a href="../revolution.htm"><b>15</b></a> <a href="../repairing_operations.htm"><b>16</b></a> <a href="../plane.htm"><b>17</b></a> <a href="../pipe_creation.htm"><b>18</b></a> <a href="../partition.htm"><b>19</b></a> <a href="../offset_surface.htm"><b>20</b></a> <a href="../newentity_blocks.htm"><b>21</b></a> <a href="../transformation_operations.htm"><b>22</b></a> <a href="../suppress_internal_wires.htm"><b>23</b></a> <a href="../suppress_faces.htm"><b>24</b></a> <a href="../sketcher_tui.htm"><b>25</b></a> <a href="../sketcher.htm"><b>26</b></a> <a href="../shape_processing.htm"><b>27</b></a> <a href="../working_plane.htm"><b>28</b></a> </nobr><br><a href="../repairing_operations.htm"><b>face_name</b></a> <br><a href="../repairing_operations.htm"><b>face_rot</b></a> <br><nobr>face1 <a href="../chamfer.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> <a href="../geometrical_objects.htm"><b>3</b></a> </nobr><br><nobr>face2 <a href="../chamfer.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> <a href="../geometrical_objects.htm"><b>3</b></a> </nobr><br><a href="../geometrical_objects.htm"><b>face3</b></a> <br><a href="../groups.htm"><b>faceid</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>facemaxtol</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>facemintol</b></a> <br><nobr>faces <a href="../check_free_faces.htm"><b>1</b></a> <a href="../chamfer.htm"><b>2</b></a> <a href="../building_by_blocks.htm"><b>3</b></a> <a href="../explode_on_blocks.htm"><b>4</b></a> <a href="../explode.htm"><b>5</b></a> <a href="../complex_objects.htm"><b>6</b></a> <a href="../multi_transformation.htm"><b>7</b></a> <a href="../measurement_tools.htm"><b>8</b></a> <a href="../groups.htm"><b>9</b></a> <a href="../glue_faces.htm"><b>10</b></a> <a href="../geometrical_objects.htm"><b>11</b></a> <a href="../fillet.htm"><b>12</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>13</b></a> <a href="../repairing_operations.htm"><b>14</b></a> <a href="../offset_surface.htm"><b>15</b></a> <a href="../newentity_blocks.htm"><b>16</b></a> <a href="../transformation_operations.htm"><b>17</b></a> <a href="../suppress_internal_wires.htm"><b>18</b></a> <a href="../suppress_faces.htm"><b>19</b></a> <a href="../shell.htm"><b>20</b></a> <a href="../shape_processing.htm"><b>21</b></a> </nobr><br><nobr>factor <a href="../scale_transform.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>failed <a href="../measurement_tools.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><a href="../check_free_boundaries.htm"><b>false</b></a> <br><br><br></p><p class="ftsbody" align="center"><a href="whlstf4.htm" target="_self" title="previous search group"><b>&gt;&gt;</b></a>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstf4.htm b/doc/salome/gui/GEOM/whgdata/whlstf4.htm
deleted file mode 100755 (executable)
index 7699ba2..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<html>
-<head>
-<title>Search Words List</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsbody" align="center"><a href="whlstf3.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
-<p class="ftsbody" >
-<a name="bms_FI"></a><a name="subkey_FI"></a><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>file</b></a> <br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>files</b></a> <br><a href="../suppress_holes.htm"><b>fill</b></a> <br><nobr>filled <a href="../local_coordinate_system.htm"><b>1</b></a> <a href="../wireframe_and_shading.htm"><b>2</b></a> </nobr><br><nobr>fillet <a href="../chamfer.htm"><b>1</b></a> <a href="../fillet.htm"><b>2</b></a> <a href="../transformation_operations.htm"><b>3</b></a> </nobr><br><a href="../transformation_operations.htm"><b>filletall</b></a> <br><a href="../fillet.htm"><b>fillets</b></a> <br><nobr>filling <a href="../color.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> <a href="../filling.htm"><b>3</b></a> <a href="../viewing_geometrical_objects.htm"><b>4</b></a> </nobr><br><a href="../modify_the_location.htm"><b>final</b></a> <br><nobr>finally <a href="../mirror_image.htm"><b>1</b></a> <a href="../point.htm"><b>2</b></a> <a href="../plane.htm"><b>3</b></a> <a href="../translation.htm"><b>4</b></a> <a href="../working_with_groups.htm"><b>5</b></a> <a href="../working_plane.htm"><b>6</b></a> </nobr><br><nobr>first <a href="../files/salome2_sp3_booleangui_functions.htm"><b>1</b></a> <a href="../edge.htm"><b>2</b></a> <a href="../cone.htm"><b>3</b></a> <a href="../multi_transformation.htm"><b>4</b></a> <a href="../modify_the_location.htm"><b>5</b></a> <a href="../partition.htm"><b>6</b></a> <a href="../multi_translation.htm"><b>7</b></a> <a href="../sketcher_tui.htm"><b>8</b></a> <a href="../shape_processing.htm"><b>9</b></a> </nobr><br><nobr>firstly <a href="../circle.htm"><b>1</b></a> <a href="../box.htm"><b>2</b></a> <a href="../cylinder.htm"><b>3</b></a> <a href="../cone.htm"><b>4</b></a> <a href="../mirror_image.htm"><b>5</b></a> <a href="../local_coordinate_system.htm"><b>6</b></a> <a href="../point.htm"><b>7</b></a> <a href="../plane.htm"><b>8</b></a> <a href="../vector.htm"><b>9</b></a> <a href="../turus.htm"><b>10</b></a> <a href="../translation.htm"><b>11</b></a> <a href="../sphere.htm"><b>12</b></a> <a href="../working_plane.htm"><b>13</b></a> </nobr><br><a href="../occ_viewer.htm"><b>fit</b></a> <br><a href="../shape_processing.htm"><b>fix</b></a> <br><a href="../shape_processing.htm"><b>fixes</b></a> <br><a href="../shape_processing.htm"><b>fixfacesize</b></a> <br><a href="../shape_processing.htm"><b>fixing</b></a> <br><nobr>fixshape <a href="../repairing_operations.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><a name="bms_FL"></a><a name="subkey_FL"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>flag</b></a> <br><a href="../repairing_operations.htm"><b>flight_solid</b></a> <br><nobr><a name="bms_FO"></a><a name="subkey_FO"></a>following <a href="../files/salome2_sp3_booleangui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../transparency.htm"><b>3</b></a> <a href="../sketcher_tui.htm"><b>4</b></a> <a href="../sketcher.htm"><b>5</b></a> <a href="../shape_processing.htm"><b>6</b></a> <a href="../working_with_groups.htm"><b>7</b></a> </nobr><br><nobr>format <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../occ_viewer.htm"><b>2</b></a> <a href="../viewing_geometrical_objects.htm"><b>3</b></a> </nobr><br><nobr>formats <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../files/introduction_to_geom.htm"><b>2</b></a> <a href="../geometry.htm"><b>3</b></a> </nobr><br><nobr>four <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../newentity_blocks.htm"><b>2</b></a> <a href="../shape_processing.htm"><b>3</b></a> </nobr><br><a name="bms_FR"></a><a name="subkey_FR"></a><a href="../occ_viewer.htm"><b>frame</b></a> <br><nobr>free <a href="../check_free_faces.htm"><b>1</b></a> <a href="../check_free_boundaries.htm"><b>2</b></a> <a href="../sewing.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../suppress_holes.htm"><b>5</b></a> </nobr><br><a name="bms_FU"></a><a name="subkey_FU"></a><a href="../newentity_blocks.htm"><b>functionalities</b></a> <br><nobr>functionality <a href="../occ_viewer.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> <a href="../working_with_groups.htm"><b>3</b></a> </nobr><br><nobr>functions <a href="../files/introduction_to_geom.htm"><b>1</b></a> <a href="../geometry.htm"><b>2</b></a> <a href="../occ_viewer.htm"><b>3</b></a> <a href="../transformation_operations.htm"><b>4</b></a> </nobr><br><nobr>fuse <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../boolean_operations.htm"><b>2</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>3</b></a> <a href="../fuse.htm"><b>4</b></a> </nobr><br><a href="../changing_display_parameters.htm"><b>fuse_id</b></a> <br>
-<br><br>
-<a name="bm_G"></a><a name="subkey_G{"></a><a href="../shape_processing.htm"><b>g1</b></a> <br><a href="../shape_processing.htm"><b>g2</b></a> <br><a name="bms_GA"></a><a name="subkey_GA"></a><a href="../close_contour.htm"><b>gap</b></a> <br><a name="bms_GC"></a><a name="subkey_GC"></a><a href="../modify_the_location.htm"><b>gcs</b></a> <br><nobr><a name="bms_GE"></a><a name="subkey_GE"></a>general <a href="../files/salome2_sp3_booleangui_functions.htm"><b>1</b></a> <a href="../newentity_blocks.htm"><b>2</b></a> </nobr><br><nobr>generate <a href="../extrusion.htm"><b>1</b></a> <a href="../filling.htm"><b>2</b></a> <a href="../pipe_creation.htm"><b>3</b></a> </nobr><br><nobr>generation <a href="../files/introduction_to_geom.htm"><b>1</b></a> <a href="../extrusion.htm"><b>2</b></a> <a href="../geometry.htm"><b>3</b></a> <a href="../filling.htm"><b>4</b></a> <a href="../revolution.htm"><b>5</b></a> <a href="../pipe_creation.htm"><b>6</b></a> </nobr><br><nobr>geom <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../building_by_blocks.htm"><b>2</b></a> <a href="../boolean_operations.htm"><b>3</b></a> <a href="../blocks_operations.htm"><b>4</b></a> <a href="../basic_operations.htm"><b>5</b></a> <a href="../basic_geometrical_objects.htm"><b>6</b></a> <a href="../complex_objects.htm"><b>7</b></a> <a href="../measurement_tools.htm"><b>8</b></a> <a href="../groups.htm"><b>9</b></a> <a href="../geometrical_objects.htm"><b>10</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>11</b></a> <a href="../repairing_operations.htm"><b>12</b></a> <a href="../propagate.htm"><b>13</b></a> <a href="../primitives.htm"><b>14</b></a> <a href="../transformation_operations.htm"><b>15</b></a> <a href="../sketcher_tui.htm"><b>16</b></a> </nobr><br><nobr>geom_object <a href="../close_contour.htm"><b>1</b></a> <a href="../circle.htm"><b>2</b></a> <a href="../check_free_faces.htm"><b>3</b></a> <a href="../check_free_boundaries.htm"><b>4</b></a> <a href="../chamfer.htm"><b>5</b></a> <a href="../box.htm"><b>6</b></a> <a href="../archimede.htm"><b>7</b></a> <a href="../arc.htm"><b>8</b></a> <a href="../add_point_on_edge.htm"><b>9</b></a> <a href="../face.htm"><b>10</b></a> <a href="../extrusion.htm"><b>11</b></a> <a href="../explode_on_blocks.htm"><b>12</b></a> <a href="../ellipse.htm"><b>13</b></a> <a href="../edge.htm"><b>14</b></a> <a href="../cylinder.htm"><b>15</b></a> <a href="../cut.htm"><b>16</b></a> <a href="../curve.htm"><b>17</b></a> <a href="../cone.htm"><b>18</b></a> <a href="../compound.htm"><b>19</b></a> <a href="../common.htm"><b>20</b></a> <a href="../multi_transformation.htm"><b>21</b></a> <a href="../mirror_image.htm"><b>22</b></a> <a href="../line.htm"><b>23</b></a> <a href="../glue_faces.htm"><b>24</b></a> <a href="../fuse.htm"><b>25</b></a> <a href="../filling.htm"><b>26</b></a> <a href="../fillet.htm"><b>27</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>28</b></a> <a href="../sewing.htm"><b>29</b></a> <a href="../section.htm"><b>30</b></a> <a href="../scale_transform.htm"><b>31</b></a> <a href="../rotation.htm"><b>32</b></a> <a href="../revolution.htm"><b>33</b></a> <a href="../point.htm"><b>34</b></a> <a href="../plane.htm"><b>35</b></a> <a href="../pipe_creation.htm"><b>36</b></a> <a href="../partition.htm"><b>37</b></a> <a href="../offset_surface.htm"><b>38</b></a> <a href="../newentity_blocks.htm"><b>39</b></a> <a href="../wire.htm"><b>40</b></a> <a href="../vector.htm"><b>41</b></a> <a href="../turus.htm"><b>42</b></a> <a href="../translation.htm"><b>43</b></a> <a href="../suppress_internal_wires.htm"><b>44</b></a> <a href="../suppress_holes.htm"><b>45</b></a> <a href="../suppress_faces.htm"><b>46</b></a> <a href="../sphere.htm"><b>47</b></a> <a href="../solid.htm"><b>48</b></a> <a href="../sketcher.htm"><b>49</b></a> <a href="../shell.htm"><b>50</b></a> <a href="../shape_processing.htm"><b>51</b></a> <a href="../working_with_groups.htm"><b>52</b></a> </nobr><br><nobr>geom_objects <a href="../explode.htm"><b>1</b></a> <a href="../multi_rotation.htm"><b>2</b></a> <a href="../propagate.htm"><b>3</b></a> <a href="../multi_translation.htm"><b>4</b></a> </nobr><br><nobr>geometric <a href="../circle.htm"><b>1</b></a> <a href="../arc.htm"><b>2</b></a> <a href="../face.htm"><b>3</b></a> <a href="../extrusion.htm"><b>4</b></a> <a href="../ellipse.htm"><b>5</b></a> <a href="../edge.htm"><b>6</b></a> <a href="../curve.htm"><b>7</b></a> <a href="../compound.htm"><b>8</b></a> <a href="../line.htm"><b>9</b></a> <a href="../filling.htm"><b>10</b></a> <a href="../revolution.htm"><b>11</b></a> <a href="../point.htm"><b>12</b></a> <a href="../plane.htm"><b>13</b></a> <a href="../pipe_creation.htm"><b>14</b></a> <a href="../newentity_blocks.htm"><b>15</b></a> <a href="../wire.htm"><b>16</b></a> <a href="../viewing_geometrical_objects.htm"><b>17</b></a> <a href="../vector.htm"><b>18</b></a> <a href="../solid.htm"><b>19</b></a> <a href="../shell.htm"><b>20</b></a> <a href="../shape_processing.htm"><b>21</b></a> </nobr><br><nobr>geometrical <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>4</b></a> <a href="../files/introduction_to_geom.htm"><b>5</b></a> <a href="../common.htm"><b>6</b></a> <a href="../multi_rotation.htm"><b>7</b></a> <a href="../geometry.htm"><b>8</b></a> <a href="../geometrical_objects.htm"><b>9</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>10</b></a> <a href="../occ_viewer.htm"><b>11</b></a> <a href="../viewing_geometrical_objects.htm"><b>12</b></a> <a href="../working_with_groups.htm"><b>13</b></a> <a href="../wireframe_and_shading.htm"><b>14</b></a> </nobr><br><nobr>geometry <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../files/introduction_to_geom.htm"><b>2</b></a> <a href="../geometry.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../occ_viewer.htm"><b>5</b></a> <a href="../shape_processing.htm"><b>6</b></a> </nobr><br><nobr>geompy <a href="../close_contour.htm"><b>1</b></a> <a href="../circle.htm"><b>2</b></a> <a href="../check_free_boundaries.htm"><b>3</b></a> <a href="../changing_display_parameters.htm"><b>4</b></a> <a href="../chamfer.htm"><b>5</b></a> <a href="../building_by_blocks.htm"><b>6</b></a> <a href="../box.htm"><b>7</b></a> <a href="../boolean_operations.htm"><b>8</b></a> <a href="../blocks_operations.htm"><b>9</b></a> <a href="../basic_operations.htm"><b>10</b></a> <a href="../basic_geometrical_objects.htm"><b>11</b></a> <a href="../archimede.htm"><b>12</b></a> <a href="../arc.htm"><b>13</b></a> <a href="../add_point_on_edge.htm"><b>14</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>15</b></a> <a href="../face.htm"><b>16</b></a> <a href="../extrusion.htm"><b>17</b></a> <a href="../explode_on_blocks.htm"><b>18</b></a> <a href="../explode.htm"><b>19</b></a> <a href="../ellipse.htm"><b>20</b></a> <a href="../edge.htm"><b>21</b></a> <a href="../cylinder.htm"><b>22</b></a> <a href="../curve.htm"><b>23</b></a> <a href="../cone.htm"><b>24</b></a> <a href="../compound.htm"><b>25</b></a> <a href="../complex_objects.htm"><b>26</b></a> <a href="../common.htm"><b>27</b></a> <a href="../multi_transformation.htm"><b>28</b></a> <a href="../multi_rotation.htm"><b>29</b></a> <a href="../modify_the_location.htm"><b>30</b></a> <a href="../mirror_image.htm"><b>31</b></a> <a href="../measurement_tools.htm"><b>32</b></a> <a href="../local_coordinate_system.htm"><b>33</b></a> <a href="../line.htm"><b>34</b></a> <a href="../groups.htm"><b>35</b></a> <a href="../glue_faces.htm"><b>36</b></a> <a href="../geometrical_objects.htm"><b>37</b></a> <a href="../fuse.htm"><b>38</b></a> <a href="../filling.htm"><b>39</b></a> <a href="../fillet.htm"><b>40</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>41</b></a> <a href="../sewing.htm"><b>42</b></a> <a href="../section.htm"><b>43</b></a> <a href="../scale_transform.htm"><b>44</b></a> <a href="../rotation.htm"><b>45</b></a> <a href="../revolution.htm"><b>46</b></a> <a href="../repairing_operations.htm"><b>47</b></a> <a href="../propagate.htm"><b>48</b></a> <a href="../primitives.htm"><b>49</b></a> <a href="../point.htm"><b>50</b></a> <a href="../plane.htm"><b>51</b></a> <a href="../pipe_creation.htm"><b>52</b></a> <a href="../partition.htm"><b>53</b></a> <a href="../offset_surface.htm"><b>54</b></a> <a href="../newentity_blocks.htm"><b>55</b></a> <a href="../multi_translation.htm"><b>56</b></a> <a href="../wire.htm"><b>57</b></a> <a href="../vector.htm"><b>58</b></a> <a href="../turus.htm"><b>59</b></a> <a href="../translation.htm"><b>60</b></a> <a href="../transformation_operations.htm"><b>61</b></a> <a href="../suppress_internal_wires.htm"><b>62</b></a> <a href="../suppress_holes.htm"><b>63</b></a> <a href="../suppress_faces.htm"><b>64</b></a> <a href="../sphere.htm"><b>65</b></a> <a href="../solid.htm"><b>66</b></a> <a href="../sketcher_tui.htm"><b>67</b></a> <a href="../sketcher.htm"><b>68</b></a> <a href="../shell.htm"><b>69</b></a> <a href="../shape_processing.htm"><b>70</b></a> <a href="../working_with_groups.htm"><b>71</b></a> </nobr><br><nobr>get <a href="../blocks_operations.htm"><b>1</b></a> <a href="../measurement_tools.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> <a href="../transformation_operations.htm"><b>4</b></a> </nobr><br><a href="../repairing_operations.htm"><b>getenv</b></a> <br><a href="../blocks_operations.htm"><b>getfacenearpoint</b></a> <br><nobr>getfreeboundary <a href="../check_free_boundaries.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><nobr>getfreefacesids <a href="../check_free_faces.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><a href="../working_with_groups.htm"><b>getobjectids</b></a> <br><a href="../repairing_operations.htm"><b>getsubshape</b></a> <br><nobr>getsubshapeid <a href="../groups.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../transformation_operations.htm"><b>3</b></a> </nobr><br><a href="../blocks_operations.htm"><b>getsubshapeindex</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>getting</b></a> <br><nobr><a name="bms_GG"></a><a name="subkey_GG"></a>gg <a href="../color.htm"><b>1</b></a> <a href="../changing_display_parameters.htm"><b>2</b></a> <a href="../building_by_blocks.htm"><b>3</b></a> <a href="../boolean_operations.htm"><b>4</b></a> <a href="../blocks_operations.htm"><b>5</b></a> <a href="../basic_operations.htm"><b>6</b></a> <a href="../basic_geometrical_objects.htm"><b>7</b></a> <a href="../complex_objects.htm"><b>8</b></a> <a href="../measurement_tools.htm"><b>9</b></a> <a href="../groups.htm"><b>10</b></a> <a href="../geometrical_objects.htm"><b>11</b></a> <a href="../repairing_operations.htm"><b>12</b></a> <a href="../primitives.htm"><b>13</b></a> <a href="../transparency.htm"><b>14</b></a> <a href="../transformation_operations.htm"><b>15</b></a> <a href="../sketcher_tui.htm"><b>16</b></a> <a href="../wireframe_and_shading.htm"><b>17</b></a> </nobr><br><nobr><a name="bms_GI"></a><a name="subkey_GI"></a>given <a href="../check_free_faces.htm"><b>1</b></a> <a href="../chamfer.htm"><b>2</b></a> <a href="../building_by_blocks.htm"><b>3</b></a> <a href="../blocks_operations.htm"><b>4</b></a> <a href="../basic_geometrical_objects.htm"><b>5</b></a> <a href="../face.htm"><b>6</b></a> <a href="../explode_on_blocks.htm"><b>7</b></a> <a href="../explode.htm"><b>8</b></a> <a href="../cylinder.htm"><b>9</b></a> <a href="../complex_objects.htm"><b>10</b></a> <a href="../multi_rotation.htm"><b>11</b></a> <a href="../line.htm"><b>12</b></a> <a href="../glue_faces.htm"><b>13</b></a> <a href="../geometrical_objects.htm"><b>14</b></a> <a href="../fillet.htm"><b>15</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>16</b></a> <a href="../repairing_operations.htm"><b>17</b></a> <a href="../point.htm"><b>18</b></a> <a href="../offset_surface.htm"><b>19</b></a> <a href="../turus.htm"><b>20</b></a> <a href="../transformation_operations.htm"><b>21</b></a> <a href="../sketcher_tui.htm"><b>22</b></a> <a href="../shape_processing.htm"><b>23</b></a> </nobr><br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>gives</b></a> <br><nobr>giving <a href="../circle.htm"><b>1</b></a> <a href="../ellipse.htm"><b>2</b></a> <a href="../plane.htm"><b>3</b></a> <a href="../shape_processing.htm"><b>4</b></a> </nobr><br><nobr><a name="bms_GL"></a><a name="subkey_GL"></a>global <a href="../modify_the_location.htm"><b>1</b></a> <a href="../local_coordinate_system.htm"><b>2</b></a> <a href="../occ_viewer.htm"><b>3</b></a> </nobr><br><nobr>glue <a href="../blocks_operations.htm"><b>1</b></a> <a href="../measurement_tools.htm"><b>2</b></a> <a href="../glue_faces.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../partition.htm"><b>5</b></a> </nobr><br><nobr>glued <a href="../glue_faces.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><a href="../glue_faces.htm"><b>glues</b></a> <br><a name="bms_GO"></a><a name="subkey_GO"></a><a href="../occ_viewer.htm"><b>good</b></a> <br><nobr><a name="bms_GR"></a><a name="subkey_GR"></a>gravity <a href="../explode.htm"><b>1</b></a> <a href="../multi_rotation.htm"><b>2</b></a> <a href="../measurement_tools.htm"><b>3</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>4</b></a> </nobr><br><a href="../occ_viewer.htm"><b>greater</b></a> <br><nobr>group <a href="../groups.htm"><b>1</b></a> <a href="../propagate.htm"><b>2</b></a> <a href="../working_with_groups.htm"><b>3</b></a> </nobr><br><a href="../working_with_groups.htm"><b>group_n</b></a> <br><a href="../groups.htm"><b>group1</b></a> <br><nobr>groups <a href="../blocks_operations.htm"><b>1</b></a> <a href="../files/introduction_to_geom.htm"><b>2</b></a> <a href="../groups.htm"><b>3</b></a> <a href="../geometry.htm"><b>4</b></a> <a href="../propagate.htm"><b>5</b></a> <a href="../occ_viewer.htm"><b>6</b></a> <a href="../working_with_groups.htm"><b>7</b></a> </nobr><br><br><br></p><p class="ftsbody" align="center"><a href="whlstf5.htm" target="_self" title="previous search group"><b>&gt;&gt;</b></a>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstf5.htm b/doc/salome/gui/GEOM/whgdata/whlstf5.htm
deleted file mode 100755 (executable)
index 1691b48..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words List</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsbody" align="center"><a href="whlstf4.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
-<p class="ftsbody" >
-
-
-<a name="bm_H"></a><a name="subkey_HA"></a><a href="../working_with_groups.htm"><b>handling</b></a> <br><nobr>having <a href="../shell.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_HE"></a><a name="subkey_HE"></a>height <a href="../boolean_operations.htm"><b>1</b></a> <a href="../extrusion.htm"><b>2</b></a> <a href="../cylinder.htm"><b>3</b></a> <a href="../cone.htm"><b>4</b></a> <a href="../repairing_operations.htm"><b>5</b></a> <a href="../transformation_operations.htm"><b>6</b></a> </nobr><br><a href="../working_with_groups.htm"><b>here</b></a> <br><a href="../building_by_blocks.htm"><b>hexagonal</b></a> <br><nobr>hexahedral <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../multi_transformation.htm"><b>2</b></a> <a href="../newentity_blocks.htm"><b>3</b></a> </nobr><br><a href="../newentity_blocks.htm"><b>hexahedron</b></a> <br><nobr><a name="bms_HI"></a><a name="subkey_HI"></a>hide <a href="../occ_viewer.htm"><b>1</b></a> <a href="../viewing_geometrical_objects.htm"><b>2</b></a> </nobr><br><a href="../occ_viewer.htm"><b>hides</b></a> <br><a href="../viewing_geometrical_objects.htm"><b>hiding</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>highlight</b></a> <br><a href="../check_free_boundaries.htm"><b>highlights</b></a> <br><a name="bms_HO"></a><a name="subkey_HO"></a><a href="../wire.htm"><b>holding</b></a> <br><nobr>holes <a href="../repairing_operations.htm"><b>1</b></a> <a href="../suppress_holes.htm"><b>2</b></a> </nobr><br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>how</b></a> <br>
-<br><br>
-<nobr><a name="bm_I"></a><a name="subkey_I{"></a>i <a href="../complex_objects.htm"><b>1</b></a> <a href="../groups.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> <a href="../shape_processing.htm"><b>4</b></a> </nobr><br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>i11</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>i12</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>i13</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>i21</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>i22</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>i23</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>i31</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>i32</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>i33</b></a> <br><nobr><a name="bms_ID"></a><a name="subkey_ID"></a>id <a href="../color.htm"><b>1</b></a> <a href="../close_contour.htm"><b>2</b></a> <a href="../add_point_on_edge.htm"><b>3</b></a> <a href="../multi_transformation.htm"><b>4</b></a> <a href="../viewing_geometrical_objects.htm"><b>5</b></a> <a href="../transparency.htm"><b>6</b></a> <a href="../suppress_internal_wires.htm"><b>7</b></a> <a href="../suppress_holes.htm"><b>8</b></a> <a href="../suppress_faces.htm"><b>9</b></a> <a href="../working_with_groups.htm"><b>10</b></a> <a href="../wireframe_and_shading.htm"><b>11</b></a> </nobr><br><a href="../basic_geometrical_objects.htm"><b>id_arc</b></a> <br><a href="../basic_operations.htm"><b>id_archimede</b></a> <br><a href="../transformation_operations.htm"><b>id_axis</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_bezier</b></a> <br><nobr>id_box <a href="../blocks_operations.htm"><b>1</b></a> <a href="../basic_operations.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> <a href="../transformation_operations.htm"><b>4</b></a> </nobr><br><a href="../blocks_operations.htm"><b>id_box_tr1</b></a> <br><a href="../blocks_operations.htm"><b>id_box_tr2</b></a> <br><nobr>id_box1 <a href="../repairing_operations.htm"><b>1</b></a> <a href="../primitives.htm"><b>2</b></a> </nobr><br><nobr>id_box2 <a href="../repairing_operations.htm"><b>1</b></a> <a href="../primitives.htm"><b>2</b></a> </nobr><br><a href="../primitives.htm"><b>id_box3</b></a> <br><a href="../transformation_operations.htm"><b>id_chamfer_all</b></a> <br><a href="../transformation_operations.htm"><b>id_chamfer_e</b></a> <br><a href="../transformation_operations.htm"><b>id_chamfer_f</b></a> <br><a href="../transformation_operations.htm"><b>id_chamfer_f1</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_circle1</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_circle2</b></a> <br><a href="../boolean_operations.htm"><b>id_common</b></a> <br><nobr>id_compound <a href="../blocks_operations.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> </nobr><br><a href="../primitives.htm"><b>id_cone1</b></a> <br><a href="../primitives.htm"><b>id_cone2</b></a> <br><a href="../transformation_operations.htm"><b>id_cs1</b></a> <br><a href="../transformation_operations.htm"><b>id_cs2</b></a> <br><nobr>id_cut <a href="../boolean_operations.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><a href="../repairing_operations.htm"><b>id_cut_without_f_2</b></a> <br><nobr>id_cylinder <a href="../boolean_operations.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><a href="../repairing_operations.htm"><b>id_divide</b></a> <br><nobr>id_edge <a href="../complex_objects.htm"><b>1</b></a> <a href="../geometrical_objects.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> </nobr><br><a href="../building_by_blocks.htm"><b>id_edge1</b></a> <br><a href="../building_by_blocks.htm"><b>id_edge2</b></a> <br><a href="../building_by_blocks.htm"><b>id_edge3</b></a> <br><a href="../building_by_blocks.htm"><b>id_edge4</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_ellipse</b></a> <br><nobr>id_face <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../sketcher_tui.htm"><b>3</b></a> </nobr><br><a href="../repairing_operations.htm"><b>id_face_rot</b></a> <br><nobr>id_face1 <a href="../complex_objects.htm"><b>1</b></a> <a href="../geometrical_objects.htm"><b>2</b></a> </nobr><br><nobr>id_face2 <a href="../complex_objects.htm"><b>1</b></a> <a href="../geometrical_objects.htm"><b>2</b></a> </nobr><br><a href="../geometrical_objects.htm"><b>id_face3</b></a> <br><a href="../transformation_operations.htm"><b>id_fillet</b></a> <br><a href="../transformation_operations.htm"><b>id_filletall</b></a> <br><a href="../complex_objects.htm"><b>id_filling</b></a> <br><a href="../boolean_operations.htm"><b>id_fuse</b></a> <br><a href="../repairing_operations.htm"><b>id_glue</b></a> <br><a href="../groups.htm"><b>id_group1</b></a> <br><a href="../repairing_operations.htm"><b>id_importbrep</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_interpol</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_line1</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_line2</b></a> <br><a href="../blocks_operations.htm"><b>id_make_block_explode</b></a> <br><a href="../transformation_operations.htm"><b>id_mirror1</b></a> <br><a href="../transformation_operations.htm"><b>id_mirror2</b></a> <br><a href="../transformation_operations.htm"><b>id_mirror3</b></a> <br><a href="../transformation_operations.htm"><b>id_offset</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_p_on_arc</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_p0</b></a> <br><nobr>id_p1 <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> </nobr><br><a href="../basic_geometrical_objects.htm"><b>id_p100</b></a> <br><nobr>id_p2 <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> </nobr><br><nobr>id_p3 <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> </nobr><br><nobr>id_p4 <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../transformation_operations.htm"><b>3</b></a> </nobr><br><a href="../basic_operations.htm"><b>id_partition1</b></a> <br><a href="../basic_operations.htm"><b>id_partition2</b></a> <br><a href="../basic_operations.htm"><b>id_partition3</b></a> <br><a href="../complex_objects.htm"><b>id_pipe</b></a> <br><nobr>id_plane <a href="../basic_operations.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><a href="../basic_geometrical_objects.htm"><b>id_plane1</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_plane2</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_plane3</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_polyline</b></a> <br><a href="../transformation_operations.htm"><b>id_position</b></a> <br><a href="../transformation_operations.htm"><b>id_prism</b></a> <br><a href="../complex_objects.htm"><b>id_prism1</b></a> <br><a href="../complex_objects.htm"><b>id_prism2</b></a> <br><a href="../repairing_operations.htm"><b>id_ps</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_px</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_py</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_pz</b></a> <br><a href="../building_by_blocks.htm"><b>id_qface1</b></a> <br><a href="../building_by_blocks.htm"><b>id_qface2</b></a> <br><a href="../building_by_blocks.htm"><b>id_qface3</b></a> <br><a href="../repairing_operations.htm"><b>id_result</b></a> <br><a href="../complex_objects.htm"><b>id_revolution</b></a> <br><a href="../transformation_operations.htm"><b>id_rot1d</b></a> <br><a href="../transformation_operations.htm"><b>id_rot2d</b></a> <br><a href="../transformation_operations.htm"><b>id_rotation</b></a> <br><a href="../transformation_operations.htm"><b>id_scale</b></a> <br><a href="../boolean_operations.htm"><b>id_section</b></a> <br><a href="../repairing_operations.htm"><b>id_sewing</b></a> <br><a href="../repairing_operations.htm"><b>id_shape</b></a> <br><a href="../geometrical_objects.htm"><b>id_shell</b></a> <br><a href="../sketcher_tui.htm"><b>id_sketcher1</b></a> <br><a href="../sketcher_tui.htm"><b>id_sketcher2</b></a> <br><a href="../geometrical_objects.htm"><b>id_solid</b></a> <br><a href="../building_by_blocks.htm"><b>id_solid1</b></a> <br><a href="../building_by_blocks.htm"><b>id_solid2</b></a> <br><a href="../boolean_operations.htm"><b>id_sphere</b></a> <br><a href="../primitives.htm"><b>id_sphere1</b></a> <br><a href="../primitives.htm"><b>id_sphere2</b></a> <br><a href="../primitives.htm"><b>id_sphere3</b></a> <br><a href="../primitives.htm"><b>id_torus1</b></a> <br><a href="../primitives.htm"><b>id_torus2</b></a> <br><a href="../transformation_operations.htm"><b>id_tr1d</b></a> <br><a href="../transformation_operations.htm"><b>id_tr2d</b></a> <br><a href="../transformation_operations.htm"><b>id_translation1</b></a> <br><a href="../transformation_operations.htm"><b>id_translation2</b></a> <br><a href="../transformation_operations.htm"><b>id_translation3</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_vector</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_vector1</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_vector2</b></a> <br><a href="../complex_objects.htm"><b>id_vector3</b></a> <br><a href="../transformation_operations.htm"><b>id_vr</b></a> <br><a href="../basic_geometrical_objects.htm"><b>id_vxy</b></a> <br><nobr>id_wire <a href="../complex_objects.htm"><b>1</b></a> <a href="../geometrical_objects.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> </nobr><br><a href="../repairing_operations.htm"><b>id_wire_close</b></a> <br><nobr>idlist <a href="../repairing_operations.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><a href="../transformation_operations.htm"><b>idlist_e</b></a> <br><a href="../transformation_operations.htm"><b>idlist_f</b></a> <br><nobr>ids <a href="../check_free_faces.htm"><b>1</b></a> <a href="../explode.htm"><b>2</b></a> <a href="../multi_transformation.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> <a href="../working_with_groups.htm"><b>6</b></a> </nobr><br><nobr><a name="bms_IF"></a><a name="subkey_IF"></a>if <a href="../close_contour.htm"><b>1</b></a> <a href="../check_free_boundaries.htm"><b>2</b></a> <a href="../add_point_on_edge.htm"><b>3</b></a> <a href="../face.htm"><b>4</b></a> <a href="../cone.htm"><b>5</b></a> <a href="../measurement_tools.htm"><b>6</b></a> <a href="../groups.htm"><b>7</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>8</b></a> <a href="../repairing_operations.htm"><b>9</b></a> <a href="../partition.htm"><b>10</b></a> <a href="../occ_viewer.htm"><b>11</b></a> <a href="../suppress_internal_wires.htm"><b>12</b></a> <a href="../suppress_holes.htm"><b>13</b></a> <a href="../shape_processing.htm"><b>14</b></a> </nobr><br><nobr><a name="bms_IG"></a><a name="subkey_IG"></a>iges <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../files/introduction_to_geom.htm"><b>2</b></a> <a href="../geometry.htm"><b>3</b></a> </nobr><br><nobr><a name="bms_IM"></a><a name="subkey_IM"></a>image <a href="../mirror_image.htm"><b>1</b></a> <a href="../occ_viewer.htm"><b>2</b></a> <a href="../viewing_geometrical_objects.htm"><b>3</b></a> <a href="../transformation_operations.htm"><b>4</b></a> </nobr><br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>implemented</b></a> <br><a href="../shape_processing.htm"><b>implies</b></a> <br><a href="../shape_processing.htm"><b>imply</b></a> <br><nobr>import <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../building_by_blocks.htm"><b>2</b></a> <a href="../boolean_operations.htm"><b>3</b></a> <a href="../blocks_operations.htm"><b>4</b></a> <a href="../basic_operations.htm"><b>5</b></a> <a href="../basic_geometrical_objects.htm"><b>6</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>7</b></a> <a href="../files/introduction_to_geom.htm"><b>8</b></a> <a href="../complex_objects.htm"><b>9</b></a> <a href="../measurement_tools.htm"><b>10</b></a> <a href="../groups.htm"><b>11</b></a> <a href="../geometry.htm"><b>12</b></a> <a href="../geometrical_objects.htm"><b>13</b></a> <a href="../repairing_operations.htm"><b>14</b></a> <a href="../primitives.htm"><b>15</b></a> <a href="../transformation_operations.htm"><b>16</b></a> <a href="../sketcher_tui.htm"><b>17</b></a> </nobr><br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>importation</b></a> <br><a href="../repairing_operations.htm"><b>importbrep</b></a> <br><nobr>importcomponentgui <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../building_by_blocks.htm"><b>2</b></a> <a href="../boolean_operations.htm"><b>3</b></a> <a href="../blocks_operations.htm"><b>4</b></a> <a href="../basic_operations.htm"><b>5</b></a> <a href="../basic_geometrical_objects.htm"><b>6</b></a> <a href="../complex_objects.htm"><b>7</b></a> <a href="../measurement_tools.htm"><b>8</b></a> <a href="../groups.htm"><b>9</b></a> <a href="../geometrical_objects.htm"><b>10</b></a> <a href="../repairing_operations.htm"><b>11</b></a> <a href="../primitives.htm"><b>12</b></a> <a href="../transformation_operations.htm"><b>13</b></a> <a href="../sketcher_tui.htm"><b>14</b></a> </nobr><br><nobr>imported <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>importing</b></a> <br><a href="../face.htm"><b>impossible</b></a> <br><a href="../blocks_operations.htm"><b>improve</b></a> <br><br><br></p><p class="ftsbody" align="center"><a href="whlstf6.htm" target="_self" title="previous search group"><b>&gt;&gt;</b></a>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstf6.htm b/doc/salome/gui/GEOM/whgdata/whlstf6.htm
deleted file mode 100755 (executable)
index 2ae9885..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<html>
-<head>
-<title>Search Words List</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsbody" align="center"><a href="whlstf5.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
-<p class="ftsbody" >
-<a name="bms_IN"></a><a name="subkey_IN"></a><a href="../groups.htm"><b>included</b></a> <br><a href="../close_contour.htm"><b>increased</b></a> <br><a href="../common.htm"><b>independent</b></a> <br><a href="../explode.htm"><b>index</b></a> <br><a href="../working_with_groups.htm"><b>indexes</b></a> <br><a href="../multi_translation.htm"><b>indicate</b></a> <br><a href="../point.htm"><b>indicating</b></a> <br><nobr>indices <a href="../chamfer.htm"><b>1</b></a> <a href="../explode.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> <a href="../partition.htm"><b>4</b></a> </nobr><br><nobr>inertia <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>informs</b></a> <br><nobr>initial <a href="../multi_rotation.htm"><b>1</b></a> <a href="../modify_the_location.htm"><b>2</b></a> <a href="../mirror_image.htm"><b>3</b></a> <a href="../scale_transform.htm"><b>4</b></a> <a href="../rotation.htm"><b>5</b></a> <a href="../translation.htm"><b>6</b></a> </nobr><br><a href="../offset_surface.htm"><b>inner</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>inquired</b></a> <br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>ins</b></a> <br><a href="../close_contour.htm"><b>inserted</b></a> <br><a href="../partition.htm"><b>inside</b></a> <br><a href="../cone.htm"><b>instead</b></a> <br><a href="../multi_transformation.htm"><b>integer</b></a> <br><nobr>integers <a href="../explode_on_blocks.htm"><b>1</b></a> <a href="../multi_transformation.htm"><b>2</b></a> </nobr><br><a href="../explode_on_blocks.htm"><b>interactively</b></a> <br><a href="../newentity_blocks.htm"><b>intermediate</b></a> <br><nobr>internal <a href="../repairing_operations.htm"><b>1</b></a> <a href="../suppress_internal_wires.htm"><b>2</b></a> </nobr><br><a href="../basic_geometrical_objects.htm"><b>interpol</b></a> <br><a href="../curve.htm"><b>interpolated</b></a> <br><a href="../partition.htm"><b>intersect</b></a> <br><a href="../partition.htm"><b>intersected</b></a> <br><a href="../partition.htm"><b>intersection</b></a> <br><nobr>introduction <a href="../files/introduction_to_geom.htm"><b>1</b></a> <a href="../geometry.htm"><b>2</b></a> <a href="../newentity_blocks.htm"><b>3</b></a> </nobr><br><nobr>invalid <a href="../measurement_tools.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../shape_processing.htm"><b>3</b></a> </nobr><br><a href="../occ_viewer.htm"><b>invert</b></a> <br><a href="../transparency.htm"><b>invisible</b></a> <br><a name="bms_IS"></a><a name="subkey_IS"></a><a href="../add_point_on_edge.htm"><b>isbyparameter</b></a> <br><a href="../close_contour.htm"><b>iscommonvertex</b></a> <br><nobr>isolines <a href="../isos.htm"><b>1</b></a> <a href="../viewing_geometrical_objects.htm"><b>2</b></a> </nobr><br><a href="../occ_viewer.htm"><b>isometric</b></a> <br><a href="../viewing_geometrical_objects.htm"><b>isos</b></a> <br><a href="../geometrical_objects.htm"><b>isplanarface</b></a> <br><nobr>isplanarwanted <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../face.htm"><b>2</b></a> <a href="../complex_objects.htm"><b>3</b></a> <a href="../sketcher_tui.htm"><b>4</b></a> </nobr><br><a href="../repairing_operations.htm"><b>issuccess</b></a> <br><nobr>isvalid <a href="../measurement_tools.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><a name="bms_IT"></a><a name="subkey_IT"></a><a href="../filling.htm"><b>iterations</b></a> <br><a href="../close_contour.htm"><b>itself</b></a> <br><nobr><a name="bms_IX"></a><a name="subkey_IX"></a>ix <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_IY"></a><a name="subkey_IY"></a>iy <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_IZ"></a><a name="subkey_IZ"></a>iz <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br>
-<br><br>
-<a name="bm_J"></a><a name="subkey_JO"></a><a href="../shape_processing.htm"><b>joined</b></a> <br><nobr><a name="bms_JP"></a><a name="subkey_JP"></a>jpeg <a href="../occ_viewer.htm"><b>1</b></a> <a href="../viewing_geometrical_objects.htm"><b>2</b></a> </nobr><br><nobr>jpg <a href="../occ_viewer.htm"><b>1</b></a> <a href="../viewing_geometrical_objects.htm"><b>2</b></a> </nobr><br><a name="bms_JU"></a><a name="subkey_JU"></a><a href="../shape_processing.htm"><b>junction</b></a> <br><a href="../newentity_blocks.htm"><b>just</b></a> <br>
-<br><br>
-<a name="bm_K"></a><a name="subkey_K{"></a><a href="../shape_processing.htm"><b>k</b></a> <br><nobr><a name="bms_KE"></a><a name="subkey_KE"></a>keep <a href="../modify_the_location.htm"><b>1</b></a> <a href="../mirror_image.htm"><b>2</b></a> <a href="../rotation.htm"><b>3</b></a> <a href="../translation.htm"><b>4</b></a> <a href="../working_with_groups.htm"><b>5</b></a> </nobr><br><a href="../working_with_groups.htm"><b>keyboard</b></a> <br><a name="bms_KO"></a><a name="subkey_KO"></a><a href="../repairing_operations.htm"><b>ko</b></a> <br>
-<br><br>
-<nobr><a name="bm_L"></a><a name="subkey_L{"></a>l <a href="../geometrical_objects.htm"><b>1</b></a> <a href="../sketcher_tui.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_LA"></a><a name="subkey_LA"></a>last <a href="../edge.htm"><b>1</b></a> <a href="../local_coordinate_system.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_LC"></a><a name="subkey_LC"></a>lcs <a href="../modify_the_location.htm"><b>1</b></a> <a href="../local_coordinate_system.htm"><b>2</b></a> </nobr><br><a href="../modify_the_location.htm"><b>lcs1</b></a> <br><a href="../modify_the_location.htm"><b>lcs2</b></a> <br><a name="bms_LE"></a><a name="subkey_LE"></a><a href="../curve.htm"><b>least</b></a> <br><a href="../working_with_groups.htm"><b>leaves</b></a> <br><nobr>left <a href="../modify_the_location.htm"><b>1</b></a> <a href="../occ_viewer.htm"><b>2</b></a> <a href="../viewing_geometrical_objects.htm"><b>3</b></a> </nobr><br><a href="../repairing_operations.htm"><b>len</b></a> <br><nobr>length <a href="../add_point_on_edge.htm"><b>1</b></a> <a href="../measurement_tools.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> <a href="../sketcher.htm"><b>4</b></a> </nobr><br><nobr><a name="bms_LI"></a><a name="subkey_LI"></a>lie <a href="../circle.htm"><b>1</b></a> <a href="../arc.htm"><b>2</b></a> </nobr><br><a href="../partition.htm"><b>limit</b></a> <br><nobr>line <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../archimede.htm"><b>2</b></a> <a href="../line.htm"><b>3</b></a> <a href="../sketcher.htm"><b>4</b></a> </nobr><br><a href="../basic_geometrical_objects.htm"><b>line1</b></a> <br><a href="../basic_geometrical_objects.htm"><b>line2</b></a> <br><a href="../sketcher.htm"><b>linear</b></a> <br><nobr>lines <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../working_with_groups.htm"><b>2</b></a> </nobr><br><nobr>list <a href="../close_contour.htm"><b>1</b></a> <a href="../check_free_faces.htm"><b>2</b></a> <a href="../check_free_boundaries.htm"><b>3</b></a> <a href="../chamfer.htm"><b>4</b></a> <a href="../basic_geometrical_objects.htm"><b>5</b></a> <a href="../face.htm"><b>6</b></a> <a href="../explode.htm"><b>7</b></a> <a href="../curve.htm"><b>8</b></a> <a href="../compound.htm"><b>9</b></a> <a href="../groups.htm"><b>10</b></a> <a href="../filling.htm"><b>11</b></a> <a href="../sewing.htm"><b>12</b></a> <a href="../repairing_operations.htm"><b>13</b></a> <a href="../propagate.htm"><b>14</b></a> <a href="../partition.htm"><b>15</b></a> <a href="../wire.htm"><b>16</b></a> <a href="../transformation_operations.htm"><b>17</b></a> <a href="../suppress_internal_wires.htm"><b>18</b></a> <a href="../suppress_holes.htm"><b>19</b></a> <a href="../suppress_faces.htm"><b>20</b></a> <a href="../solid.htm"><b>21</b></a> <a href="../sketcher.htm"><b>22</b></a> <a href="../shell.htm"><b>23</b></a> <a href="../shape_processing.htm"><b>24</b></a> <a href="../working_with_groups.htm"><b>25</b></a> </nobr><br><a href="../blocks_operations.htm"><b>listchains</b></a> <br><a href="../chamfer.htm"><b>listoffaceid</b></a> <br><a href="../suppress_faces.htm"><b>listofgeomshapes</b></a> <br><a href="../suppress_faces.htm"><b>listofid</b></a> <br><a href="../explode.htm"><b>listofind</b></a> <br><a href="../partition.htm"><b>listofkeepinside</b></a> <br><a href="../partition.htm"><b>listofmaterials</b></a> <br><a href="../partition.htm"><b>listofremoveinside</b></a> <br><nobr>listofshape <a href="../curve.htm"><b>1</b></a> <a href="../compound.htm"><b>2</b></a> <a href="../sewing.htm"><b>3</b></a> <a href="../wire.htm"><b>4</b></a> <a href="../solid.htm"><b>5</b></a> <a href="../shell.htm"><b>6</b></a> </nobr><br><nobr>listofshapes <a href="../curve.htm"><b>1</b></a> <a href="../partition.htm"><b>2</b></a> </nobr><br><a href="../partition.htm"><b>listoftools</b></a> <br><a href="../suppress_holes.htm"><b>listofwireid</b></a> <br><a href="../fillet.htm"><b>listshapes</b></a> <br><a name="bms_LL"></a><a name="subkey_LL"></a><a href="../occ_viewer.htm"><b>ll</b></a> <br><nobr><a name="bms_LO"></a><a name="subkey_LO"></a>local <a href="../modify_the_location.htm"><b>1</b></a> <a href="../local_coordinate_system.htm"><b>2</b></a> <a href="../offset_surface.htm"><b>3</b></a> <a href="../transformation_operations.htm"><b>4</b></a> <a href="../sketcher.htm"><b>5</b></a> </nobr><br><a href="../modify_the_location.htm"><b>localcs1</b></a> <br><a href="../modify_the_location.htm"><b>localcs2</b></a> <br><a href="../blocks_operations.htm"><b>localop</b></a> <br><a href="../point.htm"><b>located</b></a> <br><nobr>location <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../modify_the_location.htm"><b>2</b></a> <a href="../local_coordinate_system.htm"><b>3</b></a> <a href="../transformation_operations.htm"><b>4</b></a> </nobr><br><a href="../occ_viewer.htm"><b>locking</b></a> <br><a name="bms_LS"></a><a name="subkey_LS"></a><a href="../modify_the_location.htm"><b>lsc</b></a> <br><nobr><a name="bms_LY"></a><a name="subkey_LY"></a>lying <a href="../suppress_internal_wires.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> </nobr><br>
-<br><br>
-<a name="bm_M"></a><a name="subkey_MA"></a><a href="../shape_processing.htm"><b>magnitude</b></a> <br><nobr>main <a href="../close_contour.htm"><b>1</b></a> <a href="../circle.htm"><b>2</b></a> <a href="../check_free_faces.htm"><b>3</b></a> <a href="../check_free_boundaries.htm"><b>4</b></a> <a href="../chamfer.htm"><b>5</b></a> <a href="../box.htm"><b>6</b></a> <a href="../archimede.htm"><b>7</b></a> <a href="../arc.htm"><b>8</b></a> <a href="../add_point_on_edge.htm"><b>9</b></a> <a href="../face.htm"><b>10</b></a> <a href="../extrusion.htm"><b>11</b></a> <a href="../explode_on_blocks.htm"><b>12</b></a> <a href="../explode.htm"><b>13</b></a> <a href="../ellipse.htm"><b>14</b></a> <a href="../edge.htm"><b>15</b></a> <a href="../cylinder.htm"><b>16</b></a> <a href="../cut.htm"><b>17</b></a> <a href="../curve.htm"><b>18</b></a> <a href="../cone.htm"><b>19</b></a> <a href="../compound.htm"><b>20</b></a> <a href="../common.htm"><b>21</b></a> <a href="../multi_transformation.htm"><b>22</b></a> <a href="../multi_rotation.htm"><b>23</b></a> <a href="../modify_the_location.htm"><b>24</b></a> <a href="../mirror_image.htm"><b>25</b></a> <a href="../measurement_tools.htm"><b>26</b></a> <a href="../local_coordinate_system.htm"><b>27</b></a> <a href="../line.htm"><b>28</b></a> <a href="../glue_faces.htm"><b>29</b></a> <a href="../fuse.htm"><b>30</b></a> <a href="../filling.htm"><b>31</b></a> <a href="../fillet.htm"><b>32</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>33</b></a> <a href="../sewing.htm"><b>34</b></a> <a href="../section.htm"><b>35</b></a> <a href="../scale_transform.htm"><b>36</b></a> <a href="../rotation.htm"><b>37</b></a> <a href="../revolution.htm"><b>38</b></a> <a href="../propagate.htm"><b>39</b></a> <a href="../point.htm"><b>40</b></a> <a href="../plane.htm"><b>41</b></a> <a href="../pipe_creation.htm"><b>42</b></a> <a href="../partition.htm"><b>43</b></a> <a href="../offset_surface.htm"><b>44</b></a> <a href="../newentity_blocks.htm"><b>45</b></a> <a href="../multi_translation.htm"><b>46</b></a> <a href="../wire.htm"><b>47</b></a> <a href="../vector.htm"><b>48</b></a> <a href="../turus.htm"><b>49</b></a> <a href="../translation.htm"><b>50</b></a> <a href="../suppress_internal_wires.htm"><b>51</b></a> <a href="../suppress_holes.htm"><b>52</b></a> <a href="../suppress_faces.htm"><b>53</b></a> <a href="../sphere.htm"><b>54</b></a> <a href="../solid.htm"><b>55</b></a> <a href="../sketcher.htm"><b>56</b></a> <a href="../shell.htm"><b>57</b></a> <a href="../shape_processing.htm"><b>58</b></a> <a href="../working_with_groups.htm"><b>59</b></a> <a href="../working_plane.htm"><b>60</b></a> </nobr><br><a href="../working_with_groups.htm"><b>mainshape</b></a> <br><nobr>major <a href="../ellipse.htm"><b>1</b></a> <a href="../turus.htm"><b>2</b></a> </nobr><br><nobr>make <a href="../chamfer.htm"><b>1</b></a> <a href="../boolean_operations.htm"><b>2</b></a> <a href="../blocks_operations.htm"><b>3</b></a> <a href="../measurement_tools.htm"><b>4</b></a> <a href="../repairing_operations.htm"><b>5</b></a> <a href="../transformation_operations.htm"><b>6</b></a> </nobr><br><a href="../blocks_operations.htm"><b>make_block_explode</b></a> <br><nobr>makearc <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../arc.htm"><b>2</b></a> <a href="../complex_objects.htm"><b>3</b></a> <a href="../geometrical_objects.htm"><b>4</b></a> <a href="../repairing_operations.htm"><b>5</b></a> <a href="../transformation_operations.htm"><b>6</b></a> <a href="../sketcher_tui.htm"><b>7</b></a> </nobr><br><nobr>makebezier <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../curve.htm"><b>2</b></a> </nobr><br><nobr>makeblockexplode <a href="../blocks_operations.htm"><b>1</b></a> <a href="../explode_on_blocks.htm"><b>2</b></a> </nobr><br><nobr>makeboolean <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>2</b></a> </nobr><br><nobr>makebox <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../box.htm"><b>2</b></a> <a href="../measurement_tools.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../primitives.htm"><b>5</b></a> <a href="../transformation_operations.htm"><b>6</b></a> </nobr><br><nobr>makeboxdxdydz <a href="../box.htm"><b>1</b></a> <a href="../blocks_operations.htm"><b>2</b></a> <a href="../measurement_tools.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../primitives.htm"><b>5</b></a> <a href="../transformation_operations.htm"><b>6</b></a> </nobr><br><nobr>makeboxtwopnt <a href="../box.htm"><b>1</b></a> <a href="../basic_operations.htm"><b>2</b></a> <a href="../groups.htm"><b>3</b></a> <a href="../primitives.htm"><b>4</b></a> </nobr><br><nobr>makecdg <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><a href="../transformation_operations.htm"><b>makechamfer</b></a> <br><nobr>makechamferall <a href="../chamfer.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>makechamferedge <a href="../chamfer.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>makechamferfaces <a href="../chamfer.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>makecircle <a href="../circle.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> </nobr><br><nobr>makecirclethreepnt <a href="../circle.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> </nobr><br><nobr>makecommon <a href="../boolean_operations.htm"><b>1</b></a> <a href="../common.htm"><b>2</b></a> </nobr><br><nobr>makecompound <a href="../blocks_operations.htm"><b>1</b></a> <a href="../compound.htm"><b>2</b></a> <a href="../complex_objects.htm"><b>3</b></a> <a href="../measurement_tools.htm"><b>4</b></a> <a href="../repairing_operations.htm"><b>5</b></a> </nobr><br><nobr>makecone <a href="../cone.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../primitives.htm"><b>3</b></a> </nobr><br><nobr>makeconer1r2h <a href="../cone.htm"><b>1</b></a> <a href="../primitives.htm"><b>2</b></a> </nobr><br><nobr>makecut <a href="../boolean_operations.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><nobr>makecylinder <a href="../boolean_operations.htm"><b>1</b></a> <a href="../cylinder.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> <a href="../transformation_operations.htm"><b>4</b></a> </nobr><br><a href="../cylinder.htm"><b>makecylinderrh</b></a> <br><nobr>makeedge <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../edge.htm"><b>2</b></a> <a href="../complex_objects.htm"><b>3</b></a> <a href="../geometrical_objects.htm"><b>4</b></a> <a href="../repairing_operations.htm"><b>5</b></a> </nobr><br><nobr>makeellipse <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../ellipse.htm"><b>2</b></a> </nobr><br><nobr>makeface <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../face.htm"><b>2</b></a> <a href="../complex_objects.htm"><b>3</b></a> <a href="../geometrical_objects.htm"><b>4</b></a> <a href="../repairing_operations.htm"><b>5</b></a> <a href="../transformation_operations.htm"><b>6</b></a> <a href="../sketcher_tui.htm"><b>7</b></a> </nobr><br><nobr>makefaces <a href="../face.htm"><b>1</b></a> <a href="../geometrical_objects.htm"><b>2</b></a> </nobr><br><nobr>makefacewires <a href="../face.htm"><b>1</b></a> <a href="../geometrical_objects.htm"><b>2</b></a> </nobr><br><nobr>makefillet <a href="../fillet.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>makefilletall <a href="../fillet.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>makefilling <a href="../complex_objects.htm"><b>1</b></a> <a href="../filling.htm"><b>2</b></a> </nobr><br><nobr>makefuse <a href="../boolean_operations.htm"><b>1</b></a> <a href="../fuse.htm"><b>2</b></a> </nobr><br><nobr>makegluefaces <a href="../measurement_tools.htm"><b>1</b></a> <a href="../glue_faces.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> </nobr><br><nobr>makehalfpartition <a href="../basic_operations.htm"><b>1</b></a> <a href="../partition.htm"><b>2</b></a> </nobr><br><nobr>makehexa <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../newentity_blocks.htm"><b>2</b></a> </nobr><br><nobr>makehexa2faces <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../newentity_blocks.htm"><b>2</b></a> </nobr><br><nobr>makeinterpol <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../curve.htm"><b>2</b></a> </nobr><br><nobr>makeline <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../line.htm"><b>2</b></a> </nobr><br><nobr>makelinetwopnt <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../line.htm"><b>2</b></a> </nobr><br><nobr>makemarker <a href="../local_coordinate_system.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>makemirrorbyaxis <a href="../mirror_image.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>makemirrorbyplane <a href="../mirror_image.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>makemirrorbypoint <a href="../mirror_image.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><a href="../multi_rotation.htm"><b>makemultirotation1d</b></a> <br><a href="../multi_rotation.htm"><b>makemultirotation2d</b></a> <br><nobr>makemultitransformation1d <a href="../blocks_operations.htm"><b>1</b></a> <a href="../multi_transformation.htm"><b>2</b></a> </nobr><br><nobr>makemultitransformation2d <a href="../blocks_operations.htm"><b>1</b></a> <a href="../multi_transformation.htm"><b>2</b></a> </nobr><br><nobr>makemultitranslation1d <a href="../multi_translation.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>makemultitranslation2d <a href="../multi_translation.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>makeoffset <a href="../offset_surface.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>makepartition <a href="../basic_operations.htm"><b>1</b></a> <a href="../partition.htm"><b>2</b></a> </nobr><br><nobr>makepipe <a href="../complex_objects.htm"><b>1</b></a> <a href="../pipe_creation.htm"><b>2</b></a> </nobr><br><nobr>makeplane <a href="../basic_operations.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../plane.htm"><b>3</b></a> </nobr><br><nobr>makeplaneface <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../plane.htm"><b>2</b></a> </nobr><br><nobr>makeplanethreepnt <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../plane.htm"><b>2</b></a> <a href="../transformation_operations.htm"><b>3</b></a> </nobr><br><nobr>makepolyline <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../curve.htm"><b>2</b></a> </nobr><br><nobr>makeposition <a href="../modify_the_location.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>makeprism <a href="../extrusion.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> <a href="../geometrical_objects.htm"><b>3</b></a> </nobr><br><nobr>makeprismvech <a href="../extrusion.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> <a href="../transformation_operations.htm"><b>4</b></a> </nobr><br><nobr>makequad <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../newentity_blocks.htm"><b>2</b></a> </nobr><br><nobr>makequad2edges <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../newentity_blocks.htm"><b>2</b></a> </nobr><br><nobr>makequad4vertices <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../newentity_blocks.htm"><b>2</b></a> </nobr><br><nobr>makerevolution <a href="../complex_objects.htm"><b>1</b></a> <a href="../revolution.htm"><b>2</b></a> </nobr><br><nobr>makerotation <a href="../rotation.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../transformation_operations.htm"><b>3</b></a> </nobr><br><nobr>makes <a href="../multi_transformation.htm"><b>1</b></a> <a href="../partition.htm"><b>2</b></a> <a href="../multi_translation.htm"><b>3</b></a> <a href="../translation.htm"><b>4</b></a> <a href="../working_with_groups.htm"><b>5</b></a> </nobr><br><nobr>makescaletransform <a href="../scale_transform.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>makesection <a href="../boolean_operations.htm"><b>1</b></a> <a href="../section.htm"><b>2</b></a> </nobr><br><nobr>makesewing <a href="../sewing.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><nobr>makeshell <a href="../geometrical_objects.htm"><b>1</b></a> <a href="../shell.htm"><b>2</b></a> </nobr><br><nobr>makesketcher <a href="../geometrical_objects.htm"><b>1</b></a> <a href="../sketcher_tui.htm"><b>2</b></a> <a href="../sketcher.htm"><b>3</b></a> </nobr><br><a href="../sketcher_tui.htm"><b>makesketcheronplane</b></a> <br><nobr>makesolid <a href="../geometrical_objects.htm"><b>1</b></a> <a href="../solid.htm"><b>2</b></a> </nobr><br><nobr>makesphere <a href="../changing_display_parameters.htm"><b>1</b></a> <a href="../primitives.htm"><b>2</b></a> <a href="../sphere.htm"><b>3</b></a> </nobr><br><a href="../primitives.htm"><b>makespherepntr</b></a> <br><nobr>makespherer <a href="../boolean_operations.htm"><b>1</b></a> <a href="../blocks_operations.htm"><b>2</b></a> <a href="../primitives.htm"><b>3</b></a> <a href="../sphere.htm"><b>4</b></a> </nobr><br><nobr>maketorus <a href="../primitives.htm"><b>1</b></a> <a href="../turus.htm"><b>2</b></a> </nobr><br><nobr>maketorusrr <a href="../primitives.htm"><b>1</b></a> <a href="../turus.htm"><b>2</b></a> </nobr><br><nobr>maketranslation <a href="../complex_objects.htm"><b>1</b></a> <a href="../translation.htm"><b>2</b></a> <a href="../transformation_operations.htm"><b>3</b></a> </nobr><br><nobr>maketranslationtwopoints <a href="../translation.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>maketranslationvector <a href="../translation.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>makevector <a href="../boolean_operations.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../complex_objects.htm"><b>3</b></a> <a href="../geometrical_objects.htm"><b>4</b></a> <a href="../repairing_operations.htm"><b>5</b></a> <a href="../primitives.htm"><b>6</b></a> <a href="../vector.htm"><b>7</b></a> <a href="../transformation_operations.htm"><b>8</b></a> <a href="../sketcher_tui.htm"><b>9</b></a> </nobr><br><nobr>makevectordxdydz <a href="../basic_operations.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../complex_objects.htm"><b>3</b></a> <a href="../vector.htm"><b>4</b></a> </nobr><br><nobr>makevertex <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../boolean_operations.htm"><b>2</b></a> <a href="../blocks_operations.htm"><b>3</b></a> <a href="../basic_operations.htm"><b>4</b></a> <a href="../basic_geometrical_objects.htm"><b>5</b></a> <a href="../complex_objects.htm"><b>6</b></a> <a href="../measurement_tools.htm"><b>7</b></a> <a href="../groups.htm"><b>8</b></a> <a href="../geometrical_objects.htm"><b>9</b></a> <a href="../repairing_operations.htm"><b>10</b></a> <a href="../primitives.htm"><b>11</b></a> <a href="../point.htm"><b>12</b></a> <a href="../transformation_operations.htm"><b>13</b></a> <a href="../sketcher_tui.htm"><b>14</b></a> </nobr><br><nobr>makevertexoncurve <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../point.htm"><b>2</b></a> </nobr><br><nobr>makevertexwithref <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../point.htm"><b>2</b></a> </nobr><br><nobr>makewire <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> <a href="../geometrical_objects.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../wire.htm"><b>5</b></a> <a href="../transformation_operations.htm"><b>6</b></a> <a href="../sketcher_tui.htm"><b>7</b></a> </nobr><br><a href="../working_with_groups.htm"><b>manually</b></a> <br><a href="../occ_viewer.htm"><b>marked</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>mass</b></a> <br><a href="../measurement_tools.htm"><b>masses</b></a> <br><a href="../partition.htm"><b>materials</b></a> <br><nobr>math <a href="../measurement_tools.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../transformation_operations.htm"><b>3</b></a> </nobr><br><nobr>matrix <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr>max <a href="../explode_on_blocks.htm"><b>1</b></a> <a href="../measurement_tools.htm"><b>2</b></a> <a href="../filling.htm"><b>3</b></a> <a href="../shape_processing.htm"><b>4</b></a> </nobr><br><a href="../complex_objects.htm"><b>maxdeg</b></a> <br><a href="../filling.htm"><b>maxdegree</b></a> <br><nobr>maximal <a href="../explode_on_blocks.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../shape_processing.htm"><b>3</b></a> </nobr><br><nobr>maximum <a href="../explode_on_blocks.htm"><b>1</b></a> <a href="../glue_faces.htm"><b>2</b></a> <a href="../filling.htm"><b>3</b></a> <a href="../shape_processing.htm"><b>4</b></a> </nobr><br><a href="../explode_on_blocks.htm"><b>maxnbfaces</b></a> <br><a href="../shape_processing.htm"><b>maxtolerance</b></a> <br><a href="../shape_processing.htm"><b>maxtolerance3d</b></a> <br><br><br></p><p class="ftsbody" align="center"><a href="whlstf7.htm" target="_self" title="previous search group"><b>&gt;&gt;</b></a>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstf7.htm b/doc/salome/gui/GEOM/whgdata/whlstf7.htm
deleted file mode 100755 (executable)
index ae1ba02..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words List</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsbody" align="center"><a href="whlstf6.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
-<p class="ftsbody" >
-<a name="bms_ME"></a><a name="subkey_ME"></a><a href="../offset_surface.htm"><b>meaning</b></a> <br><nobr>means <a href="../point.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> <a href="../wireframe_and_shading.htm"><b>3</b></a> </nobr><br><nobr>measurement <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>measures</b></a> <br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>mechanisms</b></a> <br><a href="../shape_processing.htm"><b>meet</b></a> <br><a href="../occ_viewer.htm"><b>memorise</b></a> <br><a href="../newentity_blocks.htm"><b>mentioned</b></a> <br><nobr>menu <a href="../color.htm"><b>1</b></a> <a href="../close_contour.htm"><b>2</b></a> <a href="../circle.htm"><b>3</b></a> <a href="../check_free_faces.htm"><b>4</b></a> <a href="../check_free_boundaries.htm"><b>5</b></a> <a href="../chamfer.htm"><b>6</b></a> <a href="../box.htm"><b>7</b></a> <a href="../archimede.htm"><b>8</b></a> <a href="../arc.htm"><b>9</b></a> <a href="../add_point_on_edge.htm"><b>10</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>11</b></a> <a href="../face.htm"><b>12</b></a> <a href="../extrusion.htm"><b>13</b></a> <a href="../explode_on_blocks.htm"><b>14</b></a> <a href="../explode.htm"><b>15</b></a> <a href="../ellipse.htm"><b>16</b></a> <a href="../edge.htm"><b>17</b></a> <a href="../cylinder.htm"><b>18</b></a> <a href="../cut.htm"><b>19</b></a> <a href="../curve.htm"><b>20</b></a> <a href="../cone.htm"><b>21</b></a> <a href="../compound.htm"><b>22</b></a> <a href="../common.htm"><b>23</b></a> <a href="../multi_transformation.htm"><b>24</b></a> <a href="../multi_rotation.htm"><b>25</b></a> <a href="../modify_the_location.htm"><b>26</b></a> <a href="../mirror_image.htm"><b>27</b></a> <a href="../local_coordinate_system.htm"><b>28</b></a> <a href="../line.htm"><b>29</b></a> <a href="../isos.htm"><b>30</b></a> <a href="../glue_faces.htm"><b>31</b></a> <a href="../fuse.htm"><b>32</b></a> <a href="../filling.htm"><b>33</b></a> <a href="../fillet.htm"><b>34</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>35</b></a> <a href="../sewing.htm"><b>36</b></a> <a href="../section.htm"><b>37</b></a> <a href="../scale_transform.htm"><b>38</b></a> <a href="../rotation.htm"><b>39</b></a> <a href="../revolution.htm"><b>40</b></a> <a href="../propagate.htm"><b>41</b></a> <a href="../point.htm"><b>42</b></a> <a href="../plane.htm"><b>43</b></a> <a href="../pipe_creation.htm"><b>44</b></a> <a href="../partition.htm"><b>45</b></a> <a href="../offset_surface.htm"><b>46</b></a> <a href="../newentity_blocks.htm"><b>47</b></a> <a href="../multi_translation.htm"><b>48</b></a> <a href="../wire.htm"><b>49</b></a> <a href="../viewing_geometrical_objects.htm"><b>50</b></a> <a href="../vector.htm"><b>51</b></a> <a href="../turus.htm"><b>52</b></a> <a href="../translation.htm"><b>53</b></a> <a href="../suppress_internal_wires.htm"><b>54</b></a> <a href="../suppress_holes.htm"><b>55</b></a> <a href="../suppress_faces.htm"><b>56</b></a> <a href="../sphere.htm"><b>57</b></a> <a href="../solid.htm"><b>58</b></a> <a href="../sketcher.htm"><b>59</b></a> <a href="../shell.htm"><b>60</b></a> <a href="../shape_processing.htm"><b>61</b></a> <a href="../working_with_groups.htm"><b>62</b></a> <a href="../working_plane.htm"><b>63</b></a> <a href="../wireframe_and_shading.htm"><b>64</b></a> </nobr><br><a href="../shape_processing.htm"><b>merge</b></a> <br><nobr>mesh <a href="../archimede.htm"><b>1</b></a> <a href="../occ_viewer.htm"><b>2</b></a> <a href="../viewing_geometrical_objects.htm"><b>3</b></a> </nobr><br><a href="../occ_viewer.htm"><b>meshes</b></a> <br><nobr>meshing <a href="../archimede.htm"><b>1</b></a> <a href="../newentity_blocks.htm"><b>2</b></a> </nobr><br><nobr>meshingdeflection <a href="../basic_operations.htm"><b>1</b></a> <a href="../archimede.htm"><b>2</b></a> </nobr><br><a href="../modify_the_location.htm"><b>method</b></a> <br><nobr><a name="bms_MI"></a><a name="subkey_MI"></a>middle <a href="../arc.htm"><b>1</b></a> <a href="../point.htm"><b>2</b></a> </nobr><br><nobr>min <a href="../explode_on_blocks.htm"><b>1</b></a> <a href="../measurement_tools.htm"><b>2</b></a> <a href="../filling.htm"><b>3</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>4</b></a> </nobr><br><a href="../measurement_tools.htm"><b>min_dist</b></a> <br><a href="../complex_objects.htm"><b>mindeg</b></a> <br><a href="../filling.htm"><b>mindegree</b></a> <br><nobr>mindistance <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr>minimal <a href="../face.htm"><b>1</b></a> <a href="../explode_on_blocks.htm"><b>2</b></a> <a href="../measurement_tools.htm"><b>3</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>4</b></a> </nobr><br><nobr>minimum <a href="../explode_on_blocks.htm"><b>1</b></a> <a href="../filling.htm"><b>2</b></a> <a href="../shape_processing.htm"><b>3</b></a> </nobr><br><a href="../explode_on_blocks.htm"><b>minnbfaces</b></a> <br><nobr>minor <a href="../ellipse.htm"><b>1</b></a> <a href="../turus.htm"><b>2</b></a> </nobr><br><nobr>mirror <a href="../mirror_image.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><a href="../transformation_operations.htm"><b>mirror1</b></a> <br><a href="../transformation_operations.htm"><b>mirror2</b></a> <br><a href="../transformation_operations.htm"><b>mirror3</b></a> <br><a href="../mirror_image.htm"><b>mirrored</b></a> <br><nobr><a name="bms_MO"></a><a name="subkey_MO"></a>mode <a href="../close_contour.htm"><b>1</b></a> <a href="../changing_display_parameters.htm"><b>2</b></a> <a href="../add_point_on_edge.htm"><b>3</b></a> <a href="../viewing_geometrical_objects.htm"><b>4</b></a> <a href="../shape_processing.htm"><b>5</b></a> <a href="../wireframe_and_shading.htm"><b>6</b></a> </nobr><br><a href="../archimede.htm"><b>modeled</b></a> <br><nobr>models <a href="../files/introduction_to_geom.htm"><b>1</b></a> <a href="../geometry.htm"><b>2</b></a> </nobr><br><a href="../add_point_on_edge.htm"><b>modes</b></a> <br><a href="../modify_the_location.htm"><b>modified</b></a> <br><nobr>modifies <a href="../close_contour.htm"><b>1</b></a> <a href="../modify_the_location.htm"><b>2</b></a> </nobr><br><nobr>modify <a href="../modify_the_location.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>module <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../files/introduction_to_geom.htm"><b>2</b></a> <a href="../geometry.htm"><b>3</b></a> <a href="../occ_viewer.htm"><b>4</b></a> </nobr><br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>moment</b></a> <br><nobr>moments <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr>mouse <a href="../occ_viewer.htm"><b>1</b></a> <a href="../viewing_geometrical_objects.htm"><b>2</b></a> </nobr><br><a href="../modify_the_location.htm"><b>move</b></a> <br><a href="../multi_translation.htm"><b>moved</b></a> <br><a name="bms_MU"></a><a name="subkey_MU"></a><a href="../working_with_groups.htm"><b>much</b></a> <br><nobr>multi <a href="../blocks_operations.htm"><b>1</b></a> <a href="../multi_transformation.htm"><b>2</b></a> <a href="../multi_rotation.htm"><b>3</b></a> <a href="../multi_translation.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> </nobr><br><nobr>multirotate1d <a href="../multi_rotation.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr>multirotate2d <a href="../multi_rotation.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><a href="../propagate.htm"><b>multitude</b></a> <br><nobr>must <a href="../multi_rotation.htm"><b>1</b></a> <a href="../measurement_tools.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> <a href="../multi_translation.htm"><b>4</b></a> <a href="../suppress_holes.htm"><b>5</b></a> </nobr><br>
-<br><br>
-<a name="bm_N"></a><a name="subkey_N{"></a><a href="../shape_processing.htm"><b>n</b></a> <br><nobr><a name="bms_NA"></a><a name="subkey_NA"></a>name <a href="../close_contour.htm"><b>1</b></a> <a href="../circle.htm"><b>2</b></a> <a href="../chamfer.htm"><b>3</b></a> <a href="../box.htm"><b>4</b></a> <a href="../archimede.htm"><b>5</b></a> <a href="../arc.htm"><b>6</b></a> <a href="../add_point_on_edge.htm"><b>7</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>8</b></a> <a href="../face.htm"><b>9</b></a> <a href="../extrusion.htm"><b>10</b></a> <a href="../ellipse.htm"><b>11</b></a> <a href="../edge.htm"><b>12</b></a> <a href="../cylinder.htm"><b>13</b></a> <a href="../cut.htm"><b>14</b></a> <a href="../curve.htm"><b>15</b></a> <a href="../cone.htm"><b>16</b></a> <a href="../compound.htm"><b>17</b></a> <a href="../common.htm"><b>18</b></a> <a href="../multi_transformation.htm"><b>19</b></a> <a href="../multi_rotation.htm"><b>20</b></a> <a href="../modify_the_location.htm"><b>21</b></a> <a href="../mirror_image.htm"><b>22</b></a> <a href="../local_coordinate_system.htm"><b>23</b></a> <a href="../line.htm"><b>24</b></a> <a href="../glue_faces.htm"><b>25</b></a> <a href="../fuse.htm"><b>26</b></a> <a href="../filling.htm"><b>27</b></a> <a href="../fillet.htm"><b>28</b></a> <a href="../sewing.htm"><b>29</b></a> <a href="../section.htm"><b>30</b></a> <a href="../scale_transform.htm"><b>31</b></a> <a href="../revolution.htm"><b>32</b></a> <a href="../point.htm"><b>33</b></a> <a href="../plane.htm"><b>34</b></a> <a href="../pipe_creation.htm"><b>35</b></a> <a href="../partition.htm"><b>36</b></a> <a href="../offset_surface.htm"><b>37</b></a> <a href="../newentity_blocks.htm"><b>38</b></a> <a href="../multi_translation.htm"><b>39</b></a> <a href="../wire.htm"><b>40</b></a> <a href="../viewing_geometrical_objects.htm"><b>41</b></a> <a href="../vector.htm"><b>42</b></a> <a href="../turus.htm"><b>43</b></a> <a href="../translation.htm"><b>44</b></a> <a href="../suppress_internal_wires.htm"><b>45</b></a> <a href="../suppress_holes.htm"><b>46</b></a> <a href="../suppress_faces.htm"><b>47</b></a> <a href="../sphere.htm"><b>48</b></a> <a href="../solid.htm"><b>49</b></a> <a href="../shell.htm"><b>50</b></a> <a href="../shape_processing.htm"><b>51</b></a> <a href="../working_with_groups.htm"><b>52</b></a> <a href="../working_plane.htm"><b>53</b></a> </nobr><br><a href="../shape_processing.htm"><b>names</b></a> <br><nobr><a name="bms_NB"></a><a name="subkey_NB"></a>nb <a href="../box.htm"><b>1</b></a> <a href="../extrusion.htm"><b>2</b></a> <a href="../line.htm"><b>3</b></a> <a href="../sphere.htm"><b>4</b></a> </nobr><br><a href="../explode.htm"><b>nb_sub</b></a> <br><nobr>nbiter <a href="../complex_objects.htm"><b>1</b></a> <a href="../filling.htm"><b>2</b></a> </nobr><br><a href="../measurement_tools.htm"><b>nbounding</b></a> <br><a href="../measurement_tools.htm"><b>nbox</b></a> <br><a href="../shape_processing.htm"><b>nbsplitpoints</b></a> <br><nobr>nbtimes <a href="../multi_transformation.htm"><b>1</b></a> <a href="../multi_rotation.htm"><b>2</b></a> <a href="../multi_translation.htm"><b>3</b></a> </nobr><br><nobr>nbtimes1 <a href="../multi_rotation.htm"><b>1</b></a> <a href="../multi_translation.htm"><b>2</b></a> </nobr><br><nobr>nbtimes2 <a href="../multi_rotation.htm"><b>1</b></a> <a href="../multi_translation.htm"><b>2</b></a> </nobr><br><a href="../multi_transformation.htm"><b>nbtimesu</b></a> <br><a href="../multi_transformation.htm"><b>nbtimesv</b></a> <br><a name="bms_NC"></a><a name="subkey_NC"></a><a href="../measurement_tools.htm"><b>ncentre</b></a> <br><a href="../measurement_tools.htm"><b>ncompound</b></a> <br><a name="bms_NE"></a><a name="subkey_NE"></a><a href="../shape_processing.htm"><b>necessarily</b></a> <br><nobr>necessary <a href="../chamfer.htm"><b>1</b></a> <a href="../fillet.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> <a href="../sketcher.htm"><b>4</b></a> <a href="../shape_processing.htm"><b>5</b></a> </nobr><br><nobr>need <a href="../chamfer.htm"><b>1</b></a> <a href="../box.htm"><b>2</b></a> <a href="../face.htm"><b>3</b></a> <a href="../extrusion.htm"><b>4</b></a> <a href="../explode.htm"><b>5</b></a> <a href="../multi_rotation.htm"><b>6</b></a> <a href="../filling.htm"><b>7</b></a> <a href="../fillet.htm"><b>8</b></a> <a href="../scale_transform.htm"><b>9</b></a> <a href="../rotation.htm"><b>10</b></a> <a href="../revolution.htm"><b>11</b></a> <a href="../pipe_creation.htm"><b>12</b></a> <a href="../multi_translation.htm"><b>13</b></a> <a href="../translation.htm"><b>14</b></a> <a href="../sphere.htm"><b>15</b></a> <a href="../shape_processing.htm"><b>16</b></a> </nobr><br><a href="../close_contour.htm"><b>needed</b></a> <br><a href="../offset_surface.htm"><b>negative</b></a> <br><a href="../shape_processing.htm"><b>neighbouring</b></a> <br><nobr>new <a href="../close_contour.htm"><b>1</b></a> <a href="../circle.htm"><b>2</b></a> <a href="../box.htm"><b>3</b></a> <a href="../arc.htm"><b>4</b></a> <a href="../face.htm"><b>5</b></a> <a href="../extrusion.htm"><b>6</b></a> <a href="../explode.htm"><b>7</b></a> <a href="../ellipse.htm"><b>8</b></a> <a href="../edge.htm"><b>9</b></a> <a href="../cylinder.htm"><b>10</b></a> <a href="../curve.htm"><b>11</b></a> <a href="../cone.htm"><b>12</b></a> <a href="../compound.htm"><b>13</b></a> <a href="../local_coordinate_system.htm"><b>14</b></a> <a href="../line.htm"><b>15</b></a> <a href="../filling.htm"><b>16</b></a> <a href="../revolution.htm"><b>17</b></a> <a href="../point.htm"><b>18</b></a> <a href="../plane.htm"><b>19</b></a> <a href="../pipe_creation.htm"><b>20</b></a> <a href="../occ_viewer.htm"><b>21</b></a> <a href="../newentity_blocks.htm"><b>22</b></a> <a href="../wire.htm"><b>23</b></a> <a href="../vector.htm"><b>24</b></a> <a href="../turus.htm"><b>25</b></a> <a href="../transformation_operations.htm"><b>26</b></a> <a href="../sphere.htm"><b>27</b></a> <a href="../solid.htm"><b>28</b></a> <a href="../sketcher.htm"><b>29</b></a> <a href="../shell.htm"><b>30</b></a> <a href="../working_with_groups.htm"><b>31</b></a> <a href="../working_plane.htm"><b>32</b></a> </nobr><br><a href="../viewing_geometrical_objects.htm"><b>newly</b></a> <br><a name="bms_NI"></a><a name="subkey_NI"></a><a href="../measurement_tools.htm"><b>ninertia</b></a> <br><a name="bms_NM"></a><a name="subkey_NM"></a><a href="../measurement_tools.htm"><b>nminimal</b></a> <br><a name="bms_NO"></a><a name="subkey_NO"></a><a href="../curve.htm"><b>nodes</b></a> <br><a href="../check_free_boundaries.htm"><b>noerror</b></a> <br><a href="../measurement_tools.htm"><b>none</b></a> <br><nobr>normal <a href="../circle.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../ellipse.htm"><b>3</b></a> <a href="../plane.htm"><b>4</b></a> <a href="../offset_surface.htm"><b>5</b></a> <a href="../turus.htm"><b>6</b></a> </nobr><br><a href="../cone.htm"><b>note</b></a> <br><a href="../face.htm"><b>nothing</b></a> <br><a href="../newentity_blocks.htm"><b>notions</b></a> <br><a name="bms_NT"></a><a name="subkey_NT"></a><a href="../shape_processing.htm"><b>nth</b></a> <br><nobr><a name="bms_NU"></a><a name="subkey_NU"></a>number <a href="../explode_on_blocks.htm"><b>1</b></a> <a href="../multi_transformation.htm"><b>2</b></a> <a href="../multi_rotation.htm"><b>3</b></a> <a href="../isos.htm"><b>4</b></a> <a href="../filling.htm"><b>5</b></a> <a href="../sewing.htm"><b>6</b></a> <a href="../repairing_operations.htm"><b>7</b></a> <a href="../offset_surface.htm"><b>8</b></a> <a href="../multi_translation.htm"><b>9</b></a> <a href="../viewing_geometrical_objects.htm"><b>10</b></a> <a href="../transformation_operations.htm"><b>11</b></a> <a href="../suppress_holes.htm"><b>12</b></a> <a href="../shape_processing.htm"><b>13</b></a> </nobr><br><a href="../multi_transformation.htm"><b>numbers</b></a> <br>
-<br><br>
-<nobr><a name="bm_O"></a><a name="subkey_OB"></a>object <a href="../color.htm"><b>1</b></a> <a href="../chamfer.htm"><b>2</b></a> <a href="../archimede.htm"><b>3</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>4</b></a> <a href="../face.htm"><b>5</b></a> <a href="../extrusion.htm"><b>6</b></a> <a href="../explode.htm"><b>7</b></a> <a href="../common.htm"><b>8</b></a> <a href="../multi_rotation.htm"><b>9</b></a> <a href="../modify_the_location.htm"><b>10</b></a> <a href="../mirror_image.htm"><b>11</b></a> <a href="../local_coordinate_system.htm"><b>12</b></a> <a href="../groups.htm"><b>13</b></a> <a href="../geometrical_objects.htm"><b>14</b></a> <a href="../fillet.htm"><b>15</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>16</b></a> <a href="../rotation.htm"><b>17</b></a> <a href="../revolution.htm"><b>18</b></a> <a href="../repairing_operations.htm"><b>19</b></a> <a href="../propagate.htm"><b>20</b></a> <a href="../pipe_creation.htm"><b>21</b></a> <a href="../offset_surface.htm"><b>22</b></a> <a href="../occ_viewer.htm"><b>23</b></a> <a href="../wire.htm"><b>24</b></a> <a href="../viewing_geometrical_objects.htm"><b>25</b></a> <a href="../translation.htm"><b>26</b></a> <a href="../transformation_operations.htm"><b>27</b></a> <a href="../suppress_internal_wires.htm"><b>28</b></a> <a href="../shape_processing.htm"><b>29</b></a> <a href="../working_with_groups.htm"><b>30</b></a> <a href="../wireframe_and_shading.htm"><b>31</b></a> </nobr><br><nobr>objects <a href="../circle.htm"><b>1</b></a> <a href="../changing_display_parameters.htm"><b>2</b></a> <a href="../building_by_blocks.htm"><b>3</b></a> <a href="../boolean_operations.htm"><b>4</b></a> <a href="../blocks_operations.htm"><b>5</b></a> <a href="../basic_operations.htm"><b>6</b></a> <a href="../basic_geometrical_objects.htm"><b>7</b></a> <a href="../arc.htm"><b>8</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>9</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>10</b></a> <a href="../files/introduction_to_geom.htm"><b>11</b></a> <a href="../face.htm"><b>12</b></a> <a href="../extrusion.htm"><b>13</b></a> <a href="../ellipse.htm"><b>14</b></a> <a href="../edge.htm"><b>15</b></a> <a href="../curve.htm"><b>16</b></a> <a href="../compound.htm"><b>17</b></a> <a href="../complex_objects.htm"><b>18</b></a> <a href="../multi_rotation.htm"><b>19</b></a> <a href="../line.htm"><b>20</b></a> <a href="../groups.htm"><b>21</b></a> <a href="../geometry.htm"><b>22</b></a> <a href="../geometrical_objects.htm"><b>23</b></a> <a href="../filling.htm"><b>24</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>25</b></a> <a href="../revolution.htm"><b>26</b></a> <a href="../repairing_operations.htm"><b>27</b></a> <a href="../primitives.htm"><b>28</b></a> <a href="../point.htm"><b>29</b></a> <a href="../plane.htm"><b>30</b></a> <a href="../pipe_creation.htm"><b>31</b></a> <a href="../offset_surface.htm"><b>32</b></a> <a href="../occ_viewer.htm"><b>33</b></a> <a href="../wire.htm"><b>34</b></a> <a href="../viewing_geometrical_objects.htm"><b>35</b></a> <a href="../vector.htm"><b>36</b></a> <a href="../transformation_operations.htm"><b>37</b></a> <a href="../solid.htm"><b>38</b></a> <a href="../sketcher_tui.htm"><b>39</b></a> <a href="../shell.htm"><b>40</b></a> <a href="../wireframe_and_shading.htm"><b>41</b></a> </nobr><br><nobr>obtain <a href="../explode.htm"><b>1</b></a> <a href="../modify_the_location.htm"><b>2</b></a> <a href="../shape_processing.htm"><b>3</b></a> </nobr><br><a href="../measurement_tools.htm"><b>obtained</b></a> <br><br><br></p><p class="ftsbody" align="center"><a href="whlstf8.htm" target="_self" title="previous search group"><b>&gt;&gt;</b></a>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstf8.htm b/doc/salome/gui/GEOM/whgdata/whlstf8.htm
deleted file mode 100755 (executable)
index 4fe7761..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<html>
-<head>
-<title>Search Words List</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsbody" align="center"><a href="whlstf7.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
-<p class="ftsbody" >
-<nobr><a name="bms_OC"></a><a name="subkey_OC"></a>occ <a href="../close_contour.htm"><b>1</b></a> <a href="../chamfer.htm"><b>2</b></a> <a href="../add_point_on_edge.htm"><b>3</b></a> <a href="../fillet.htm"><b>4</b></a> <a href="../occ_viewer.htm"><b>5</b></a> <a href="../viewing_geometrical_objects.htm"><b>6</b></a> <a href="../suppress_internal_wires.htm"><b>7</b></a> <a href="../suppress_holes.htm"><b>8</b></a> <a href="../suppress_faces.htm"><b>9</b></a> <a href="../working_with_groups.htm"><b>10</b></a> </nobr><br><a href="../check_free_boundaries.htm"><b>occurred</b></a> <br><nobr><a name="bms_OF"></a><a name="subkey_OF"></a>offset <a href="../offset_surface.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_OK"></a><a name="subkey_OK"></a>ok <a href="../measurement_tools.htm"><b>1</b></a> <a href="../local_coordinate_system.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> <a href="../working_with_groups.htm"><b>4</b></a> </nobr><br><a name="bms_OL"></a><a name="subkey_OL"></a><a href="../point.htm"><b>old</b></a> <br><nobr><a name="bms_ON"></a><a name="subkey_ON"></a>one <a href="../close_contour.htm"><b>1</b></a> <a href="../add_point_on_edge.htm"><b>2</b></a> <a href="../cut.htm"><b>3</b></a> <a href="../multi_transformation.htm"><b>4</b></a> <a href="../multi_rotation.htm"><b>5</b></a> <a href="../repairing_operations.htm"><b>6</b></a> <a href="../point.htm"><b>7</b></a> <a href="../plane.htm"><b>8</b></a> <a href="../multi_translation.htm"><b>9</b></a> <a href="../transformation_operations.htm"><b>10</b></a> <a href="../sketcher.htm"><b>11</b></a> <a href="../shape_processing.htm"><b>12</b></a> <a href="../working_plane.htm"><b>13</b></a> </nobr><br><a name="bms_OP"></a><a name="subkey_OP"></a><a href="../transparency.htm"><b>opaque</b></a> <br><nobr>open <a href="../close_contour.htm"><b>1</b></a> <a href="../check_free_boundaries.htm"><b>2</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../occ_viewer.htm"><b>5</b></a> <a href="../working_with_groups.htm"><b>6</b></a> </nobr><br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>opening</b></a> <br><a href="../occ_viewer.htm"><b>opens</b></a> <br><nobr>openwires <a href="../check_free_boundaries.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><nobr>operation <a href="../close_contour.htm"><b>1</b></a> <a href="../circle.htm"><b>2</b></a> <a href="../check_free_faces.htm"><b>3</b></a> <a href="../check_free_boundaries.htm"><b>4</b></a> <a href="../chamfer.htm"><b>5</b></a> <a href="../box.htm"><b>6</b></a> <a href="../basic_operations.htm"><b>7</b></a> <a href="../archimede.htm"><b>8</b></a> <a href="../arc.htm"><b>9</b></a> <a href="../add_point_on_edge.htm"><b>10</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>11</b></a> <a href="../extrusion.htm"><b>12</b></a> <a href="../explode_on_blocks.htm"><b>13</b></a> <a href="../explode.htm"><b>14</b></a> <a href="../ellipse.htm"><b>15</b></a> <a href="../cylinder.htm"><b>16</b></a> <a href="../cut.htm"><b>17</b></a> <a href="../curve.htm"><b>18</b></a> <a href="../cone.htm"><b>19</b></a> <a href="../common.htm"><b>20</b></a> <a href="../multi_transformation.htm"><b>21</b></a> <a href="../multi_rotation.htm"><b>22</b></a> <a href="../modify_the_location.htm"><b>23</b></a> <a href="../mirror_image.htm"><b>24</b></a> <a href="../line.htm"><b>25</b></a> <a href="../glue_faces.htm"><b>26</b></a> <a href="../fuse.htm"><b>27</b></a> <a href="../filling.htm"><b>28</b></a> <a href="../fillet.htm"><b>29</b></a> <a href="../sewing.htm"><b>30</b></a> <a href="../section.htm"><b>31</b></a> <a href="../scale_transform.htm"><b>32</b></a> <a href="../rotation.htm"><b>33</b></a> <a href="../revolution.htm"><b>34</b></a> <a href="../propagate.htm"><b>35</b></a> <a href="../point.htm"><b>36</b></a> <a href="../plane.htm"><b>37</b></a> <a href="../pipe_creation.htm"><b>38</b></a> <a href="../partition.htm"><b>39</b></a> <a href="../offset_surface.htm"><b>40</b></a> <a href="../newentity_blocks.htm"><b>41</b></a> <a href="../multi_translation.htm"><b>42</b></a> <a href="../vector.htm"><b>43</b></a> <a href="../turus.htm"><b>44</b></a> <a href="../translation.htm"><b>45</b></a> <a href="../transformation_operations.htm"><b>46</b></a> <a href="../suppress_internal_wires.htm"><b>47</b></a> <a href="../suppress_holes.htm"><b>48</b></a> <a href="../suppress_faces.htm"><b>49</b></a> <a href="../sphere.htm"><b>50</b></a> <a href="../sketcher.htm"><b>51</b></a> <a href="../shape_processing.htm"><b>52</b></a> <a href="../working_with_groups.htm"><b>53</b></a> </nobr><br><nobr>operations <a href="../close_contour.htm"><b>1</b></a> <a href="../check_free_faces.htm"><b>2</b></a> <a href="../check_free_boundaries.htm"><b>3</b></a> <a href="../chamfer.htm"><b>4</b></a> <a href="../boolean_operations.htm"><b>5</b></a> <a href="../blocks_operations.htm"><b>6</b></a> <a href="../basic_operations.htm"><b>7</b></a> <a href="../archimede.htm"><b>8</b></a> <a href="../add_point_on_edge.htm"><b>9</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>10</b></a> <a href="../files/introduction_to_geom.htm"><b>11</b></a> <a href="../explode_on_blocks.htm"><b>12</b></a> <a href="../cut.htm"><b>13</b></a> <a href="../common.htm"><b>14</b></a> <a href="../multi_transformation.htm"><b>15</b></a> <a href="../multi_rotation.htm"><b>16</b></a> <a href="../modify_the_location.htm"><b>17</b></a> <a href="../mirror_image.htm"><b>18</b></a> <a href="../glue_faces.htm"><b>19</b></a> <a href="../geometry.htm"><b>20</b></a> <a href="../fuse.htm"><b>21</b></a> <a href="../fillet.htm"><b>22</b></a> <a href="../sewing.htm"><b>23</b></a> <a href="../section.htm"><b>24</b></a> <a href="../scale_transform.htm"><b>25</b></a> <a href="../rotation.htm"><b>26</b></a> <a href="../repairing_operations.htm"><b>27</b></a> <a href="../propagate.htm"><b>28</b></a> <a href="../partition.htm"><b>29</b></a> <a href="../offset_surface.htm"><b>30</b></a> <a href="../multi_translation.htm"><b>31</b></a> <a href="../translation.htm"><b>32</b></a> <a href="../transformation_operations.htm"><b>33</b></a> <a href="../suppress_internal_wires.htm"><b>34</b></a> <a href="../suppress_holes.htm"><b>35</b></a> <a href="../suppress_faces.htm"><b>36</b></a> <a href="../shape_processing.htm"><b>37</b></a> </nobr><br><a href="../shape_processing.htm"><b>operator</b></a> <br><nobr>operators <a href="../repairing_operations.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>opportunity</b></a> <br><a href="../box.htm"><b>opposite</b></a> <br><nobr>optimization <a href="../files/introduction_to_geom.htm"><b>1</b></a> <a href="../geometry.htm"><b>2</b></a> </nobr><br><a href="../wireframe_and_shading.htm"><b>option</b></a> <br><a href="../viewing_geometrical_objects.htm"><b>options</b></a> <br><a name="bms_OR"></a><a name="subkey_OR"></a><a href="../shape_processing.htm"><b>order</b></a> <br><a href="../occ_viewer.htm"><b>orientate</b></a> <br><a href="../occ_viewer.htm"><b>orientation</b></a> <br><a href="../newentity_blocks.htm"><b>oriented</b></a> <br><nobr>origin <a href="../box.htm"><b>1</b></a> <a href="../cylinder.htm"><b>2</b></a> <a href="../cone.htm"><b>3</b></a> <a href="../local_coordinate_system.htm"><b>4</b></a> <a href="../occ_viewer.htm"><b>5</b></a> <a href="../vector.htm"><b>6</b></a> <a href="../turus.htm"><b>7</b></a> <a href="../sphere.htm"><b>8</b></a> </nobr><br><a name="bms_OS"></a><a name="subkey_OS"></a><a href="../repairing_operations.htm"><b>os</b></a> <br><nobr><a name="bms_OT"></a><a name="subkey_OT"></a>otherwise <a href="../close_contour.htm"><b>1</b></a> <a href="../add_point_on_edge.htm"><b>2</b></a> <a href="../modify_the_location.htm"><b>3</b></a> <a href="../mirror_image.htm"><b>4</b></a> <a href="../rotation.htm"><b>5</b></a> <a href="../translation.htm"><b>6</b></a> </nobr><br><nobr><a name="bms_OU"></a><a name="subkey_OU"></a>our <a href="../color.htm"><b>1</b></a> <a href="../close_contour.htm"><b>2</b></a> <a href="../circle.htm"><b>3</b></a> <a href="../check_free_faces.htm"><b>4</b></a> <a href="../check_free_boundaries.htm"><b>5</b></a> <a href="../chamfer.htm"><b>6</b></a> <a href="../box.htm"><b>7</b></a> <a href="../archimede.htm"><b>8</b></a> <a href="../arc.htm"><b>9</b></a> <a href="../add_point_on_edge.htm"><b>10</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>11</b></a> <a href="../face.htm"><b>12</b></a> <a href="../extrusion.htm"><b>13</b></a> <a href="../explode_on_blocks.htm"><b>14</b></a> <a href="../ellipse.htm"><b>15</b></a> <a href="../edge.htm"><b>16</b></a> <a href="../cylinder.htm"><b>17</b></a> <a href="../cut.htm"><b>18</b></a> <a href="../curve.htm"><b>19</b></a> <a href="../cone.htm"><b>20</b></a> <a href="../compound.htm"><b>21</b></a> <a href="../common.htm"><b>22</b></a> <a href="../multi_transformation.htm"><b>23</b></a> <a href="../multi_rotation.htm"><b>24</b></a> <a href="../modify_the_location.htm"><b>25</b></a> <a href="../mirror_image.htm"><b>26</b></a> <a href="../line.htm"><b>27</b></a> <a href="../glue_faces.htm"><b>28</b></a> <a href="../fuse.htm"><b>29</b></a> <a href="../filling.htm"><b>30</b></a> <a href="../fillet.htm"><b>31</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>32</b></a> <a href="../sewing.htm"><b>33</b></a> <a href="../section.htm"><b>34</b></a> <a href="../scale_transform.htm"><b>35</b></a> <a href="../rotation.htm"><b>36</b></a> <a href="../revolution.htm"><b>37</b></a> <a href="../propagate.htm"><b>38</b></a> <a href="../point.htm"><b>39</b></a> <a href="../plane.htm"><b>40</b></a> <a href="../pipe_creation.htm"><b>41</b></a> <a href="../partition.htm"><b>42</b></a> <a href="../offset_surface.htm"><b>43</b></a> <a href="../newentity_blocks.htm"><b>44</b></a> <a href="../multi_translation.htm"><b>45</b></a> <a href="../wire.htm"><b>46</b></a> <a href="../vector.htm"><b>47</b></a> <a href="../turus.htm"><b>48</b></a> <a href="../transparency.htm"><b>49</b></a> <a href="../translation.htm"><b>50</b></a> <a href="../suppress_internal_wires.htm"><b>51</b></a> <a href="../suppress_holes.htm"><b>52</b></a> <a href="../suppress_faces.htm"><b>53</b></a> <a href="../sphere.htm"><b>54</b></a> <a href="../solid.htm"><b>55</b></a> <a href="../sketcher.htm"><b>56</b></a> <a href="../shell.htm"><b>57</b></a> <a href="../shape_processing.htm"><b>58</b></a> <a href="../working_with_groups.htm"><b>59</b></a> <a href="../wireframe_and_shading.htm"><b>60</b></a> </nobr><br><nobr>out <a href="../occ_viewer.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><a href="../partition.htm"><b>outside</b></a> <br><nobr><a name="bms_OX"></a><a name="subkey_OX"></a>ox <a href="../local_coordinate_system.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> </nobr><br><a name="bms_OY"></a><a name="subkey_OY"></a><a href="../local_coordinate_system.htm"><b>oy</b></a> <br><nobr><a name="bms_OZ"></a><a name="subkey_OZ"></a>oz <a href="../cylinder.htm"><b>1</b></a> <a href="../cone.htm"><b>2</b></a> <a href="../local_coordinate_system.htm"><b>3</b></a> <a href="../sketcher.htm"><b>4</b></a> </nobr><br>
-<br><br>
-<a name="bm_P"></a><a name="subkey_P{"></a><a href="../primitives.htm"><b>p</b></a> <br><a href="../blocks_operations.htm"><b>p_25_25_50</b></a> <br><a href="../blocks_operations.htm"><b>p_25_50_25</b></a> <br><a href="../blocks_operations.htm"><b>p_50_25_25</b></a> <br><a href="../basic_geometrical_objects.htm"><b>p_on_arc</b></a> <br><nobr>p0 <a href="../basic_operations.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../complex_objects.htm"><b>3</b></a> <a href="../groups.htm"><b>4</b></a> <a href="../geometrical_objects.htm"><b>5</b></a> <a href="../repairing_operations.htm"><b>6</b></a> <a href="../primitives.htm"><b>7</b></a> <a href="../transformation_operations.htm"><b>8</b></a> </nobr><br><nobr>p1 <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../boolean_operations.htm"><b>2</b></a> <a href="../basic_geometrical_objects.htm"><b>3</b></a> <a href="../complex_objects.htm"><b>4</b></a> <a href="../repairing_operations.htm"><b>5</b></a> <a href="../primitives.htm"><b>6</b></a> <a href="../transformation_operations.htm"><b>7</b></a> <a href="../sketcher_tui.htm"><b>8</b></a> </nobr><br><a href="../building_by_blocks.htm"><b>p10</b></a> <br><a href="../basic_geometrical_objects.htm"><b>p100</b></a> <br><a href="../building_by_blocks.htm"><b>p11</b></a> <br><a href="../building_by_blocks.htm"><b>p12</b></a> <br><a href="../building_by_blocks.htm"><b>p13</b></a> <br><nobr>p2 <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../boolean_operations.htm"><b>2</b></a> <a href="../basic_geometrical_objects.htm"><b>3</b></a> <a href="../complex_objects.htm"><b>4</b></a> <a href="../repairing_operations.htm"><b>5</b></a> <a href="../primitives.htm"><b>6</b></a> <a href="../transformation_operations.htm"><b>7</b></a> <a href="../sketcher_tui.htm"><b>8</b></a> </nobr><br><nobr>p200 <a href="../basic_operations.htm"><b>1</b></a> <a href="../groups.htm"><b>2</b></a> </nobr><br><nobr>p3 <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../complex_objects.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> <a href="../sketcher_tui.htm"><b>6</b></a> </nobr><br><nobr>p4 <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../complex_objects.htm"><b>3</b></a> <a href="../transformation_operations.htm"><b>4</b></a> </nobr><br><nobr>p5 <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../complex_objects.htm"><b>3</b></a> <a href="../transformation_operations.htm"><b>4</b></a> </nobr><br><a href="../basic_geometrical_objects.htm"><b>p50</b></a> <br><nobr>p6 <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> </nobr><br><nobr>p7 <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> </nobr><br><a href="../primitives.htm"><b>p70</b></a> <br><nobr>p8 <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> </nobr><br><a href="../building_by_blocks.htm"><b>p9</b></a> <br><a name="bms_PA"></a><a name="subkey_PA"></a><a href="../occ_viewer.htm"><b>panning</b></a> <br><nobr>parallel <a href="../box.htm"><b>1</b></a> <a href="../local_coordinate_system.htm"><b>2</b></a> <a href="../line.htm"><b>3</b></a> <a href="../shape_processing.htm"><b>4</b></a> </nobr><br><nobr>parameter <a href="../close_contour.htm"><b>1</b></a> <a href="../add_point_on_edge.htm"><b>2</b></a> <a href="../point.htm"><b>3</b></a> <a href="../shape_processing.htm"><b>4</b></a> </nobr><br><a href="../shape_processing.htm"><b>parameterization</b></a> <br><nobr>parameters <a href="../color.htm"><b>1</b></a> <a href="../basic_operations.htm"><b>2</b></a> <a href="../filling.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../viewing_geometrical_objects.htm"><b>5</b></a> <a href="../transparency.htm"><b>6</b></a> <a href="../sketcher.htm"><b>7</b></a> <a href="../shape_processing.htm"><b>8</b></a> <a href="../wireframe_and_shading.htm"><b>9</b></a> </nobr><br><a href="../shape_processing.htm"><b>parametric</b></a> <br><a href="../add_point_on_edge.htm"><b>paramter</b></a> <br><nobr>part <a href="../cone.htm"><b>1</b></a> <a href="../common.htm"><b>2</b></a> <a href="../occ_viewer.htm"><b>3</b></a> </nobr><br><nobr>partition <a href="../basic_operations.htm"><b>1</b></a> <a href="../partition.htm"><b>2</b></a> </nobr><br><a href="../basic_operations.htm"><b>partition1</b></a> <br><a href="../basic_operations.htm"><b>partition2</b></a> <br><a href="../basic_operations.htm"><b>partition3</b></a> <br><a href="../occ_viewer.htm"><b>parts</b></a> <br><a href="../sketcher.htm"><b>passed</b></a> <br><nobr>passes <a href="../curve.htm"><b>1</b></a> <a href="../multi_rotation.htm"><b>2</b></a> <a href="../line.htm"><b>3</b></a> <a href="../plane.htm"><b>4</b></a> </nobr><br><a href="../line.htm"><b>passing</b></a> <br><nobr>path <a href="../complex_objects.htm"><b>1</b></a> <a href="../pipe_creation.htm"><b>2</b></a> </nobr><br><a href="../pipe_creation.htm"><b>pathshape</b></a> <br><nobr><a name="bms_PE"></a><a name="subkey_PE"></a>perform <a href="../basic_operations.htm"><b>1</b></a> <a href="../explode.htm"><b>2</b></a> <a href="../transformation_operations.htm"><b>3</b></a> </nobr><br><a href="../partition.htm"><b>performed</b></a> <br><a href="../sketcher.htm"><b>perpendicular</b></a> <br><nobr><a name="bms_PI"></a><a name="subkey_PI"></a>pi <a href="../multi_rotation.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../transformation_operations.htm"><b>3</b></a> </nobr><br><a href="../modify_the_location.htm"><b>picture</b></a> <br><nobr>pipe <a href="../complex_objects.htm"><b>1</b></a> <a href="../pipe_creation.htm"><b>2</b></a> </nobr><br><a name="bms_PL"></a><a name="subkey_PL"></a><a href="../occ_viewer.htm"><b>place</b></a> <br><a href="../shape_processing.htm"><b>placed</b></a> <br><a href="../modify_the_location.htm"><b>places</b></a> <br><nobr>planar <a href="../face.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> <a href="../sketcher_tui.htm"><b>3</b></a> <a href="../sketcher.htm"><b>4</b></a> <a href="../working_plane.htm"><b>5</b></a> </nobr><br><nobr>plane <a href="../basic_operations.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../archimede.htm"><b>3</b></a> <a href="../mirror_image.htm"><b>4</b></a> <a href="../plane.htm"><b>5</b></a> <a href="../partition.htm"><b>6</b></a> <a href="../occ_viewer.htm"><b>7</b></a> <a href="../transformation_operations.htm"><b>8</b></a> <a href="../sketcher.htm"><b>9</b></a> <a href="../working_plane.htm"><b>10</b></a> </nobr><br><a href="../basic_geometrical_objects.htm"><b>plane1</b></a> <br><a href="../basic_geometrical_objects.htm"><b>plane2</b></a> <br><a href="../basic_geometrical_objects.htm"><b>plane3</b></a> <br><nobr>planes <a href="../plane.htm"><b>1</b></a> <a href="../occ_viewer.htm"><b>2</b></a> <a href="../working_with_groups.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>plug</b></a> <br><a href="../archimede.htm"><b>plunged</b></a> <br><br><br></p><p class="ftsbody" align="center"><a href="whlstf9.htm" target="_self" title="previous search group"><b>&gt;&gt;</b></a>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstf9.htm b/doc/salome/gui/GEOM/whgdata/whlstf9.htm
deleted file mode 100755 (executable)
index e6bc718..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words List</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsbody" align="center"><a href="whlstf8.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
-<p class="ftsbody" >
-<nobr><a name="bms_PN"></a><a name="subkey_PN"></a>png <a href="../occ_viewer.htm"><b>1</b></a> <a href="../viewing_geometrical_objects.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_PO"></a><a name="subkey_PO"></a>point <a href="../circle.htm"><b>1</b></a> <a href="../box.htm"><b>2</b></a> <a href="../basic_geometrical_objects.htm"><b>3</b></a> <a href="../arc.htm"><b>4</b></a> <a href="../add_point_on_edge.htm"><b>5</b></a> <a href="../extrusion.htm"><b>6</b></a> <a href="../ellipse.htm"><b>7</b></a> <a href="../cylinder.htm"><b>8</b></a> <a href="../cone.htm"><b>9</b></a> <a href="../multi_rotation.htm"><b>10</b></a> <a href="../mirror_image.htm"><b>11</b></a> <a href="../measurement_tools.htm"><b>12</b></a> <a href="../local_coordinate_system.htm"><b>13</b></a> <a href="../line.htm"><b>14</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>15</b></a> <a href="../scale_transform.htm"><b>16</b></a> <a href="../repairing_operations.htm"><b>17</b></a> <a href="../point.htm"><b>18</b></a> <a href="../plane.htm"><b>19</b></a> <a href="../offset_surface.htm"><b>20</b></a> <a href="../occ_viewer.htm"><b>21</b></a> <a href="../vector.htm"><b>22</b></a> <a href="../turus.htm"><b>23</b></a> <a href="../transformation_operations.htm"><b>24</b></a> <a href="../sphere.htm"><b>25</b></a> <a href="../sketcher.htm"><b>26</b></a> </nobr><br><nobr>point1 <a href="../circle.htm"><b>1</b></a> <a href="../building_by_blocks.htm"><b>2</b></a> <a href="../box.htm"><b>3</b></a> <a href="../basic_geometrical_objects.htm"><b>4</b></a> <a href="../arc.htm"><b>5</b></a> <a href="../extrusion.htm"><b>6</b></a> <a href="../edge.htm"><b>7</b></a> <a href="../line.htm"><b>8</b></a> <a href="../plane.htm"><b>9</b></a> <a href="../vector.htm"><b>10</b></a> <a href="../translation.htm"><b>11</b></a> </nobr><br><nobr>point2 <a href="../circle.htm"><b>1</b></a> <a href="../building_by_blocks.htm"><b>2</b></a> <a href="../box.htm"><b>3</b></a> <a href="../basic_geometrical_objects.htm"><b>4</b></a> <a href="../arc.htm"><b>5</b></a> <a href="../extrusion.htm"><b>6</b></a> <a href="../edge.htm"><b>7</b></a> <a href="../line.htm"><b>8</b></a> <a href="../plane.htm"><b>9</b></a> <a href="../vector.htm"><b>10</b></a> <a href="../translation.htm"><b>11</b></a> </nobr><br><nobr>point3 <a href="../circle.htm"><b>1</b></a> <a href="../building_by_blocks.htm"><b>2</b></a> <a href="../basic_geometrical_objects.htm"><b>3</b></a> <a href="../arc.htm"><b>4</b></a> <a href="../plane.htm"><b>5</b></a> </nobr><br><nobr>point4 <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> </nobr><br><a href="../basic_geometrical_objects.htm"><b>point5</b></a> <br><nobr>pointcoordinates <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><nobr>points <a href="../close_contour.htm"><b>1</b></a> <a href="../circle.htm"><b>2</b></a> <a href="../building_by_blocks.htm"><b>3</b></a> <a href="../box.htm"><b>4</b></a> <a href="../basic_operations.htm"><b>5</b></a> <a href="../basic_geometrical_objects.htm"><b>6</b></a> <a href="../arc.htm"><b>7</b></a> <a href="../edge.htm"><b>8</b></a> <a href="../curve.htm"><b>9</b></a> <a href="../complex_objects.htm"><b>10</b></a> <a href="../line.htm"><b>11</b></a> <a href="../groups.htm"><b>12</b></a> <a href="../geometrical_objects.htm"><b>13</b></a> <a href="../repairing_operations.htm"><b>14</b></a> <a href="../plane.htm"><b>15</b></a> <a href="../newentity_blocks.htm"><b>16</b></a> <a href="../vector.htm"><b>17</b></a> <a href="../translation.htm"><b>18</b></a> <a href="../transformation_operations.htm"><b>19</b></a> <a href="../sketcher_tui.htm"><b>20</b></a> <a href="../sketcher.htm"><b>21</b></a> <a href="../shape_processing.htm"><b>22</b></a> <a href="../working_with_groups.htm"><b>23</b></a> </nobr><br><nobr>polyline <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../curve.htm"><b>2</b></a> </nobr><br><nobr>pop <a href="../color.htm"><b>1</b></a> <a href="../wireframe_and_shading.htm"><b>2</b></a> </nobr><br><nobr>position <a href="../add_point_on_edge.htm"><b>1</b></a> <a href="../modify_the_location.htm"><b>2</b></a> <a href="../point.htm"><b>3</b></a> <a href="../occ_viewer.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> <a href="../working_plane.htm"><b>6</b></a> </nobr><br><a href="../shape_processing.htm"><b>positional</b></a> <br><a href="../shape_processing.htm"><b>positions</b></a> <br><a href="../face.htm"><b>possibilities</b></a> <br><a href="../shape_processing.htm"><b>possibility</b></a> <br><nobr>possible <a href="../blocks_operations.htm"><b>1</b></a> <a href="../curve.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> <a href="../propagate.htm"><b>4</b></a> <a href="../shape_processing.htm"><b>5</b></a> </nobr><br><nobr><a name="bms_PR"></a><a name="subkey_PR"></a>precision <a href="../sewing.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><a href="../sketcher.htm"><b>predefined</b></a> <br><a href="../viewing_geometrical_objects.htm"><b>presentation</b></a> <br><a href="../local_coordinate_system.htm"><b>press</b></a> <br><a href="../occ_viewer.htm"><b>pressed</b></a> <br><a href="../local_coordinate_system.htm"><b>presumes</b></a> <br><a href="../occ_viewer.htm"><b>preview</b></a> <br><nobr>previous <a href="../sketcher.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><nobr>primitives <a href="../box.htm"><b>1</b></a> <a href="../files/introduction_to_geom.htm"><b>2</b></a> <a href="../cylinder.htm"><b>3</b></a> <a href="../cone.htm"><b>4</b></a> <a href="../geometry.htm"><b>5</b></a> <a href="../primitives.htm"><b>6</b></a> <a href="../turus.htm"><b>7</b></a> <a href="../sphere.htm"><b>8</b></a> </nobr><br><nobr>print <a href="../measurement_tools.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> </nobr><br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>printed</b></a> <br><nobr>prism <a href="../extrusion.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> <a href="../geometrical_objects.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> </nobr><br><a href="../transformation_operations.htm"><b>prism_edges</b></a> <br><nobr>prism_faces <a href="../geometrical_objects.htm"><b>1</b></a> <a href="../transformation_operations.htm"><b>2</b></a> </nobr><br><a href="../complex_objects.htm"><b>prism1</b></a> <br><a href="../complex_objects.htm"><b>prism2</b></a> <br><nobr>prisms <a href="../extrusion.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> </nobr><br><a href="../shape_processing.htm"><b>problems</b></a> <br><nobr>process <a href="../repairing_operations.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><nobr>processed <a href="../close_contour.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../suppress_faces.htm"><b>3</b></a> <a href="../shape_processing.htm"><b>4</b></a> </nobr><br><a href="../shape_processing.htm"><b>processes</b></a> <br><nobr>processing <a href="../repairing_operations.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><nobr>processshape <a href="../repairing_operations.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><nobr>produce <a href="../close_contour.htm"><b>1</b></a> <a href="../chamfer.htm"><b>2</b></a> <a href="../archimede.htm"><b>3</b></a> <a href="../explode_on_blocks.htm"><b>4</b></a> <a href="../cut.htm"><b>5</b></a> <a href="../common.htm"><b>6</b></a> <a href="../multi_transformation.htm"><b>7</b></a> <a href="../multi_rotation.htm"><b>8</b></a> <a href="../mirror_image.htm"><b>9</b></a> <a href="../fuse.htm"><b>10</b></a> <a href="../fillet.htm"><b>11</b></a> <a href="../sewing.htm"><b>12</b></a> <a href="../section.htm"><b>13</b></a> <a href="../scale_transform.htm"><b>14</b></a> <a href="../rotation.htm"><b>15</b></a> <a href="../propagate.htm"><b>16</b></a> <a href="../partition.htm"><b>17</b></a> <a href="../offset_surface.htm"><b>18</b></a> <a href="../multi_translation.htm"><b>19</b></a> <a href="../translation.htm"><b>20</b></a> <a href="../transformation_operations.htm"><b>21</b></a> <a href="../suppress_faces.htm"><b>22</b></a> <a href="../shape_processing.htm"><b>23</b></a> </nobr><br><a href="../groups.htm"><b>program</b></a> <br><a href="../multi_rotation.htm"><b>projection</b></a> <br><a href="../working_plane.htm"><b>projections</b></a> <br><nobr>propagate <a href="../blocks_operations.htm"><b>1</b></a> <a href="../propagate.htm"><b>2</b></a> </nobr><br><nobr>propagation <a href="../blocks_operations.htm"><b>1</b></a> <a href="../propagate.htm"><b>2</b></a> </nobr><br><nobr>properties <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> </nobr><br><a href="../shape_processing.htm"><b>proportional</b></a> <br><a href="../measurement_tools.htm"><b>props</b></a> <br><nobr>provide <a href="../color.htm"><b>1</b></a> <a href="../close_contour.htm"><b>2</b></a> <a href="../circle.htm"><b>3</b></a> <a href="../check_free_faces.htm"><b>4</b></a> <a href="../check_free_boundaries.htm"><b>5</b></a> <a href="../chamfer.htm"><b>6</b></a> <a href="../box.htm"><b>7</b></a> <a href="../archimede.htm"><b>8</b></a> <a href="../arc.htm"><b>9</b></a> <a href="../add_point_on_edge.htm"><b>10</b></a> <a href="../files/salome2_sp3_booleangui_functions.htm"><b>11</b></a> <a href="../face.htm"><b>12</b></a> <a href="../extrusion.htm"><b>13</b></a> <a href="../explode_on_blocks.htm"><b>14</b></a> <a href="../ellipse.htm"><b>15</b></a> <a href="../edge.htm"><b>16</b></a> <a href="../cylinder.htm"><b>17</b></a> <a href="../cut.htm"><b>18</b></a> <a href="../curve.htm"><b>19</b></a> <a href="../cone.htm"><b>20</b></a> <a href="../compound.htm"><b>21</b></a> <a href="../common.htm"><b>22</b></a> <a href="../multi_transformation.htm"><b>23</b></a> <a href="../multi_rotation.htm"><b>24</b></a> <a href="../modify_the_location.htm"><b>25</b></a> <a href="../mirror_image.htm"><b>26</b></a> <a href="../line.htm"><b>27</b></a> <a href="../glue_faces.htm"><b>28</b></a> <a href="../fuse.htm"><b>29</b></a> <a href="../filling.htm"><b>30</b></a> <a href="../fillet.htm"><b>31</b></a> <a href="../sewing.htm"><b>32</b></a> <a href="../section.htm"><b>33</b></a> <a href="../scale_transform.htm"><b>34</b></a> <a href="../rotation.htm"><b>35</b></a> <a href="../revolution.htm"><b>36</b></a> <a href="../propagate.htm"><b>37</b></a> <a href="../point.htm"><b>38</b></a> <a href="../plane.htm"><b>39</b></a> <a href="../pipe_creation.htm"><b>40</b></a> <a href="../partition.htm"><b>41</b></a> <a href="../offset_surface.htm"><b>42</b></a> <a href="../newentity_blocks.htm"><b>43</b></a> <a href="../multi_translation.htm"><b>44</b></a> <a href="../wire.htm"><b>45</b></a> <a href="../vector.htm"><b>46</b></a> <a href="../turus.htm"><b>47</b></a> <a href="../transparency.htm"><b>48</b></a> <a href="../translation.htm"><b>49</b></a> <a href="../suppress_internal_wires.htm"><b>50</b></a> <a href="../suppress_holes.htm"><b>51</b></a> <a href="../suppress_faces.htm"><b>52</b></a> <a href="../sphere.htm"><b>53</b></a> <a href="../solid.htm"><b>54</b></a> <a href="../sketcher.htm"><b>55</b></a> <a href="../shell.htm"><b>56</b></a> <a href="../shape_processing.htm"><b>57</b></a> <a href="../working_with_groups.htm"><b>58</b></a> <a href="../wireframe_and_shading.htm"><b>59</b></a> </nobr><br><a href="../occ_viewer.htm"><b>providing</b></a> <br><a name="bms_PS"></a><a name="subkey_PS"></a><a href="../repairing_operations.htm"><b>ps</b></a> <br><a name="bms_PU"></a><a name="subkey_PU"></a><a href="../archimede.htm"><b>put</b></a> <br><nobr><a name="bms_PX"></a><a name="subkey_PX"></a>px <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> <a href="../geometrical_objects.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> </nobr><br><a href="../transformation_operations.htm"><b>pxy</b></a> <br><nobr>pxyz <a href="../complex_objects.htm"><b>1</b></a> <a href="../geometrical_objects.htm"><b>2</b></a> <a href="../transformation_operations.htm"><b>3</b></a> </nobr><br><nobr><a name="bms_PY"></a><a name="subkey_PY"></a>py <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../complex_objects.htm"><b>2</b></a> <a href="../geometrical_objects.htm"><b>3</b></a> <a href="../repairing_operations.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> </nobr><br><a href="../repairing_operations.htm"><b>py1</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>python</b></a> <br><nobr><a name="bms_PZ"></a><a name="subkey_PZ"></a>pz <a href="../basic_operations.htm"><b>1</b></a> <a href="../basic_geometrical_objects.htm"><b>2</b></a> <a href="../complex_objects.htm"><b>3</b></a> <a href="../geometrical_objects.htm"><b>4</b></a> <a href="../repairing_operations.htm"><b>5</b></a> <a href="../transformation_operations.htm"><b>6</b></a> </nobr><br>
-<br><br>
-<a name="bm_Q"></a><a name="subkey_QF"></a><a href="../building_by_blocks.htm"><b>qface1</b></a> <br><a href="../building_by_blocks.htm"><b>qface2</b></a> <br><a href="../building_by_blocks.htm"><b>qface3</b></a> <br><a href="../building_by_blocks.htm"><b>qface4</b></a> <br><a href="../building_by_blocks.htm"><b>qface5</b></a> <br><a href="../building_by_blocks.htm"><b>qface6</b></a> <br><a href="../building_by_blocks.htm"><b>qface7</b></a> <br><a href="../building_by_blocks.htm"><b>qface8</b></a> <br><nobr><a name="bms_QU"></a><a name="subkey_QU"></a>quadrangle <a href="../building_by_blocks.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../plane.htm"><b>3</b></a> <a href="../newentity_blocks.htm"><b>4</b></a> </nobr><br>
-<br><br>
-<nobr><a name="bm_R"></a><a name="subkey_R{"></a>r <a href="../geometrical_objects.htm"><b>1</b></a> <a href="../fillet.htm"><b>2</b></a> <a href="../sketcher_tui.htm"><b>3</b></a> </nobr><br><a name="bms_RA"></a><a name="subkey_RA"></a><a href="../working_with_groups.htm"><b>radio</b></a> <br><nobr>radius <a href="../circle.htm"><b>1</b></a> <a href="../chamfer.htm"><b>2</b></a> <a href="../basic_geometrical_objects.htm"><b>3</b></a> <a href="../ellipse.htm"><b>4</b></a> <a href="../cylinder.htm"><b>5</b></a> <a href="../cone.htm"><b>6</b></a> <a href="../fillet.htm"><b>7</b></a> <a href="../turus.htm"><b>8</b></a> <a href="../transformation_operations.htm"><b>9</b></a> <a href="../sphere.htm"><b>10</b></a> <a href="../sketcher.htm"><b>11</b></a> </nobr><br><nobr>radius1 <a href="../boolean_operations.htm"><b>1</b></a> <a href="../cone.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> <a href="../primitives.htm"><b>4</b></a> <a href="../transformation_operations.htm"><b>5</b></a> </nobr><br><nobr>radius2 <a href="../cone.htm"><b>1</b></a> <a href="../primitives.htm"><b>2</b></a> </nobr><br><a href="../primitives.htm"><b>radius3</b></a> <br><nobr>radiuses <a href="../basic_geometrical_objects.htm"><b>1</b></a> <a href="../ellipse.htm"><b>2</b></a> <a href="../cone.htm"><b>3</b></a> <a href="../turus.htm"><b>4</b></a> </nobr><br><nobr>radiusmajor <a href="../ellipse.htm"><b>1</b></a> <a href="../turus.htm"><b>2</b></a> </nobr><br><nobr>radiusminor <a href="../ellipse.htm"><b>1</b></a> <a href="../turus.htm"><b>2</b></a> </nobr><br><nobr>raise <a href="../measurement_tools.htm"><b>1</b></a> <a href="../groups.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> </nobr><br><nobr>range <a href="../add_point_on_edge.htm"><b>1</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>2</b></a> <a href="../files/introduction_to_geom.htm"><b>3</b></a> <a href="../explode.htm"><b>4</b></a> <a href="../geometry.htm"><b>5</b></a> <a href="../transparency.htm"><b>6</b></a> </nobr><br><a name="bms_RE"></a><a name="subkey_RE"></a><a href="../viewing_geometrical_objects.htm"><b>recent</b></a> <br><a href="../partition.htm"><b>reconstruction</b></a> <br><a href="../viewing_geometrical_objects.htm"><b>redefine</b></a> <br><a href="../shape_processing.htm"><b>reduce</b></a> <br><nobr>reference <a href="../local_coordinate_system.htm"><b>1</b></a> <a href="../point.htm"><b>2</b></a> </nobr><br><a href="../viewing_geometrical_objects.htm"><b>refreshes</b></a> <br><a href="../point.htm"><b>regarding</b></a> <br><a href="../sketcher.htm"><b>relative</b></a> <br><a href="../transformation_operations.htm"><b>relatively</b></a> <br><a href="../wireframe_and_shading.htm"><b>relevant</b></a> <br><nobr>remain <a href="../occ_viewer.htm"><b>1</b></a> <a href="../wireframe_and_shading.htm"><b>2</b></a> </nobr><br><a href="../modify_the_location.htm"><b>remainder</b></a> <br><a href="../occ_viewer.htm"><b>remote</b></a> <br><nobr>remove <a href="../groups.htm"><b>1</b></a> <a href="../repairing_operations.htm"><b>2</b></a> <a href="../suppress_internal_wires.htm"><b>3</b></a> <a href="../suppress_holes.htm"><b>4</b></a> <a href="../working_with_groups.htm"><b>5</b></a> </nobr><br><nobr>removed <a href="../modify_the_location.htm"><b>1</b></a> <a href="../mirror_image.htm"><b>2</b></a> <a href="../rotation.htm"><b>3</b></a> <a href="../occ_viewer.htm"><b>4</b></a> <a href="../translation.htm"><b>5</b></a> <a href="../suppress_internal_wires.htm"><b>6</b></a> <a href="../suppress_holes.htm"><b>7</b></a> <a href="../suppress_faces.htm"><b>8</b></a> <a href="../working_with_groups.htm"><b>9</b></a> </nobr><br><nobr>removeobject <a href="../groups.htm"><b>1</b></a> <a href="../working_with_groups.htm"><b>2</b></a> </nobr><br><nobr>removes <a href="../suppress_internal_wires.htm"><b>1</b></a> <a href="../suppress_holes.htm"><b>2</b></a> <a href="../shape_processing.htm"><b>3</b></a> </nobr><br><a href="../partition.htm"><b>removewebs</b></a> <br><a href="../groups.htm"><b>removing</b></a> <br><a href="../viewing_geometrical_objects.htm"><b>rename</b></a> <br><nobr>repair <a href="../close_contour.htm"><b>1</b></a> <a href="../check_free_faces.htm"><b>2</b></a> <a href="../check_free_boundaries.htm"><b>3</b></a> <a href="../add_point_on_edge.htm"><b>4</b></a> <a href="../glue_faces.htm"><b>5</b></a> <a href="../sewing.htm"><b>6</b></a> <a href="../suppress_internal_wires.htm"><b>7</b></a> <a href="../suppress_holes.htm"><b>8</b></a> <a href="../suppress_faces.htm"><b>9</b></a> <a href="../shape_processing.htm"><b>10</b></a> </nobr><br><nobr>repairing <a href="../close_contour.htm"><b>1</b></a> <a href="../check_free_faces.htm"><b>2</b></a> <a href="../check_free_boundaries.htm"><b>3</b></a> <a href="../add_point_on_edge.htm"><b>4</b></a> <a href="../files/introduction_to_geom.htm"><b>5</b></a> <a href="../glue_faces.htm"><b>6</b></a> <a href="../geometry.htm"><b>7</b></a> <a href="../sewing.htm"><b>8</b></a> <a href="../repairing_operations.htm"><b>9</b></a> <a href="../suppress_internal_wires.htm"><b>10</b></a> <a href="../suppress_holes.htm"><b>11</b></a> <a href="../suppress_faces.htm"><b>12</b></a> <a href="../shape_processing.htm"><b>13</b></a> </nobr><br><nobr>repetition <a href="../multi_rotation.htm"><b>1</b></a> <a href="../multi_translation.htm"><b>2</b></a> </nobr><br><a href="../multi_translation.htm"><b>repetitions</b></a> <br><a href="../occ_viewer.htm"><b>representation</b></a> <br><a href="../occ_viewer.htm"><b>represented</b></a> <br><nobr>representing <a href="../plane.htm"><b>1</b></a> <a href="../occ_viewer.htm"><b>2</b></a> </nobr><br><a href="../occ_viewer.htm"><b>represents</b></a> <br><nobr>required <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>1</b></a> <a href="../shape_processing.htm"><b>2</b></a> </nobr><br><a href="../shape_processing.htm"><b>requireddegree</b></a> <br><a href="../shape_processing.htm"><b>requirednbsegments</b></a> <br><a href="../shape_processing.htm"><b>requires</b></a> <br><a href="../repairing_operations.htm"><b>res</b></a> <br><a href="../occ_viewer.htm"><b>reset</b></a> <br><a href="../occ_viewer.htm"><b>resizes</b></a> <br><nobr>respect <a href="../glue_faces.htm"><b>1</b></a> <a href="../sketcher.htm"><b>2</b></a> </nobr><br><a href="../occ_viewer.htm"><b>restore</b></a> <br><a href="../occ_viewer.htm"><b>restores</b></a> <br><a href="../shape_processing.htm"><b>restriction</b></a> <br><nobr>result <a href="../close_contour.htm"><b>1</b></a> <a href="../circle.htm"><b>2</b></a> <a href="../check_free_faces.htm"><b>3</b></a> <a href="../check_free_boundaries.htm"><b>4</b></a> <a href="../chamfer.htm"><b>5</b></a> <a href="../box.htm"><b>6</b></a> <a href="../blocks_operations.htm"><b>7</b></a> <a href="../basic_operations.htm"><b>8</b></a> <a href="../archimede.htm"><b>9</b></a> <a href="../arc.htm"><b>10</b></a> <a href="../add_point_on_edge.htm"><b>11</b></a> <a href="../face.htm"><b>12</b></a> <a href="../extrusion.htm"><b>13</b></a> <a href="../explode_on_blocks.htm"><b>14</b></a> <a href="../explode.htm"><b>15</b></a> <a href="../ellipse.htm"><b>16</b></a> <a href="../edge.htm"><b>17</b></a> <a href="../cylinder.htm"><b>18</b></a> <a href="../cut.htm"><b>19</b></a> <a href="../curve.htm"><b>20</b></a> <a href="../cone.htm"><b>21</b></a> <a href="../compound.htm"><b>22</b></a> <a href="../common.htm"><b>23</b></a> <a href="../multi_transformation.htm"><b>24</b></a> <a href="../multi_rotation.htm"><b>25</b></a> <a href="../mirror_image.htm"><b>26</b></a> <a href="../line.htm"><b>27</b></a> <a href="../glue_faces.htm"><b>28</b></a> <a href="../fuse.htm"><b>29</b></a> <a href="../filling.htm"><b>30</b></a> <a href="../fillet.htm"><b>31</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>32</b></a> <a href="../sewing.htm"><b>33</b></a> <a href="../section.htm"><b>34</b></a> <a href="../scale_transform.htm"><b>35</b></a> <a href="../rotation.htm"><b>36</b></a> <a href="../revolution.htm"><b>37</b></a> <a href="../repairing_operations.htm"><b>38</b></a> <a href="../propagate.htm"><b>39</b></a> <a href="../point.htm"><b>40</b></a> <a href="../plane.htm"><b>41</b></a> <a href="../pipe_creation.htm"><b>42</b></a> <a href="../partition.htm"><b>43</b></a> <a href="../offset_surface.htm"><b>44</b></a> <a href="../newentity_blocks.htm"><b>45</b></a> <a href="../multi_translation.htm"><b>46</b></a> <a href="../wire.htm"><b>47</b></a> <a href="../vector.htm"><b>48</b></a> <a href="../turus.htm"><b>49</b></a> <a href="../translation.htm"><b>50</b></a> <a href="../transformation_operations.htm"><b>51</b></a> <a href="../suppress_internal_wires.htm"><b>52</b></a> <a href="../suppress_holes.htm"><b>53</b></a> <a href="../suppress_faces.htm"><b>54</b></a> <a href="../sphere.htm"><b>55</b></a> <a href="../solid.htm"><b>56</b></a> <a href="../sketcher.htm"><b>57</b></a> <a href="../shell.htm"><b>58</b></a> <a href="../shape_processing.htm"><b>59</b></a> <a href="../working_with_groups.htm"><b>60</b></a> </nobr><br><a href="../shape_processing.htm"><b>resultant</b></a> <br><nobr>resulting <a href="../face.htm"><b>1</b></a> <a href="../explode_on_blocks.htm"><b>2</b></a> <a href="../suppress_internal_wires.htm"><b>3</b></a> <a href="../sketcher.htm"><b>4</b></a> <a href="../shape_processing.htm"><b>5</b></a> </nobr><br><nobr>results <a href="../boolean_operations.htm"><b>1</b></a> <a href="../blocks_operations.htm"><b>2</b></a> <a href="../repairing_operations.htm"><b>3</b></a> <a href="../partition.htm"><b>4</b></a> <a href="../occ_viewer.htm"><b>5</b></a> <a href="../transformation_operations.htm"><b>6</b></a> </nobr><br><a href="../check_free_faces.htm"><b>retrieves</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>return</b></a> <br><nobr>returned <a href="../measurement_tools.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../working_with_groups.htm"><b>3</b></a> </nobr><br><a href="../explode.htm"><b>returning</b></a> <br><nobr>returns <a href="../explode_on_blocks.htm"><b>1</b></a> <a href="../explode.htm"><b>2</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>3</b></a> <a href="../occ_viewer.htm"><b>4</b></a> <a href="../working_with_groups.htm"><b>5</b></a> </nobr><br><nobr>reverse <a href="../multi_rotation.htm"><b>1</b></a> <a href="../rotation.htm"><b>2</b></a> </nobr><br><nobr>revolution <a href="../complex_objects.htm"><b>1</b></a> <a href="../revolution.htm"><b>2</b></a> <a href="../shape_processing.htm"><b>3</b></a> </nobr><br><br><br></p><p class="ftsbody" align="center"><a href="whlstf10.htm" target="_self" title="previous search group"><b>&gt;&gt;</b></a>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl0.htm b/doc/salome/gui/GEOM/whgdata/whlstfl0.htm
deleted file mode 100755 (executable)
index a8d6ceb..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_{"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf0.htm#bm_{" target="ftslist" title="search letter { "><b>{ </b></a> <a href="whlstf0.htm#bms_{D" target="ftslist" title="search letter {D"><b>{D</b></a> <a href="whlstf0.htm#bms_{E" target="ftslist" title="search letter {E"><b>{E</b></a> <a href="whlstf0.htm#bms_{D" target="ftslist" title="search letter {D"><b>{D</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl1.htm b/doc/salome/gui/GEOM/whgdata/whlstfl1.htm
deleted file mode 100755 (executable)
index 3ddd0ea..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_A"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf0.htm#bm_A" target="ftslist" title="search letter AB"><b>AB</b></a> <a href="whlstf0.htm#bms_AC" target="ftslist" title="search letter AC"><b>AC</b></a> <a href="whlstf0.htm#bms_AD" target="ftslist" title="search letter AD"><b>AD</b></a> <a href="whlstf0.htm#bms_AL" target="ftslist" title="search letter AL"><b>AL</b></a> <a href="whlstf0.htm#bms_AN" target="ftslist" title="search letter AN"><b>AN</b></a> <a href="whlstf0.htm#bms_AP" target="ftslist" title="search letter AP"><b>AP</b></a> <a href="whlstf0.htm#bms_AR" target="ftslist" title="search letter AR"><b>AR</b></a> <a href="whlstf0.htm#bms_AU" target="ftslist" title="search letter AU"><b>AU</b></a> <a href="whlstf0.htm#bms_AV" target="ftslist" title="search letter AV"><b>AV</b></a> <a href="whlstf0.htm#bms_AX" target="ftslist" title="search letter AX"><b>AX</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl10.htm b/doc/salome/gui/GEOM/whgdata/whlstfl10.htm
deleted file mode 100755 (executable)
index c098d32..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_J"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf6.htm#bm_J" target="ftslist" title="search letter JO"><b>JO</b></a> <a href="whlstf6.htm#bms_JP" target="ftslist" title="search letter JP"><b>JP</b></a> <a href="whlstf6.htm#bms_JU" target="ftslist" title="search letter JU"><b>JU</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl11.htm b/doc/salome/gui/GEOM/whgdata/whlstfl11.htm
deleted file mode 100755 (executable)
index 4547492..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_K"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf6.htm#bm_K" target="ftslist" title="search letter K "><b>K </b></a> <a href="whlstf6.htm#bms_KE" target="ftslist" title="search letter KE"><b>KE</b></a> <a href="whlstf6.htm#bms_KO" target="ftslist" title="search letter KO"><b>KO</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl12.htm b/doc/salome/gui/GEOM/whgdata/whlstfl12.htm
deleted file mode 100755 (executable)
index 07c629b..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_L"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf6.htm#bm_L" target="ftslist" title="search letter L "><b>L </b></a> <a href="whlstf6.htm#bms_LA" target="ftslist" title="search letter LA"><b>LA</b></a> <a href="whlstf6.htm#bms_LC" target="ftslist" title="search letter LC"><b>LC</b></a> <a href="whlstf6.htm#bms_LE" target="ftslist" title="search letter LE"><b>LE</b></a> <a href="whlstf6.htm#bms_LI" target="ftslist" title="search letter LI"><b>LI</b></a> <a href="whlstf6.htm#bms_LL" target="ftslist" title="search letter LL"><b>LL</b></a> <a href="whlstf6.htm#bms_LO" target="ftslist" title="search letter LO"><b>LO</b></a> <a href="whlstf6.htm#bms_LS" target="ftslist" title="search letter LS"><b>LS</b></a> <a href="whlstf6.htm#bms_LY" target="ftslist" title="search letter LY"><b>LY</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl13.htm b/doc/salome/gui/GEOM/whgdata/whlstfl13.htm
deleted file mode 100755 (executable)
index fa383d4..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_M"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf6.htm#bm_M" target="ftslist" title="search letter MA"><b>MA</b></a> <a href="whlstf7.htm#bms_ME" target="ftslist" title="search letter ME"><b>ME</b></a> <a href="whlstf7.htm#bms_MI" target="ftslist" title="search letter MI"><b>MI</b></a> <a href="whlstf7.htm#bms_MO" target="ftslist" title="search letter MO"><b>MO</b></a> <a href="whlstf7.htm#bms_MU" target="ftslist" title="search letter MU"><b>MU</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl14.htm b/doc/salome/gui/GEOM/whgdata/whlstfl14.htm
deleted file mode 100755 (executable)
index 60532d3..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_N"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf7.htm#bm_N" target="ftslist" title="search letter N "><b>N </b></a> <a href="whlstf7.htm#bms_NA" target="ftslist" title="search letter NA"><b>NA</b></a> <a href="whlstf7.htm#bms_NB" target="ftslist" title="search letter NB"><b>NB</b></a> <a href="whlstf7.htm#bms_NC" target="ftslist" title="search letter NC"><b>NC</b></a> <a href="whlstf7.htm#bms_NE" target="ftslist" title="search letter NE"><b>NE</b></a> <a href="whlstf7.htm#bms_NI" target="ftslist" title="search letter NI"><b>NI</b></a> <a href="whlstf7.htm#bms_NM" target="ftslist" title="search letter NM"><b>NM</b></a> <a href="whlstf7.htm#bms_NO" target="ftslist" title="search letter NO"><b>NO</b></a> <a href="whlstf7.htm#bms_NT" target="ftslist" title="search letter NT"><b>NT</b></a> <a href="whlstf7.htm#bms_NU" target="ftslist" title="search letter NU"><b>NU</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl15.htm b/doc/salome/gui/GEOM/whgdata/whlstfl15.htm
deleted file mode 100755 (executable)
index 68165a4..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_O"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf7.htm#bm_O" target="ftslist" title="search letter OB"><b>OB</b></a> <a href="whlstf8.htm#bms_OC" target="ftslist" title="search letter OC"><b>OC</b></a> <a href="whlstf8.htm#bms_OF" target="ftslist" title="search letter OF"><b>OF</b></a> <a href="whlstf8.htm#bms_OK" target="ftslist" title="search letter OK"><b>OK</b></a> <a href="whlstf8.htm#bms_OL" target="ftslist" title="search letter OL"><b>OL</b></a> <a href="whlstf8.htm#bms_ON" target="ftslist" title="search letter ON"><b>ON</b></a> <a href="whlstf8.htm#bms_OP" target="ftslist" title="search letter OP"><b>OP</b></a> <a href="whlstf8.htm#bms_OR" target="ftslist" title="search letter OR"><b>OR</b></a> <a href="whlstf8.htm#bms_OS" target="ftslist" title="search letter OS"><b>OS</b></a> <a href="whlstf8.htm#bms_OT" target="ftslist" title="search letter OT"><b>OT</b></a> <a href="whlstf8.htm#bms_OU" target="ftslist" title="search letter OU"><b>OU</b></a> <a href="whlstf8.htm#bms_OX" target="ftslist" title="search letter OX"><b>OX</b></a> <a href="whlstf8.htm#bms_OY" target="ftslist" title="search letter OY"><b>OY</b></a> <a href="whlstf8.htm#bms_OZ" target="ftslist" title="search letter OZ"><b>OZ</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl16.htm b/doc/salome/gui/GEOM/whgdata/whlstfl16.htm
deleted file mode 100755 (executable)
index eda34ce..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_P"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf8.htm#bm_P" target="ftslist" title="search letter P "><b>P </b></a> <a href="whlstf8.htm#bms_PA" target="ftslist" title="search letter PA"><b>PA</b></a> <a href="whlstf8.htm#bms_PE" target="ftslist" title="search letter PE"><b>PE</b></a> <a href="whlstf8.htm#bms_PI" target="ftslist" title="search letter PI"><b>PI</b></a> <a href="whlstf8.htm#bms_PL" target="ftslist" title="search letter PL"><b>PL</b></a> <a href="whlstf9.htm#bms_PN" target="ftslist" title="search letter PN"><b>PN</b></a> <a href="whlstf9.htm#bms_PO" target="ftslist" title="search letter PO"><b>PO</b></a> <a href="whlstf9.htm#bms_PR" target="ftslist" title="search letter PR"><b>PR</b></a> <a href="whlstf9.htm#bms_PS" target="ftslist" title="search letter PS"><b>PS</b></a> <a href="whlstf9.htm#bms_PU" target="ftslist" title="search letter PU"><b>PU</b></a> <a href="whlstf9.htm#bms_PX" target="ftslist" title="search letter PX"><b>PX</b></a> <a href="whlstf9.htm#bms_PY" target="ftslist" title="search letter PY"><b>PY</b></a> <a href="whlstf9.htm#bms_PZ" target="ftslist" title="search letter PZ"><b>PZ</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl17.htm b/doc/salome/gui/GEOM/whgdata/whlstfl17.htm
deleted file mode 100755 (executable)
index a4abf71..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_Q"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf9.htm#bm_Q" target="ftslist" title="search letter QF"><b>QF</b></a> <a href="whlstf9.htm#bms_QU" target="ftslist" title="search letter QU"><b>QU</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl18.htm b/doc/salome/gui/GEOM/whgdata/whlstfl18.htm
deleted file mode 100755 (executable)
index e11002a..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_R"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf9.htm#bm_R" target="ftslist" title="search letter R "><b>R </b></a> <a href="whlstf9.htm#bms_RA" target="ftslist" title="search letter RA"><b>RA</b></a> <a href="whlstf9.htm#bms_RE" target="ftslist" title="search letter RE"><b>RE</b></a> <a href="whlstf10.htm#bms_RI" target="ftslist" title="search letter RI"><b>RI</b></a> <a href="whlstf10.htm#bms_RO" target="ftslist" title="search letter RO"><b>RO</b></a> <a href="whlstf10.htm#bms_RU" target="ftslist" title="search letter RU"><b>RU</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl19.htm b/doc/salome/gui/GEOM/whgdata/whlstfl19.htm
deleted file mode 100755 (executable)
index 0a710d8..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_S"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf10.htm#bm_S" target="ftslist" title="search letter S "><b>S </b></a> <a href="whlstf10.htm#bms_SA" target="ftslist" title="search letter SA"><b>SA</b></a> <a href="whlstf10.htm#bms_SC" target="ftslist" title="search letter SC"><b>SC</b></a> <a href="whlstf10.htm#bms_SE" target="ftslist" title="search letter SE"><b>SE</b></a> <a href="whlstf10.htm#bms_SG" target="ftslist" title="search letter SG"><b>SG</b></a> <a href="whlstf10.htm#bms_SH" target="ftslist" title="search letter SH"><b>SH</b></a> <a href="whlstf11.htm#bms_SI" target="ftslist" title="search letter SI"><b>SI</b></a> <a href="whlstf11.htm#bms_SK" target="ftslist" title="search letter SK"><b>SK</b></a> <a href="whlstf11.htm#bms_SM" target="ftslist" title="search letter SM"><b>SM</b></a> <a href="whlstf11.htm#bms_SO" target="ftslist" title="search letter SO"><b>SO</b></a> <a href="whlstf11.htm#bms_SP" target="ftslist" title="search letter SP"><b>SP</b></a> <a href="whlstf11.htm#bms_SQ" target="ftslist" title="search letter SQ"><b>SQ</b></a> <a href="whlstf11.htm#bms_ST" target="ftslist" title="search letter ST"><b>ST</b></a> <a href="whlstf11.htm#bms_SU" target="ftslist" title="search letter SU"><b>SU</b></a> <a href="whlstf11.htm#bms_SY" target="ftslist" title="search letter SY"><b>SY</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl2.htm b/doc/salome/gui/GEOM/whgdata/whlstfl2.htm
deleted file mode 100755 (executable)
index b122abd..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_B"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf0.htm#bm_B" target="ftslist" title="search letter B "><b>B </b></a> <a href="whlstf0.htm#bms_BA" target="ftslist" title="search letter BA"><b>BA</b></a> <a href="whlstf0.htm#bms_BB" target="ftslist" title="search letter BB"><b>BB</b></a> <a href="whlstf0.htm#bms_BE" target="ftslist" title="search letter BE"><b>BE</b></a> <a href="whlstf0.htm#bms_BL" target="ftslist" title="search letter BL"><b>BL</b></a> <a href="whlstf0.htm#bms_BM" target="ftslist" title="search letter BM"><b>BM</b></a> <a href="whlstf0.htm#bms_BO" target="ftslist" title="search letter BO"><b>BO</b></a> <a href="whlstf1.htm#bms_BR" target="ftslist" title="search letter BR"><b>BR</b></a> <a href="whlstf1.htm#bms_BS" target="ftslist" title="search letter BS"><b>BS</b></a> <a href="whlstf1.htm#bms_BU" target="ftslist" title="search letter BU"><b>BU</b></a> <a href="whlstf1.htm#bms_BY" target="ftslist" title="search letter BY"><b>BY</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl20.htm b/doc/salome/gui/GEOM/whgdata/whlstfl20.htm
deleted file mode 100755 (executable)
index 095ab47..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_T"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf11.htm#bm_T" target="ftslist" title="search letter T "><b>T </b></a> <a href="whlstf11.htm#bms_TA" target="ftslist" title="search letter TA"><b>TA</b></a> <a href="whlstf11.htm#bms_TE" target="ftslist" title="search letter TE"><b>TE</b></a> <a href="whlstf11.htm#bms_TH" target="ftslist" title="search letter TH"><b>TH</b></a> <a href="whlstf11.htm#bms_TI" target="ftslist" title="search letter TI"><b>TI</b></a> <a href="whlstf11.htm#bms_TO" target="ftslist" title="search letter TO"><b>TO</b></a> <a href="whlstf11.htm#bms_TR" target="ftslist" title="search letter TR"><b>TR</b></a> <a href="whlstf12.htm#bms_TT" target="ftslist" title="search letter TT"><b>TT</b></a> <a href="whlstf12.htm#bms_TU" target="ftslist" title="search letter TU"><b>TU</b></a> <a href="whlstf12.htm#bms_TW" target="ftslist" title="search letter TW"><b>TW</b></a> <a href="whlstf12.htm#bms_TY" target="ftslist" title="search letter TY"><b>TY</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl21.htm b/doc/salome/gui/GEOM/whgdata/whlstfl21.htm
deleted file mode 100755 (executable)
index 1d1f4d3..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_U"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf12.htm#bm_U" target="ftslist" title="search letter U "><b>U </b></a> <a href="whlstf12.htm#bms_UN" target="ftslist" title="search letter UN"><b>UN</b></a> <a href="whlstf12.htm#bms_UP" target="ftslist" title="search letter UP"><b>UP</b></a> <a href="whlstf12.htm#bms_US" target="ftslist" title="search letter US"><b>US</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl22.htm b/doc/salome/gui/GEOM/whgdata/whlstfl22.htm
deleted file mode 100755 (executable)
index ca8764f..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_V"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf12.htm#bm_V" target="ftslist" title="search letter V "><b>V </b></a> <a href="whlstf12.htm#bms_VA" target="ftslist" title="search letter VA"><b>VA</b></a> <a href="whlstf12.htm#bms_VE" target="ftslist" title="search letter VE"><b>VE</b></a> <a href="whlstf12.htm#bms_VI" target="ftslist" title="search letter VI"><b>VI</b></a> <a href="whlstf12.htm#bms_VO" target="ftslist" title="search letter VO"><b>VO</b></a> <a href="whlstf12.htm#bms_VR" target="ftslist" title="search letter VR"><b>VR</b></a> <a href="whlstf12.htm#bms_VT" target="ftslist" title="search letter VT"><b>VT</b></a> <a href="whlstf12.htm#bms_VX" target="ftslist" title="search letter VX"><b>VX</b></a> <a href="whlstf12.htm#bms_VZ" target="ftslist" title="search letter VZ"><b>VZ</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl23.htm b/doc/salome/gui/GEOM/whgdata/whlstfl23.htm
deleted file mode 100755 (executable)
index 57d263d..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_W"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf12.htm#bm_W" target="ftslist" title="search letter W "><b>W </b></a> <a href="whlstf13.htm#bms_WA" target="ftslist" title="search letter WA"><b>WA</b></a> <a href="whlstf13.htm#bms_WE" target="ftslist" title="search letter WE"><b>WE</b></a> <a href="whlstf13.htm#bms_WF" target="ftslist" title="search letter WF"><b>WF</b></a> <a href="whlstf13.htm#bms_WH" target="ftslist" title="search letter WH"><b>WH</b></a> <a href="whlstf13.htm#bms_WI" target="ftslist" title="search letter WI"><b>WI</b></a> <a href="whlstf13.htm#bms_WO" target="ftslist" title="search letter WO"><b>WO</b></a> <a href="whlstf13.htm#bms_WW" target="ftslist" title="search letter WW"><b>WW</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl24.htm b/doc/salome/gui/GEOM/whgdata/whlstfl24.htm
deleted file mode 100755 (executable)
index c0564aa..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_X"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf13.htm#bm_X" target="ftslist" title="search letter X "><b>X </b></a> <a href="whlstf13.htm#bms_XD" target="ftslist" title="search letter XD"><b>XD</b></a> <a href="whlstf13.htm#bms_XM" target="ftslist" title="search letter XM"><b>XM</b></a> <a href="whlstf13.htm#bms_XO" target="ftslist" title="search letter XO"><b>XO</b></a> <a href="whlstf13.htm#bms_XY" target="ftslist" title="search letter XY"><b>XY</b></a> <a href="whlstf13.htm#bms_XZ" target="ftslist" title="search letter XZ"><b>XZ</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl25.htm b/doc/salome/gui/GEOM/whgdata/whlstfl25.htm
deleted file mode 100755 (executable)
index 2d94192..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_Y"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf13.htm#bm_Y" target="ftslist" title="search letter Y "><b>Y </b></a> <a href="whlstf13.htm#bms_YD" target="ftslist" title="search letter YD"><b>YD</b></a> <a href="whlstf13.htm#bms_YM" target="ftslist" title="search letter YM"><b>YM</b></a> <a href="whlstf13.htm#bms_YO" target="ftslist" title="search letter YO"><b>YO</b></a> <a href="whlstf13.htm#bms_YZ" target="ftslist" title="search letter YZ"><b>YZ</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl26.htm b/doc/salome/gui/GEOM/whgdata/whlstfl26.htm
deleted file mode 100755 (executable)
index c096d46..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_Z"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf13.htm#bm_Z" target="ftslist" title="search letter Z "><b>Z </b></a> <a href="whlstf13.htm#bms_ZE" target="ftslist" title="search letter ZE"><b>ZE</b></a> <a href="whlstf13.htm#bms_ZM" target="ftslist" title="search letter ZM"><b>ZM</b></a> <a href="whlstf13.htm#bms_ZO" target="ftslist" title="search letter ZO"><b>ZO</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl3.htm b/doc/salome/gui/GEOM/whgdata/whlstfl3.htm
deleted file mode 100755 (executable)
index 819f2db..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_C"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf1.htm#bm_C" target="ftslist" title="search letter C "><b>C </b></a> <a href="whlstf1.htm#bms_CA" target="ftslist" title="search letter CA"><b>CA</b></a> <a href="whlstf1.htm#bms_CE" target="ftslist" title="search letter CE"><b>CE</b></a> <a href="whlstf1.htm#bms_CH" target="ftslist" title="search letter CH"><b>CH</b></a> <a href="whlstf1.htm#bms_CI" target="ftslist" title="search letter CI"><b>CI</b></a> <a href="whlstf1.htm#bms_CL" target="ftslist" title="search letter CL"><b>CL</b></a> <a href="whlstf1.htm#bms_CM" target="ftslist" title="search letter CM"><b>CM</b></a> <a href="whlstf1.htm#bms_CN" target="ftslist" title="search letter CN"><b>CN</b></a> <a href="whlstf1.htm#bms_CO" target="ftslist" title="search letter CO"><b>CO</b></a> <a href="whlstf2.htm#bms_CR" target="ftslist" title="search letter CR"><b>CR</b></a> <a href="whlstf2.htm#bms_CS" target="ftslist" title="search letter CS"><b>CS</b></a> <a href="whlstf2.htm#bms_CU" target="ftslist" title="search letter CU"><b>CU</b></a> <a href="whlstf2.htm#bms_CY" target="ftslist" title="search letter CY"><b>CY</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl4.htm b/doc/salome/gui/GEOM/whgdata/whlstfl4.htm
deleted file mode 100755 (executable)
index 4f958b9..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_D"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf2.htm#bm_D" target="ftslist" title="search letter D "><b>D </b></a> <a href="whlstf2.htm#bms_DA" target="ftslist" title="search letter DA"><b>DA</b></a> <a href="whlstf2.htm#bms_DE" target="ftslist" title="search letter DE"><b>DE</b></a> <a href="whlstf2.htm#bms_DI" target="ftslist" title="search letter DI"><b>DI</b></a> <a href="whlstf2.htm#bms_DO" target="ftslist" title="search letter DO"><b>DO</b></a> <a href="whlstf2.htm#bms_DR" target="ftslist" title="search letter DR"><b>DR</b></a> <a href="whlstf3.htm#bms_DU" target="ftslist" title="search letter DU"><b>DU</b></a> <a href="whlstf3.htm#bms_DX" target="ftslist" title="search letter DX"><b>DX</b></a> <a href="whlstf3.htm#bms_DY" target="ftslist" title="search letter DY"><b>DY</b></a> <a href="whlstf3.htm#bms_DZ" target="ftslist" title="search letter DZ"><b>DZ</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl5.htm b/doc/salome/gui/GEOM/whgdata/whlstfl5.htm
deleted file mode 100755 (executable)
index 6436a81..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_E"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf3.htm#bm_E" target="ftslist" title="search letter E "><b>E </b></a> <a href="whlstf3.htm#bms_EA" target="ftslist" title="search letter EA"><b>EA</b></a> <a href="whlstf3.htm#bms_ED" target="ftslist" title="search letter ED"><b>ED</b></a> <a href="whlstf3.htm#bms_EG" target="ftslist" title="search letter EG"><b>EG</b></a> <a href="whlstf3.htm#bms_EI" target="ftslist" title="search letter EI"><b>EI</b></a> <a href="whlstf3.htm#bms_EL" target="ftslist" title="search letter EL"><b>EL</b></a> <a href="whlstf3.htm#bms_EM" target="ftslist" title="search letter EM"><b>EM</b></a> <a href="whlstf3.htm#bms_EN" target="ftslist" title="search letter EN"><b>EN</b></a> <a href="whlstf3.htm#bms_EQ" target="ftslist" title="search letter EQ"><b>EQ</b></a> <a href="whlstf3.htm#bms_ER" target="ftslist" title="search letter ER"><b>ER</b></a> <a href="whlstf3.htm#bms_ET" target="ftslist" title="search letter ET"><b>ET</b></a> <a href="whlstf3.htm#bms_EX" target="ftslist" title="search letter EX"><b>EX</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl6.htm b/doc/salome/gui/GEOM/whgdata/whlstfl6.htm
deleted file mode 100755 (executable)
index aeeed42..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_F"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf3.htm#bm_F" target="ftslist" title="search letter F "><b>F </b></a> <a href="whlstf3.htm#bms_FA" target="ftslist" title="search letter FA"><b>FA</b></a> <a href="whlstf4.htm#bms_FI" target="ftslist" title="search letter FI"><b>FI</b></a> <a href="whlstf4.htm#bms_FL" target="ftslist" title="search letter FL"><b>FL</b></a> <a href="whlstf4.htm#bms_FO" target="ftslist" title="search letter FO"><b>FO</b></a> <a href="whlstf4.htm#bms_FR" target="ftslist" title="search letter FR"><b>FR</b></a> <a href="whlstf4.htm#bms_FU" target="ftslist" title="search letter FU"><b>FU</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl7.htm b/doc/salome/gui/GEOM/whgdata/whlstfl7.htm
deleted file mode 100755 (executable)
index 8f8665a..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_G"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf4.htm#bm_G" target="ftslist" title="search letter G "><b>G </b></a> <a href="whlstf4.htm#bms_GA" target="ftslist" title="search letter GA"><b>GA</b></a> <a href="whlstf4.htm#bms_GC" target="ftslist" title="search letter GC"><b>GC</b></a> <a href="whlstf4.htm#bms_GE" target="ftslist" title="search letter GE"><b>GE</b></a> <a href="whlstf4.htm#bms_GG" target="ftslist" title="search letter GG"><b>GG</b></a> <a href="whlstf4.htm#bms_GI" target="ftslist" title="search letter GI"><b>GI</b></a> <a href="whlstf4.htm#bms_GL" target="ftslist" title="search letter GL"><b>GL</b></a> <a href="whlstf4.htm#bms_GO" target="ftslist" title="search letter GO"><b>GO</b></a> <a href="whlstf4.htm#bms_GR" target="ftslist" title="search letter GR"><b>GR</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl8.htm b/doc/salome/gui/GEOM/whgdata/whlstfl8.htm
deleted file mode 100755 (executable)
index 124e38a..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_H"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf5.htm#bm_H" target="ftslist" title="search letter HA"><b>HA</b></a> <a href="whlstf5.htm#bms_HE" target="ftslist" title="search letter HE"><b>HE</b></a> <a href="whlstf5.htm#bms_HI" target="ftslist" title="search letter HI"><b>HI</b></a> <a href="whlstf5.htm#bms_HO" target="ftslist" title="search letter HO"><b>HO</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl9.htm b/doc/salome/gui/GEOM/whgdata/whlstfl9.htm
deleted file mode 100755 (executable)
index c8ce4cd..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<title>Search Words letter</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<p class="ftsheader"><a name="subkey_I"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf5.htm#bm_I" target="ftslist" title="search letter I "><b>I </b></a> <a href="whlstf5.htm#bms_ID" target="ftslist" title="search letter ID"><b>ID</b></a> <a href="whlstf5.htm#bms_IF" target="ftslist" title="search letter IF"><b>IF</b></a> <a href="whlstf5.htm#bms_IG" target="ftslist" title="search letter IG"><b>IG</b></a> <a href="whlstf5.htm#bms_IM" target="ftslist" title="search letter IM"><b>IM</b></a> <a href="whlstf6.htm#bms_IN" target="ftslist" title="search letter IN"><b>IN</b></a> <a href="whlstf6.htm#bms_IS" target="ftslist" title="search letter IS"><b>IS</b></a> <a href="whlstf6.htm#bms_IT" target="ftslist" title="search letter IT"><b>IT</b></a> <a href="whlstf6.htm#bms_IX" target="ftslist" title="search letter IX"><b>IX</b></a> <a href="whlstf6.htm#bms_IY" target="ftslist" title="search letter IY"><b>IY</b></a> <a href="whlstf6.htm#bms_IZ" target="ftslist" title="search letter IZ"><b>IZ</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstg0.htm b/doc/salome/gui/GEOM/whgdata/whlstg0.htm
deleted file mode 100755 (executable)
index 193fb7c..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-<html>
-<head>
-<title>Glossary words list</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<base target="bsscright">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.glsheader {margin-left:10pt; margin-top:0pt;}
-.glsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.glsheader {margin-top:0pt; } .glsheader {margin-bottom:0pt; } .glsheader {margin-left:9pt; } 
-
-.glsbody {margin-top:0pt; } .glsbody {margin-bottom:0pt; } .glsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; }A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="glsbody" style="margin-bottom:1pt;"><a name="bm_C"></a><nobr><b>Cell</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">Element of a mesh. Cells are determined by their connectivity. They can have 0,1,2 or 3 dimension.<p>
-<p class="glsbody" style="margin-bottom:1pt;"><nobr><b>Component</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">One integer or real value can correspond to each component of a field and to each entity of a mesh<p>
-<p class="glsbody" style="margin-bottom:1pt;"><a name="bm_D"></a><nobr><b>Descendant connectivity</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">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.<p>
-<p class="glsbody" style="margin-bottom:1pt;"><a name="bm_E"></a><nobr><b>Edge</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">An edge of a volumetric or surface mesh. It is composed of 2 or 3 nodes (2 vertex nodes and optionally one middle node).<p>
-<p class="glsbody" style="margin-bottom:1pt;"><nobr><b>Entity of a mesh</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">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.<p>
-<p class="glsbody" style="margin-bottom:1pt;"><nobr><b>Equivalence</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">Equivalence represents a list of correspondance 2 by 2 of the entities of the same dimension.<p>
-<p class="glsbody" style="margin-bottom:1pt;"><a name="bm_F"></a><nobr><b>Face</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">Face of a volumetrical cell (triangle, quadrangle).<p>
-<p class="glsbody" style="margin-bottom:1pt;"><nobr><b>Family</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">Entities of a mesh are described by a certain number&nbsp;  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.<p>
-<p class="glsbody" style="margin-bottom:1pt;"><nobr><b>Field</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">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.<p>
-<p class="glsbody" style="margin-bottom:1pt;"><nobr><b>Field profile</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">Fields can be defined only on one part of the mesh. Profile&nbsp;  of the field or profile of the component of a field indicates which entities of the mesh contain values.<p>
-<p class="glsbody" style="margin-bottom:1pt;"><a name="bm_G"></a><nobr><b>Group</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">Unordered set of entities of a mesh. One entity can belong to&nbsp;  several groups.<p>
-<p class="glsbody" style="margin-bottom:1pt;"><a name="bm_M"></a><nobr><b>Mesh</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">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).<p>
-<p class="glsbody" style="margin-bottom:1pt;"><a name="bm_N"></a><nobr><b>Nodal connectivity</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">It is a description of an entity of the mesh by an ordered list of nodes constituting this entity.<p>
-<p class="glsbody" style="margin-bottom:1pt;"><nobr><b>Node</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">Node can be an isolated node of a mesh, a vertex or middle node of an edge. A node is associated to a point.<p>
-<p class="glsbody" style="margin-bottom:1pt;"><a name="bm_P"></a><nobr><b>Point</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">Geometrical entity determined by its coordinates in the space.<p>
-<p class="glsbody" style="margin-bottom:1pt;"><a name="bm_R"></a><nobr><b>Reference connectivity</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">For each type of entity of a mesh, reference connectivity define the topology of an entity.<p>
-<p class="glsbody" style="margin-bottom:1pt;"><nobr><b>Result</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">List of fields referring to one mesh.<p>
-<p class="glsbody" style="margin-bottom:1pt;"><a name="bm_S"></a><nobr><b>Study</b></nobr></p>
-<p class="glsbody" style="margin-top:1pt;">Study represents a chain of sequences of calculations.<p>
-<p class="glsbody"><br><br></p>
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlsti0.htm b/doc/salome/gui/GEOM/whgdata/whlsti0.htm
deleted file mode 100755 (executable)
index 32e2c7f..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Index words list</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ndxheader {margin-left:10pt; margin-top:0pt;}
-.ndxbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ndxheader {margin-top:0pt; } .ndxheader {margin-bottom:0pt; } .ndxheader {margin-left:9pt; } 
-
-.ndxbody {margin-top:0pt; } .ndxbody {margin-bottom:0pt; } .ndxbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt0.htm b/doc/salome/gui/GEOM/whgdata/whlstt0.htm
deleted file mode 100755 (executable)
index 98e3b2c..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt1.htm#1" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt1.htm b/doc/salome/gui/GEOM/whgdata/whlstt1.htm
deleted file mode 100755 (executable)
index 71d6e31..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt2.htm#2" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt8.htm#8" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt14.htm#14" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt10.htm b/doc/salome/gui/GEOM/whgdata/whlstt10.htm
deleted file mode 100755 (executable)
index 204cdfe..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt2.htm#2" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt1.htm#8" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="9"></a><a href="whlstt9.htm#9" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Basic Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="10"></a><a href="whlstt8.htm#10" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Boolean Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_booleangui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using boolean operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../fuse.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Fuse</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../common.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Common</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../cut.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Cut</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../section.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Section</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="11"></a><a href="whlstt11.htm#11" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transformation Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="12"></a><a href="whlstt12.htm#12" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Blocks Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="13"></a><a href="whlstt13.htm#13" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Repairing Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt14.htm#14" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt11.htm b/doc/salome/gui/GEOM/whgdata/whlstt11.htm
deleted file mode 100755 (executable)
index 1a34a25..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt2.htm#2" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt1.htm#8" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="9"></a><a href="whlstt9.htm#9" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Basic Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="10"></a><a href="whlstt10.htm#10" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Boolean Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="11"></a><a href="whlstt8.htm#11" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Transformation Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../translation.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Translation</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../rotation.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Rotation</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../modify_the_location.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Modify the Location</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../mirror_image.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Mirror Image</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../scale_transform.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Scale Transform</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../offset_surface.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Offset Surface</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../multi_translation.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Multi Translation</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../multi_rotation.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Multi Rotation</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../fillet.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Fillet</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../chamfer.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Chamfer</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="12"></a><a href="whlstt12.htm#12" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Blocks Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="13"></a><a href="whlstt13.htm#13" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Repairing Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt14.htm#14" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt12.htm b/doc/salome/gui/GEOM/whgdata/whlstt12.htm
deleted file mode 100755 (executable)
index af8e2ab..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt2.htm#2" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt1.htm#8" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="9"></a><a href="whlstt9.htm#9" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Basic Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="10"></a><a href="whlstt10.htm#10" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Boolean Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="11"></a><a href="whlstt11.htm#11" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transformation Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="12"></a><a href="whlstt8.htm#12" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Blocks Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../multi_transformation.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Multi Transformation</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../explode_on_blocks.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Explode on Blocks</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../propagate.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Propagate</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="13"></a><a href="whlstt13.htm#13" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Repairing Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt14.htm#14" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt13.htm b/doc/salome/gui/GEOM/whgdata/whlstt13.htm
deleted file mode 100755 (executable)
index a6ad534..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt2.htm#2" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt1.htm#8" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="9"></a><a href="whlstt9.htm#9" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Basic Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="10"></a><a href="whlstt10.htm#10" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Boolean Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="11"></a><a href="whlstt11.htm#11" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transformation Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="12"></a><a href="whlstt12.htm#12" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Blocks Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="13"></a><a href="whlstt8.htm#13" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Repairing Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../shape_processing.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Shape Processing</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../suppress_faces.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Suppress Faces</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../close_contour.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Close Contour</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../suppress_internal_wires.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Suppress Internal Wires</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../suppress_holes.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Suppress Holes</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../sewing.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Sewing</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../glue_faces.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Glue Faces</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../add_point_on_edge.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Add Point on Edge</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../check_free_boundaries.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Check Free Boundaries</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../check_free_faces.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Check Free Faces</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt14.htm#14" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt14.htm b/doc/salome/gui/GEOM/whgdata/whlstt14.htm
deleted file mode 100755 (executable)
index 9014180..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt2.htm#2" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt8.htm#8" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt1.htm#14" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../changing_display_parameters.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Viewing Geometrical Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="15"></a><a href="whlstt15.htm#15" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Geometric Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="16"></a><a href="whlstt16.htm#16" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transformation</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../measurement_tools.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Measurement Tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../geompy_doc/namespacegeompy.html"><img src="../wht_toc3.gif" border="0" align="absmiddle"> Python interface geompy.py</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt15.htm b/doc/salome/gui/GEOM/whgdata/whlstt15.htm
deleted file mode 100755 (executable)
index a55c468..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt2.htm#2" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt8.htm#8" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt1.htm#14" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../changing_display_parameters.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Viewing Geometrical Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="15"></a><a href="whlstt14.htm#15" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Creating Geometric Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../basic_geometrical_objects.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Basic Geometrical Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../primitives.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Primitives</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../complex_objects.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Complex Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../groups.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Working with Groups</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../building_by_blocks.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Building by Blocks</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../sketcher_tui.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Sketcher</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../geometrical_objects.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Advanced Geometrical Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="16"></a><a href="whlstt16.htm#16" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transformation</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../measurement_tools.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Measurement Tools</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt16.htm b/doc/salome/gui/GEOM/whgdata/whlstt16.htm
deleted file mode 100755 (executable)
index 941a079..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt2.htm#2" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt8.htm#8" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt1.htm#14" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../changing_display_parameters.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Viewing Geometrical Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="15"></a><a href="whlstt15.htm#15" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Geometric Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="16"></a><a href="whlstt14.htm#16" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Transformation</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../basic_operations.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Basic Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../boolean_operations.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Boolean Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../transformation_operations.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Transformation Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../blocks_operations.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Blocks Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../repairing_operations.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Repairing Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../measurement_tools.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Measurement Tools</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt2.htm b/doc/salome/gui/GEOM/whgdata/whlstt2.htm
deleted file mode 100755 (executable)
index 7ec8d9f..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt1.htm#2" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="3"></a><a href="whlstt3.htm#3" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Basic Geometric Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="4"></a><a href="whlstt4.htm#4" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Primitives</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="5"></a><a href="whlstt5.htm#5" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Complex Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../working_with_groups.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Working with groups</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../newentity_blocks.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Building by blocks</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../sketcher.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Sketcher</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="6"></a><a href="whlstt6.htm#6" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Advanced Geometrical Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt8.htm#8" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt14.htm#14" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt3.htm b/doc/salome/gui/GEOM/whgdata/whlstt3.htm
deleted file mode 100755 (executable)
index 80435d6..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt1.htm#2" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="3"></a><a href="whlstt2.htm#3" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Creating Basic Geometric Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../point.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Point</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../line.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Line</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../circle.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Circle</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../ellipse.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Ellipse</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../arc.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Arc</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../curve.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Curve</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../vector.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Vector</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../plane.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Plane</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../working_plane.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Working Plane</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../local_coordinate_system.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Local Coordinate System</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="4"></a><a href="whlstt4.htm#4" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Primitives</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="5"></a><a href="whlstt5.htm#5" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Complex Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../working_with_groups.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Working with groups</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../newentity_blocks.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Building by blocks</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../sketcher.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Sketcher</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="6"></a><a href="whlstt6.htm#6" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Advanced Geometrical Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt8.htm#8" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt14.htm#14" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt4.htm b/doc/salome/gui/GEOM/whgdata/whlstt4.htm
deleted file mode 100755 (executable)
index 53e8bf2..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt1.htm#2" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="3"></a><a href="whlstt3.htm#3" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Basic Geometric Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="4"></a><a href="whlstt2.htm#4" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Creating Primitives</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../box.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Box</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../cylinder.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Cylinder</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../sphere.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Sphere</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../turus.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Torus</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../cone.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Cone</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="5"></a><a href="whlstt5.htm#5" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Complex Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../working_with_groups.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Working with groups</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../newentity_blocks.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Building by blocks</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../sketcher.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Sketcher</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="6"></a><a href="whlstt6.htm#6" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Advanced Geometrical Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt8.htm#8" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt14.htm#14" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt5.htm b/doc/salome/gui/GEOM/whgdata/whlstt5.htm
deleted file mode 100755 (executable)
index 12c834b..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt1.htm#2" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="3"></a><a href="whlstt3.htm#3" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Basic Geometric Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="4"></a><a href="whlstt4.htm#4" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Primitives</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="5"></a><a href="whlstt2.htm#5" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Creating Complex Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../extrusion.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Extrusion</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../revolution.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Revolution</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../filling.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Filling</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../pipe_creation.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Pipe</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../working_with_groups.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Working with groups</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../newentity_blocks.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Building by blocks</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../sketcher.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Sketcher</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="6"></a><a href="whlstt6.htm#6" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Advanced Geometrical Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt8.htm#8" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt14.htm#14" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt6.htm b/doc/salome/gui/GEOM/whgdata/whlstt6.htm
deleted file mode 100755 (executable)
index 39a238c..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt1.htm#2" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="3"></a><a href="whlstt3.htm#3" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Basic Geometric Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="4"></a><a href="whlstt4.htm#4" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Primitives</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="5"></a><a href="whlstt5.htm#5" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating Complex Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../working_with_groups.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Working with groups</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../newentity_blocks.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Building by blocks</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../sketcher.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Sketcher</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="6"></a><a href="whlstt2.htm#6" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Creating Advanced Geometrical Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../explode.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Explode</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../edge.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Edge</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../wire.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Wire</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../face.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Face</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../shell.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Shell</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../solid.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Solid</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../compound.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Compound</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt8.htm#8" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt14.htm#14" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt7.htm b/doc/salome/gui/GEOM/whgdata/whlstt7.htm
deleted file mode 100755 (executable)
index 90cd66b..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt2.htm#2" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt1.htm#7" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../viewing_geometrical_objects.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Viewing Geometrical Objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../occ_viewer.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> OCC 3D Viewer</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../wireframe_and_shading.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Display Mode</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../color.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Color</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../transparency.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Transparency</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../isos.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Isolines</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt8.htm#8" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt14.htm#14" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt8.htm b/doc/salome/gui/GEOM/whgdata/whlstt8.htm
deleted file mode 100755 (executable)
index 5827228..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt2.htm#2" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt1.htm#8" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="9"></a><a href="whlstt9.htm#9" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Basic Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="10"></a><a href="whlstt10.htm#10" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Boolean Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="11"></a><a href="whlstt11.htm#11" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transformation Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="12"></a><a href="whlstt12.htm#12" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Blocks Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="13"></a><a href="whlstt13.htm#13" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Repairing Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt14.htm#14" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whlstt9.htm b/doc/salome/gui/GEOM/whgdata/whlstt9.htm
deleted file mode 100755 (executable)
index 59e42a1..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table border=0>
-<tr><td>
-<p class="tocbody">
-<nobr><a name="1"></a><a href="whlstt0.htm#1" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Geometry module</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../geometry.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Introduction to Geometry</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Importing/exporting geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="2"></a><a href="whlstt2.htm#2" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Creating geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="7"></a><a href="whlstt7.htm#7" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Viewing geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="8"></a><a href="whlstt1.htm#8" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Transforming geometrical objects</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="9"></a><a href="whlstt8.htm#9" target="_self"><img src="../whd_toc2.gif" border="0" align="absmiddle"> Basic Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../partition.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Partition</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a href="../archimede.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Archimede</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="10"></a><a href="whlstt10.htm#10" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Boolean Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="11"></a><a href="whlstt11.htm#11" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Transformation Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="12"></a><a href="whlstt12.htm#12" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Blocks Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<nobr><a name="13"></a><a href="whlstt13.htm#13" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> Repairing Operations</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a href="../files/salome2_sp3_measuregui_functions.htm"><img src="../whd_toc3.gif" border="0" align="absmiddle"> Using measurement tools</a></nobr><br>
-&nbsp;&nbsp;&nbsp;<nobr><a name="14"></a><a href="whlstt14.htm#14" target="_self" title="closed book"><img src="../whd_toc1.gif" border="0" align="absmiddle"> TUI Scripts</a></nobr><br>
-</p>
-
-</td></tr>
-<tr><td>
-<p><img src="whexpbar.gif" > <p>
-</td></tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whnvf30.htm b/doc/salome/gui/GEOM/whgdata/whnvf30.htm
deleted file mode 100755 (executable)
index 7cff7ce..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>toc frame</title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-</head>
-<frameset rows="100%, *" border="0" frameborder="0">
-       <frame name="toctree" title="toc tree frame" src="whlstt0.htm"></frame>
-</frameset>
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whnvf31.htm b/doc/salome/gui/GEOM/whgdata/whnvf31.htm
deleted file mode 100755 (executable)
index 91a985f..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Index frame</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-</head>
-<frameset rows="40, *" border="0" frameborder="0">
-       <frame name="ndxletter" title="index letter frame" src="whnvl31.htm" noresize frameborder="1" scrolling="no" border="0" marginheight="0" marginwidth="0" ></frame>
-       <frame name="ndxlist" title="index list frame" src="whlsti0.htm"></frame>
-</frameset>
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whnvf32.htm b/doc/salome/gui/GEOM/whgdata/whnvf32.htm
deleted file mode 100755 (executable)
index bc2231f..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>search frame</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-</head>
-<frameset rows="40, *" border="0" frameborder="0">
-       <frame name="ftsletter" title="search letter frame" src="whnvl32.htm" noresize frameborder="1" scrolling="no" border="0" marginheight="0" marginwidth="0" ></frame>
-       <frame name="ftslist" title="seach word frame" src="whlstf0.htm"></frame>
-</frameset>
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whnvf33.htm b/doc/salome/gui/GEOM/whgdata/whnvf33.htm
deleted file mode 100755 (executable)
index 6c091d8..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Glossary frame</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-</head>
-<frameset rows="40, *" border="0" frameborder="0">
-       <frame name="glsletter" title="glossary letter frame" src="whnvl33.htm" noresize frameborder="1" scrolling="no" border="0" marginheight="0" marginwidth="0" ></frame>
-       <frame name="glslist" title="glossary defination frame" src="whlstg0.htm"></frame>
-</frameset>
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whnvl31.htm b/doc/salome/gui/GEOM/whgdata/whnvl31.htm
deleted file mode 100755 (executable)
index e29abc0..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Index Letters</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ndxheader {margin-left:10pt; margin-top:0pt;}
-.ndxbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ndxheader {margin-top:0pt; } .ndxheader {margin-bottom:0pt; } .ndxheader {margin-left:9pt; } 
-
-.ndxbody {margin-top:0pt; } .ndxbody {margin-bottom:0pt; } .ndxbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-
-<body>
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whnvl32.htm b/doc/salome/gui/GEOM/whgdata/whnvl32.htm
deleted file mode 100755 (executable)
index c76e9d1..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Search Letters</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="ftsheader">
-<a name="home"></a> <a href="whlstfl0.htm#subkey_{" target="_self"title="search non-alphabet letter"><b>#</b></a> 
- <a href="whlstfl1.htm#subkey_A" target="_self"title="search letter A"><b>A</b></a> 
- <a href="whlstfl2.htm#subkey_B" target="_self"title="search letter B"><b>B</b></a> 
- <a href="whlstfl3.htm#subkey_C" target="_self"title="search letter C"><b>C</b></a> 
- <a href="whlstfl4.htm#subkey_D" target="_self"title="search letter D"><b>D</b></a> 
- <a href="whlstfl5.htm#subkey_E" target="_self"title="search letter E"><b>E</b></a> 
- <a href="whlstfl6.htm#subkey_F" target="_self"title="search letter F"><b>F</b></a> 
- <a href="whlstfl7.htm#subkey_G" target="_self"title="search letter G"><b>G</b></a> 
- <a href="whlstfl8.htm#subkey_H" target="_self"title="search letter H"><b>H</b></a> 
- <a href="whlstfl9.htm#subkey_I" target="_self"title="search letter I"><b>I</b></a> 
- <a href="whlstfl10.htm#subkey_J" target="_self"title="search letter J"><b>J</b></a> 
- <a href="whlstfl11.htm#subkey_K" target="_self"title="search letter K"><b>K</b></a> 
- <a href="whlstfl12.htm#subkey_L" target="_self"title="search letter L"><b>L</b></a> 
- <a href="whlstfl13.htm#subkey_M" target="_self"title="search letter M"><b>M</b></a> 
- <a href="whlstfl14.htm#subkey_N" target="_self"title="search letter N"><b>N</b></a> 
- <a href="whlstfl15.htm#subkey_O" target="_self"title="search letter O"><b>O</b></a> 
- <a href="whlstfl16.htm#subkey_P" target="_self"title="search letter P"><b>P</b></a> 
- <a href="whlstfl17.htm#subkey_Q" target="_self"title="search letter Q"><b>Q</b></a> 
- <a href="whlstfl18.htm#subkey_R" target="_self"title="search letter R"><b>R</b></a> 
- <a href="whlstfl19.htm#subkey_S" target="_self"title="search letter S"><b>S</b></a> 
- <a href="whlstfl20.htm#subkey_T" target="_self"title="search letter T"><b>T</b></a> 
- <a href="whlstfl21.htm#subkey_U" target="_self"title="search letter U"><b>U</b></a> 
- <a href="whlstfl22.htm#subkey_V" target="_self"title="search letter V"><b>V</b></a> 
- <a href="whlstfl23.htm#subkey_W" target="_self"title="search letter W"><b>W</b></a> 
- <a href="whlstfl24.htm#subkey_X" target="_self"title="search letter X"><b>X</b></a> 
- <a href="whlstfl25.htm#subkey_Y" target="_self"title="search letter Y"><b>Y</b></a> 
- <a href="whlstfl26.htm#subkey_Z" target="_self"title="search letter Z"><b>Z</b></a> 
-</p>
-
-<body>
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whnvl33.htm b/doc/salome/gui/GEOM/whgdata/whnvl33.htm
deleted file mode 100755 (executable)
index d6f20c3..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Glossary Letters</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.glsheader {margin-left:10pt; margin-top:0pt;}
-.glsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.glsheader {margin-top:0pt; } .glsheader {margin-bottom:0pt; } .glsheader {margin-left:9pt; } 
-
-.glsbody {margin-top:0pt; } .glsbody {margin-bottom:0pt; } .glsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; }A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-<style>
-<!--
-
--->
-</style>
-</head>
-<body marginheight="0"  marginwidth="0" bgproperties="fixed">
-<p class="glsheader">
- <font class="inactive">#</font> 
- <font class="inactive">A</font> 
- <font class="inactive">B</font> 
- <a href="whlstg0.htm#bm_C" target="glslist"title="glossary letter C"><b>C</b></a> 
- <a href="whlstg0.htm#bm_D" target="glslist"title="glossary letter D"><b>D</b></a> 
- <a href="whlstg0.htm#bm_E" target="glslist"title="glossary letter E"><b>E</b></a> 
- <a href="whlstg0.htm#bm_F" target="glslist"title="glossary letter F"><b>F</b></a> 
- <a href="whlstg0.htm#bm_G" target="glslist"title="glossary letter G"><b>G</b></a> 
- <font class="inactive">H</font> 
- <font class="inactive">I</font> 
- <font class="inactive">J</font> 
- <font class="inactive">K</font> 
- <font class="inactive">L</font> 
- <a href="whlstg0.htm#bm_M" target="glslist"title="glossary letter M"><b>M</b></a> 
- <a href="whlstg0.htm#bm_N" target="glslist"title="glossary letter N"><b>N</b></a> 
- <font class="inactive">O</font> 
- <a href="whlstg0.htm#bm_P" target="glslist"title="glossary letter P"><b>P</b></a> 
- <font class="inactive">Q</font> 
- <a href="whlstg0.htm#bm_R" target="glslist"title="glossary letter R"><b>R</b></a> 
- <a href="whlstg0.htm#bm_S" target="glslist"title="glossary letter S"><b>S</b></a> 
- <font class="inactive">T</font> 
- <font class="inactive">U</font> 
- <font class="inactive">V</font> 
- <font class="inactive">W</font> 
- <font class="inactive">X</font> 
- <font class="inactive">Y</font> 
- <font class="inactive">Z</font> 
-</p>
-
-<body>
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whnvp30.htm b/doc/salome/gui/GEOM/whgdata/whnvp30.htm
deleted file mode 100755 (executable)
index 0c9cb81..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- WebHelp version 5.10 -->
-<html>
-<head>
-<title> Content Navigation Pane </title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-
-</style>
-</head>
-<frameset rows="36, *" border="0" frameborder="0">
-       <frame name="toctabs" title="tab selection frame" src="whnvt30.htm" noresize frameborder="no" scrolling="no" border="0" marginheight="0" marginwidth="0" ></frame>
-       <frame name="toclist" title="content frame" src="whlstt0.htm"></frame>
-</frameset>
-</html>
\ No newline at end of file
diff --git a/doc/salome/gui/GEOM/whgdata/whnvp31.htm b/doc/salome/gui/GEOM/whgdata/whnvp31.htm
deleted file mode 100755 (executable)
index 87921c0..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- WebHelp version 5.10 -->
-<html>
-<head>
-<title> Index Navigation Pane </title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-
-</style>
-</head>
-<frameset rows="36, *" border="0" frameborder="0">
-       <frame name="ndxtabs" title="tab selection frame" src="whnvt31.htm" noresize frameborder="no" scrolling="no" border="0" marginheight="0" marginwidth="0" ></frame>
-       <frame name="ndxdata" title="index frame" src="whnvf31.htm"></frame>
-</frameset>
-</html>
\ No newline at end of file
diff --git a/doc/salome/gui/GEOM/whgdata/whnvp32.htm b/doc/salome/gui/GEOM/whgdata/whnvp32.htm
deleted file mode 100755 (executable)
index 90697b0..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- WebHelp version 5.10 -->
-<html>
-<head>
-<title> Search Navigation Pane </title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-
-</style>
-</head>
-<frameset rows="36, *" border="0" frameborder="0">
-       <frame name="ftstabs" title="tab selection frame" src="whnvt32.htm" noresize frameborder="no" scrolling="no" border="0" marginheight="0" marginwidth="0" ></frame>
-       <frame name="ftsdata" title="search frame" src="whnvf32.htm"></frame>
-</frameset>
-</html>
\ No newline at end of file
diff --git a/doc/salome/gui/GEOM/whgdata/whnvp33.htm b/doc/salome/gui/GEOM/whgdata/whnvp33.htm
deleted file mode 100755 (executable)
index 8351bcb..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- WebHelp version 5.10 -->
-<html>
-<head>
-<title> Glossary Navigation Pane </title>
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-
-</style>
-</head>
-<frameset rows="36, *" border="0" frameborder="0">
-       <frame name="glstabs" title="tab selection frame" src="whnvt33.htm" noresize frameborder="no" scrolling="no" border="0" marginheight="0" marginwidth="0" ></frame>
-       <frame name="glsdata" title="glossary frame" src="whnvf33.htm"></frame>
-</frameset>
-</html>
\ No newline at end of file
diff --git a/doc/salome/gui/GEOM/whgdata/whnvt30.htm b/doc/salome/gui/GEOM/whgdata/whnvt30.htm
deleted file mode 100755 (executable)
index ec1bb84..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Content Navigation Tab</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-
-.tabs {background-color:#c0c0c0;}
-.tocbody {margin-left:10pt; margin-top:0pt;}
-.bo {}
-.bc {}
-.pn {}
-.pr {}
-
-.tocbody {margin-top:0pt; } .tocbody {margin-bottom:0pt; } .tocbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-img {vertial-align:middle;}
--->
-</style>
-</head>
-<body class="tabs" marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table class="tabs" width="100%">
- <tr> 
-   <td class="tabs">
-   <nobr><a href="javascript:void(0)" title="Contents"><img src="../whd_tab1.gif" border="0"></a><a href="whnvp32.htm" target="_parent" title="Search"><img src="../whd_tab6.gif" border="0"></a><a href="whnvp33.htm" target="_parent" title="Glossary"><img src="../whd_tab8.gif" border="0"></a></nobr>
-   </td>
- </tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whnvt31.htm b/doc/salome/gui/GEOM/whgdata/whnvt31.htm
deleted file mode 100755 (executable)
index e17d825..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Index Navigation Tab</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ndxheader {margin-left:10pt; margin-top:0pt;}
-.ndxbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ndxheader {margin-top:0pt; } .ndxheader {margin-bottom:0pt; } .ndxheader {margin-left:9pt; } 
-
-.ndxbody {margin-top:0pt; } .ndxbody {margin-bottom:0pt; } .ndxbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body class="tabs" marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table class="tabs" width="100%">
- <tr> 
-   <td class="tabs">
-   <nobr><a href="whnvp30.htm" target="_parent" title="Contents"><img src="../whd_tab2.gif" border="0"></a><a href="whnvp32.htm" target="_parent" title="Search"><img src="../whd_tab6.gif" border="0"></a><a href="whnvp33.htm" target="_parent" title="Glossary"><img src="../whd_tab8.gif" border="0"></a></nobr>
-   </td>
- </tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whnvt32.htm b/doc/salome/gui/GEOM/whgdata/whnvt32.htm
deleted file mode 100755 (executable)
index d638925..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Search Navigation Tab</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.ftsheader {margin-left:10pt; margin-top:0pt;}
-.ftsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.ftsheader {margin-top:0pt; } .ftsheader {margin-bottom:0pt; } .ftsheader {margin-left:9pt; } 
-
-.ftsbody {margin-top:0pt; } .ftsbody {margin-bottom:0pt; } .ftsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; } A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body class="tabs" marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table class="tabs" width="100%">
- <tr> 
-   <td class="tabs">
-   <nobr><a href="whnvp30.htm" target="_parent" title="Contents"><img src="../whd_tab2.gif" border="0"></a><a href="javascript:void(0)" title="Search"><img src="../whd_tab5.gif" border="0"></a><a href="whnvp33.htm" target="_parent" title="Glossary"><img src="../whd_tab8.gif" border="0"></a></nobr>
-   </td>
- </tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whgdata/whnvt33.htm b/doc/salome/gui/GEOM/whgdata/whnvt33.htm
deleted file mode 100755 (executable)
index af63a02..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<!-- WebHelp version 5.10 -->
-<title>Glossary Navigation Tab</title>
-<base target="bsscright">
-
-<meta name="generator" content="RoboHelp by eHelp Corporation   www.ehelp.com">
-<meta name="description" content="WebHelp 5.50">
-<style>
-<!--
-body {margin-left:1pt; margin-top:1pt; margin-right:1pt;font-family:Arial; font-size:9pt;}
-
-A:link {font-family:Arial; font-size:9pt; color:#000000;  font-style:normal;  text-decoration:none; }
-A:visited {font-family:Arial; font-size:9pt; color:#000000; font-style:normal;  text-decoration:none; }
-A:active {background-color:#cccccc;}
-A:hover {font-family:Arial; font-size:9pt; color:#007f00; font-style:normal;  text-decoration:underline; }
-
-.tabs {background-color:#c0c0c0;}
-.glsheader {margin-left:10pt; margin-top:0pt;}
-.glsbody {margin-left:10pt; margin-top:0pt;}
-.inactive {color:#666666;}
-.glsheader {margin-top:0pt; } .glsheader {margin-bottom:0pt; } .glsheader {margin-left:9pt; } 
-
-.glsbody {margin-top:0pt; } .glsbody {margin-bottom:0pt; } .glsbody {margin-left:9pt; } 
-p {color:#000000; } p {font-family:Arial; } p {font-size:9pt; } p {font-style:normal; } p {text-decoration:none; } 
-A:link {color:#000000; } A:link {font-family:Arial; } A:link {font-size:9pt; } A:link {font-style:normal; } A:link {text-decoration:none; } 
-A:visited {color:#000000; } A:visited {font-family:Arial; }A:visited {font-size:9pt; } A:visited {font-style:normal; } A:visited {text-decoration:none; } 
-A:active {background-color:#cccccc; } 
-A:hover {color:#007f00; } A:hover {font-family:Arial; } A:hover {font-size:9pt; } A:hover {font-style:normal; } A:hover {text-decoration:underline; } 
-
--->
-</style>
-</head>
-<body class="tabs" marginheight="0"  marginwidth="0" bgproperties="fixed">
-<table class="tabs" width="100%">
- <tr> 
-   <td class="tabs">
-   <nobr><a href="whnvp30.htm" target="_parent" title="Contents"><img src="../whd_tab2.gif" border="0"></a><a href="whnvp32.htm" target="_parent" title="Search"><img src="../whd_tab6.gif" border="0"></a><a href="javascript:void(0)" title="Glossary"><img src="../whd_tab7.gif" border="0"></a></nobr>
-   </td>
- </tr>
-</table>
-</body>
-
-</html>
-
diff --git a/doc/salome/gui/GEOM/whxdata/whftdata0.xml b/doc/salome/gui/GEOM/whxdata/whftdata0.xml
deleted file mode 100755 (executable)
index 0f5be19..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version='1.0' encoding='windows-1252' ?>
-<ftstdata>
-<topic name="Add Point on Edge" url="add_point_on_edge.htm" />
-<topic name="Arc" url="arc.htm" />
-<topic name="Archimede" url="archimede.htm" />
-<topic name="Basic Geometrical Objects" url="basic_geometrical_objects.htm" />
-<topic name="Basic Operations" url="basic_operations.htm" />
-<topic name="Blocks Operations" url="blocks_operations.htm" />
-<topic name="Boolean Operations" url="boolean_operations.htm" />
-<topic name="Box" url="box.htm" />
-<topic name="Building by Blocks" url="building_by_blocks.htm" />
-<topic name="Chamfer" url="chamfer.htm" />
-<topic name="Change Orientation" url="change_orientation.htm" />
-<topic name="Changing Display Parameters" url="changing_display_parameters.htm" />
-<topic name="Check Free Boundaries" url="check_free_boundaries.htm" />
-<topic name="Check Free Faces" url="check_free_faces.htm" />
-<topic name="Circle" url="circle.htm" />
-<topic name="Close Contour" url="close_contour.htm" />
-<topic name="Color" url="color.htm" />
-<topic name="Common" url="common.htm" />
-<topic name="Complex Objects" url="complex_objects.htm" />
-<topic name="Compound" url="compound.htm" />
-<topic name="Cone" url="cone.htm" />
-<topic name="Curve" url="curve.htm" />
-<topic name="Cut" url="cut.htm" />
-<topic name="Cylinder" url="cylinder.htm" />
-<topic name="Edge" url="edge.htm" />
-<topic name="Ellipse" url="ellipse.htm" />
-<topic name="Explode" url="explode.htm" />
-<topic name="Explode on Blocks" url="explode_on_blocks.htm" />
-<topic name="Extrusion" url="extrusion.htm" />
-<topic name="Face" url="face.htm" />
-<topic name="Introduction to GEOM" url="files/introduction_to_geom.htm" />
-<topic name="Using Boolean Operations" url="files/salome2_sp3_booleangui_functions.htm" />
-<topic name="Importing and exporting geometrical objects" url="files/salome2_sp3_geomtoolsgui_functions.htm" />
-<topic name="Using Measurement Tools" url="files/salome2_sp3_measuregui_functions.htm" />
-<topic name="Fillet" url="fillet.htm" />
-<topic name="Filling" url="filling.htm" />
-<topic name="Fuse" url="fuse.htm" />
-<topic name="Geometrical Objects" url="geometrical_objects.htm" />
-<topic name="geometry" url="geometry.htm" />
-<topic name="Glue Faces" url="glue_faces.htm" />
-<topic name="Groups" url="groups.htm" />
-<topic name="Isos" url="isos.htm" />
-<topic name="Line" url="line.htm" />
-<topic name="Local Coordinate System" url="local_coordinate_system.htm" />
-<topic name="Measurement Tools" url="measurement_tools.htm" />
-<topic name="Mirror Image" url="mirror_image.htm" />
-<topic name="Modify the Location" url="modify_the_location.htm" />
-<topic name="Multi Rotation" url="multi_rotation.htm" />
-<topic name="Multi Transformation" url="multi_transformation.htm" />
-<topic name="Multi Translation" url="multi_translation.htm" />
-<topic name="Blocks" url="newentity_blocks.htm" />
-<topic name="OCC_Viewer" url="occ_viewer.htm" />
-<topic name="Offset Surface" url="offset_surface.htm" />
-<topic name="Partition" url="partition.htm" />
-<topic name="Pipe Creation" url="pipe_creation.htm" />
-<topic name="Plane" url="plane.htm" />
-<topic name="Point" url="point.htm" />
-<topic name="Primitives" url="primitives.htm" />
-<topic name="Propagate" url="propagate.htm" />
-<topic name="Repairing Operations" url="repairing_operations.htm" />
-<topic name="Revolution" url="revolution.htm" />
-<topic name="Rotation" url="rotation.htm" />
-<topic name="Scale Transform" url="scale_transform.htm" />
-<topic name="Section" url="section.htm" />
-<topic name="Sewing" url="sewing.htm" />
-<topic name="Shape Processing" url="shape_processing.htm" />
-<topic name="Shell" url="shell.htm" />
-<topic name="Sketcher" url="sketcher.htm" />
-<topic name="Sketcher" url="sketcher_tui.htm" />
-<topic name="Solid" url="solid.htm" />
-<topic name="Sphere" url="sphere.htm" />
-<topic name="Suppress Faces" url="suppress_faces.htm" />
-<topic name="Suppress Holes" url="suppress_holes.htm" />
-<topic name="Suppress Internal Wires" url="suppress_internal_wires.htm" />
-<topic name="Transformation Operations" url="transformation_operations.htm" />
-<topic name="Translation" url="translation.htm" />
-<topic name="Transparency" url="transparency.htm" />
-<topic name="Turus" url="turus.htm" />
-<topic name="Vector" url="vector.htm" />
-<topic name="Viewing Geometrical Objects" url="viewing_geometrical_objects.htm" />
-<topic name="Wire" url="wire.htm" />
-<topic name="Wireframe and Shading" url="wireframe_and_shading.htm" />
-<topic name="Working Plane" url="working_plane.htm" />
-<topic name="Working with groups" url="working_with_groups.htm" />
-
-</ftstdata>  
diff --git a/doc/salome/gui/GEOM/whxdata/whfts.xml b/doc/salome/gui/GEOM/whxdata/whfts.xml
deleted file mode 100755 (executable)
index 3146b80..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='windows-1252' ?>
-<fts>
-<chunkinfo url="whfwdata0.xml" first="0" last="zoom"/>
-
-<tchunkinfo first="0" last="82" url="whftdata0.xml" />
-
-</fts>
diff --git a/doc/salome/gui/GEOM/whxdata/whfwdata0.xml b/doc/salome/gui/GEOM/whxdata/whfwdata0.xml
deleted file mode 100755 (executable)
index da0b6c7..0000000
+++ /dev/null
@@ -1,1365 +0,0 @@
-<?xml version='1.0' encoding='windows-1252' ?>
-<ftswdata>
-<key name="0"> 0,3,4,5,6,8,11,18,37,40,44,46,56,57,59,65,68,74,76,33, </key>
-<key name="00001"> 59, </key>
-<key name="0001"> 18, </key>
-<key name="01"> 4, </key>
-<key name="07"> 44, </key>
-<key name="1"> 0,2,3,4,5,6,8,9,10,11,14,15,18,20,23,25,26,27,28,29,34,35,37,39,40,43,44,45,46,47,48,49,53,54,55,56,57,58,59,60,61,62,64,65,67,68,70,72,74,75,76,77,31,82,83, </key>
-<key name="10"> 3,18,37,44,57,68,74, </key>
-<key name="100"> 3,4,5,18,37,44,46,59,68,74, </key>
-<key name="1000"> 3,74, </key>
-<key name="1000000"> 4, </key>
-<key name="100x30x100"> 44, </key>
-<key name="105"> 44, </key>
-<key name="11"> 44, </key>
-<key name="12"> 33, </key>
-<key name="120"> 8, </key>
-<key name="130"> 59, </key>
-<key name="140"> 59, </key>
-<key name="15"> 8,18,44,57,68, </key>
-<key name="150"> 3,8,37,59,68, </key>
-<key name="165"> 11, </key>
-<key name="17"> 57, </key>
-<key name="170"> 3, </key>
-<key name="180"> 59,65,68, </key>
-<key name="1840"> 44, </key>
-<key name="1d"> 5,74, </key>
-<key name="1e"> 44,59, </key>
-<key name="2"> 50,5,7,14,17,18,21,22,23,24,27,28,36,37,40,41,42,44,47,48,49,53,59,63,67,74,75,77,31,78,82, </key>
-<key name="20"> 3,6,18,37,57,59,68,74, </key>
-<key name="200"> 3,4,5,40,44,46,59,74, </key>
-<key name="210"> 74, </key>
-<key name="218"> 11, </key>
-<key name="220"> 74, </key>
-<key name="23"> 44, </key>
-<key name="25"> 3,5,6,57,74, </key>
-<key name="250"> 37,44,59,68, </key>
-<key name="2d"> 5,35,59,65,74,31, </key>
-<key name="3"> 1,2,5,7,11,14,18,20,37,40,44,48,55,56,59,61,67,74,75,31,78, </key>
-<key name="30"> 3,8,11,18,37,44,57,59,68,74, </key>
-<key name="300"> 37,68, </key>
-<key name="300000"> 44, </key>
-<key name="31"> 11, </key>
-<key name="32"> 59, </key>
-<key name="32000"> 44, </key>
-<key name="35"> 6,8,57,59,74, </key>
-<key name="3d"> 14,21,35,43,51,55,56,59,65,71,31,33,78,79,81,83, </key>
-<key name="4"> 50,37,40,44,48,67,74,31, </key>
-<key name="40"> 6,8,18,37,57,59,74, </key>
-<key name="41"> 59, </key>
-<key name="45"> 57,59, </key>
-<key name="5"> 0,3,11,18,35,37,40,32,44,56,59,67,68,74, </key>
-<key name="50"> 3,5,8,11,18,37,44,59,68,74,76, </key>
-<key name="500"> 4, </key>
-<key name="55"> 6,57,59, </key>
-<key name="6"> 50,5,44,33, </key>
-<key name="60"> 18,37,59,74, </key>
-<key name="65"> 59, </key>
-<key name="7"> 37,44,59, </key>
-<key name="70"> 3,8,37,57,59,68,74, </key>
-<key name="8"> 44, </key>
-<key name="80"> 44,59,68,74, </key>
-<key name="9"> 37,44,67, </key>
-<key name="90"> 65,67, </key>
-<key name="abl"> 51,67, </key>
-<key name="absolut"> 67, </key>
-<key name="absolute"> 76, </key>
-<key name="acces"> 51,79, </key>
-<key name="accessibl"> 7,16,29,42,70, </key>
-<key name="accord"> 0, </key>
-<key name="accordanc"> 0,15, </key>
-<key name="ad"> 15,40,32,83, </key>
-<key name="add"> 0,3,4,5,6,8,18,37,40,57,59,68,74,83, </key>
-<key name="addobject"> 40,83, </key>
-<key name="addtostudy"> 3,4,5,6,8,11,18,37,40,57,59,68,74, </key>
-<key name="addtostudyinfath"> 5,59, </key>
-<key name="advanc"> 7,19,24,28,29,37,66,69,70,80, </key>
-<key name="algorithm"> 7,14,20,21,23,28,43,46,55,56,61,67,70,77,78,82, </key>
-<key name="all_fac"> 59, </key>
-<key name="allow"> 50,9,26,43,45,46,47,51,53,61,64,65,67,72,75,33,79, </key>
-<key name="along"> 7,9,46,49,52,54,74,75, </key>
-<key name="alongsid"> 31, </key>
-<key name="already"> 40, </key>
-<key name="although"> 46, </key>
-<key name="angl"> 47,59,60,61,65,67,74, </key>
-<key name="anoth"> 22,42,55,56,70,74, </key>
-<key name="any"> 43,53,61,65,75, </key>
-<key name="ap"> 43,74,83, </key>
-<key name="appear"> 79,83, </key>
-<key name="append"> 18,37,74, </key>
-<key name="appli"> 9,65, </key>
-<key name="applicabl"> 52, </key>
-<key name="apply"> 65,79, </key>
-<key name="approximation"> 65, </key>
-<key name="arc"> 1,3,18,37,59,67,68,74, </key>
-<key name="arc1"> 18, </key>
-<key name="arc2"> 18, </key>
-<key name="archimed"> 2,4, </key>
-<key name="area"> 44,51, </key>
-<key name="argument"> 0,1,2,50,7,9,10,14,15,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,41,42,43,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,66,67,69,70,71,72,73,75,77,31,78,80,82,83, </key>
-<key name="around"> 47,51,60,74, </key>
-<key name="automatical"> 50,43,79, </key>
-<key name="availabl"> 0,50,15,32,51,67,71,72,73,83, </key>
-<key name="ax"> 7,43,49,51,75, </key>
-<key name="axi"> 18,20,23,43,45,46,47,60,61,74,33, </key>
-<key name="b"> 3,21,65, </key>
-<key name="background"> 79, </key>
-<key name="bas"> 20,23,28,43,47,51,54,59,60,62,65,75,77, </key>
-<key name="baseshap"> 54, </key>
-<key name="basi"> 28,51, </key>
-<key name="basic"> 1,2,3,4,14,21,25,38,30,42,43,44,53,55,56,67,33,78,82, </key>
-<key name="basicproperti"> 44,33, </key>
-<key name="bb"> 44, </key>
-<key name="be"> 24, </key>
-<key name="befor"> 59,65,67, </key>
-<key name="begin"> 59, </key>
-<key name="belong"> 9, </key>
-<key name="below"> 50, </key>
-<key name="besi"> 21, </key>
-<key name="bezi"> 3,21,65, </key>
-<key name="black"> 79, </key>
-<key name="block"> 50,5,8,27,38,30,44,48,58,33, </key>
-<key name="bmp"> 51,79, </key>
-<key name="boolean"> 6,17,22,36,38,30,63,31,33, </key>
-<key name="both"> 7,20,48,49,65, </key>
-<key name="boudari"> 59, </key>
-<key name="bound"> 8,37,44,51,33, </key>
-<key name="boundari"> 12,59,64,72, </key>
-<key name="boundary"> 12,59,73, </key>
-<key name="boundingbox"> 44,33, </key>
-<key name="box"> 4,50,5,7,11,16,22,27,40,32,44,51,53,57,59,65,67,73,74,76,33,80,83, </key>
-<key name="box_tr1"> 5, </key>
-<key name="box_tr2"> 5, </key>
-<key name="box1"> 44,57,59, </key>
-<key name="box2"> 44,57,59, </key>
-<key name="box3"> 57, </key>
-<key name="bracket"> 65, </key>
-<key name="break"> 58, </key>
-<key name="brep"> 38,32,30,59, </key>
-<key name="brows"> 32,43,79,80, </key>
-<key name="bsplin"> 65, </key>
-<key name="bsplinerestriction"> 65, </key>
-<key name="build"> 50,5,8,19,24,29,38,30,53,58,66,69,80, </key>
-<key name="button"> 43,51,54,64,72,80,83, </key>
-<key name="bypas"> 50, </key>
-<key name="c"> 37,65,68, </key>
-<key name="c0"> 65, </key>
-<key name="c1"> 65, </key>
-<key name="c2"> 65, </key>
-<key name="cad"> 38,30, </key>
-<key name="calculat"> 43,33, </key>
-<key name="camera"> 82, </key>
-<key name="cas"> 50,43,48,61,73, </key>
-<key name="cascad"> 51, </key>
-<key name="catia"> 32, </key>
-<key name="cc"> 51, </key>
-<key name="cent"> 7,14,20,25,44,46,47,51,67,70,74,77,33, </key>
-<key name="center"> 26, </key>
-<key name="centerofscal"> 62, </key>
-<key name="central"> 20,23,61,62,65, </key>
-<key name="centralpoint"> 61, </key>
-<key name="certain"> 65,83, </key>
-<key name="chain"> 5, </key>
-<key name="chamf"> 9,74, </key>
-<key name="chamfer_"> 74, </key>
-<key name="chamfer_all"> 74, </key>
-<key name="chamfer_f"> 74, </key>
-<key name="chamfer_f1"> 74, </key>
-<key name="chang"> 10,11,16,41,51,76,79,81, </key>
-<key name="changeorientation"> 10, </key>
-<key name="check"> 12,13,27,29,44,59,65,73,33, </key>
-<key name="check_box"> 5, </key>
-<key name="checkbox"> 10,45,46,47,61,72,75,33, </key>
-<key name="checkcompoundofblock"> 44,33, </key>
-<key name="checkshap"> 44,59,33, </key>
-<key name="choic"> 21, </key>
-<key name="choos"> 27,32,43,51,53, </key>
-<key name="circl"> 3,14,67, </key>
-<key name="circle1"> 3, </key>
-<key name="circle2"> 3, </key>
-<key name="click"> 16,32,51,54,79,81,83, </key>
-<key name="clip"> 51, </key>
-<key name="clon"> 51, </key>
-<key name="clos"> 12,15,59,65,69,83, </key>
-<key name="closecontour"> 15,59, </key>
-<key name="closedwir"> 12,59, </key>
-<key name="closur"> 15, </key>
-<key name="cm"> 44, </key>
-<key name="cn"> 65, </key>
-<key name="coincid"> 46, </key>
-<key name="coincident"> 39, </key>
-<key name="coincidental"> 65, </key>
-<key name="collinear"> 20,23, </key>
-<key name="color"> 11,16,79,81, </key>
-<key name="command"> 0,1,2,50,7,9,10,12,13,14,15,16,17,19,20,21,23,24,25,26,27,28,29,34,35,36,39,42,43,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,76,77,31,33,78,79,80,81,83, </key>
-<key name="common"> 6,9,15,17,74,31, </key>
-<key name="complex"> 18,28,35,38,30,54,60,31, </key>
-<key name="component"> 3,18,67,75, </key>
-<key name="compos"> 50,10,33, </key>
-<key name="compound"> 50,5,17,18,19,22,26,27,35,36,37,39,44,47,49,52,59,63,33, </key>
-<key name="compsolid"> 26,28,54,60, </key>
-<key name="compund"> 37, </key>
-<key name="comput"> 2,33, </key>
-<key name="con"> 20,57,59, </key>
-<key name="concern"> 33, </key>
-<key name="condition"> 33, </key>
-<key name="cone1"> 57, </key>
-<key name="cone2"> 57, </key>
-<key name="confirm"> 32,83, </key>
-<key name="conical"> 65, </key>
-<key name="connect"> 9,29,66,33,80, </key>
-<key name="connection"> 33, </key>
-<key name="consequent"> 74, </key>
-<key name="consider"> 15,39,33, </key>
-<key name="consol"> 33, </key>
-<key name="constraint"> 50, </key>
-<key name="construct"> 50,69, </key>
-<key name="construction"> 21,38,30,43,51,31, </key>
-<key name="contain"> 0,13,15,58, </key>
-<key name="content"> 40,32,51, </key>
-<key name="continuiti"> 65, </key>
-<key name="continuity"> 65, </key>
-<key name="continuity2d"> 65, </key>
-<key name="continuity3d"> 65, </key>
-<key name="continuou"> 65, </key>
-<key name="contour"> 15,59, </key>
-<key name="conversion"> 65, </key>
-<key name="convert"> 65, </key>
-<key name="coord"> 44, </key>
-<key name="coordinat"> 7,20,23,26,43,44,46,51,55,56,67,70,74,75,77,33,78,82, </key>
-<key name="copy"> 10,45,46,61,75, </key>
-<key name="corn"> 65, </key>
-<key name="corner"> 7,8, </key>
-<key name="correct"> 65, </key>
-<key name="correction"> 65, </key>
-<key name="correspond"> 2,12,21,24,27, </key>
-<key name="count"> 59, </key>
-<key name="coupl"> 67, </key>
-<key name="cover"> 31, </key>
-<key name="creat"> 1,2,3,4,50,5,6,7,8,9,10,14,15,18,19,20,21,23,24,25,26,28,29,34,35,36,37,40,42,43,44,45,46,47,51,54,55,56,57,59,60,61,62,63,66,67,68,69,70,74,75,77,33,78,79,80,82,83, </key>
-<key name="createanddisplaygo"> 3,4,5,6,8,11,18,37,40,57,59,68,74, </key>
-<key name="creategroup"> 40,83, </key>
-<key name="creation"> 1,3,7,14,15,18,19,20,21,23,24,25,28,29,35,37,38,40,30,42,54,55,56,57,59,60,66,69,70,77,78,80,83, </key>
-<key name="criteria"> 5, </key>
-<key name="cros"> 51, </key>
-<key name="cs1"> 74, </key>
-<key name="cs2"> 74, </key>
-<key name="cub"> 46, </key>
-<key name="current"> 7,42,51,53,67,70, </key>
-<key name="curv"> 3,21,35,65,67, </key>
-<key name="curvatur"> 65, </key>
-<key name="curve2dmod"> 65, </key>
-<key name="curve3dmod"> 65, </key>
-<key name="curvecontinuity"> 65, </key>
-<key name="cut"> 6,17,22,53,59,31, </key>
-<key name="cut_without_f_2"> 59, </key>
-<key name="cylind"> 6,20,23,57,59,74, </key>
-<key name="cylinder"> 18,57, </key>
-<key name="cylinder1"> 57, </key>
-<key name="cylinder2"> 57, </key>
-<key name="cylindrical"> 65, </key>
-<key name="d"> 9,59,65, </key>
-<key name="d1"> 9,74, </key>
-<key name="d2"> 9,74, </key>
-<key name="data"> 33, </key>
-<key name="data_dir"> 59, </key>
-<key name="def"> 44, </key>
-<key name="default"> 51,56,67,79,83, </key>
-<key name="defin"> 1,7,9,14,20,21,23,25,26,27,28,34,35,32,42,43,47,48,49,51,54,55,56,60,61,62,65,67,70,75,77,78,82,83, </key>
-<key name="definit"> 72, </key>
-<key name="definition"> 54, </key>
-<key name="deflection"> 2, </key>
-<key name="defn"> 61, </key>
-<key name="degenerat"> 33, </key>
-<key name="degre"> 35,60,65,67, </key>
-<key name="delet"> 83, </key>
-<key name="density"> 2, </key>
-<key name="depend"> 48,65, </key>
-<key name="derivativ"> 65, </key>
-<key name="descr"> 44, </key>
-<key name="describ"> 79, </key>
-<key name="description"> 50,44,67,68,33, </key>
-<key name="design"> 83, </key>
-<key name="destin"> 38,30, </key>
-<key name="destination"> 67, </key>
-<key name="detail"> 79, </key>
-<key name="detect"> 12,64,72, </key>
-<key name="detection"> 65, </key>
-<key name="develop"> 51, </key>
-<key name="dialog"> 50,22,32,65,67,76,80,83, </key>
-<key name="differencelist"> 40, </key>
-<key name="different"> 45,33, </key>
-<key name="dimension"> 7,9,23,28,47,33, </key>
-<key name="dir"> 47,49, </key>
-<key name="dir1"> 49, </key>
-<key name="dir2"> 49, </key>
-<key name="direct"> 43,61, </key>
-<key name="direction"> 2,14,20,25,28,43,47,48,49,51,60,61,65,67,77, </key>
-<key name="dirfaceid1"> 48, </key>
-<key name="dirfaceid1u"> 48, </key>
-<key name="dirfaceid1v"> 48, </key>
-<key name="dirfaceid2"> 48, </key>
-<key name="dirfaceid2u"> 48, </key>
-<key name="dirfaceid2v"> 48, </key>
-<key name="display"> 3,4,5,6,8,11,16,18,37,40,32,41,51,57,59,64,68,72,74,76,33,79,81,83, </key>
-<key name="displayon"> 79, </key>
-<key name="distanc"> 39,44,52,65,33, </key>
-<key name="divid"> 0,59, </key>
-<key name="divideedg"> 0,59, </key>
-<key name="documentation"> 79, </key>
-<key name="doesn"> 40,51, </key>
-<key name="don"> 7,10,15,28,49,51,70, </key>
-<key name="doubl"> 47,48,49,67,76, </key>
-<key name="down"> 83, </key>
-<key name="downward"> 51, </key>
-<key name="drag"> 51, </key>
-<key name="drawn"> 51, </key>
-<key name="drop"> 65, </key>
-<key name="dropsmalledg"> 65, </key>
-<key name="du"> 65, </key>
-<key name="dump"> 51,79, </key>
-<key name="duplicat"> 51, </key>
-<key name="dx"> 7,44,67,75,78, </key>
-<key name="dy"> 7,44,67,75,78, </key>
-<key name="dz"> 7,44,75,78, </key>
-<key name="e"> 44,53,65, </key>
-<key name="e1"> 50, </key>
-<key name="e2"> 50, </key>
-<key name="e3"> 50, </key>
-<key name="e4"> 50, </key>
-<key name="easi"> 83, </key>
-<key name="edg"> 0,1,50,7,8,9,12,14,15,18,21,24,25,26,28,34,35,37,42,44,54,56,58,59,60,65,66,67,74,33,78,80,81, </key>
-<key name="edge_ind"> 59, </key>
-<key name="edge_point"> 59, </key>
-<key name="edge1"> 8, </key>
-<key name="edge2"> 8, </key>
-<key name="edge3"> 8, </key>
-<key name="edge4"> 8, </key>
-<key name="edgeid"> 0, </key>
-<key name="edit"> 83, </key>
-<key name="egdemaxtol"> 33, </key>
-<key name="egdemintol"> 33, </key>
-<key name="eith"> 50,46, </key>
-<key name="element"> 15,29,67,31,33,79,83, </key>
-<key name="elementary"> 50, </key>
-<key name="ellips"> 3,25, </key>
-<key name="els"> 44,59, </key>
-<key name="empty"> 72,73, </key>
-<key name="encounter"> 33, </key>
-<key name="end"> 1,15,28,46,59,65,67,74,75,78, </key>
-<key name="ent"> 83, </key>
-<key name="entir"> 33, </key>
-<key name="entity"> 1,50,7,14,19,20,21,23,24,25,26,28,29,35,42,43,54,55,56,60,66,67,69,70,77,78,80,82,83, </key>
-<key name="equal"> 20,65,67, </key>
-<key name="eras"> 79, </key>
-<key name="eraseall"> 79, </key>
-<key name="eraseon"> 79, </key>
-<key name="error"> 12,40,33, </key>
-<key name="etc"> 26,53,65, </key>
-<key name="exampl"> 0,1,2,50,7,9,10,12,13,14,15,16,17,19,20,21,22,23,24,25,27,28,29,34,35,36,39,32,41,42,43,45,46,47,48,49,52,53,54,55,56,58,59,60,61,62,63,64,65,66,67,69,70,71,72,73,75,76,77,31,78,80,81,83, </key>
-<key name="except"> 73, </key>
-<key name="exist"> 67,83, </key>
-<key name="expand"> 32, </key>
-<key name="explod"> 5,26,27,37, </key>
-<key name="export"> 38,32,30,51,79, </key>
-<key name="exportation"> 32, </key>
-<key name="extend"> 51, </key>
-<key name="extra"> 33, </key>
-<key name="extract"> 27, </key>
-<key name="extrud"> 54,60, </key>
-<key name="extrusion"> 28,54, </key>
-<key name="f"> 37,68, </key>
-<key name="f_2"> 59, </key>
-<key name="f_ind_1"> 74, </key>
-<key name="f_ind_2"> 74, </key>
-<key name="f1"> 50, </key>
-<key name="f1_id"> 59, </key>
-<key name="f2"> 50, </key>
-<key name="f3"> 50, </key>
-<key name="f4"> 50, </key>
-<key name="f5"> 50, </key>
-<key name="f6"> 50, </key>
-<key name="fab"> 44, </key>
-<key name="fac"> 2,3,50,5,8,9,10,13,15,18,26,27,28,29,34,35,37,39,40,44,48,52,53,54,55,59,60,65,66,67,68,71,73,74,33,82, </key>
-<key name="face_nam"> 59, </key>
-<key name="face_rot"> 59, </key>
-<key name="face1"> 9,18,37, </key>
-<key name="face2"> 9,18,37, </key>
-<key name="face3"> 37, </key>
-<key name="faceid"> 40, </key>
-<key name="facemaxtol"> 33, </key>
-<key name="facemintol"> 33, </key>
-<key name="factor"> 62,74, </key>
-<key name="fail"> 44,59, </key>
-<key name="fals"> 12, </key>
-<key name="far"> 53, </key>
-<key name="field"> 10, </key>
-<key name="fil"> 16,18,35,32,79,81, </key>
-<key name="fill"> 72, </key>
-<key name="fillet"> 9,34,74, </key>
-<key name="filletall"> 74, </key>
-<key name="final"> 45,46,55,56,75,82,83, </key>
-<key name="first"> 7,14,20,23,24,28,43,45,46,48,49,53,55,56,61,65,68,70,75,77,31,78,82, </key>
-<key name="fit"> 51, </key>
-<key name="fix"> 65, </key>
-<key name="fixfacesiz"> 65, </key>
-<key name="fixshap"> 59,65, </key>
-<key name="flag"> 33, </key>
-<key name="flight_solid"> 59, </key>
-<key name="follow"> 65,67,68,76,31,33,83, </key>
-<key name="format"> 38,32,30,51,79, </key>
-<key name="four"> 50,8,65, </key>
-<key name="fram"> 51, </key>
-<key name="fre"> 12,13,59,64,72, </key>
-<key name="function"> 38,30,51,74, </key>
-<key name="functionaliti"> 50, </key>
-<key name="functionality"> 51,53,67,83, </key>
-<key name="fus"> 6,11,36,31, </key>
-<key name="fuse_id"> 11, </key>
-<key name="g1"> 65, </key>
-<key name="g2"> 65, </key>
-<key name="gap"> 15, </key>
-<key name="gc"> 46, </key>
-<key name="general"> 50,31, </key>
-<key name="generat"> 28,35,54, </key>
-<key name="generation"> 28,35,38,30,54,60, </key>
-<key name="geom"> 3,4,5,6,8,11,18,37,40,44,57,58,59,68,74,33, </key>
-<key name="geom_object"> 0,1,2,50,7,9,12,13,14,15,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,42,45,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,77,33,78,80,83, </key>
-<key name="geometric"> 1,50,14,19,21,24,25,28,29,35,42,54,55,56,60,65,66,69,78,79,80, </key>
-<key name="geometrical"> 3,11,17,37,38,32,30,47,51,53,31,33,79,81,83, </key>
-<key name="geometry"> 38,32,30,51,59,65,33, </key>
-<key name="geompy"> 0,1,2,3,4,50,5,6,7,8,9,10,11,12,14,15,17,18,19,20,21,23,24,25,26,27,28,29,34,35,36,37,39,40,42,43,44,45,46,47,48,49,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,77,31,33,78,80,83, </key>
-<key name="get"> 5,44,59,74,33, </key>
-<key name="getenv"> 59, </key>
-<key name="getfacenearpoint"> 5, </key>
-<key name="getfreeboundary"> 12,59, </key>
-<key name="getfreefacesid"> 13,59, </key>
-<key name="getobjectid"> 83, </key>
-<key name="getsubshap"> 59, </key>
-<key name="getsubshapeid"> 5,40,59,74, </key>
-<key name="gg"> 3,4,5,6,8,11,16,18,37,40,44,57,59,68,74,76,81, </key>
-<key name="giv"> 14,25,32,55,65, </key>
-<key name="given"> 3,5,8,9,13,18,23,26,27,29,34,37,39,42,47,52,56,59,65,68,74,77,33, </key>
-<key name="global"> 46,51, </key>
-<key name="glu"> 5,39,44,59,33, </key>
-<key name="good"> 51, </key>
-<key name="gravity"> 26,44,47,33, </key>
-<key name="great"> 51, </key>
-<key name="group"> 5,38,40,30,51,58,83, </key>
-<key name="group_n"> 83, </key>
-<key name="group1"> 40, </key>
-<key name="gui"> 79, </key>
-<key name="handl"> 83, </key>
-<key name="hav"> 65,66, </key>
-<key name="height"> 6,20,23,28,57,59,74, </key>
-<key name="her"> 83, </key>
-<key name="hexagonal"> 8, </key>
-<key name="hexahedral"> 50,8,48, </key>
-<key name="hexahedron"> 50, </key>
-<key name="hid"> 51,79, </key>
-<key name="highlight"> 12,33, </key>
-<key name="hol"> 59,72, </key>
-<key name="hold"> 80, </key>
-<key name="how"> 33, </key>
-<key name="i"> 18,37,40,53,59,65, </key>
-<key name="i11"> 33, </key>
-<key name="i12"> 33, </key>
-<key name="i13"> 33, </key>
-<key name="i21"> 33, </key>
-<key name="i22"> 33, </key>
-<key name="i23"> 33, </key>
-<key name="i31"> 33, </key>
-<key name="i32"> 33, </key>
-<key name="i33"> 33, </key>
-<key name="id"> 0,13,15,16,26,48,59,71,72,73,74,76,79,81,83, </key>
-<key name="id_arc"> 3, </key>
-<key name="id_archimed"> 4, </key>
-<key name="id_axi"> 74, </key>
-<key name="id_bezi"> 3, </key>
-<key name="id_box"> 4,5,59,74, </key>
-<key name="id_box_tr1"> 5, </key>
-<key name="id_box_tr2"> 5, </key>
-<key name="id_box1"> 57,59, </key>
-<key name="id_box2"> 57,59, </key>
-<key name="id_box3"> 57, </key>
-<key name="id_chamfer_"> 74, </key>
-<key name="id_chamfer_all"> 74, </key>
-<key name="id_chamfer_f"> 74, </key>
-<key name="id_chamfer_f1"> 74, </key>
-<key name="id_circle1"> 3, </key>
-<key name="id_circle2"> 3, </key>
-<key name="id_common"> 6, </key>
-<key name="id_compound"> 5,18,37,59, </key>
-<key name="id_cone1"> 57, </key>
-<key name="id_cone2"> 57, </key>
-<key name="id_cs1"> 74, </key>
-<key name="id_cs2"> 74, </key>
-<key name="id_cut"> 6,59, </key>
-<key name="id_cut_without_f_2"> 59, </key>
-<key name="id_cylind"> 6,74, </key>
-<key name="id_cylinder1"> 57, </key>
-<key name="id_cylinder2"> 57, </key>
-<key name="id_divid"> 59, </key>
-<key name="id_edg"> 18,37,59, </key>
-<key name="id_edge1"> 8, </key>
-<key name="id_edge2"> 8, </key>
-<key name="id_edge3"> 8, </key>
-<key name="id_edge4"> 8, </key>
-<key name="id_ellips"> 3, </key>
-<key name="id_fac"> 3,59,68, </key>
-<key name="id_face_rot"> 59, </key>
-<key name="id_face1"> 18,37, </key>
-<key name="id_face2"> 18,37, </key>
-<key name="id_face3"> 37, </key>
-<key name="id_fil"> 18, </key>
-<key name="id_fillet"> 74, </key>
-<key name="id_filletall"> 74, </key>
-<key name="id_fus"> 6, </key>
-<key name="id_glu"> 59, </key>
-<key name="id_group1"> 40, </key>
-<key name="id_importbrep"> 59, </key>
-<key name="id_interpol"> 3, </key>
-<key name="id_line1"> 3, </key>
-<key name="id_line2"> 3, </key>
-<key name="id_make_block_explod"> 5, </key>
-<key name="id_mirror1"> 74, </key>
-<key name="id_mirror2"> 74, </key>
-<key name="id_mirror3"> 74, </key>
-<key name="id_offset"> 74, </key>
-<key name="id_p"> 59, </key>
-<key name="id_p_on_arc"> 3, </key>
-<key name="id_p0"> 3, </key>
-<key name="id_p1"> 3,8,74, </key>
-<key name="id_p100"> 3, </key>
-<key name="id_p2"> 3,8,74, </key>
-<key name="id_p3"> 3,8, </key>
-<key name="id_p4"> 3,8,74, </key>
-<key name="id_partition1"> 4, </key>
-<key name="id_partition2"> 4, </key>
-<key name="id_partition3"> 4, </key>
-<key name="id_pip"> 18, </key>
-<key name="id_plan"> 4,74, </key>
-<key name="id_plane1"> 3, </key>
-<key name="id_plane2"> 3, </key>
-<key name="id_plane3"> 3, </key>
-<key name="id_polylin"> 3, </key>
-<key name="id_position"> 74, </key>
-<key name="id_prism"> 74, </key>
-<key name="id_prism1"> 18, </key>
-<key name="id_prism2"> 18, </key>
-<key name="id_px"> 3, </key>
-<key name="id_py"> 3, </key>
-<key name="id_pz"> 3, </key>
-<key name="id_qface1"> 8, </key>
-<key name="id_qface2"> 8, </key>
-<key name="id_qface3"> 8, </key>
-<key name="id_result"> 59, </key>
-<key name="id_revolution"> 18, </key>
-<key name="id_rot1d"> 74, </key>
-<key name="id_rot2d"> 74, </key>
-<key name="id_rotation1"> 74, </key>
-<key name="id_rotation2"> 74, </key>
-<key name="id_scal"> 74, </key>
-<key name="id_section"> 6, </key>
-<key name="id_sew"> 59, </key>
-<key name="id_shap"> 59, </key>
-<key name="id_shell"> 37, </key>
-<key name="id_sketcher1"> 68, </key>
-<key name="id_sketcher2"> 68, </key>
-<key name="id_solid"> 37, </key>
-<key name="id_solid1"> 8, </key>
-<key name="id_solid2"> 8, </key>
-<key name="id_spher"> 6, </key>
-<key name="id_sphere1"> 57, </key>
-<key name="id_sphere2"> 57, </key>
-<key name="id_sphere3"> 57, </key>
-<key name="id_torus1"> 57, </key>
-<key name="id_torus2"> 57, </key>
-<key name="id_tr1d"> 74, </key>
-<key name="id_tr2d"> 74, </key>
-<key name="id_translation1"> 74, </key>
-<key name="id_translation2"> 74, </key>
-<key name="id_translation3"> 74, </key>
-<key name="id_vector"> 3, </key>
-<key name="id_vector1"> 3, </key>
-<key name="id_vector2"> 3, </key>
-<key name="id_vector3"> 18, </key>
-<key name="id_vr"> 74, </key>
-<key name="id_vxy"> 3, </key>
-<key name="id_wir"> 18,37,59, </key>
-<key name="id_wire_clos"> 59, </key>
-<key name="idlist"> 59,74, </key>
-<key name="idlist_"> 74, </key>
-<key name="idlist_f"> 74, </key>
-<key name="if"> 0,10,12,15,20,29,40,44,51,59,65,72,73,33, </key>
-<key name="ig"> 38,32,30, </key>
-<key name="ignor"> 53, </key>
-<key name="ii"> 5, </key>
-<key name="imag"> 45,51,74,79, </key>
-<key name="imp"> 65, </key>
-<key name="implement"> 32, </key>
-<key name="implementation"> 53, </key>
-<key name="impli"> 65, </key>
-<key name="import"> 3,4,5,6,8,11,18,37,38,40,32,30,44,57,59,68,74,33, </key>
-<key name="importation"> 32, </key>
-<key name="importbrep"> 59, </key>
-<key name="importcomponentgui"> 3,4,5,6,8,11,18,37,40,44,57,59,68,74, </key>
-<key name="impossibl"> 29, </key>
-<key name="in"> 32,52, </key>
-<key name="includ"> 40, </key>
-<key name="increas"> 15, </key>
-<key name="independent"> 17, </key>
-<key name="index"> 26,83, </key>
-<key name="indic"> 9,26,59, </key>
-<key name="indicat"> 49,56, </key>
-<key name="inertia"> 44,33, </key>
-<key name="inform"> 33, </key>
-<key name="initial"> 10,45,46,47,61,62,75, </key>
-<key name="inquir"> 33, </key>
-<key name="insert"> 15, </key>
-<key name="instead"> 20, </key>
-<key name="integ"> 48, </key>
-<key name="integer"> 27,48, </key>
-<key name="interactive"> 27, </key>
-<key name="intermediat"> 50, </key>
-<key name="internal"> 59,73, </key>
-<key name="interpol"> 3, </key>
-<key name="interpolat"> 21, </key>
-<key name="intersect"> 53, </key>
-<key name="intersection"> 53, </key>
-<key name="introduction"> 50,38,30, </key>
-<key name="invalid"> 44,59,65, </key>
-<key name="invert"> 51, </key>
-<key name="invisibl"> 76, </key>
-<key name="inward"> 10, </key>
-<key name="isbyparamet"> 0, </key>
-<key name="iscommonvertex"> 15, </key>
-<key name="isequal"> 44, </key>
-<key name="iso"> 79, </key>
-<key name="isolin"> 41,79, </key>
-<key name="isometric"> 51, </key>
-<key name="isplanarfac"> 37, </key>
-<key name="isplanarwant"> 3,18,29,68, </key>
-<key name="issucces"> 59, </key>
-<key name="isvalid"> 44,59, </key>
-<key name="iteration"> 35, </key>
-<key name="itself"> 15, </key>
-<key name="ix"> 44,33, </key>
-<key name="iy"> 44,33, </key>
-<key name="iz"> 44,33, </key>
-<key name="join"> 65, </key>
-<key name="jpeg"> 51,79, </key>
-<key name="jpg"> 51,79, </key>
-<key name="junction"> 65, </key>
-<key name="just"> 50, </key>
-<key name="k"> 65, </key>
-<key name="keep"> 45,46,61,75,83, </key>
-<key name="keyboard"> 83, </key>
-<key name="ko"> 59, </key>
-<key name="l"> 37,68, </key>
-<key name="last"> 24,43, </key>
-<key name="lc"> 43,46, </key>
-<key name="lcs1"> 46, </key>
-<key name="lcs2"> 46, </key>
-<key name="least"> 21, </key>
-<key name="leav"> 10,83, </key>
-<key name="left"> 46,51,79, </key>
-<key name="len"> 59, </key>
-<key name="length"> 0,44,67,33, </key>
-<key name="li"> 1,14, </key>
-<key name="limit"> 53, </key>
-<key name="lin"> 2,3,42,43,67,83, </key>
-<key name="line1"> 3, </key>
-<key name="line2"> 3, </key>
-<key name="linear"> 67, </key>
-<key name="list"> 3,9,12,13,15,19,21,26,29,35,40,53,58,59,64,65,66,67,69,71,72,73,74,80,83, </key>
-<key name="listchain"> 5, </key>
-<key name="listoffaceid"> 9, </key>
-<key name="listofgeomshap"> 71, </key>
-<key name="listofid"> 71, </key>
-<key name="listofind"> 26, </key>
-<key name="listofkeepinsid"> 53, </key>
-<key name="listofmaterial"> 53, </key>
-<key name="listofremoveinsid"> 53, </key>
-<key name="listofshap"> 19,21,53,64,66,69,80, </key>
-<key name="listoftool"> 53, </key>
-<key name="listofwireid"> 72, </key>
-<key name="listshap"> 34, </key>
-<key name="ll"> 51, </key>
-<key name="local"> 43,46,52,55,67,74,82, </key>
-<key name="localcs1"> 46, </key>
-<key name="localcs2"> 46, </key>
-<key name="locat"> 51,56, </key>
-<key name="location"> 32,43,46,74, </key>
-<key name="lock"> 10,51, </key>
-<key name="lsc"> 46, </key>
-<key name="ly"> 67,73, </key>
-<key name="magnitud"> 65, </key>
-<key name="main"> 0,1,2,50,7,9,10,12,13,14,15,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,42,43,44,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,77,33,78,80,82,83, </key>
-<key name="mainshap"> 83, </key>
-<key name="major"> 25,77, </key>
-<key name="mak"> 5,6,9,44,48,49,59,74,75,83, </key>
-<key name="make_block_explod"> 5, </key>
-<key name="makearc"> 1,3,18,37,59,68,74, </key>
-<key name="makebezi"> 3,21, </key>
-<key name="makeblockexplod"> 5,27, </key>
-<key name="makeboolean"> 11,31, </key>
-<key name="makebox"> 7,11,44,57,59,74, </key>
-<key name="makeboxdxdydz"> 5,7,44,57,59,74, </key>
-<key name="makeboxtwopnt"> 4,7,40,57, </key>
-<key name="makecdg"> 44,33, </key>
-<key name="makechamf"> 74, </key>
-<key name="makechamferall"> 9,74, </key>
-<key name="makechamferedg"> 9,74, </key>
-<key name="makechamferfac"> 9,74, </key>
-<key name="makecircl"> 3,14, </key>
-<key name="makecirclethreepnt"> 3,14, </key>
-<key name="makecommon"> 6,17, </key>
-<key name="makecompound"> 5,18,19,37,44,59, </key>
-<key name="makecon"> 20,57,59, </key>
-<key name="makeconer1r2h"> 20,57, </key>
-<key name="makecut"> 6,59, </key>
-<key name="makecylind"> 6,23,57,59,74, </key>
-<key name="makecylinderrh"> 23,57, </key>
-<key name="makeedg"> 8,18,24,37,59, </key>
-<key name="makeellips"> 3,25, </key>
-<key name="makefac"> 3,18,29,37,59,68,74, </key>
-<key name="makefacewir"> 29,37, </key>
-<key name="makefil"> 18,35, </key>
-<key name="makefillet"> 34,74, </key>
-<key name="makefilletall"> 34,74, </key>
-<key name="makefus"> 6,36, </key>
-<key name="makegluefac"> 39,44,59, </key>
-<key name="makehalfpartition"> 4,53, </key>
-<key name="makehexa"> 50,8, </key>
-<key name="makehexa2fac"> 50,8, </key>
-<key name="makeinterpol"> 3,21, </key>
-<key name="makelin"> 3,42, </key>
-<key name="makelinetwopnt"> 3,42, </key>
-<key name="makemark"> 43,74, </key>
-<key name="makemirrorbyaxi"> 45,74, </key>
-<key name="makemirrorbyplan"> 45,74, </key>
-<key name="makemirrorbypoint"> 45,74, </key>
-<key name="makemultirotation1d"> 47, </key>
-<key name="makemultirotation2d"> 47, </key>
-<key name="makemultitransformation1d"> 5,48, </key>
-<key name="makemultitransformation2d"> 5,48, </key>
-<key name="makemultitranslation1d"> 49,74, </key>
-<key name="makemultitranslation2d"> 49,74, </key>
-<key name="makeoffset"> 52,74, </key>
-<key name="makepartition"> 4,53, </key>
-<key name="makepip"> 18,54, </key>
-<key name="makeplan"> 3,4,55, </key>
-<key name="makeplanefac"> 3,55, </key>
-<key name="makeplanethreepnt"> 3,55,74, </key>
-<key name="makepolylin"> 3,21, </key>
-<key name="makeposition"> 46,74, </key>
-<key name="makeprism"> 18,28,37, </key>
-<key name="makeprismvech"> 18,28,59,74, </key>
-<key name="makequad"> 50,8, </key>
-<key name="makequad2edg"> 50,8, </key>
-<key name="makequad4vertic"> 50,8, </key>
-<key name="makerevolution"> 18,60, </key>
-<key name="makerotation"> 59,61,74, </key>
-<key name="makerotationthreepoint"> 61,74, </key>
-<key name="makescaletransform"> 62,74, </key>
-<key name="makesection"> 6,63, </key>
-<key name="makesew"> 59,64, </key>
-<key name="makeshell"> 37,66, </key>
-<key name="makesketch"> 37,67,68, </key>
-<key name="makesketcheronplan"> 68, </key>
-<key name="makesolid"> 37,69, </key>
-<key name="makespher"> 5,6,11,57,70, </key>
-<key name="makespherepntr"> 57, </key>
-<key name="maketoru"> 57,77, </key>
-<key name="maketorusrr"> 57,77, </key>
-<key name="maketranslation"> 18,37,74,75, </key>
-<key name="maketranslationtwopoint"> 74,75, </key>
-<key name="maketranslationvector"> 74,75, </key>
-<key name="makevector"> 3,6,18,37,57,59,68,74,78, </key>
-<key name="makevectordxdydz"> 3,4,18,78, </key>
-<key name="makevertex"> 3,4,5,6,8,18,37,40,44,56,57,59,68,74, </key>
-<key name="makevertexoncurv"> 3,56, </key>
-<key name="makevertexwithref"> 3,56, </key>
-<key name="makewir"> 3,18,37,59,68,74,80, </key>
-<key name="manual"> 51,83, </key>
-<key name="mark"> 51, </key>
-<key name="mas"> 44,33, </key>
-<key name="math"> 44,59,74, </key>
-<key name="matrix"> 44,33, </key>
-<key name="max"> 27,35,44,65, </key>
-<key name="max_nb_fac"> 5, </key>
-<key name="maxdeg"> 18, </key>
-<key name="maxdegre"> 35, </key>
-<key name="maximal"> 27,65,33, </key>
-<key name="maximum"> 27,35,39,65,33, </key>
-<key name="maxnbfac"> 27, </key>
-<key name="maxtoleranc"> 65, </key>
-<key name="maxtolerance3d"> 65, </key>
-<key name="mean"> 52,56,67,81, </key>
-<key name="measur"> 33, </key>
-<key name="measurement"> 44,33, </key>
-<key name="mechanism"> 32, </key>
-<key name="meet"> 65, </key>
-<key name="memoris"> 51, </key>
-<key name="mention"> 50, </key>
-<key name="menu"> 0,1,2,50,7,9,10,12,13,14,15,16,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,32,41,42,43,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,77,33,78,79,80,81,82,83, </key>
-<key name="merg"> 65, </key>
-<key name="mesh"> 2,50,51,79, </key>
-<key name="meshingdeflection"> 2,4, </key>
-<key name="method"> 46, </key>
-<key name="middl"> 1,56, </key>
-<key name="min"> 27,35,44,33, </key>
-<key name="min_dist"> 44, </key>
-<key name="min_nb_fac"> 5, </key>
-<key name="mindeg"> 18, </key>
-<key name="mindegre"> 35, </key>
-<key name="mindistanc"> 44,33, </key>
-<key name="minimal"> 27,29,44,33, </key>
-<key name="minimum"> 27,35,65,33, </key>
-<key name="minnbfac"> 27, </key>
-<key name="minor"> 25,77, </key>
-<key name="mirror"> 45,74, </key>
-<key name="mirror1"> 74, </key>
-<key name="mirror2"> 74, </key>
-<key name="mirror3"> 74, </key>
-<key name="mod"> 0,11,15,65,79,81, </key>
-<key name="model"> 2,38,30, </key>
-<key name="modifi"> 15,46, </key>
-<key name="modify"> 46,74, </key>
-<key name="modul"> 38,32,30,51,79, </key>
-<key name="moment"> 44,33, </key>
-<key name="mous"> 51,79, </key>
-<key name="mov"> 46,49, </key>
-<key name="much"> 83, </key>
-<key name="multi"> 5,47,48,49,74, </key>
-<key name="multirotate1d"> 47,74, </key>
-<key name="multirotate2d"> 47,74, </key>
-<key name="multitud"> 58, </key>
-<key name="must"> 44,47,49,72,33, </key>
-<key name="n"> 65, </key>
-<key name="nam"> 0,1,2,50,7,9,10,14,15,17,19,20,21,22,23,24,25,28,29,34,35,36,39,32,42,43,45,46,47,48,49,52,53,54,55,56,60,62,63,64,65,66,69,70,71,72,73,75,77,78,79,80,82,83, </key>
-<key name="nb"> 5,7,42,70, </key>
-<key name="nb_sub"> 26, </key>
-<key name="nbit"> 18,35, </key>
-<key name="nbound"> 44, </key>
-<key name="nbox"> 44, </key>
-<key name="nbsplitpoint"> 65, </key>
-<key name="nbtim"> 47,48,49, </key>
-<key name="nbtimes1"> 47,49, </key>
-<key name="nbtimes2"> 47,49, </key>
-<key name="nbtimesu"> 48, </key>
-<key name="nbtimesv"> 48, </key>
-<key name="ncentr"> 44, </key>
-<key name="ncompound"> 44, </key>
-<key name="ne"> 7,9,26,28,29,34,35,47,49,54,60,62,65,70,75, </key>
-<key name="necessari"> 65, </key>
-<key name="necessary"> 9,34,65,67,33, </key>
-<key name="need"> 15,61, </key>
-<key name="negativ"> 52, </key>
-<key name="neighbour"> 65, </key>
-<key name="new"> 1,50,7,14,15,19,20,21,23,24,25,26,28,29,35,42,43,51,53,54,55,56,60,66,67,69,70,74,77,78,79,80,82,83, </key>
-<key name="ninertia"> 44, </key>
-<key name="nminimal"> 44, </key>
-<key name="nod"> 21, </key>
-<key name="noerror"> 12, </key>
-<key name="non"> 44, </key>
-<key name="normal"> 3,10,14,25,52,55,77, </key>
-<key name="not"> 20, </key>
-<key name="noth"> 29, </key>
-<key name="notion"> 50, </key>
-<key name="nth"> 65, </key>
-<key name="numb"> 27,35,41,47,48,49,52,59,64,65,72,74,79, </key>
-<key name="number"> 48, </key>
-<key name="object"> 1,2,3,4,5,6,8,9,10,11,14,16,17,18,19,21,24,25,26,28,29,34,35,37,38,40,32,30,42,43,45,46,47,51,52,53,54,55,56,57,58,59,60,61,65,66,68,69,73,74,75,31,33,78,79,80,81,83, </key>
-<key name="obtain"> 26,44,46,65, </key>
-<key name="occ"> 0,9,15,34,51,71,72,73,79,83, </key>
-<key name="occur"> 12, </key>
-<key name="offset"> 52,74, </key>
-<key name="ok"> 43,44,59,83, </key>
-<key name="old"> 53,56, </key>
-<key name="on"> 0,15,22,47,48,49,56,59,65,67,82, </key>
-<key name="opaqu"> 76, </key>
-<key name="open"> 12,15,32,51,59,83, </key>
-<key name="openwir"> 12,59, </key>
-<key name="operation"> 0,1,2,4,50,5,6,7,9,10,12,13,14,15,17,20,21,22,23,25,26,27,28,34,35,36,38,39,30,42,45,46,47,48,49,52,53,54,55,56,58,59,60,61,62,63,64,65,67,70,71,72,73,74,75,77,31,78,83, </key>
-<key name="operator"> 59,65, </key>
-<key name="opportunity"> 32, </key>
-<key name="opposit"> 7, </key>
-<key name="optimization"> 38,30, </key>
-<key name="option"> 79,81, </key>
-<key name="ord"> 65, </key>
-<key name="orient"> 50, </key>
-<key name="orientat"> 51, </key>
-<key name="orientation"> 10,51, </key>
-<key name="origin"> 7,20,23,43,51,70,77,78, </key>
-<key name="orthogonal"> 61, </key>
-<key name="os"> 59, </key>
-<key name="otherwis"> 0,15,45,46,61,75, </key>
-<key name="our"> 0,1,2,50,7,9,12,13,14,15,16,17,19,20,21,22,23,24,25,27,28,29,34,35,36,39,42,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,76,77,31,33,78,80,81,83, </key>
-<key name="out"> 51,65, </key>
-<key name="outward"> 10, </key>
-<key name="ox"> 43,67, </key>
-<key name="oy"> 43, </key>
-<key name="oz"> 20,23,43,67, </key>
-<key name="p"> 57, </key>
-<key name="p_25_25_50"> 5, </key>
-<key name="p_25_50_25"> 5, </key>
-<key name="p_50_25_25"> 5, </key>
-<key name="p_on_arc"> 3, </key>
-<key name="p0"> 3,4,8,18,37,40,57,59,74, </key>
-<key name="p1"> 3,6,8,18,37,57,59,68,74, </key>
-<key name="p10"> 8, </key>
-<key name="p100"> 3, </key>
-<key name="p11"> 8, </key>
-<key name="p2"> 3,6,8,18,37,57,59,68,74, </key>
-<key name="p200"> 4,40, </key>
-<key name="p3"> 3,8,18,37,59,68,74, </key>
-<key name="p4"> 3,8,18,74, </key>
-<key name="p5"> 3,8,18,74, </key>
-<key name="p50"> 3, </key>
-<key name="p6"> 8,18, </key>
-<key name="p7"> 8,18, </key>
-<key name="p70"> 57, </key>
-<key name="p8"> 8,18, </key>
-<key name="p9"> 8, </key>
-<key name="pan"> 51, </key>
-<key name="parallel"> 7,42,65, </key>
-<key name="paramet"> 0,15,56,65, </key>
-<key name="parameter"> 4,16,35,53,59,65,67,76,79,81, </key>
-<key name="parameterization"> 65, </key>
-<key name="parametric"> 65, </key>
-<key name="paramt"> 0, </key>
-<key name="part"> 17,20,51, </key>
-<key name="partition"> 4,53, </key>
-<key name="partition1"> 4, </key>
-<key name="partition2"> 4, </key>
-<key name="partition3"> 4, </key>
-<key name="partitionalgo"> 53, </key>
-<key name="pas"> 5,21,42,44,47,55,61,67, </key>
-<key name="path"> 18,54, </key>
-<key name="pathshap"> 54, </key>
-<key name="perform"> 4,26,51,74, </key>
-<key name="perpendicular"> 67, </key>
-<key name="pi"> 47,59,74, </key>
-<key name="pictur"> 46, </key>
-<key name="pip"> 18,54, </key>
-<key name="plac"> 46,51,65, </key>
-<key name="plan"> 2,3,4,45,51,53,55,61,67,74,82,83, </key>
-<key name="planar"> 29,67,68,74,82, </key>
-<key name="plane1"> 3, </key>
-<key name="plane2"> 3, </key>
-<key name="plane3"> 3, </key>
-<key name="plug"> 32, </key>
-<key name="plung"> 2, </key>
-<key name="png"> 51,79, </key>
-<key name="point"> 0,1,3,4,50,7,8,14,15,18,20,21,23,24,25,28,37,40,42,43,44,45,47,51,52,55,56,59,61,62,65,67,68,70,74,75,77,33,78,83, </key>
-<key name="point1"> 1,3,7,8,14,24,28,42,55,61,75,78, </key>
-<key name="point2"> 1,3,7,8,14,24,28,42,55,61,75,78, </key>
-<key name="point3"> 1,3,8,14,55, </key>
-<key name="point4"> 3,8, </key>
-<key name="point5"> 3, </key>
-<key name="pointcoordinat"> 44,33, </key>
-<key name="polylin"> 3,21, </key>
-<key name="pop"> 16,81, </key>
-<key name="position"> 0,46,51,56,65,74,82, </key>
-<key name="positional"> 65, </key>
-<key name="possibiliti"> 29, </key>
-<key name="possibility"> 65, </key>
-<key name="possibl"> 5,21,58,65,33, </key>
-<key name="precision"> 59,64, </key>
-<key name="predefin"> 67, </key>
-<key name="preferrabl"> 53, </key>
-<key name="pres"> 43,51, </key>
-<key name="presentation"> 79, </key>
-<key name="preview"> 51, </key>
-<key name="previou"> 65,67, </key>
-<key name="primitiv"> 7,20,23,38,30,57,70,77, </key>
-<key name="print"> 44,59,33, </key>
-<key name="prism"> 18,28,37,59,74, </key>
-<key name="prism_edg"> 74, </key>
-<key name="prism_fac"> 37,74, </key>
-<key name="prism1"> 18, </key>
-<key name="prism2"> 18, </key>
-<key name="problem"> 65, </key>
-<key name="proces"> 15,59,65,71, </key>
-<key name="processshap"> 59,65, </key>
-<key name="produc"> 2,9,15,17,22,27,34,36,45,47,48,49,52,53,58,61,62,63,64,65,71,74,75, </key>
-<key name="program"> 40, </key>
-<key name="project"> 10, </key>
-<key name="projection"> 47,82, </key>
-<key name="prop"> 44, </key>
-<key name="propagat"> 5,58, </key>
-<key name="propagation"> 5,58, </key>
-<key name="properti"> 44,33, </key>
-<key name="proportional"> 65, </key>
-<key name="provid"> 0,1,2,50,7,9,12,13,14,15,16,17,19,20,21,22,23,24,25,27,28,29,34,35,36,39,42,45,46,47,48,49,51,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,76,77,31,78,80,81,83, </key>
-<key name="ps"> 59, </key>
-<key name="put"> 2, </key>
-<key name="px"> 3,18,37,59,74, </key>
-<key name="pxy"> 74, </key>
-<key name="pxyz"> 18,37,74, </key>
-<key name="py"> 3,18,37,59,74, </key>
-<key name="py1"> 59, </key>
-<key name="python"> 33, </key>
-<key name="pz"> 3,4,18,37,59,74, </key>
-<key name="qface1"> 8, </key>
-<key name="qface2"> 8, </key>
-<key name="qface3"> 8, </key>
-<key name="qface4"> 8, </key>
-<key name="qface5"> 8, </key>
-<key name="qface6"> 8, </key>
-<key name="qface7"> 8, </key>
-<key name="quadrangl"> 50,8,55,33, </key>
-<key name="quantiti"> 33, </key>
-<key name="r"> 34,37,68, </key>
-<key name="radio"> 83, </key>
-<key name="radiu"> 3,9,14,20,23,25,34,67,70,74,77, </key>
-<key name="radius"> 3,20,25,77, </key>
-<key name="radius1"> 6,20,57,59,74, </key>
-<key name="radius2"> 20,57, </key>
-<key name="radius3"> 57, </key>
-<key name="radiusmajor"> 25,77, </key>
-<key name="radiusminor"> 25,77, </key>
-<key name="rais"> 40,44,59, </key>
-<key name="rang"> 0,26,38,32,30,76, </key>
-<key name="recent"> 79, </key>
-<key name="reconstruction"> 53, </key>
-<key name="redefin"> 79, </key>
-<key name="reduc"> 65, </key>
-<key name="referenc"> 43,56, </key>
-<key name="refresh"> 79, </key>
-<key name="regard"> 56, </key>
-<key name="relativ"> 67, </key>
-<key name="relevant"> 81, </key>
-<key name="remain"> 51,53,81, </key>
-<key name="remaind"> 46, </key>
-<key name="remot"> 51, </key>
-<key name="remov"> 40,45,46,51,59,61,65,71,72,73,75,83, </key>
-<key name="removeobject"> 40,83, </key>
-<key name="removeweb"> 53, </key>
-<key name="renam"> 79, </key>
-<key name="repair"> 0,10,12,13,15,38,39,30,59,64,65,71,72,73, </key>
-<key name="repetition"> 47,49, </key>
-<key name="represent"> 51,55, </key>
-<key name="representation"> 51, </key>
-<key name="requir"> 32,65, </key>
-<key name="requireddegre"> 65, </key>
-<key name="requirednbsegment"> 65, </key>
-<key name="res"> 59, </key>
-<key name="reset"> 51, </key>
-<key name="resiz"> 51, </key>
-<key name="respect"> 39,67, </key>
-<key name="restor"> 51, </key>
-<key name="restriction"> 65, </key>
-<key name="result"> 0,1,2,4,50,5,6,7,9,10,12,13,14,15,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,42,45,47,48,49,51,52,53,54,55,56,58,59,60,61,62,63,64,65,66,67,69,70,71,72,73,74,75,77,33,78,80,83, </key>
-<key name="resultant"> 65, </key>
-<key name="retriev"> 13, </key>
-<key name="return"> 26,27,44,51,33,83, </key>
-<key name="revers"> 10,47,61, </key>
-<key name="revolution"> 18,60,65, </key>
-<key name="right"> 16,46,79,81, </key>
-<key name="ris"> 65, </key>
-<key name="rot1d"> 74, </key>
-<key name="rot2d"> 74, </key>
-<key name="rotat"> 47,51,60,61,74, </key>
-<key name="rotation"> 47,51,59,61,74, </key>
-<key name="rotation1"> 74, </key>
-<key name="rotation2"> 74, </key>
-<key name="rul"> 65, </key>
-<key name="runtimeerror"> 44,59, </key>
-<key name="s"> 12,14,15,18,37,48,59,62,71,72,73,83, </key>
-<key name="s1"> 17,36,63, </key>
-<key name="s2"> 17,36,63, </key>
-<key name="salom"> 3,4,5,6,8,11,18,37,38,40,30,44,57,59,68,74, </key>
-<key name="sam"> 47,65,67,74,83, </key>
-<key name="sameparamet"> 65, </key>
-<key name="satisfy"> 33, </key>
-<key name="sav"> 32,51, </key>
-<key name="scal"> 62,74, </key>
-<key name="scen"> 51, </key>
-<key name="script"> 0,1,2,50,7,9,12,13,14,15,16,17,19,20,21,22,23,24,25,27,28,29,34,35,36,39,42,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,76,77,31,33,78,80,81,83, </key>
-<key name="se"> 46,51,81, </key>
-<key name="search"> 32, </key>
-<key name="second"> 7,14,20,23,28,43,45,46,48,49,53,55,56,61,65,68,70,75,77,31,78,82, </key>
-<key name="section"> 2,6,51,63,31, </key>
-<key name="seem"> 59, </key>
-<key name="segment"> 65,67, </key>
-<key name="select"> 0,1,2,4,7,9,10,12,13,14,15,16,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,40,32,42,43,45,46,47,48,49,51,52,53,54,55,56,58,59,60,61,62,63,64,65,66,67,69,70,71,72,73,75,77,33,78,79,80,81,82,83, </key>
-<key name="selection"> 34,67,82,83, </key>
-<key name="separat"> 31, </key>
-<key name="serv"> 21,28,54,60, </key>
-<key name="set"> 0,15,27,29,37,47,51,52,56,82, </key>
-<key name="setcolor"> 11,16, </key>
-<key name="setdisplaymod"> 3,4,5,6,8,11,18,37,57,59,68,74,81, </key>
-<key name="settransparency"> 3,11,37,68,74,76, </key>
-<key name="sew"> 59,64, </key>
-<key name="sg"> 5,40,59,79, </key>
-<key name="shad"> 79,81, </key>
-<key name="shap"> 0,2,4,9,10,12,13,15,17,19,22,26,28,34,35,36,37,38,39,40,30,41,44,45,46,47,49,51,52,53,54,58,59,60,61,62,63,64,65,71,72,73,74,75,76,33,79,83, </key>
-<key name="shape1"> 31,33, </key>
-<key name="shape2"> 31,33, </key>
-<key name="shapelistcompound"> 18,37, </key>
-<key name="shapes_of_given_typ"> 26, </key>
-<key name="shapetyp"> 34,37,40,59,74,83, </key>
-<key name="shapetypeedg"> 74, </key>
-<key name="shapetypefac"> 74, </key>
-<key name="shar"> 13, </key>
-<key name="sharp"> 65, </key>
-<key name="shel"> 13,19,37,52,66,69,81, </key>
-<key name="shell"> 50,10,28,37,52,53,54,60,66,69, </key>
-<key name="shift"> 46,56,80,83, </key>
-<key name="short"> 16,81, </key>
-<key name="shortcut"> 29, </key>
-<key name="should"> 42,71,72,33, </key>
-<key name="show"> 51,33, </key>
-<key name="shown"> 43, </key>
-<key name="sid"> 55, </key>
-<key name="sign"> 52, </key>
-<key name="simp"> 43, </key>
-<key name="simpl"> 47,48,49, </key>
-<key name="sinc"> 53, </key>
-<key name="singl"> 29, </key>
-<key name="six"> 50,8, </key>
-<key name="siz"> 9,55,65, </key>
-<key name="sketch"> 37,67,68, </key>
-<key name="sketcher"> 37, </key>
-<key name="sketcher1"> 37,68, </key>
-<key name="sketcher2"> 37,68, </key>
-<key name="sketcher3"> 37, </key>
-<key name="skip"> 83, </key>
-<key name="small"> 51,65, </key>
-<key name="so"> 29,46, </key>
-<key name="solid"> 50,7,8,20,23,26,28,37,48,52,53,54,60,69,70,77, </key>
-<key name="solid1"> 8, </key>
-<key name="solid2"> 8, </key>
-<key name="sort"> 26, </key>
-<key name="sourc"> 60, </key>
-<key name="spac"> 14,21,55,56,33,78, </key>
-<key name="specifi"> 0,7,9,15,34,43,48,59,65,73,74, </key>
-<key name="specific"> 50, </key>
-<key name="specify"> 0,61, </key>
-<key name="spher"> 5,6,11,57,70,74, </key>
-<key name="sphere1"> 57, </key>
-<key name="sphere2"> 57, </key>
-<key name="sphere3"> 57, </key>
-<key name="splin"> 3,21, </key>
-<key name="split"> 0,65, </key>
-<key name="splitangl"> 65, </key>
-<key name="splitclosedfac"> 65, </key>
-<key name="splitcontinuity"> 65, </key>
-<key name="spot"> 65, </key>
-<key name="sqrt"> 44, </key>
-<key name="stag"> 50, </key>
-<key name="standard"> 16,79, </key>
-<key name="start"> 1,28,46,67,75,78, </key>
-<key name="step"> 38,32,30,47,49, </key>
-<key name="step1"> 49, </key>
-<key name="step2"> 49, </key>
-<key name="still"> 65, </key>
-<key name="str"> 67, </key>
-<key name="strict"> 51, </key>
-<key name="strip"> 65, </key>
-<key name="study"> 3,4,5,6,8,18,37,57,59,68,74, </key>
-<key name="sub"> 26,51,59,72,83, </key>
-<key name="sub_shape_id"> 59, </key>
-<key name="subfacelist"> 40, </key>
-<key name="submenu"> 33, </key>
-<key name="subshap"> 26,83, </key>
-<key name="subshapeall"> 26, </key>
-<key name="subshapeallid"> 26, </key>
-<key name="subshapeallsort"> 26,37,40,59,74, </key>
-<key name="subshapeallsortedid"> 26, </key>
-<key name="subshapeid"> 83, </key>
-<key name="subshapesort"> 26, </key>
-<key name="subtraction"> 46, </key>
-<key name="successful"> 44, </key>
-<key name="sup_fac"> 59, </key>
-<key name="support"> 53, </key>
-<key name="suppres"> 59,71,72,73, </key>
-<key name="suppressfac"> 59,71, </key>
-<key name="suppresshol"> 59,72, </key>
-<key name="suppressinternalwir"> 59,73, </key>
-<key name="surfac"> 29,35,44,52,65,74,33, </key>
-<key name="surfacecontinuity"> 65, </key>
-<key name="surfacemod"> 65, </key>
-<key name="symmetric"> 74, </key>
-<key name="symmetrical"> 45,74, </key>
-<key name="symmetry"> 45, </key>
-<key name="system"> 20,23,43,46,55,70,74,82, </key>
-<key name="t"> 7,10,28,40,51,70, </key>
-<key name="tak"> 65, </key>
-<key name="tangent"> 65,67, </key>
-<key name="tangential"> 65, </key>
-<key name="target"> 27,67, </key>
-<key name="technology"> 51, </key>
-<key name="test"> 33, </key>
-<key name="tetrahedral"> 50, </key>
-<key name="textual"> 67,68, </key>
-<key name="th"> 65, </key>
-<key name="theendlc"> 46, </key>
-<key name="theischeckgeom"> 33, </key>
-<key name="them"> 7,26,51,65,71,80,83, </key>
-<key name="theobject"> 46, </key>
-<key name="therefor"> 67, </key>
-<key name="theshap"> 39,59,33, </key>
-<key name="thestartlc"> 46, </key>
-<key name="thetoleranc"> 39, </key>
-<key name="third"> 7,61, </key>
-<key name="thre"> 1,3,14,18,21,37,43,45,55,56,61,68,74,82, </key>
-<key name="thu"> 65,76, </key>
-<key name="tim"> 21,47,49,56,74, </key>
-<key name="tobezi"> 65, </key>
-<key name="togeth"> 83, </key>
-<key name="tol"> 44, </key>
-<key name="tol2d"> 18,35, </key>
-<key name="tol3d"> 18,35, </key>
-<key name="toleranc"> 15,35,39,44,59,65,33, </key>
-<key name="tolerance2d"> 65, </key>
-<key name="tolerance3d"> 59,65, </key>
-<key name="tool"> 44,53,33, </key>
-<key name="toolbar"> 51,54, </key>
-<key name="top_fac"> 5, </key>
-<key name="top_face_ind"> 5, </key>
-<key name="topology"> 33, </key>
-<key name="toru"> 57,77, </key>
-<key name="torus"> 57, </key>
-<key name="torus1"> 57, </key>
-<key name="torus2"> 57, </key>
-<key name="tr1d"> 74, </key>
-<key name="tr2d"> 74, </key>
-<key name="transform"> 5,17,48,62,74, </key>
-<key name="transformat"> 5, </key>
-<key name="transformation"> 5,9,34,38,30,45,46,47,48,49,51,52,61,62,74,75, </key>
-<key name="translat"> 46,47,49,52,74,75, </key>
-<key name="translation"> 47,48,49,74,75, </key>
-<key name="translation1"> 74, </key>
-<key name="translation2"> 74, </key>
-<key name="translation3"> 74, </key>
-<key name="transparency"> 11,76,79, </key>
-<key name="transparent"> 76,81, </key>
-<key name="triangl"> 51, </key>
-<key name="trihedron"> 51, </key>
-<key name="trimsiz"> 3,4,55, </key>
-<key name="tru"> 0,15,59,33, </key>
-<key name="truncat"> 20, </key>
-<key name="try"> 29, </key>
-<key name="tt"> 37,68, </key>
-<key name="tui"> 0,1,2,50,7,9,10,12,13,14,15,16,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,42,43,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,76,77,31,33,78,79,80,81,83, </key>
-<key name="tupl"> 33, </key>
-<key name="two"> 0,3,4,50,7,8,9,13,17,18,20,24,36,37,39,40,46,47,48,49,53,61,65,68,70,74,77,33,82,83, </key>
-<key name="typ"> 21,26,27,53,65,67,31,33,83, </key>
-<key name="u"> 65, </key>
-<key name="uncheck"> 10,51, </key>
-<key name="underly"> 15,65, </key>
-<key name="unionlist"> 40, </key>
-<key name="up"> 16,20,81, </key>
-<key name="updat"> 79, </key>
-<key name="updateobjbrows"> 5,40,59, </key>
-<key name="us"> 2,50,15,26,27,35,38,30,46,48,51,65,67,73,76,31,33,83, </key>
-<key name="useful"> 0,1,2,50,7,9,12,13,14,15,16,17,19,20,21,22,23,24,25,27,28,29,34,35,36,39,42,45,46,47,48,49,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,76,77,31,78,79,80,81,83, </key>
-<key name="v"> 6,57,59,74, </key>
-<key name="v1"> 50, </key>
-<key name="v2"> 50, </key>
-<key name="v3"> 50, </key>
-<key name="v4"> 50, </key>
-<key name="val"> 0, </key>
-<key name="val1"> 44, </key>
-<key name="val2"> 44, </key>
-<key name="valid"> 44,59,33, </key>
-<key name="validity"> 33, </key>
-<key name="valu"> 0,2,7,9,15,20,23,28,34,39,41,43,44,46,47,49,52,55,59,60,64,65,67,70,75,77,33,78, </key>
-<key name="variety"> 26, </key>
-<key name="variou"> 65, </key>
-<key name="vector"> 3,4,6,14,18,20,23,25,28,37,42,43,45,47,49,55,57,59,60,61,65,67,68,74,75,77,78,82, </key>
-<key name="vector_arc"> 3,68, </key>
-<key name="vector1"> 3,18, </key>
-<key name="vector1_arc1"> 18, </key>
-<key name="vector1_arc2"> 18, </key>
-<key name="vector2"> 3,18, </key>
-<key name="vector2_arc1"> 18, </key>
-<key name="vector2_arc2"> 18, </key>
-<key name="vector3"> 18, </key>
-<key name="versa"> 65, </key>
-<key name="version"> 53, </key>
-<key name="vertex"> 3,4,6,14,15,18,20,23,24,25,28,37,44,45,54,55,56,57,59,60,62,70,74,77,33, </key>
-<key name="vertex_n"> 56, </key>
-<key name="vertex1"> 24, </key>
-<key name="vertex2"> 24, </key>
-<key name="vertexmaxtol"> 33, </key>
-<key name="vertexmintol"> 33, </key>
-<key name="vertic"> 1,3,50,5,7,8,15,18,24,26,28,37,40,42,55,57,59,68,74,75,78, </key>
-<key name="via"> 50,7,29,32,42,51,67,70, </key>
-<key name="vic"> 65, </key>
-<key name="view"> 0,9,11,15,34,43,51,71,72,73,33,79,80,81,83, </key>
-<key name="visibl"> 51, </key>
-<key name="visualiz"> 51, </key>
-<key name="volum"> 44,33, </key>
-<key name="vr"> 74, </key>
-<key name="vrot1d"> 74, </key>
-<key name="vt"> 74, </key>
-<key name="vtr1d"> 74, </key>
-<key name="vtr2d"> 74, </key>
-<key name="vxy"> 3,18,37,59,74, </key>
-<key name="vxyz"> 4, </key>
-<key name="vz"> 74, </key>
-<key name="w_0"> 59, </key>
-<key name="wantplanarfac"> 59, </key>
-<key name="wat"> 2, </key>
-<key name="waterdensity"> 2,4, </key>
-<key name="way"> 7,26,28,42,45,47,70,83, </key>
-<key name="weight"> 2,4, </key>
-<key name="well"> 65,33, </key>
-<key name="wf"> 68, </key>
-<key name="what"> 44, </key>
-<key name="whati"> 44,33, </key>
-<key name="wheth"> 33, </key>
-<key name="whil"> 12,18,37,44,65,81, </key>
-<key name="whos"> 29,33, </key>
-<key name="wid"> 38,30, </key>
-<key name="will"> 0,1,2,50,7,9,10,12,13,14,15,17,19,20,21,22,23,24,25,26,27,28,29,34,35,36,39,32,42,45,46,47,48,49,51,52,53,54,55,56,58,60,61,62,63,64,65,66,67,69,70,71,72,73,75,77,78,80,83, </key>
-<key name="wir"> 3,50,12,15,18,26,28,29,37,44,54,59,60,67,68,72,73,74,80, </key>
-<key name="wire_clos"> 59, </key>
-<key name="wire_nam"> 59, </key>
-<key name="wire1"> 18, </key>
-<key name="wire2"> 18, </key>
-<key name="wirefram"> 79,81, </key>
-<key name="wish"> 10,26,32,51, </key>
-<key name="within"> 15,41,79, </key>
-<key name="without"> 59, </key>
-<key name="work"> 38,30,47,51,65,67,82,83, </key>
-<key name="workingplan"> 67, </key>
-<key name="ww"> 37,68, </key>
-<key name="x"> 3,7,25,43,46,56,67,70,33, </key>
-<key name="x1"> 7, </key>
-<key name="x2"> 7, </key>
-<key name="xdx"> 43, </key>
-<key name="xdy"> 43, </key>
-<key name="xdz"> 43, </key>
-<key name="xmax"> 44,33, </key>
-<key name="xmin"> 44,33, </key>
-<key name="xoy"> 67, </key>
-<key name="xyz"> 82, </key>
-<key name="xz_fac"> 5, </key>
-<key name="xz_face_ind"> 5, </key>
-<key name="y"> 3,7,25,43,56,67,70,33, </key>
-<key name="y1"> 7, </key>
-<key name="y2"> 7, </key>
-<key name="ydx"> 43, </key>
-<key name="ydy"> 43, </key>
-<key name="ydz"> 43, </key>
-<key name="ymax"> 44,33, </key>
-<key name="ymin"> 44,33, </key>
-<key name="your"> 16,32,64,72,79,82,83, </key>
-<key name="yz_fac"> 5, </key>
-<key name="yz_face_ind"> 5, </key>
-<key name="z"> 2,3,7,43,56,70,33, </key>
-<key name="z1"> 7, </key>
-<key name="z2"> 7, </key>
-<key name="zero"> 20, </key>
-<key name="zmax"> 44,33, </key>
-<key name="zmin"> 44,33, </key>
-<key name="zoom"> 51, </key>
-
-</ftswdata>  
diff --git a/doc/salome/gui/GEOM/whxdata/whgdata0.xml b/doc/salome/gui/GEOM/whxdata/whgdata0.xml
deleted file mode 100755 (executable)
index b0993a0..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='windows-1252' ?>
-<glossarydata>
- <entry name="Cell" value="Element of a mesh. Cells are determined by their connectivity. They can have 0,1,2 or 3 dimension." />
- <entry name="Component" value="One integer or real value can correspond to each component of a field and to each entity of a mesh" />
- <entry name="Descendant connectivity" value="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." />
- <entry name="Edge" value="An edge of a volumetric or surface mesh. It is composed of 2 or 3 nodes (2 vertex nodes and optionally one middle node)." />
- <entry name="Entity of a mesh" value="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." />
- <entry name="Equivalence" value="Equivalence represents a list of correspondance 2 by 2 of the entities of the same dimension." />
- <entry name="Face" value="Face of a volumetrical cell (triangle, quadrangle)." />
- <entry name="Family" value="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." />
- <entry name="Field" value="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." />
- <entry name="Field profile" value="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." />
- <entry name="Group" value="Unordered set of entities of a mesh. One entity can belong to   several groups." />
- <entry name="Mesh" value="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)." />
- <entry name="Nodal connectivity" value="It is a description of an entity of the mesh by an ordered list of nodes constituting this entity." />
- <entry name="Node" value="Node can be an isolated node of a mesh, a vertex or middle node of an edge. A node is associated to a point." />
- <entry name="Point" value="Geometrical entity determined by its coordinates in the space." />
- <entry name="Reference connectivity" value="For each type of entity of a mesh, reference connectivity define the topology of an entity." />
- <entry name="Result" value="List of fields referring to one mesh." />
- <entry name="Study" value="Study represents a chain of sequences of calculations." />
-
-</glossarydata>
diff --git a/doc/salome/gui/GEOM/whxdata/whglo.xml b/doc/salome/gui/GEOM/whxdata/whglo.xml
deleted file mode 100755 (executable)
index ac67056..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='windows-1252' ?>
-<glossary>
-<chunkinfo url="whgdata0.xml" first="Cell" last="Study" num="18" />
-
-</glossary>
\ No newline at end of file
diff --git a/doc/salome/gui/GEOM/whxdata/whidx.xml b/doc/salome/gui/GEOM/whxdata/whidx.xml
deleted file mode 100755 (executable)
index 44f05e5..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='windows-1252' ?>
-<index>
-
-</index>
diff --git a/doc/salome/gui/GEOM/whxdata/whtdata0.xml b/doc/salome/gui/GEOM/whxdata/whtdata0.xml
deleted file mode 100755 (executable)
index 9f521a7..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version='1.0' encoding='windows-1252' ?>
-<tocdata>
-<book name="Geometry module" >
-  <item name="Introduction to Geometry" url="geometry.htm" />
-  <item name="Importing/exporting geometrical objects" url="files/salome2_sp3_geomtoolsgui_functions.htm" />
-  <book name="Creating geometrical objects" >
-    <book name="Creating Basic Geometric Objects" >
-      <item name="Point" url="point.htm" />
-      <item name="Line" url="line.htm" />
-      <item name="Circle" url="circle.htm" />
-      <item name="Ellipse" url="ellipse.htm" />
-      <item name="Arc" url="arc.htm" />
-      <item name="Curve" url="curve.htm" />
-      <item name="Vector" url="vector.htm" />
-      <item name="Plane" url="plane.htm" />
-      <item name="Working Plane" url="working_plane.htm" />
-      <item name="Local Coordinate System" url="local_coordinate_system.htm" />
-    </book>
-    <book name="Creating Primitives" >
-      <item name="Box" url="box.htm" />
-      <item name="Cylinder" url="cylinder.htm" />
-      <item name="Sphere" url="sphere.htm" />
-      <item name="Torus" url="turus.htm" />
-      <item name="Cone" url="cone.htm" />
-    </book>
-    <book name="Creating Complex Objects" >
-      <item name="Extrusion" url="extrusion.htm" />
-      <item name="Revolution" url="revolution.htm" />
-      <item name="Filling" url="filling.htm" />
-      <item name="Extrusion along a path" url="pipe_creation.htm" />
-    </book>
-    <item name="Working with groups" url="working_with_groups.htm" />
-    <item name="Building by blocks" url="newentity_blocks.htm" />
-    <item name="Sketcher" url="sketcher.htm" />
-    <book name="Creating Advanced Geometrical Objects" >
-      <item name="Explode" url="explode.htm" />
-      <item name="Edge" url="edge.htm" />
-      <item name="Wire" url="wire.htm" />
-      <item name="Face" url="face.htm" />
-      <item name="Shell" url="shell.htm" />
-      <item name="Solid" url="solid.htm" />
-      <item name="Compound" url="compound.htm" />
-    </book>
-  </book>
-  <book name="Viewing geometrical objects" >
-    <item name="Viewing Geometrical Objects" url="viewing_geometrical_objects.htm" />
-    <item name="Display Mode" url="wireframe_and_shading.htm" />
-    <item name="Color" url="color.htm" />
-    <item name="Transparency" url="transparency.htm" />
-    <item name="Isolines" url="isos.htm" />
-  </book>
-  <book name="Transforming geometrical objects" >
-    <book name="Basic Operations" >
-      <item name="Partition" url="partition.htm" />
-      <item name="Archimede" url="archimede.htm" />
-    </book>
-    <book name="Boolean Operations" >
-      <item name="Using boolean operations" url="files/salome2_sp3_booleangui_functions.htm" />
-      <item name="Fuse" url="fuse.htm" />
-      <item name="Common" url="common.htm" />
-      <item name="Cut" url="cut.htm" />
-      <item name="Section" url="section.htm" />
-    </book>
-    <book name="Transformation Operations" >
-      <item name="Translation" url="translation.htm" />
-      <item name="Rotation" url="rotation.htm" />
-      <item name="Modify the Location" url="modify_the_location.htm" />
-      <item name="Mirror Image" url="mirror_image.htm" />
-      <item name="Scale Transform" url="scale_transform.htm" />
-      <item name="Offset Surface" url="offset_surface.htm" />
-      <item name="Multi Translation" url="multi_translation.htm" />
-      <item name="Multi Rotation" url="multi_rotation.htm" />
-      <item name="Fillet" url="fillet.htm" />
-      <item name="Chamfer" url="chamfer.htm" />
-    </book>
-    <book name="Blocks Operations" >
-      <item name="Multi Transformation" url="multi_transformation.htm" />
-      <item name="Explode on Blocks" url="explode_on_blocks.htm" />
-      <item name="Propagate" url="propagate.htm" />
-    </book>
-    <book name="Repairing Operations" >
-      <item name="Shape Processing" url="shape_processing.htm" />
-      <item name="Suppress Faces" url="suppress_faces.htm" />
-      <item name="Close Contour" url="close_contour.htm" />
-      <item name="Suppress Internal Wires" url="suppress_internal_wires.htm" />
-      <item name="Suppress Holes" url="suppress_holes.htm" />
-      <item name="Sewing" url="sewing.htm" />
-      <item name="Glue Faces" url="glue_faces.htm" />
-      <item name="Add Point on Edge" url="add_point_on_edge.htm" />
-      <item name="Check Free Boundaries" url="check_free_boundaries.htm" />
-      <item name="Check Free Faces" url="check_free_faces.htm" />
-      <item name="Change Orientation" url="change_orientation.htm" />
-    </book>
-  </book>
-  <item name="Using measurement tools" url="files/salome2_sp3_measuregui_functions.htm" />
- <item name="Python Interface geompy.py" url="geompy_doc/namespacegeompy.html" />
-
-  <book name="TUI Scripts" >
-    <item name="Viewing Geometrical Objects" url="changing_display_parameters.htm" />
-    <book name="Creating Geometric Objects" >
-      <item name="Basic Geometrical Objects" url="basic_geometrical_objects.htm" />
-      <item name="Primitives" url="primitives.htm" />
-      <item name="Complex Objects" url="complex_objects.htm" />
-      <item name="Working with Groups" url="groups.htm" />
-      <item name="Building by Blocks" url="building_by_blocks.htm" />
-      <item name="Sketcher" url="sketcher_tui.htm" />
-      <item name="Advanced Geometrical Objects" url="geometrical_objects.htm" />
-    </book>
-    <book name="Transformation" >
-      <item name="Basic Operations" url="basic_operations.htm" />
-      <item name="Boolean Operations" url="boolean_operations.htm" />
-      <item name="Transformation Operations" url="transformation_operations.htm" />
-      <item name="Blocks Operations" url="blocks_operations.htm" />
-      <item name="Repairing Operations" url="repairing_operations.htm" />
-    </book>
-    <item name="Measurement Tools" url="measurement_tools.htm" />
-  </book>
-</book>
-
-</tocdata>
diff --git a/doc/salome/gui/GEOM/whxdata/whtoc.xml b/doc/salome/gui/GEOM/whxdata/whtoc.xml
deleted file mode 100755 (executable)
index 871ec25..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='windows-1252' ?>
-<toc root="whtdata0.xml">
-
-</toc>
index dec4ee81c99949fc9a2a95461387d086eab9d8c2..e099a6aee31c14b499132dd43d5f90a03508e27b 100644 (file)
@@ -1,4 +1,7 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-#  File   : Makefile.in
-#  Author : Vasily Rusyaev (Open Cascade NN)
+# -* Makefile *- 
+# Author : Patrick GOLDBRONN (CEA)
+# Date : 30/11/2001
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : doc
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-EXTRA_DIST+=GEOM
-
-doxygen=@DOXYGEN@
-
-# Below command replaces "geompyDC" by "geompy" except cases
-# "sgeompyDC", "1geompyDC" and "egeompyDC" (these sequences
-# can be found in file names and must not be replaces):
-#
-# sed 's/\([^s1e]\)geompyDC\|^geompyDC/\1geompy/g' $${filen} > ./tmp;
+# $Header:
 #
+SUBDIRS = GEOM
+
 usr_docs:
-       cd ./GEOM; \
-       echo "Processing geompyDC.py file: "; \
-       $(doxygen) ./doxyfile_py; \
-       cd ./geompy_doc; \
-       filesl=`find .`; \
-       for filen in $${filesl}; do \
-         sed 's/\([^s1e]\)geompyDC\|^geompyDC/\1geompy/g' $${filen} > ./tmp1; \
-         sed 's/geompy\.geompy/geompy/g' ./tmp1 > ./tmp; \
-         rm -f tmp1; \
-         mv -f tmp $${filen}; \
-       done; \
-       cd ..; \
-       echo "Running doxygen in directory: "`pwd`; \
-       $(doxygen) ./doxyfile;
+       (cd GEOM && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
 
 docs: usr_docs
-
-clean-local:
-       rm -fr `ls | grep -v "Makefile"`
-       rm -fr GEOM
-
-install-data-local: usr_docs
-       mkdir -p $(docdir)/gui
-       cp -rf GEOM $(docdir)/gui
-       -find $(PWD) -name CVS -prune -exec rm -rf {} \;
-
-uninstall-local:
-       rm -rf $(docdir)/gui/GEOM
-
-docguidir=$(docdir)/gui/GEOM
-
-nodist_docgui_DATA= GEOM/doxyfile
-nodist_docgui_DATA+= GEOM/doxyfile_py
-EXTRA_DIST+= GEOM/doxyfile.in
-EXTRA_DIST+= GEOM/doxyfile_py.in
diff --git a/doc/salome/tui/GEOM/HTML/GEOM_Gen.html b/doc/salome/tui/GEOM/HTML/GEOM_Gen.html
deleted file mode 100644 (file)
index 507db79..0000000
+++ /dev/null
@@ -1,802 +0,0 @@
-<HTML><b>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_Object</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>string  GetEntry (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetEntry (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  GetStudyID (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetStudyID (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  GetType (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetType (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>shape_type  GetShapeType (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetShapeType (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void SetName ( in string theName )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>SetName ( theName )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>string  GetName (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetName (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void SetStudyEntry ( in string theEntry )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>SetStudyEntry ( theEntry )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>string  GetStudyEntry (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetStudyEntry (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>ListOfGO  GetDependency (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetDependency (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>ListOfGO  GetLastDependency (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetLastDependency (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  getShape (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = getShape (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>TMPFile  GetShapeStream (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetShapeStream (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>boolean  IsMainShape (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = IsMainShape (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>ListOfLong  GetSubShapeIndices (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetSubShapeIndices (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetMainShape (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetMainShape (  )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>boolean  IsDone (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = IsDone (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void SetErrorCode ( in string theErrorID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>SetErrorCode ( theErrorID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>string  GetErrorCode (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetErrorCode (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  GetStudyID (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetStudyID (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void StartOperation (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>StartOperation (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void FinishOperation (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>FinishOperation (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void AbortOperation (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>AbortOperation (  )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IBasicOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePointXYZ ( in double theX, in double theY, in double theZ )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePointXYZ ( theX, theY, theZ )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePointWithReference ( in GEOM_Object theReference, in double theX, in double theY, in double theZ )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePointWithReference ( theReference, theX, theY, theZ )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePointOnCurve ( in GEOM_Object theRefCurve, in double theParameter )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePointOnCurve ( theRefCurve, theParameter )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeVectorDXDYDZ ( in double theDX, in double theDY, in double theDZ )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeVectorDXDYDZ ( theDX, theDY, theDZ )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeVectorTwoPnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeVectorTwoPnt ( thePnt1, thePnt2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeLineTwoPnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeLineTwoPnt ( thePnt1, thePnt2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePlaneThreePnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2, in GEOM_Object thePnt3, in double theTrimSize )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePlaneThreePnt ( thePnt1, thePnt2, thePnt3, theTrimSize )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePlanePntVec ( in GEOM_Object thePnt, in GEOM_Object theVec, in double theTrimSize )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePlanePntVec ( thePnt, theVec, theTrimSize )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePlaneFace ( in GEOM_Object theFace, in double theTrimSize )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePlaneFace ( theFace, theTrimSize )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeMarker ( in double theOX, in double theOY, in double theOZ, in double theXDX, in double theXDY, in double theXDZ, in double theYDX, in double theYDY, in double theYDZ )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeMarker ( theOX, theOY, theOZ, theXDX, theXDY, theXDZ, theYDX, theYDY, theYDZ )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_ITransformOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  TranslateTwoPoints ( in GEOM_Object theObject, in GEOM_Object thePoint1, in GEOM_Object thePoint2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = TranslateTwoPoints ( theObject, thePoint1, thePoint2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  TranslateTwoPointsCopy ( in GEOM_Object theObject, in GEOM_Object thePoint1, in GEOM_Object thePoint2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = TranslateTwoPointsCopy ( theObject, thePoint1, thePoint2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  TranslateDXDYDZ ( in GEOM_Object theObject, in double theDX, in double theDY, in double theDZ )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = TranslateDXDYDZ ( theObject, theDX, theDY, theDZ )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  TranslateDXDYDZCopy ( in GEOM_Object theObject, in double theDX, in double theDY, in double theDZ )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = TranslateDXDYDZCopy ( theObject, theDX, theDY, theDZ )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  TranslateVector ( in GEOM_Object theObject, in GEOM_Object theVector )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = TranslateVector ( theObject, theVector )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  TranslateVectorCopy ( in GEOM_Object theObject, in GEOM_Object theVector )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = TranslateVectorCopy ( theObject, theVector )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MultiTranslate1D ( in GEOM_Object theObject, in GEOM_Object theVector, in double theStep, in long theNbTimes )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MultiTranslate1D ( theObject, theVector, theStep, theNbTimes )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MultiTranslate2D ( in GEOM_Object theObject, in GEOM_Object theVector1, in double theStep1, in long theNbTimes1, in GEOM_Object theVector2, in double theStep2, in long theNbTimes2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MultiTranslate2D ( theObject, theVector1, theStep1, theNbTimes1, theVector2, theStep2, theNbTimes2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  Rotate ( in GEOM_Object theObject, in GEOM_Object theAxis, in double theAngle )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = Rotate ( theObject, theAxis, theAngle )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  RotateCopy ( in GEOM_Object theObject, in GEOM_Object theAxis, in double theAngle )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = RotateCopy ( theObject, theAxis, theAngle )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MultiRotate1D ( in GEOM_Object theObject, in GEOM_Object theAxis, in long theNbTimes )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MultiRotate1D ( theObject, theAxis, theNbTimes )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MultiRotate2D ( in GEOM_Object theObject, in GEOM_Object theAxis, in double theAngle, in long theNbTimes1, in double theStep, in long theNbTimes2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MultiRotate2D ( theObject, theAxis, theAngle, theNbTimes1, theStep, theNbTimes2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MirrorPlane ( in GEOM_Object theObject, in GEOM_Object thePlane )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MirrorPlane ( theObject, thePlane )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MirrorPlaneCopy ( in GEOM_Object theObject, in GEOM_Object thePlane )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MirrorPlaneCopy ( theObject, thePlane )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MirrorAxis ( in GEOM_Object theObject, in GEOM_Object theAxis )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MirrorAxis ( theObject, theAxis )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MirrorAxisCopy ( in GEOM_Object theObject, in GEOM_Object theAxis )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MirrorAxisCopy ( theObject, theAxis )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MirrorPoint ( in GEOM_Object theObject, in GEOM_Object thePoint )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MirrorPoint ( theObject, thePoint )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MirrorPointCopy ( in GEOM_Object theObject, in GEOM_Object thePoint )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MirrorPointCopy ( theObject, thePoint )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  OffsetShape ( in GEOM_Object theObject, in double theOffset )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = OffsetShape ( theObject, theOffset )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  OffsetShapeCopy ( in GEOM_Object theObject, in double theOffset )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = OffsetShapeCopy ( theObject, theOffset )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  ScaleShape ( in GEOM_Object theObject, in GEOM_Object thePoint, in double theFactor )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = ScaleShape ( theObject, thePoint, theFactor )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  ScaleShapeCopy ( in GEOM_Object theObject, in GEOM_Object thePoint, in double theFactor )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = ScaleShapeCopy ( theObject, thePoint, theFactor )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  PositionShape ( in GEOM_Object theObject, in GEOM_Object theStartLCS, in GEOM_Object theEndLCS )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = PositionShape ( theObject, theStartLCS, theEndLCS )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  PositionShapeCopy ( in GEOM_Object theObject, in GEOM_Object theStartLCS, in GEOM_Object theEndLCS )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = PositionShapeCopy ( theObject, theStartLCS, theEndLCS )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_I3DPrimOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeBoxDXDYDZ ( in double theDX, in double theDY, in double theDZ )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeBoxDXDYDZ ( theDX, theDY, theDZ )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeBoxTwoPnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeBoxTwoPnt ( thePnt1, thePnt2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeCylinderRH ( in double theR, in double theH )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeCylinderRH ( theR, theH )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeCylinderPntVecRH ( in GEOM_Object thePnt, in GEOM_Object theAxis, in double theR, in double theH )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeCylinderPntVecRH ( thePnt, theAxis, theR, theH )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeConeR1R2H ( in double theR1, in double theR2, in double theH )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeConeR1R2H ( theR1, theR2, theH )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeConePntVecR1R2H ( in GEOM_Object thePnt, in GEOM_Object theAxis, in double theR1, in double theR2, in double theH )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeConePntVecR1R2H ( thePnt, theAxis, theR1, theR2, theH )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeTorusRR ( in double theRMajor, in double theRMinor )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeTorusRR ( theRMajor, theRMinor )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeTorusPntVecRR ( in GEOM_Object thePnt, in GEOM_Object theVec, in double theRMajor, in double theRMinor )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeTorusPntVecRR ( thePnt, theVec, theRMajor, theRMinor )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeSphereR ( in double theR )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeSphereR ( theR )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeSpherePntR ( in GEOM_Object thePnt, in double theR )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeSpherePntR ( thePnt, theR )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePrismVecH ( in GEOM_Object theBase, in GEOM_Object theVec, in double theH )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePrismVecH ( theBase, theVec, theH )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePrismTwoPnt ( in GEOM_Object theBase, in GEOM_Object thePoint1, in GEOM_Object thePoint2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePrismTwoPnt ( theBase, thePoint1, thePoint2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePipe ( in GEOM_Object theBase, in GEOM_Object thePath )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePipe ( theBase, thePath )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeRevolutionAxisAngle ( in GEOM_Object theBase, in GEOM_Object theAxis, in double theAngle )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeRevolutionAxisAngle ( theBase, theAxis, theAngle )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeFilling ( in GEOM_Object theShape, in long theMinDeg, in long theMaxDeg, in double theTol2D, in double theTol3D, in long theNbIter )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeFilling ( theShape, theMinDeg, theMaxDeg, theTol2D, theTol3D, theNbIter )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IShapesOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeEdge ( in GEOM_Object thePnt1, in GEOM_Object thePnt2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeEdge ( thePnt1, thePnt2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeWire ( in ListOfGO theEdgesAndWires )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeWire ( theEdgesAndWires )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeFace ( in GEOM_Object theWire, in boolean isPlanarWanted )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeFace ( theWire, isPlanarWanted )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeFaceWires ( in ListOfGO theWires, in boolean isPlanarWanted )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeFaceWires ( theWires, isPlanarWanted )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeShell ( in ListOfGO theFacesAndShells )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeShell ( theFacesAndShells )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeSolidShell ( in GEOM_Object theShell )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeSolidShell ( theShell )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeSolidShells ( in ListOfGO theShells )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeSolidShells ( theShells )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeCompound ( in ListOfGO theShapes )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeCompound ( theShapes )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeGlueFaces ( in GEOM_Object theShape, in double theTolerance )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeGlueFaces ( theShape, theTolerance )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>ListOfGO  MakeExplode ( in GEOM_Object theShape, in long theShapeType, in boolean isSorted )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeExplode ( theShape, theShapeType, isSorted )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  NumberOfFaces ( in GEOM_Object theShape )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = NumberOfFaces ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  NumberOfEdges ( in GEOM_Object theShape )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = NumberOfEdges ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  ChangeOrientation ( in GEOM_Object theShape )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = ChangeOrientation ( theShape )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IBlocksOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeQuadFaceFourVertices ( in GEOM_Object thePnt1, in GEOM_Object thePnt2, in GEOM_Object thePnt3, in GEOM_Object thePnt4 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeQuadFaceFourVertices ( thePnt1, thePnt2, thePnt3, thePnt4 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeQuadFaceFourEdges ( in GEOM_Object theEdge1, in GEOM_Object theEdge2, in GEOM_Object theEdge3, in GEOM_Object theEdge4 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeQuadFaceFourEdges ( theEdge1, theEdge2, theEdge3, theEdge4 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeQuadFaceTwoEdges ( in GEOM_Object theEdge1, in GEOM_Object theEdge2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeQuadFaceTwoEdges ( theEdge1, theEdge2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeHexaSolidSixFaces ( in GEOM_Object theFace1, in GEOM_Object theFace2, in GEOM_Object theFace3, in GEOM_Object theFace4, in GEOM_Object theFace5, in GEOM_Object theFace6 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeHexaSolidSixFaces ( theFace1, theFace2, theFace3, theFace4, theFace5, theFace6 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeHexaSolidTwoFaces ( in GEOM_Object theFace1, in GEOM_Object theFace2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeHexaSolidTwoFaces ( theFace1, theFace2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetEdge ( in GEOM_Object theShape, in GEOM_Object thePoint1, in GEOM_Object thePoint2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetEdge ( theShape, thePoint1, thePoint2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetFaceByPoints ( in GEOM_Object theShape, in GEOM_Object thePoint1, in GEOM_Object thePoint2, in GEOM_Object thePoint3, in GEOM_Object thePoint4 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetFaceByPoints ( theShape, thePoint1, thePoint2, thePoint3, thePoint4 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetFaceByEdges ( in GEOM_Object theShape, in GEOM_Object theEdge1, in GEOM_Object theEdge2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetFaceByEdges ( theShape, theEdge1, theEdge2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetOppositeFace ( in GEOM_Object theBlock, in GEOM_Object theFace )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetOppositeFace ( theBlock, theFace )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetFaceNearPoint ( in GEOM_Object theShape, in GEOM_Object thePoint )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetFaceNearPoint ( theShape, thePoint )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetFaceByNormale ( in GEOM_Object theBlock, in GEOM_Object theVector )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetFaceByNormale ( theBlock, theVector )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>boolean  IsCompoundOfBlocks ( in GEOM_Object theCompound, in long theMinNbFaces, in long theMaxNbFaces, out long theNbBlocks )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ return_value,  theNbBlocks ] = IsCompoundOfBlocks ( theCompound, theMinNbFaces, theMaxNbFaces )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>ListOfGO  ExplodeCompoundOfBlocks ( in GEOM_Object theCompound, in long theMinNbFaces, in long theMaxNbFaces )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = ExplodeCompoundOfBlocks ( theCompound, theMinNbFaces, theMaxNbFaces )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetBlockNearPoint ( in GEOM_Object theCompound, in GEOM_Object thePoint )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetBlockNearPoint ( theCompound, thePoint )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetBlockByParts ( in GEOM_Object theCompound, in ListOfGO theParts )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetBlockByParts ( theCompound, theParts )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>ListOfGO  GetBlocksByParts ( in GEOM_Object theCompound, in ListOfGO theParts )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetBlocksByParts ( theCompound, theParts )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeMultiTransformation1D ( in GEOM_Object theBlock, in long theDirFace1, in long theDirFace2, in long theNbTimes )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeMultiTransformation1D ( theBlock, theDirFace1, theDirFace2, theNbTimes )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeMultiTransformation2D ( in GEOM_Object theBlock, in long theDirFace1U, in long theDirFace2U, in long theNbTimesU, in long theDirFace1V, in long theDirFace2V, in long theNbTimesV )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeMultiTransformation2D ( theBlock, theDirFace1U, theDirFace2U, theNbTimesU, theDirFace1V, theDirFace2V, theNbTimesV )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IBooleanOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeBoolean ( in GEOM_Object theShape1, in GEOM_Object theShape2, in long theOperation )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeBoolean ( theShape1, theShape2, theOperation )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePartition ( in ListOfGO theShapes, in ListOfGO theTools, in ListOfGO theKeepInside, in ListOfGO theRemoveInside, in short theLimit, in boolean theRemoveWebs, in ListOfLong theMaterials )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePartition ( theShapes, theTools, theKeepInside, theRemoveInside, theLimit, theRemoveWebs, theMaterials )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeHalfPartition ( in GEOM_Object theShape, in GEOM_Object thePlane )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeHalfPartition ( theShape, thePlane )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_ICurvesOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeCirclePntVecR ( in GEOM_Object thePnt, in GEOM_Object theVec, in double theR )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeCirclePntVecR ( thePnt, theVec, theR )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeCircleThreePnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2, in GEOM_Object thePnt3 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeCircleThreePnt ( thePnt1, thePnt2, thePnt3 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeEllipse ( in GEOM_Object thePnt, in GEOM_Object theVec, in double theRMajor, in double theRMinor )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeEllipse ( thePnt, theVec, theRMajor, theRMinor )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeArc ( in GEOM_Object thePnt1, in GEOM_Object thePnt2, in GEOM_Object thePnt3 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeArc ( thePnt1, thePnt2, thePnt3 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePolyline ( in ListOfGO thePoints )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePolyline ( thePoints )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeSplineBezier ( in ListOfGO thePoints )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeSplineBezier ( thePoints )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeSplineInterpolation ( in ListOfGO thePoints )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeSplineInterpolation ( thePoints )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeSketcher ( in string theCommand, in ListOfDouble theWorkingPlane )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeSketcher ( theCommand, theWorkingPlane )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_ILocalOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeFilletAll ( in GEOM_Object theShape, in double theR )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeFilletAll ( theShape, theR )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeFilletEdges ( in GEOM_Object theShape, in double theR, in ListOfLong theEdges )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeFilletEdges ( theShape, theR, theEdges )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeFilletFaces ( in GEOM_Object theShape, in double theR, in ListOfLong theFaces )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeFilletFaces ( theShape, theR, theFaces )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeChamferAll ( in GEOM_Object theShape, in double theD )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeChamferAll ( theShape, theD )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeChamferEdge ( in GEOM_Object theShape, in double theD1, in double theD2, in long theFace1, in long theFace2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeChamferEdge ( theShape, theD1, theD2, theFace1, theFace2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeChamferFaces ( in GEOM_Object theShape, in double theD1, in double theD2, in ListOfLong theFaces )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeChamferFaces ( theShape, theD1, theD2, theFaces )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeArchimede ( in GEOM_Object theShape, in double theWeight, in double theWaterDensity, in double theMeshDeflection )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeArchimede ( theShape, theWeight, theWaterDensity, theMeshDeflection )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  GetSubShapeIndex ( in GEOM_Object theShape, in GEOM_Object theSubShape )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetSubShapeIndex ( theShape, theSubShape )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IHealingOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  ProcessShape ( in GEOM_Object theShapes, in string_array theOperators, in string_array theParameters, in string_array theValues )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = ProcessShape ( theShapes, theOperators, theParameters, theValues )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void GetShapeProcessParameters ( out string_array theOperators, out string_array theParameters, out string_array theValues )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ theOperators, theParameters, theValues ] = GetShapeProcessParameters (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  SuppressFaces ( in GEOM_Object theObject, in short_array theFaces )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = SuppressFaces ( theObject, theFaces )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  CloseContour ( in GEOM_Object theObject, in short_array theWires, in boolean isCommonVertex )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = CloseContour ( theObject, theWires, isCommonVertex )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  RemoveIntWires ( in GEOM_Object theObject, in short_array theWires )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = RemoveIntWires ( theObject, theWires )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  FillHoles ( in GEOM_Object theObject, in short_array theWires )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = FillHoles ( theObject, theWires )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  Sew ( in GEOM_Object theObject, in double theTolerance )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = Sew ( theObject, theTolerance )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  DivideEdge ( in GEOM_Object theObject, in short theEdgeIndex, in double theValue, in boolean isByParameter )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = DivideEdge ( theObject, theEdgeIndex, theValue, isByParameter )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>boolean  GetFreeBoundary ( in GEOM_Object theObject, out ListOfGO theClosedWires, out ListOfGO theOpenWires )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ return_value,  theClosedWires, theOpenWires ] = GetFreeBoundary ( theObject )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IInsertOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeCopy ( in GEOM_Object theOriginal )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeCopy ( theOriginal )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void Export ( in GEOM_Object theObject, in string theFileName, in string theFormatName )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>Export ( theObject, theFileName, theFormatName )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  Import ( in string theFileName, in string theFormatName )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = Import ( theFileName, theFormatName )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void ImportTranslators ( out string_array theFormats, out string_array thePatterns )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ theFormats, thePatterns ] = ImportTranslators (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void ExportTranslators ( out string_array theFormats, out string_array thePatterns )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ theFormats, thePatterns ] = ExportTranslators (  )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IMeasureOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void GetBasicProperties ( in GEOM_Object theShape, out double theLength, out double theSurfArea, out double theVolume )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ theLength, theSurfArea, theVolume ] = GetBasicProperties ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetCentreOfMass ( in GEOM_Object theShape )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetCentreOfMass ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void GetInertia ( in GEOM_Object theShape, out double I11, out double I12, out double I13, out double I21, out double I22, out double I23, out double I31, out double I32, out double I33, out double Ix, out double Iy, out double Iz )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ I11, I12, I13, I21, I22, I23, I31, I32, I33, Ix, Iy, Iz ] = GetInertia ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void GetBoundingBox ( in GEOM_Object theShape, out double Xmin, out double Xmax, out double Ymin, out double Ymax, out double Zmin, out double Zmax )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ Xmin, Xmax, Ymin, Ymax, Zmin, Zmax ] = GetBoundingBox ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void GetTolerance ( in GEOM_Object theShape, out double FaceMin, out double FaceMax, out double EdgeMin, out double EdgeMax, out double VertMin, out double VertMax )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ FaceMin, FaceMax, EdgeMin, EdgeMax, VertMin, VertMax ] = GetTolerance ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>boolean  CheckShape ( in GEOM_Object theShape, out string theDescription )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ return_value,  theDescription ] = CheckShape ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>string  WhatIs ( in GEOM_Object theShape )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = WhatIs ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>double  GetMinDistance ( in GEOM_Object theShape1, in GEOM_Object theShape2, out double X1, out double Y1, out double Z1, out double X2, out double Y2, out double Z2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ return_value,  X1, Y1, Z1, X2, Y2, Z2 ] = GetMinDistance ( theShape1, theShape2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void PointCoordinates ( in GEOM_Object theShape, out double X, out double Y, out double Z )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ X, Y, Z ] = PointCoordinates ( theShape )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IGroupOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  CreateGroup ( in GEOM_Object theMainShape, in long theShapeType )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = CreateGroup ( theMainShape, theShapeType )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void AddObject ( in GEOM_Object theGroup, in long theSubShapeId )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>AddObject ( theGroup, theSubShapeId )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void RemoveObject ( in GEOM_Object theGroup, in long theSubShapeId )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>RemoveObject ( theGroup, theSubShapeId )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  GetType ( in GEOM_Object theGroup )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetType ( theGroup )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetMainShape ( in GEOM_Object theGroup )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetMainShape ( theGroup )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>ListOfLong  GetObjects ( in GEOM_Object theGroup )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetObjects ( theGroup )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_Gen</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void Undo ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>Undo ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void Redo ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>Redo ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>SObject  AddInStudy ( in Study theStudy, in GEOM_Object theObject, in string theName, in GEOM_Object theFather )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = AddInStudy ( theStudy, theObject, theName, theFather )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IBasicOperations  GetIBasicOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIBasicOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_ITransformOperations  GetITransformOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetITransformOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_I3DPrimOperations  GetI3DPrimOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetI3DPrimOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IShapesOperations  GetIShapesOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIShapesOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IBooleanOperations  GetIBooleanOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIBooleanOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_ICurvesOperations  GetICurvesOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetICurvesOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_ILocalOperations  GetILocalOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetILocalOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IHealingOperations  GetIHealingOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIHealingOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IInsertOperations  GetIInsertOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIInsertOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IMeasureOperations  GetIMeasureOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIMeasureOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IBlocksOperations  GetIBlocksOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIBlocksOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IGroupOperations  GetIGroupOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIGroupOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void RemoveObject ( in GEOM_Object theObject )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>RemoveObject ( theObject )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetObject ( in long theStudyID, in string theEntry )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetObject ( theStudyID, theEntry )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  AddSubShape ( in GEOM_Object theMainShape, in ListOfLong theIndices )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = AddSubShape ( theMainShape, theIndices )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetIORFromString ( in string theIOR )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIORFromString ( theIOR )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>string  GetStringFromIOR ( in GEOM_Object theObject )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetStringFromIOR ( theObject )</b></div></td>
-</tr>
-</table><br>
-</b></HTML>
diff --git a/doc/salome/tui/GEOM/HTML/GEOM_Shape.html b/doc/salome/tui/GEOM/HTML/GEOM_Shape.html
deleted file mode 100644 (file)
index bfee3cd..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<HTML><b>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_Shape</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>TMPFile  GetShapeStream (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetShapeStream (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Gen  Engine (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = Engine (  )</b></div></td>
-</tr>
-</table><br>
-</b></HTML>
diff --git a/doc/salome/tui/GEOM/doxyfile.in b/doc/salome/tui/GEOM/doxyfile.in
deleted file mode 100755 (executable)
index cba99e1..0000000
+++ /dev/null
@@ -1,241 +0,0 @@
-# Doxyfile 1.4.6
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME - GEOM - v.@VERSION@"
-PROJECT_NUMBER         = 
-OUTPUT_DIRECTORY       = ../
-CREATE_SUBDIRS         = NO
-OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = NO
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = NO
-ABBREVIATE_BRIEF       = 
-ALWAYS_DETAILED_SEC    = YES
-INLINE_INHERITED_MEMB  = YES
-FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = ../../../share/salome \
-                        ../../../build/salome
-STRIP_FROM_INC_PATH    = 
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = YES
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = YES
-SEPARATE_MEMBER_PAGES  = NO
-TAB_SIZE               = 5
-ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = YES
-OPTIMIZE_OUTPUT_JAVA   = YES
-BUILTIN_STL_SUPPORT    = NO
-DISTRIBUTE_GROUP_DOC   = NO
-SUBGROUPING            = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = YES
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = NO
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = YES
-CASE_SENSE_NAMES       = YES
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = NO
-SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 25
-SHOW_USED_FILES        = NO
-SHOW_DIRECTORIES       = NO
-FILE_VERSION_FILTER    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = log.txt
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = ../../../share/salome/src \
-                        ../../../share/salome/idl
-FILE_PATTERNS          = *.hxx *.cxx *.h *.c *.hh *.cc *.idl python_extension_must_be_here
-RECURSIVE              = YES
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = sources/
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
-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
-USE_HTAGS              = NO
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = YES
-COLS_IN_ALPHA_INDEX    = 3
-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            = sources/footer.html
-HTML_STYLESHEET        = sources/static/doxygen.css
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = YES
-TOC_EXPAND             = YES
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
-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
-LATEX_HIDE_INDICES     = 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_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# 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        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = NO
-
-#---------------------------------------------------------------------------
-# Configuration::additions 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
-GROUP_GRAPHS           = NO
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = YES
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = NO
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = YES
-DIRECTORY_GRAPH        = YES
-DOT_IMAGE_FORMAT       = jpg
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1200
-MAX_DOT_GRAPH_DEPTH    = 0
-DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = NO
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO
diff --git a/doc/salome/tui/GEOM/doxyfile_py.in b/doc/salome/tui/GEOM/doxyfile_py.in
deleted file mode 100755 (executable)
index 9d4d118..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-# Doxyfile 1.4.6
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME - GEOM - v.@VERSION@"
-PROJECT_NUMBER         = 
-OUTPUT_DIRECTORY       = ../
-CREATE_SUBDIRS         = NO
-OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = NO
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = NO
-ABBREVIATE_BRIEF       = 
-ALWAYS_DETAILED_SEC    = YES
-INLINE_INHERITED_MEMB  = YES
-FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = ../../../share/salome \
-                        ../../../build/salome
-STRIP_FROM_INC_PATH    = 
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = YES
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = YES
-SEPARATE_MEMBER_PAGES  = NO
-TAB_SIZE               = 5
-ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = YES
-OPTIMIZE_OUTPUT_JAVA   = YES
-BUILTIN_STL_SUPPORT    = NO
-DISTRIBUTE_GROUP_DOC   = NO
-SUBGROUPING            = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = YES
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = NO
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = YES
-CASE_SENSE_NAMES       = YES
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = NO
-SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 25
-SHOW_USED_FILES        = NO
-SHOW_DIRECTORIES       = NO
-FILE_VERSION_FILTER    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = log.txt
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = ../../../share/salome/src \
-                        ../../../share/salome/idl \
-                        ../../../build/salome/bin
-FILE_PATTERNS          = *.hxx *.cxx *.h *.c *.hh *.cc *.idl python_extension_must_be_here
-RECURSIVE              = YES
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = sources/
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
-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
-USE_HTAGS              = NO
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = YES
-COLS_IN_ALPHA_INDEX    = 3
-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            = sources/footer.html
-HTML_STYLESHEET        = sources/static/doxygen.css
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = YES
-TOC_EXPAND             = YES
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
-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
-LATEX_HIDE_INDICES     = 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_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# 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        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = NO
-
-#---------------------------------------------------------------------------
-# Configuration::additions 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
-GROUP_GRAPHS           = NO
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = YES
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = NO
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = YES
-DIRECTORY_GRAPH        = YES
-DOT_IMAGE_FORMAT       = jpg
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1200
-MAX_DOT_GRAPH_DEPTH    = 0
-DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = NO
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO
diff --git a/doc/salome/tui/GEOM/sources/Application-About.png b/doc/salome/tui/GEOM/sources/Application-About.png
deleted file mode 100755 (executable)
index 7b58330..0000000
Binary files a/doc/salome/tui/GEOM/sources/Application-About.png and /dev/null differ
diff --git a/doc/salome/tui/GEOM/sources/Application-About1.jpg b/doc/salome/tui/GEOM/sources/Application-About1.jpg
deleted file mode 100755 (executable)
index cf7ab8b..0000000
Binary files a/doc/salome/tui/GEOM/sources/Application-About1.jpg and /dev/null differ
diff --git a/doc/salome/tui/GEOM/sources/application.gif b/doc/salome/tui/GEOM/sources/application.gif
deleted file mode 100644 (file)
index 0b05d5c..0000000
Binary files a/doc/salome/tui/GEOM/sources/application.gif and /dev/null differ
diff --git a/doc/salome/tui/GEOM/sources/application.jpg b/doc/salome/tui/GEOM/sources/application.jpg
deleted file mode 100755 (executable)
index a6979ab..0000000
Binary files a/doc/salome/tui/GEOM/sources/application.jpg and /dev/null differ
diff --git a/doc/salome/tui/GEOM/sources/bg_salome.gif b/doc/salome/tui/GEOM/sources/bg_salome.gif
deleted file mode 100755 (executable)
index 429489c..0000000
Binary files a/doc/salome/tui/GEOM/sources/bg_salome.gif and /dev/null differ
diff --git a/doc/salome/tui/GEOM/sources/footer.html b/doc/salome/tui/GEOM/sources/footer.html
deleted file mode 100755 (executable)
index cb55f39..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-</DIV>
-<DIV class="div-footer">
-Generated on $datetime for $projectname by&nbsp;<A href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></A> $doxygenversion</DIV>
-</BODY>
-</HTML>
diff --git a/doc/salome/tui/GEOM/sources/logocorp.gif b/doc/salome/tui/GEOM/sources/logocorp.gif
deleted file mode 100755 (executable)
index 7697e08..0000000
Binary files a/doc/salome/tui/GEOM/sources/logocorp.gif and /dev/null differ
diff --git a/doc/salome/tui/GEOM/sources/myheader.html b/doc/salome/tui/GEOM/sources/myheader.html
deleted file mode 100755 (executable)
index d2efb75..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.73 [en] (WinNT; I) [Netscape]">
-   <title>Main Page</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-&nbsp;
-</body>
-</html>
diff --git a/doc/salome/tui/GEOM/sources/myheader_py2.html b/doc/salome/tui/GEOM/sources/myheader_py2.html
deleted file mode 100755 (executable)
index 372b224..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.73 [en] (WinNT; I) [Netscape]">
-   <title>Main Page</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-&nbsp;
-<center><table WIDTH="96%" >
-<tr>
-<td><a href="http://www.opencascade.com"><img src="../sources/logocorp.gif" BORDER=0 height=46 width=122></a></td>
-
-
-<td>
-<div align=right><a href="http://www.opencascade.org/SALOME/"><img src="../sources/application.gif" BORDER=0 height=46 width=108></a></div>
-</td>
-</tr>
-</table></center>
-
-
-</body>
-</html>
diff --git a/doc/salome/tui/GEOM/sources/occ.gif b/doc/salome/tui/GEOM/sources/occ.gif
deleted file mode 100755 (executable)
index ce017c8..0000000
Binary files a/doc/salome/tui/GEOM/sources/occ.gif and /dev/null differ
diff --git a/doc/salome/tui/GEOM/sources/static/doxygen.css b/doc/salome/tui/GEOM/sources/static/doxygen.css
deleted file mode 100755 (executable)
index 88e613d..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-H1 { 
-   text-align: center; 
-}
-
-CAPTION { 
-   font-weight: bold 
-}
-
-/* Link in the top navbar */
-A.qindex {}
-
-A.qindexRef {}
-
-/* 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; 
-   padding-right  : 10px; 
-   padding-top    : 2px; 
-   padding-left   : 10px; 
-   padding-bottom : 2px; 
-   margin-left    : 0px; 
-   margin-right   : 0px; 
-   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; 
-   padding-right  : 10px; 
-   padding-top    : 2px; 
-   padding-left   : 10px; 
-   padding-bottom : 2px; 
-   margin-left    : 0px; 
-   margin-right   : 0px; 
-   margin-top     : 2px; 
-   margin-bottom  : 2px  
-}
-
-span.keyword       { color: #008000 }
-span.keywordtype   { color: #604020 }
-span.keywordflow   { color: #e08000 }
-span.comment       { color: #800000 }
-span.preprocessor  { color: #806020 }
-span.stringliteral { color: #002080 }
-span.charliteral   { color: #008080 }
diff --git a/doc/salome/tui/GEOM/sources/static/page2.html b/doc/salome/tui/GEOM/sources/static/page2.html
deleted file mode 100755 (executable)
index 1966a56..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-    
-  <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
-    
-  <meta name="GENERATOR"
- content="Mozilla/4.73 [en] (WinNT; I) [Netscape]">
-  <title>Main Page</title>
-     
-  <link href="doxygen.css" rel="stylesheet" type="text/css">
-</head>
-  <body>
- &nbsp; 
-<center>
-<table width="96%">
- <tbody>
-    <tr>
- <td><a href="http://www.opencascade.com"><img
- src="sources/logocorp.gif" border="0" height="46" width="122">
-      </a></td>
-   <td> 
-      <div align="right"><a href="http://www.opencascade.org/SALOME/"><img
- src="sources/application.gif" border="0" height="46" width="108">
-      </a></div>
- </td>
- </tr>
-  </tbody>
-</table>
-</center>
-   <!-- Generated by Doxygen 1.3-rc2 --> 
-<ul>
- <li><b>SALOME GEOMETRY module</b>
-    <ul>
- <li><a href="HTML/GEOM_Gen.html">Mapping of GEOM_Gen functions</a></li>
-    </ul>
- </li>
-</ul>
- <br>
-</body>
-</html>
diff --git a/doc/salome/tui/GEOM/sources/static/tree.js.in b/doc/salome/tui/GEOM/sources/static/tree.js.in
deleted file mode 100755 (executable)
index 52841f8..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-foldersTree = gFld("<b>SALOME v.@VERSION@ </b>", "", "")
-     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/GEOM/sources/static/treeview.js b/doc/salome/tui/GEOM/sources/static/treeview.js
deleted file mode 100644 (file)
index 55eb43d..0000000
+++ /dev/null
@@ -1,505 +0,0 @@
-//**************************************************************** 
-// You are free to copy the "Folder-Tree" script as long as you  
-// keep this copyright notice: 
-// Script found in: http://www.geocities.com/Paris/LeftBank/2178/ 
-// Author: Marcelino Alves Martins (martins@hks.com) December '97. 
-//**************************************************************** 
-//Log of changes: 
-//       17 Feb 98 - Fix initialization flashing problem with Netscape
-//       
-//       27 Jan 98 - Root folder starts open; support for USETEXTLINKS; 
-//                   make the ftien4 a js file 
-//       
-// DvH:  Dec 2000 -  Made some minor changes to support external 
-//                   references
-// Definition of class Folder 
-// ***************************************************************** 
-function Folder(folderDescription, tagName, hreference) //constructor 
-{ 
-  //constant data 
-  this.desc = folderDescription 
-  this.tagName = tagName
-  this.hreference = hreference 
-  this.id = -1   
-  this.navObj = 0  
-  this.iconImg = 0  
-  this.nodeImg = 0  
-  this.isLastNode = 0 
-  //dynamic data 
-  this.isOpen = true 
-  this.iconSrc = "ftv2folderopen.png"   
-  this.children = new Array 
-  this.nChildren = 0 
-  //methods 
-  this.initialize = initializeFolder 
-  this.setState = setStateFolder 
-  this.addChild = addChild 
-  this.createIndex = createEntryIndex 
-  this.hide = hideFolder 
-  this.display = display 
-  this.renderOb = drawFolder 
-  this.totalHeight = totalHeight 
-  this.subEntries = folderSubEntries 
-  this.outputLink = outputFolderLink 
-} 
-function setStateFolder(isOpen) 
-{ 
-  var subEntries 
-  var totalHeight 
-  var fIt = 0 
-  var i=0 
-  if (isOpen == this.isOpen) 
-    return 
-  if (browserVersion == 2)  
-  { 
-    totalHeight = 0 
-    for (i=0; i < this.nChildren; i++) 
-      totalHeight = totalHeight + this.children[i].navObj.clip.height 
-      subEntries = this.subEntries() 
-    if (this.isOpen) 
-      totalHeight = 0 - totalHeight 
-    for (fIt = this.id + subEntries + 1; fIt < nEntries; fIt++) 
-      indexOfEntries[fIt].navObj.moveBy(0, totalHeight) 
-  }  
-  this.isOpen = isOpen 
-  propagateChangesInState(this) 
-} 
-function propagateChangesInState(folder) 
-{   
-  var i=0 
-  if (folder.isOpen) 
-  { 
-    if (folder.nodeImg) 
-      if (folder.isLastNode) 
-        folder.nodeImg.src = "ftv2mlastnode.png" 
-      else 
-         folder.nodeImg.src = "ftv2mnode.png" 
-    folder.iconImg.src = "ftv2folderopen.png" 
-    for (i=0; i<folder.nChildren; i++) 
-      folder.children[i].display() 
-  } 
-  else 
-  { 
-    if (folder.nodeImg) 
-      if (folder.isLastNode) 
-        folder.nodeImg.src = "ftv2plastnode.png" 
-      else 
-         folder.nodeImg.src = "ftv2pnode.png" 
-    folder.iconImg.src = "ftv2folderclosed.png" 
-    for (i=0; i<folder.nChildren; i++) 
-      folder.children[i].hide() 
-  }  
-} 
-function hideFolder() 
-{ 
-  if (browserVersion == 1 || browserVersion == 3) { 
-    if (this.navObj.style.display == "none") 
-      return 
-    this.navObj.style.display = "none" 
-  } else { 
-    if (this.navObj.visibility == "hidden") 
-      return 
-    this.navObj.visibility = "hidden" 
-  } 
-   
-  this.setState(0) 
-} 
-function initializeFolder(level, lastNode, leftSide) 
-{ 
-var j=0 
-var i=0 
-var numberOfFolders 
-var numberOfDocs 
-var nc 
-      
-  nc = this.nChildren 
-   
-  this.createIndex() 
-  var auxEv = "" 
-  if (browserVersion > 0) 
-    auxEv = "<a href='javascript:clickOnNode("+this.id+")'>" 
-  else 
-    auxEv = "<a>" 
-  if (level>0) 
-    if (lastNode) //the last 'brother' in the children array 
-    { 
-      this.renderOb(leftSide + auxEv + "<img name='nodeIcon" + this.id + "' src='ftv2mlastnode.png' width=16 height=22 border=0></a>") 
-//    leftSide = leftSide + "<img src='ftv2blank.png' width=16 height=22>"  
-      this.isLastNode = 1 
-    } 
-    else 
-    { 
-      this.renderOb(leftSide + auxEv + "<img name='nodeIcon" + this.id + "' src='ftv2mnode.png' width=16 height=22 border=0></a>") 
-      leftSide = leftSide + "<img src='ftv2vertline.png' width=16 height=22>" 
-      this.isLastNode = 0 
-    } 
-  else 
-    this.renderOb("") 
-   
-  if (nc > 0) 
-  { 
-    level = level + 1 
-    for (i=0 ; i < this.nChildren; i++)  
-    { 
-      if (i == this.nChildren-1) 
-        this.children[i].initialize(level, 1, leftSide) 
-      else 
-        this.children[i].initialize(level, 0, leftSide) 
-      } 
-  } 
-} 
-function drawFolder(leftSide) 
-{ 
-  if (browserVersion == 2) { 
-    if (!doc.yPos) 
-      doc.yPos=8 
-    doc.write("<layer id='folder" + this.id + "' top=" + doc.yPos + " visibility=hidden>") 
-  } 
-  if (browserVersion == 3) 
-  {
-    doc.write("<div id='folder" + this.id + "' style='visibility:hide;'>") 
-  }
-   
-  doc.write("\n<table ") 
-  if (browserVersion == 1) 
-    doc.write(" id='folder" + this.id + "' style='position:block;' ") 
-  doc.write(" border=0 cellspacing=0 cellpadding=0>") 
-  doc.write("\n<tr><td>") 
-  doc.write(leftSide) 
-  this.outputLink() 
-  doc.write("<img name='folderIcon" + this.id + "' ") 
-  doc.write("src='" + this.iconSrc+"' border=0></a>") 
-  doc.write("</td>\n<td valign=middle nowrap>") 
-  if (USETEXTLINKS) 
-  { 
-    this.outputLink() 
-    doc.write(this.desc + "</a>") 
-  } 
-  else 
-    doc.write(this.desc)
-
-/*! 
-  if (this.tagName!="")
-  {
-    doc.write(" [external]")
-  }
-*/
-  doc.write("</td>")  
-  doc.write("\n</table>\n") 
-   
-  if (browserVersion == 2) { 
-    doc.write("</layer>") 
-  } 
-  if (browserVersion == 3) { 
-    doc.write("</div>") 
-  } 
-  if (browserVersion == 1) { 
-    this.navObj = doc.all["folder"+this.id] 
-    this.iconImg = doc.all["folderIcon"+this.id] 
-    this.nodeImg = doc.all["nodeIcon"+this.id] 
-  } else if (browserVersion == 2) { 
-    this.navObj = doc.layers["folder"+this.id] 
-    this.iconImg = this.navObj.document.images["folderIcon"+this.id] 
-    this.nodeImg = this.navObj.document.images["nodeIcon"+this.id] 
-    doc.yPos=doc.yPos+this.navObj.clip.height 
-  } else if (browserVersion == 3) {
-    this.navObj = doc.getElementById("folder"+this.id)
-    this.iconImg = doc.images.namedItem("folderIcon"+this.id)
-    this.nodeImg = doc.images.namedItem("nodeIcon"+this.id)
-  }
-} 
-function outputFolderLink() 
-{ 
-  if (this.hreference) 
-  { 
-    doc.write("<a ")
-    if (this.tagName)
-    {
-      doc.write("doxygen='" + this.tagName + "' ");
-    }
-    doc.write("href='" + this.hreference + "' TARGET=\"basefrm\" ") 
-    if (browserVersion > 0) 
-      doc.write("onClick='javascript:clickOnFolder("+this.id+")'") 
-    doc.write(">") 
-  } 
-  else 
-    doc.write("<a>") 
-} 
-function addChild(childNode) 
-{ 
-  this.children[this.nChildren] = childNode 
-  this.nChildren++ 
-  return childNode 
-} 
-function folderSubEntries() 
-{ 
-  var i = 0 
-  var se = this.nChildren 
-  for (i=0; i < this.nChildren; i++){ 
-    if (this.children[i].children) //is a folder 
-      se = se + this.children[i].subEntries() 
-  } 
-  return se 
-} 
-// Definition of class Item (a document or link inside a Folder) 
-// ************************************************************* 
-function Item(itemDescription, tagName, itemLink) // Constructor 
-{ 
-  // constant data 
-  this.desc = itemDescription 
-  this.tagName = tagName
-  this.link = itemLink 
-  this.id = -1 //initialized in initalize() 
-  this.navObj = 0 //initialized in render() 
-  this.iconImg = 0 //initialized in render() 
-  this.iconSrc = "ftv2doc.png" 
-  // methods 
-  this.initialize = initializeItem 
-  this.createIndex = createEntryIndex 
-  this.hide = hideItem 
-  this.display = display 
-  this.renderOb = drawItem 
-  this.totalHeight = totalHeight 
-} 
-function hideItem() 
-{ 
-  if (browserVersion == 1 || browserVersion == 3) { 
-    if (this.navObj.style.display == "none") 
-      return 
-    this.navObj.style.display = "none" 
-  } else { 
-    if (this.navObj.visibility == "hidden") 
-      return 
-    this.navObj.visibility = "hidden" 
-  }     
-} 
-function initializeItem(level, lastNode, leftSide) 
-{  
-  this.createIndex() 
-  if (level>0) 
-    if (lastNode) //the last 'brother' in the children array 
-    { 
-      this.renderOb(leftSide + "<img src='ftv2lastnode.png' width=16 height=22>") 
-      leftSide = leftSide + "<img src='ftv2blank.png' width=16 height=22>"  
-    } 
-    else 
-    { 
-      this.renderOb(leftSide + "<img src='ftv2node.png' width=16 height=22>") 
-      leftSide = leftSide + "<img src='ftv2vertline.png' width=16 height=22>" 
-    } 
-  else 
-    this.renderOb("")   
-} 
-function drawItem(leftSide) 
-{ 
-  if (browserVersion == 2) 
-    doc.write("<layer id='item" + this.id + "' top=" + doc.yPos + " visibility=hidden>") 
-  if (browserVersion == 3) 
-    doc.write("<div id='item" + this.id + "' style='display:block;'>") 
-     
-  doc.write("\n<table ") 
-  if (browserVersion == 1) 
-    doc.write(" id='item" + this.id + "' style='position:block;' ") 
-  doc.write(" border=0 cellspacing=0 cellpadding=0>\n") 
-  doc.write("<tr><td>") 
-  doc.write(leftSide) 
-  if (this.link!="")
-  {
-    doc.write("<a href=" + this.link + ">") 
-  }
-  doc.write("<img id='itemIcon"+this.id+"' ") 
-  doc.write("src='"+this.iconSrc+"' border=0>") 
-  if (this.link!="")
-  {
-    doc.write("</a>")
-  } 
-  doc.write("</td>\n<td valign=middle nowrap>") 
-  if (USETEXTLINKS && this.link!="") 
-    doc.write("<a href=" + this.link + ">" + this.desc + "</a>") 
-  else 
-    doc.write(this.desc) 
-/*!
-  if (this.tagName!="")
-  {
-    doc.write(" [external]");
-  }
-*/
-  doc.write("\n</table>\n") 
-   
-  if (browserVersion == 2) 
-    doc.write("</layer>") 
-  if (browserVersion == 3) 
-    doc.write("</div>")
-  if (browserVersion == 1) { 
-    this.navObj = doc.all["item"+this.id] 
-    this.iconImg = doc.all["itemIcon"+this.id] 
-  } else if (browserVersion == 2) { 
-    this.navObj = doc.layers["item"+this.id] 
-    this.iconImg = this.navObj.document.images["itemIcon"+this.id] 
-    doc.yPos=doc.yPos+this.navObj.clip.height 
-  } else if (browserVersion == 3) {
-    this.navObj = doc.getElementById("item"+this.id)
-    this.iconImg = doc.images.namedItem("itemIcon"+this.id)
-  }
-} 
-// Methods common to both objects (pseudo-inheritance) 
-// ******************************************************** 
-function display() 
-{ 
-  if (browserVersion == 1 || browserVersion == 3) 
-    this.navObj.style.display = "block" 
-  else 
-    this.navObj.visibility = "show" 
-} 
-function createEntryIndex() 
-{ 
-  this.id = nEntries 
-  indexOfEntries[nEntries] = this 
-  nEntries++ 
-} 
-// total height of subEntries open 
-function totalHeight() //used with browserVersion == 2 
-{ 
-  var h = this.navObj.clip.height 
-  var i = 0 
-   
-  if (this.isOpen) //is a folder and _is_ open 
-    for (i=0 ; i < this.nChildren; i++)  
-      h = h + this.children[i].totalHeight() 
-  return h 
-} 
-// Events 
-// ********************************************************* 
-function clickOnFolder(folderId) 
-{ 
-  var clicked = indexOfEntries[folderId] 
-  if (!clicked.isOpen) 
-    clickOnNode(folderId) 
-  return  
-  if (clicked.isSelected) 
-    return 
-} 
-function clickOnNode(folderId) 
-{ 
-  var clickedFolder = 0 
-  var state = 0 
-  clickedFolder = indexOfEntries[folderId] 
-  state = clickedFolder.isOpen 
-  clickedFolder.setState(!state) //open<->close  
-} 
-function initializeDocument() 
-{ 
-  doc = document;
-  if (doc.all) 
-    browserVersion = 1 //IE4   
-  else 
-    if (doc.layers) 
-      browserVersion = 2 //NS4 
-    else if(navigator.userAgent.toLowerCase().indexOf('gecko') != -1)
-        browserVersion = 3 //mozilla
-      else 
-        browserVersion = 0 //other 
-
-  foldersTree.initialize(0, 1, "") 
-  foldersTree.display()
-  
-  if (browserVersion > 0) 
-  { 
-    if(browserVersion != 3)
-      doc.write("<layer top="+indexOfEntries[nEntries-1].navObj.top+">&nbsp;</layer>") 
-    // close the whole tree 
-    clickOnNode(0) 
-    // open the root folder 
-    clickOnNode(0) 
-  } 
-} 
-// Auxiliary Functions for Folder-Treee backward compatibility 
-// ********************************************************* 
-function gFld(description, tagName, hreference) 
-{ 
-  folder = new Folder(description, tagName, hreference) 
-  return folder 
-} 
-function gLnk(description, tagName, linkData) 
-{ 
-  fullLink = "" 
-  if (linkData!="")
-  {
-    fullLink = "'"+linkData+"' target=\"basefrm\"" 
-  } 
-  linkItem = new Item(description, tagName, fullLink)   
-  return linkItem 
-} 
-function insFld(parentFolder, childFolder) 
-{ 
-  return parentFolder.addChild(childFolder) 
-} 
-function insDoc(parentFolder, document) 
-{ 
-  parentFolder.addChild(document) 
-} 
-// Global variables 
-// **************** 
-USETEXTLINKS = 1
-indexOfEntries = new Array 
-nEntries = 0 
-doc = document 
-browserVersion = 0 
-selectedFolder=0
index b401ba21021afbdc9d0a53a8e8a12ced5f79780d..3bdc1b46bf1ae95c0aba7ef299a780b1bf10438c 100644 (file)
@@ -1,4 +1,7 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  File   : Makefile.in
 #  Author : Vasily Rusyaev (Open Cascade NN)
 #  Module : doc
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST+=GEOM
+EXTRA_DIST += images static
+
+dev_docs: doxyfile
+       echo "===========================================" ;                    \
+       echo "Replacing geompyDC by geompy" ;                                   \
+       echo "===========================================" ;                    \
+       sed -e "/class geompyDC/d" -e "s/^ *#/#/g" -e "s/^ *def /def /g"        \
+         -e "s/geompyDC/geompy/g" $(top_srcdir)/src/GEOM_SWIG/geompyDC.py >    \
+         $(top_builddir)/src/GEOM_SWIG/geompy.py ;                             \
+       echo "===========================================" ;                    \
+       echo "Generating TUI documentation" ;                                   \
+       echo "===========================================" ;                    \
+       $(DOXYGEN) doxyfile ;                                                   \
+       rm -f $(top_builddir)/src/GEOM_SWIG/geompy.py
 
-dev_docs:
-       cp -fr $(srcdir)/GEOM ./INPUT; \
-       cp -f ./GEOM/doxyfile ./INPUT; \
-       cd INPUT; \
-       sed 's|../../../share/salome|$(top_srcdir)|' ./doxyfile > ./doxyfile1; \
-       sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \
-       mv -f doxyfile2 doxyfile1; \
-       echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \
-       if( test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \
-         sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \
-         mv -f doxyfile2 doxyfile1; \
-         $(DOXYGEN) -u ./doxyfile1; \
-       else \
-         sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \
-         mv -f doxyfile2 doxyfile1; \
-       fi; \
-       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; \
-       echo "Running doxygen in directory:"`pwd`; \
-       $(DOXYGEN) ./doxyfile; \
-       cd ../; \
-       cp -fr $(srcdir)/GEOM/sources/ GEOM/ ; \
-       rm -fr INPUT
+clean-local:
+       -rm -fr GEOM doxygen.bak
 
-doctuidir=$(docdir)/tui/GEOM
+install-data-local:
+       if test -d GEOM; then \
+         $(INSTALL) -d $(DESTDIR)$(docdir)/tui ; \
+         cp -rp GEOM $(DESTDIR)$(docdir)/tui ; \
+       fi;
 
-nodist_doctui_DATA= GEOM/doxyfile
-EXTRA_DIST+= GEOM/doxyfile.in
+uninstall-local:
+       rm -rf $(DESTDIR)$(docdir)/tui/GEOM
diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in
new file mode 100755 (executable)
index 0000000..ad1ea5a
--- /dev/null
@@ -0,0 +1,266 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+
+# Doxyfile 1.4.6
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = "Geometry Module Programming Guide v.@VERSION@"
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = GEOM
+CREATE_SUBDIRS         = NO
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = NO
+ABBREVIATE_BRIEF       = 
+ALWAYS_DETAILED_SEC    = YES
+INLINE_INHERITED_MEMB  = YES
+FULL_PATH_NAMES        = YES
+STRIP_FROM_PATH        = @top_srcdir@ @top_builddir@
+STRIP_FROM_INC_PATH    = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = YES
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+SEPARATE_MEMBER_PAGES  = NO
+TAB_SIZE               = 5
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = YES
+OPTIMIZE_OUTPUT_JAVA   = YES
+BUILTIN_STL_SUPPORT    = @DOXYGEN_SUPPORT_STL@
+DISTRIBUTE_GROUP_DOC   = NO
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = YES
+EXTRACT_STATIC         = YES
+EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_METHODS  = NO
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = YES
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = NO
+SORT_BRIEF_DOCS        = NO
+SORT_BY_SCOPE_NAME     = NO
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 25
+SHOW_USED_FILES        = NO
+SHOW_DIRECTORIES       = NO
+FILE_VERSION_FILTER    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = @top_srcdir@/src \
+                        @top_builddir@/src/GEOM_SWIG/geompy.py \
+                        @top_srcdir@/bin \
+                        @top_srcdir@/idl \
+                        @top_builddir@/bin
+FILE_PATTERNS          = *.idl *.hxx *.cxx *.h *.c *.hh *.cc @DOXYGEN_PYTHON_EXTENSION@
+RECURSIVE              = YES
+EXCLUDE                = @top_srcdir@/src/GEOM_SWIG/geompy.py \
+                        @top_srcdir@/src/GEOM_SWIG/geompyDC.py
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = @srcdir@/images
+INPUT_FILTER           = 
+FILTER_PATTERNS        = 
+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
+USE_HTAGS              = NO
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = YES
+COLS_IN_ALPHA_INDEX    = 3
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = .
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = @srcdir@/static/myheader.html
+HTML_FOOTER            = @srcdir@/static/footer.html
+HTML_STYLESHEET        = @srcdir@/static/doxygen.css
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = YES
+TOC_EXPAND             = YES
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+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
+LATEX_HIDE_INDICES     = 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_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# 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        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = NO
+
+#---------------------------------------------------------------------------
+# Configuration::additions 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
+GROUP_GRAPHS           = NO
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = YES
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = NO
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DOT_IMAGE_FORMAT       = jpg
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1200
+MAX_DOT_GRAPH_DEPTH    = 0
+DOT_TRANSPARENT        = NO
+DOT_MULTI_TARGETS      = NO
+GENERATE_LEGEND        = NO
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
diff --git a/doc/salome/tui/images/occ.gif b/doc/salome/tui/images/occ.gif
new file mode 100755 (executable)
index 0000000..ce017c8
Binary files /dev/null and b/doc/salome/tui/images/occ.gif differ
diff --git a/doc/salome/tui/static/doxygen.css b/doc/salome/tui/static/doxygen.css
new file mode 100755 (executable)
index 0000000..88e613d
--- /dev/null
@@ -0,0 +1,170 @@
+H1 { 
+   text-align: center; 
+}
+
+CAPTION { 
+   font-weight: bold 
+}
+
+/* Link in the top navbar */
+A.qindex {}
+
+A.qindexRef {}
+
+/* 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; 
+   padding-right  : 10px; 
+   padding-top    : 2px; 
+   padding-left   : 10px; 
+   padding-bottom : 2px; 
+   margin-left    : 0px; 
+   margin-right   : 0px; 
+   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; 
+   padding-right  : 10px; 
+   padding-top    : 2px; 
+   padding-left   : 10px; 
+   padding-bottom : 2px; 
+   margin-left    : 0px; 
+   margin-right   : 0px; 
+   margin-top     : 2px; 
+   margin-bottom  : 2px  
+}
+
+span.keyword       { color: #008000 }
+span.keywordtype   { color: #604020 }
+span.keywordflow   { color: #e08000 }
+span.comment       { color: #800000 }
+span.preprocessor  { color: #806020 }
+span.stringliteral { color: #002080 }
+span.charliteral   { color: #008080 }
diff --git a/doc/salome/tui/static/footer.html b/doc/salome/tui/static/footer.html
new file mode 100755 (executable)
index 0000000..cb55f39
--- /dev/null
@@ -0,0 +1,5 @@
+</DIV>
+<DIV class="div-footer">
+Generated on $datetime for $projectname by&nbsp;<A href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></A> $doxygenversion</DIV>
+</BODY>
+</HTML>
diff --git a/doc/salome/tui/static/myheader.html b/doc/salome/tui/static/myheader.html
new file mode 100755 (executable)
index 0000000..d2efb75
--- /dev/null
@@ -0,0 +1,13 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="GENERATOR" content="Mozilla/4.73 [en] (WinNT; I) [Netscape]">
+   <title>Main Page</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head>
+<body>
+&nbsp;
+</body>
+</html>
index 4c30ee6005e62474bb20db50b949b08992aa85d0..7a64111e229fc3f0b5d9efadfcb91f217cd161ef 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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_Gen.idl
 //  Author : Sergey RUIN
-
+//
 #ifndef __GEOM_GEN__
 #define __GEOM_GEN__
 
@@ -36,7 +38,7 @@ module GEOM
    *  Topological types of shapes (like Open Cascade types)
    */
   enum shape_type { COMPOUND, COMPSOLID, SOLID, SHELL,
-                   FACE, WIRE, EDGE, VERTEX, SHAPE };
+                    FACE, WIRE, EDGE, VERTEX, SHAPE };
 
 
   /*!
@@ -76,6 +78,32 @@ module GEOM
     ST_ONIN
   };
 
+  /*!
+   *  Kind of method to find inside one main shape some subshapes,
+   *  corresponding to other given shape (its argument)
+   *  Is used in functions GEOM_Gen.RestoreSubShapes<xxx>()
+   */
+  enum find_shape_method
+  {
+    /*! Use GetInPlace functionality. Suits all cases, except transformations */
+    FSM_GetInPlace,
+
+    /*! To be used only for transformation result, to find subshapes of argument.
+     *  Only this method can be used after transformation.
+     */
+    FSM_Transformed,
+
+    /*! To find only shared subshapes, not modified by the operation */
+    FSM_GetSame,
+
+    /*! Use GetShapesOnShape method (can work only on solids) */
+    FSM_GetShapesOnShape,
+
+    /*! Use GetInPlaceByHistory method (can work only after Partition) */
+    FSM_GetInPlaceByHistory
+  };
+
+
   typedef sequence<string>      string_array;
   typedef sequence<short>       short_array;
   typedef sequence<long>        ListOfLong;
@@ -205,6 +233,18 @@ module GEOM
      *  For example, method return false for GEOM_MARKER
      */
      boolean IsShape();
+
+     /*!
+     *  Set list of parameters
+     *  \param theParameters is a string containing the notebook variables separated by ":" symbol,
+     *         used for object creation
+     */
+    void SetParameters (in string theParameters);
+                           
+    /*!
+     *  Return list of notebook variables used for object creation separated by ":" symbol
+     */
+    string GetParameters();
   };
 
 
@@ -287,6 +327,18 @@ module GEOM
     GEOM_Object MakePointOnCurve (in GEOM_Object theRefCurve,
                                  in double theParameter);
 
+    /*!
+     *  Create a point, corresponding to the given parameters on the
+     *    given surface.
+     *  \param theRefSurf The referenced surface.
+     *  \param theUParameter Value of U-parameter on the referenced surface.
+     *  \param theVParameter Value of V-parameter on the referenced surface.
+     *  \return New GEOM_Object, containing the created point.
+     */
+    GEOM_Object MakePointOnSurface (in GEOM_Object theRefSurf,
+                                   in double theUParameter,
+                                   in double theVParameter);
+
     /*!
      *  Create a point, on two lines intersection.
      *  \param theRefLine1, theRefLine2 The referenced lines.
@@ -294,13 +346,13 @@ module GEOM
      */
     GEOM_Object MakePointOnLinesIntersection (in GEOM_Object theRefLine1,
                                              in GEOM_Object theRefLine2);
-    
+
      /*!
      *  Create a vector, corresponding to tangent to the given parameter on the given curve.
      *  \param theRefCurve The referenced curve.
      *  \param theParameter Value of parameter on the referenced curve.This value should be have value
      *  \between 0. and 1.. Value of 0. corresponds first parameter of curve value 1. corresponds
-     *  \last parameter of curve. 
+     *  \last parameter of curve.
      *  \return New GEOM_Object, containing the created point.
      */
      GEOM_Object MakeTangentOnCurve (in GEOM_Object theRefCurve,
@@ -394,11 +446,11 @@ module GEOM
     GEOM_Object MakeMarker (in double theOX , in double theOY , in double theOZ,
                            in double theXDX, in double theXDY, in double theXDZ,
                            in double theYDX, in double theYDY, in double theYDZ);
-     
+
     /*!
      *  Create a tangent plane to specified face in the point with specified parameters.
      *  Values of parameters should be between 0. and 1.0
-     *  \param theFace - face for which tangent plane shuold be built. 
+     *  \param theFace - face for which tangent plane shuold be built.
      *  \param theParameterU - value of parameter by U
      *  \param theParameterV - value of parameter Vthe
      *  \param theTrimSize - defines sizes of created face
@@ -474,6 +526,20 @@ module GEOM
     GEOM_Object TranslateVectorCopy (in GEOM_Object theObject,
                                     in GEOM_Object theVector);
 
+    /*!
+     *  Translate the given object along the given vector on given distance,
+     *  creating its copy before the translation.
+     *  \param theObject The object to be translated.
+     *  \param theVector Translation vector, giving a direction.
+     *  \param theDistance Translation distance, giving a distance.
+     *  \param theCope Translation copy, creating its copy if true.
+     *  \return New GEOM_Object, containing the translated object.
+     */
+    GEOM_Object TranslateVectorDistance (in GEOM_Object theObject,
+                                        in GEOM_Object theVector,
+                                        in double      theDistance,
+                                        in boolean     theCopy);
+
     /*!
      *  Translate the given object along the given vector a given number times
      *  \param theObject The object to be translated.
@@ -683,6 +749,33 @@ module GEOM
     GEOM_Object ScaleShapeCopy (in GEOM_Object theObject, in GEOM_Object thePoint,
                                in double theFactor);
 
+    /*!
+     *  Scale the given object by different factors along coordinate axes.
+     *  \param theObject The object to be scaled.
+     *  \param thePoint Center point for scaling.
+     *  \param theFactorX,theFactorY,theFactorZ Scaling factors along each axis.
+     *  \return theObject.
+     */
+    GEOM_Object ScaleShapeAlongAxes (in GEOM_Object theObject,
+                                     in GEOM_Object thePoint,
+                                     in double theFactorX,
+                                     in double theFactorY,
+                                     in double theFactorZ);
+
+    /*!
+     *  Scale the given object by different factors along coordinate axes,
+     *  creating its copy before the scaling.
+     *  \param theObject The object to be scaled.
+     *  \param thePoint Center point for scaling.
+     *  \param theFactorX,theFactorY,theFactorZ Scaling factors along each axis.
+     *  \return New GEOM_Object, containing the scaled shape.
+     */
+    GEOM_Object ScaleShapeAlongAxesCopy (in GEOM_Object theObject,
+                                         in GEOM_Object thePoint,
+                                         in double theFactorX,
+                                         in double theFactorY,
+                                         in double theFactorZ);
+
     /*!
      *  Modify the Location of the given object by LCS.
      *  \param theObject The object to be displaced.
@@ -713,6 +806,29 @@ module GEOM
     GEOM_Object PositionShapeCopy (in GEOM_Object theObject,
                                   in GEOM_Object theStartLCS,
                                   in GEOM_Object theEndLCS);
+
+    /*!
+     *  Modify the Location of the given object by Path,
+     *  \param  theObject The object to be displaced.
+     *  \param  thePath Wire or Edge along that the object will be translated.
+     * \param  theDistance progress of Path (0 = actual location, 1 = end of path location).
+     * \param  theCopy is a true or false parameter. true is to create a copy, false to move the object.
+     * \param  theCopy is a true or false parameter. true is to reverse direction, false is to move normal direction.
+     *  \return New GEOM_Object, containing the displaced shape.
+     */
+
+    GEOM_Object PositionAlongPath (in GEOM_Object theObject,
+                                  in GEOM_Object thePath,
+                                  in double theDistance,
+                                  in boolean theCopy,
+                                  in boolean theReverse);
+
+    /*!
+     *  Recompute the shape from its arguments.
+     *  \param theObject The object to be recomputed.
+     *  \return theObject.
+     */
+    GEOM_Object RecomputeObject (in GEOM_Object theObject);
   };
 
   /*!
@@ -742,6 +858,53 @@ module GEOM
      */
     GEOM_Object MakeBoxTwoPnt (in GEOM_Object thePnt1, in GEOM_Object thePnt2);
 
+    /*!
+     *  Create a face specified dimensions along OX-OY coordinate axes,
+     *  with edges parallel to the coordinate axes.
+     *  Center of the face will be at point (0, 0, 0).
+     *  \param theH Height of the Face.
+     *  \param theW Width of the Face.
+     *  \param theOrientation Orientation belong axis OXY OYZ OZX
+     *  \return New GEOM_Object, containing the created face.
+     */
+    GEOM_Object MakeFaceHW (in double theH, in double theW, in short theOrientation);
+    /*!
+     *  Create a face by normale vector or edge and two specified sizes,
+     *  vertical (H) and horisontal (W).
+     *  \param theVec defines plane.
+     *  \param theH vertical size (height).
+     *  \param theW horisontal size (width). 
+     *  \return New GEOM_Object, containing the created face.
+     */
+    GEOM_Object MakeFaceObjHW (in GEOM_Object theObj, in double theH, in double theW);
+    /*!
+     *  Create a Disk (circular face) with given center, normal vector and radius.
+     *  \param thePnt disk center.
+     *  \param theVec Vector, normal to the plane of the disk.
+     *  \param theR Disk radius.
+     *  \return New GEOM_Object, containing the created disk.
+     */
+    GEOM_Object MakeDiskPntVecR (in GEOM_Object thePnt,
+                                in GEOM_Object theVec,
+                                in double theR);
+    /*!
+     *  Create a disk (circular face), passing through three given points
+     *  \param thePnt1, thePnt2, thePnt3 Points, defining the disk.
+     *  \return New GEOM_Object, containing the created disk.
+     */
+    GEOM_Object MakeDiskThreePnt (in GEOM_Object thePnt1,
+                                 in GEOM_Object thePnt2,
+                                 in GEOM_Object thePnt3);
+                                 
+    /*!
+     *  Create a disk specified dimensions along OX-OY coordinate axes,
+     *  Center of the disk at point (0, 0, 0).
+     *  \param theR of the Disk.
+     *  \param theOrientation Orientation belong axis OXY OYZ OZX
+     *  \return New GEOM_Object, containing the created disk.
+     */
+    GEOM_Object MakeDiskR (in double theR, in short theOrientation);
+    
     /*!
      *  Create a cylinder with given radius and height at
      *  the origin of coordinate system. Axis of the cylinder
@@ -863,6 +1026,18 @@ module GEOM
     GEOM_Object MakePrismTwoPnt2Ways (in GEOM_Object theBase,
                                      in GEOM_Object thePoint1,
                                      in GEOM_Object thePoint2);
+                                   
+    /*!
+     *  Create a shape by extrusion of the base shape along a vector, defined by DX DY DZ.
+     *  \param theBase Base shape to be extruded.
+     *  \param DX, DY, DZ end of extrusion vector.
+     *  \return New GEOM_Object, containing the created prism.
+     */
+    GEOM_Object MakePrismDXDYDZ (in GEOM_Object theBase,
+                                in double theDX, in double theDY, in double theDZ);
+    /*  The same prism but in two directions forward&backward */
+    GEOM_Object MakePrismDXDYDZ2Ways (in GEOM_Object theBase,
+                                      in double theDX, in double theDY, in double theDZ);
 
     /*!
      *  Create a shape by extrusion of the base shape along
@@ -937,7 +1112,7 @@ module GEOM
                                               in GEOM_Object thePath,
                                               in boolean theWithContact ,
                                               in boolean theWithCorrection );
-    
+
     /*!
      *  Create a shape by extrusion of the profile shape along
      *  the path shape. The path shape can be a shell or a face.
@@ -969,6 +1144,22 @@ module GEOM
      */
     GEOM_Object MakePipeShellsWithoutPath (in ListOfGO theSeqBases,
                                           in ListOfGO theLocations);
+
+    /*!
+     *  Create a shape by extrusion of the base shape along
+     *  the path shape with constant bi-normal direction along the given vector. 
+     *  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.
+     *  \param theVec Vector defines a constant binormal direction to keep the
+     *                same angle beetween the Direction and the sections
+     *                along the sweep surface.
+     *  \return New GEOM_Object, containing the created pipe.
+     */
+    GEOM_Object MakePipeBiNormalAlongVector (in GEOM_Object theBase, 
+                                            in GEOM_Object thePath, 
+                                            in GEOM_Object theVec);
+
   };
 
   /*!
@@ -1271,7 +1462,7 @@ module GEOM
                                    in long        theShapeType,
                                    in GEOM_Object theAx1,
                                    in shape_state 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.
@@ -1279,7 +1470,7 @@ module GEOM
      *  \param theShapeType Type of sub-shapes to be retrieved.
      *  \param theAx1 Vector (or line, or linear edge), specifying normal
      *                direction of the plane to find shapes on.
-     *  \param thePnt Point specifying location of the plane to find shapes on.     
+     *  \param thePnt Point specifying location of the plane to find shapes on.
      *  \param theState The state of the subshapes to find.
      *  \return List of IDs of all found sub-shapes.
      */
@@ -1368,6 +1559,45 @@ module GEOM
                             in long        theShapeType,
                             in shape_state theState);
 
+    /*!
+     * \brief Find subshapes complying with given status
+     * \param theCheckShape - the shape to check state of subshapes against
+     * \param theShape - the shape to explore
+     * \param theShapeType - type of subshape of theShape
+     * \param theState - required state
+     * \return List of IDs of all found sub-shapes.
+     */
+    ListOfLong GetShapesOnShapeIDs (in GEOM_Object theCheckShape,
+                                   in GEOM_Object theShape,
+                                   in short       theShapeType,
+                                   in shape_state theState);
+
+    /*!
+     * \brief Find subshapes complying with given status
+     * \param theCheckShape - the shape to check state of subshapes against
+     * \param theShape - the shape to explore
+     * \param theShapeType - type of subshape of theShape
+     * \param theState - required state
+     * \return List of all found sub-shapes.
+     */
+    ListOfGO GetShapesOnShape (in GEOM_Object theCheckShape,
+                              in GEOM_Object theShape,
+                              in short       theShapeType,
+                              in shape_state theState);
+
+    /*!
+     * \brief Find subshapes complying with given status
+     * \param theCheckShape - the shape to check state of subshapes against
+     * \param theShape - the shape to explore
+     * \param theShapeType - type of subshape of theShape
+     * \param theState - required state
+     * \return compound includes all found sub-shapes.
+     */
+    GEOM_Object GetShapesOnShapeAsCompound (in GEOM_Object theCheckShape,
+                                           in GEOM_Object theShape,
+                                           in short       theShapeType,
+                                           in shape_state theState);
+
     /*!
      *  Get sub-shape(s) of \a theShapeWhere, which are
      *  coincident with \a theShapeWhat or could be a part of it.
@@ -1895,6 +2125,17 @@ module GEOM
                                in GEOM_Object thePnt1,
                                in GEOM_Object thePnt2,
                                in boolean theSense);
+                              
+    /*!
+     *  Create an arc of ellipse of center C and two points P1 P2.
+     *  \param theCenter Center point of the arc.
+     *  \param thePnt1 Major radius is distance from center to Pnt1.
+     *  \param thePnt2 define a plane and Minor radius as a shortest distance from Pnt2 to vector Center->Pnt1.
+     *  \return New GEOM_Object, containing the created arc.
+     */
+    GEOM_Object MakeArcOfEllipse (in GEOM_Object theCenter,
+                                 in GEOM_Object thePnt1,
+                                 in GEOM_Object thePnt2);
 
 
     /*!
@@ -1953,6 +2194,16 @@ module GEOM
      *  \return New GEOM_Object, containing the created wire.
      */
     GEOM_Object MakeSketcher (in string theCommand, in ListOfDouble theWorkingPlane);
+    
+    /*!
+     *  Create a 3D sketcher, following the numerical description,
+     *  passed through points created by \a theCoordinates argument. \n
+     *  Format of the description string have to be the following:
+     *
+     *  "Make3DSketcher[x1, y1, z1, x2, y2, z2, ..., xN, yN, zN]"
+     */
+    
+    GEOM_Object Make3DSketcher (in ListOfDouble theCoordinates);
 
       /*!
      *  Create a sketcher (wire or face), following the textual description,
@@ -2009,10 +2260,24 @@ module GEOM
     GEOM_Object MakeFilletFaces (in GEOM_Object theShape,
                                 in double      theR,
                                 in ListOfLong  theFaces);
+                                
     GEOM_Object MakeFilletFacesR1R2 (in GEOM_Object theShape,
                                     in double      theR1,
                                     in double      theR2,
                                     in ListOfLong  theFaces);
+                                    
+    /*!
+     *  Perform a fillet on face of the specified vertexes of the given shape.
+     *  \param theShape Shape, to perform fillet on.
+     *  \param theR Fillet radius.
+     *  \param theVertexes Global indices of vertexes to perform fillet on.
+     *    \note Global index of sub-shape can be obtained, using method
+     *          <VAR>GEOM_IShapesOperations.GetSubShapeIndex()</VAR>.
+     *  \return New GEOM_Object, containing the result shape.
+     */
+    GEOM_Object MakeFillet2D (in GEOM_Object theShape,
+                             in double      theR,
+                             in ListOfLong  theVertexes);
 
     /*!
      *  Perform a symmetric chamfer on all edges of the given shape.
@@ -2037,7 +2302,7 @@ module GEOM
     GEOM_Object MakeChamferEdge (in GEOM_Object theShape,
                                 in double theD1, in double theD2,
                                 in long theFace1, in long theFace2);
-    /*! 
+    /*!
      *  The Same but with params theD = Chamfer Lenght
      *  and theAngle = Chamfer Angle (Angle in radians)
      */
@@ -2061,7 +2326,7 @@ module GEOM
     GEOM_Object MakeChamferFaces (in GEOM_Object theShape,
                                  in double theD1, in double theD2,
                                  in ListOfLong theFaces);
-    /*! 
+    /*!
      *  The Same but with params theD = Chamfer Lenght
      *  and theAngle = Chamfer Angle (Angle in radians)
      */
@@ -2080,7 +2345,7 @@ module GEOM
     GEOM_Object MakeChamferEdges (in GEOM_Object theShape,
                                  in double theD1, in double theD2,
                                  in ListOfLong theEdges);
-    /*! 
+    /*!
      *  The Same but with params theD = Chamfer Lenght
      *  and theAngle = Chamfer Angle (Angle in radians)
      */
@@ -2490,6 +2755,59 @@ module GEOM
      *  Get point coordinates
      */
     void PointCoordinates (in GEOM_Object theShape, out double X, out double Y, out double Z);
+
+    /*!
+     *  Get radius of curvature of curve in the point determinated by param
+     *  \param theShape - curve.
+     *  \param theParam - parameter on curve
+     *  \return Value of curvature.
+     */
+    double CurveCurvatureByParam (in GEOM_Object theShape, in double theParam);
+
+    /*!
+     *  Get radius of curvature of curve in the given point
+     *  \param theShape - curve.
+     *  \param thePoint - point
+     *  \return Value of curvature.
+     */
+    double CurveCurvatureByPoint (in GEOM_Object theShape, in GEOM_Object thePoint);
+
+    /*!
+     *  Get max radius of curvature of surface in the point determinated by params
+     *  \param theShape - surface.
+     *  \param theUParam - U-parameter on surface
+     *  \param theVParam - V-parameter on surface
+     *  \return Value of curvature.
+     */
+    double MaxSurfaceCurvatureByParam (in GEOM_Object theShape, in double theUParam,
+                                      in double theVParam);
+
+    /*!
+     *  Get max radius of curvature of surface in the given point
+     *  \param theShape - surface.
+     *  \param thePoint - point
+     *  \return Value of curvature.
+     */
+    double MaxSurfaceCurvatureByPoint (in GEOM_Object theShape, in GEOM_Object thePoint);
+
+    /*!
+     *  Get min radius of curvature of surface in the point determinated by params
+     *  \param theShape - surface.
+     *  \param theUParam - U-parameter on surface
+     *  \param theVParam - V-parameter on surface
+     *  \return Value of curvature.
+     */
+    double MinSurfaceCurvatureByParam (in GEOM_Object theShape, in double theUParam,
+                                      in double theVParam);
+
+    /*!
+     *  Get min radius of curvature of surface in the given point
+     *  \param theShape - surface.
+     *  \param thePoint - point
+     *  \return Value of curvature.
+     */
+    double MinSurfaceCurvatureByPoint (in GEOM_Object theShape, in GEOM_Object thePoint);
+
   };
 
 
@@ -2586,7 +2904,7 @@ module GEOM
     void Redo (in long theStudyID);
 
     /*!
-     * Publishing manangement
+     * Publishing management
      * Adds in theStudy a object theObject under with a name theName,
      * if theFather is not NULL the object is placed under thFather's SObject.
      * Returns a SObject where theObject is placed
@@ -2596,6 +2914,45 @@ module GEOM
                                  in string theName,
                                  in GEOM_Object theFather);
 
+    /*!
+     *  Publish sub-shapes, standing for arguments and sub-shapes of arguments
+     *  To be used from python scripts out of geompy.addToStudy (non-default usage)
+     *  \param theStudy  the study, in which theObject is published already,
+     *                   and in which the arguments will be published
+     *  \param theObject published GEOM object, arguments of which will be published
+     *  \param theArgs   list of GEOM_Object, operation arguments to be published.
+     *                   If this list is empty, all operation arguments will be published
+     *  \param theFindMethod method to search subshapes, corresponding to arguments and
+     *                       their subshapes. Value from enumeration GEOM::find_shape_method.
+     *  \param theInheritFirstArg set properties of the first argument for \a theObject.
+     *                            Do not publish subshapes in place of arguments, but only
+     *                            in place of subshapes of the first argument,
+     *                            because the whole shape corresponds to the first argument.
+     *                            Mainly to be used after transformations, but it also can be
+     *                            usefull after partition with one object shape, and some other
+     *                            operations, where only the first argument has to be considered.
+     *                            If theObject has only one argument shape, this flag is automatically
+     *                            considered as True, not regarding really passed value.
+     *  \return True in case of success, False otherwise.
+     */
+    boolean RestoreSubShapesO (in SALOMEDS::Study   theStudy,
+                              in GEOM_Object       theObject,
+                              in ListOfGO          theArgs,
+                              in find_shape_method theFindMethod,
+                              in boolean           theInheritFirstArg);
+
+    /*!
+     *  Publish sub-shapes, standing for arguments and sub-shapes of arguments
+     *  To be used from GUI and from geompy.addToStudy.
+     *  Work like the above method, but accepts study object theSObject instead of GEOM_Object.
+     *  \param theSObject study object, referencing GEOM object, arguments of which will be published
+     */
+    boolean RestoreSubShapesSO (in SALOMEDS::Study   theStudy,
+                               in SALOMEDS::SObject theSObject,
+                               in ListOfGO          theArgs,
+                               in find_shape_method theFindMethod,
+                               in boolean           theInheritFirstArg);
+
     /*!
      *  Methods to access interfaces for objects creation and transformation
      */
index 98d819daf53cf3e67e8be321cef78a42e1d00ac6..4690e7e7ee702bfed1bfd3ecd027435fc49b078c 100644 (file)
@@ -1,27 +1,27 @@
-//  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
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
+//  Copyright (C) 2003-2007  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_Superv.idl
 //  Author : Lucien PIGNOLONI
-
+//
 #ifndef __GEOM_SUPERV__
 #define __GEOM_SUPERV__
 
@@ -126,6 +126,20 @@ module GEOM
                               in double theDZ) ;
     GEOM_Object MakeBoxTwoPnt (in GEOM_Object thePnt1, 
                               in GEOM_Object thePnt2) ;
+    GEOM_Object MakeFaceHW (in double theH, 
+                           in double theW,
+                           in short  theOrientation) ;
+    GEOM_Object MakeFaceObjHW (in GEOM_Object theObj, 
+                              in double      theH,
+                              in double      theW) ;
+    GEOM_Object MakeDiskPntVecR (in GEOM_Object thePnt,
+                                in GEOM_Object theVec,
+                                in double      theR) ;
+    GEOM_Object MakeDiskThreePnt (in GEOM_Object thePnt1,
+                                 in GEOM_Object thePnt2,
+                                 in GEOM_Object thePnt3) ;
+    GEOM_Object MakeDiskR (in double theR, 
+                          in short  theOrientation) ;
     GEOM_Object MakeCylinderPntVecRH (in GEOM_Object thePnt,
                                      in GEOM_Object theAxis,
                                      in double      theRadius,
@@ -198,6 +212,10 @@ module GEOM
     GEOM_Object MakePipeShellsWithoutPath (in ListOfGO theSeqBases,
                                           in ListOfGO theLocations );
 
+    GEOM_Object MakePipeBiNormalAlongVector (in GEOM_Object theBase, 
+                                            in GEOM_Object thePath, 
+                                            in GEOM_Object theVec);
+
     //-----------------------------------------------------------//
     // BooleanOperations                                         //
     //-----------------------------------------------------------//
@@ -249,6 +267,10 @@ module GEOM
                                 in GEOM_Object theVector) ;
     GEOM_Object TranslateVectorCopy (in GEOM_Object theObject,
                                     in GEOM_Object theVector) ;
+    GEOM_Object TranslateVectorDistance (in GEOM_Object theObject,
+                                        in GEOM_Object theVector,
+                                        in double      theDistance,
+                                        in boolean     theCopy) ;
     GEOM_Object MultiTranslate1D (in GEOM_Object theObject,
                                  in GEOM_Object theVector,
                                  in double      theStep,
@@ -305,12 +327,27 @@ module GEOM
     GEOM_Object ScaleShapeCopy (in GEOM_Object theObject, 
                                in GEOM_Object thePoint,
                                in double      theFactor) ;
+    GEOM_Object ScaleShapeAlongAxes (in GEOM_Object theObject,
+                                     in GEOM_Object thePoint,
+                                     in double theFactorX,
+                                     in double theFactorY,
+                                     in double theFactorZ);
+    GEOM_Object ScaleShapeAlongAxesCopy (in GEOM_Object theObject,
+                                         in GEOM_Object thePoint,
+                                         in double theFactorX,
+                                         in double theFactorY,
+                                         in double theFactorZ);
     GEOM_Object PositionShape (in GEOM_Object theObject,
                               in GEOM_Object theStartLCS,
                               in GEOM_Object theEndLCS) ;
     GEOM_Object PositionShapeCopy (in GEOM_Object theObject,
                                   in GEOM_Object theStartLCS,
                                   in GEOM_Object theEndLCS) ;
+    GEOM_Object PositionAlongPath (in GEOM_Object theObject,
+                                  in GEOM_Object thePath,
+                                  in double theDistance,
+                                  in boolean theCopy,
+                                  in boolean theReverse);
 
     //-----------------------------------------------------------//
     // ShapesOperations                                          //
@@ -342,6 +379,15 @@ module GEOM
     long NumberOfEdges (in GEOM_Object theShape) ;
     GEOM_Object ChangeOrientation (in GEOM_Object theShape) ;
 
+    GEOM_List GetShapesOnShape (in GEOM_Object theCheckShape,
+                               in GEOM_Object theShape, 
+                               in short       theShapeType,
+                               in shape_state theState);
+    GEOM_Object GetShapesOnShapeAsCompound (in GEOM_Object theCheckShape,
+                                           in GEOM_Object theShape, 
+                                           in short       theShapeType,
+                                           in shape_state theState);
+
     //-----------------------------------------------------------//
     // BlocksOperations                                          //
     //-----------------------------------------------------------//
@@ -439,6 +485,9 @@ module GEOM
                                in GEOM_Object thePnt1,
                                in GEOM_Object thePnt2,
                                in boolean theSense) ;
+    GEOM_Object MakeArcOfEllipse (in GEOM_Object theCenter,
+                                in GEOM_Object thePnt1,
+                                in GEOM_Object thePnt2) ;
     GEOM_Object MakePolyline (in GEOM_List thePoints) ;
     GEOM_Object MakeSplineBezier (in GEOM_List thePoints) ;
     GEOM_Object MakeSplineInterpolation (in GEOM_List thePoints) ;
@@ -464,6 +513,9 @@ module GEOM
                                     in double      theR1,
                                     in double      theR2,
                                     in GEOM_List   theFaces) ;
+    GEOM_Object MakeFillet2D (in GEOM_Object theShape,
+                             in double      theR,
+                             in GEOM_List   theVertexes) ;
     GEOM_Object MakeChamferAll (in GEOM_Object theShape,
                                in double      theD) ;
     GEOM_Object MakeChamferEdge (in GEOM_Object theShape,
index 93172d6bffa8e5a1e2476767047abd7dab2164e0..258c691e935f1d2e46d444f5b571d9acbb65c6fe 100644 (file)
@@ -1,70 +1,58 @@
-# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
-#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
-# This library is free software; you can redistribute it and/or
-# modify it 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
-# 
-
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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 Makefile is responsible of generating the client and server
 # implementation of IDL interfaces for both C++ and python usage.
 # The building process of the C++ files is in charge of each source
 # package and then is not manage here.
 #
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-BASEIDL_FILES= GEOM_Gen.idl GEOM_Superv.idl
-
-EXTRA_DIST+= $(BASEIDL_FILES)
+BASEIDL_FILES = GEOM_Gen.idl GEOM_Superv.idl
 
 # This variable defines the files to be installed
-salomeidl_DATA = $(BASEIDL_FILES)
+dist_salomeidl_DATA = $(BASEIDL_FILES)
 
 # GUI idl common library
 lib_LTLIBRARIES = libSalomeIDLGEOM.la
 
 # Sources built from idl files
-nodist_libSalomeIDLGEOM_la_SOURCES= GEOM_GenSK.cc GEOM_SupervSK.cc
+nodist_libSalomeIDLGEOM_la_SOURCES = GEOM_GenSK.cc GEOM_SupervSK.cc
 
 # header files must be exported: other modules have to use this library
-nodist_salomeinclude_HEADERS= $(BASEIDL_FILES:%.idl=%.hh)
+nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
 
-libSalomeIDLGEOM_la_CPPFLAGS =\
-       -I$(top_builddir)/salome_adm/unix \
-       -I$(top_builddir)/idl \
+libSalomeIDLGEOM_la_CPPFLAGS =                 \
+       -I$(top_builddir)/salome_adm/unix       \
+       -I$(top_builddir)/idl                   \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@
 libSalomeIDLGEOM_la_LDFLAGS = -no-undefined -version-info=0:0:0
-libSalomeIDLGEOM_la_LIBADD  = \
-       $(STDLIB) \
-       @CORBA_LIBS@ \
-       $(KERNEL_LDFLAGS) -lSalomeIDLKernel
+libSalomeIDLGEOM_la_LIBADD  = $(STDLIB) @CORBA_LIBS@ $(KERNEL_LDFLAGS) -lSalomeIDLKernel
 
 # These variables defines the building process of CORBA files
 OMNIORB_IDL         = @OMNIORB_IDL@
 OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
 OMNIORB_IDLPYFLAGS  = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome 
-IDLCXXFLAGS = \
-       -bcxx \
-       @IDLCXXFLAGS@ \
-       -I$(top_builddir)/idl/salome \
-       -I$(KERNEL_ROOT_DIR)/idl/salome \
-       -I$(top_builddir)/salome_adm/unix
-IDLPYFLAGS  = \
-       @IDLPYFLAGS@ \
-       -I$(KERNEL_ROOT_DIR)/idl/salome
+IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(top_builddir)/salome_adm/unix
+IDLPYFLAGS  = @IDLPYFLAGS@ -I$(KERNEL_ROOT_DIR)/idl/salome
 
 # potential problem on parallel make on the following - multiple outputs
 SUFFIXES = .idl .hh SK.cc
@@ -74,14 +62,14 @@ SUFFIXES = .idl .hh SK.cc
        $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
 
 install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%)
-       $(INSTALL) -d  $(pkgpythondir)
+       $(INSTALL) -d  $(DESTDIR)$(salomepythondir)
        ls $^ | while read file; do \
-         $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(pkgpythondir) $$file ; \
+         $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \
        done
 
 # uninstall-local removes too much, but it works in distcheck
 uninstall-local:
-       rm -rf $(pkgpythondir)/*
+       rm -rf $(DESTDIR)$(salomepythondir)/*
 
 mostlyclean-local:
        -rm -f *.hh *.cc .depidl
diff --git a/resources/3dsketch.png b/resources/3dsketch.png
new file mode 100755 (executable)
index 0000000..f34ec05
Binary files /dev/null and b/resources/3dsketch.png differ
index 2739da315910312cb578874abbe03712dc3ec01f..7bf6f029723bf8b830dadc4f6dd3d204ded01eaa 100644 (file)
@@ -1,4 +1,27 @@
 <?xml version='1.0' encoding='us-ascii' ?>
+<!--
+  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+
+  Copyright (C) 2003-2007  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
+
+-->
 
 <!-- XML component catalog -->
 <begin-catalog>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
+                    <component-service>
+                        <service-name>MakeArcOfEllipse</service-name>
+                        <service-author></service-author>
+                        <service-version></service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>thePnt1</inParameter-name>
+                                <inParameter-type>GEOM_Object</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>thePnt2</inParameter-name>
+                                <inParameter-type>GEOM_Object</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>thePnt3</inParameter-name>
+                                <inParameter-type>GEOM_Object</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>return</outParameter-name>
+                                <outParameter-type>GEOM_Object</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
                     <component-service>
                         <service-name>MakePolyline</service-name>
                         <service-author></service-author>
index 01c72eecda176f403409cfa7bdc72ab208253000..eda6f84a0bd515484ae8f19a8f81d1de80395d47 100644 (file)
@@ -1,5 +1,28 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE application PUBLIC "" "desktop.dtd">
+<!--
+  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+
+  Copyright (C) 2003-2007  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
+
+-->
 
 <!--  GUI customization for GEOMETRY component  -->
 
@@ -52,6 +75,8 @@
        <popup-item item-id="4023" pos-id="" label-id="Sphere" icon-id="sphere.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
        <popup-item item-id="4024" pos-id="" label-id="Torus" icon-id="torus.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
         <popup-item item-id="4025" pos-id="" label-id="Cone" icon-id="cone.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
+        <popup-item item-id="4026" pos-id="" label-id="Face" icon-id="face.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
+       <popup-item item-id="4027" pos-id="" label-id="Face" icon-id="disk.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
    </submenu>
    <endsubmenu />
    <submenu label-id="Generation" item-id="403" pos-id="3">
    <separator pos-id=""/>
 
    <popup-item item-id="404" pos-id="" label-id="Sketch" icon-id="sketch.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
+   <popup-item item-id="405" pos-id="" label-id="3D Sketch" icon-id="3dsketch.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
    <separator pos-id=""/>
    <popup-item item-id="407" pos-id="" label-id="Explode" icon-id="subshape.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
    <submenu label-id="Build" item-id="408" pos-id="">
    <toolbutton-item item-id="4023" label-id="Sphere" icon-id="sphere.png" tooltip-id="Sphere" accel-id="" toggle-id="" execute-action=""/>
    <toolbutton-item item-id="4024" label-id="Torus" icon-id="torus.png" tooltip-id="Torus" accel-id="" toggle-id="" execute-action=""/>
    <toolbutton-item item-id="4025" label-id="Cone" icon-id="cone.png" tooltip-id="Cone" accel-id="" toggle-id="" execute-action=""/> 
+   <toolbutton-item item-id="4026" label-id="Face" icon-id="face.png" tooltip-id="Face" accel-id="" toggle-id="" execute-action=""/> 
+   <toolbutton-item item-id="4027" label-id="Disk" icon-id="disk.png" tooltip-id="Disk" accel-id="" toggle-id="" execute-action=""/> 
 </toolbar>                                                                                
 
 <toolbar label-id="Ope. Boolean">
index 8c925b61fde3bfc6afec51c96a40cf144cdc9d93..66a33d5f76a489e74b7e8743a187fc4492c8261d 100644 (file)
@@ -1,5 +1,28 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE application PUBLIC "" "desktop.dtd">
+<!--
+  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+
+  Copyright (C) 2003-2007  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
+
+-->
 
 <!--  GUI customization for GEOMETRY component  -->
 
@@ -58,6 +81,8 @@
       <popup-item item-id="4023" pos-id="" label-id="Sphère" icon-id="sphere.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
       <popup-item item-id="4024" pos-id="" label-id="Tore" icon-id="torus.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
       <popup-item item-id="4025" pos-id="" label-id="Cone" icon-id="cone.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
+      <popup-item item-id="4026" pos-id="" label-id="Face" icon-id="face.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
+      <popup-item item-id="4027" pos-id="" label-id="Face" icon-id="disk.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
    </submenu>
    <endsubmenu />
    <submenu label-id="Generation" item-id="403" pos-id="3">
@@ -69,6 +94,7 @@
    <endsubmenu />
    <separator pos-id=""/>
    <popup-item item-id="404" pos-id="" label-id="Sketch" icon-id="sketch.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
+   <popup-item item-id="405" pos-id="" label-id="3D Sketch" icon-id="3dsketch.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
    <popup-item item-id="406" pos-id="" label-id="Spline" icon-id="spline.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
    <separator pos-id=""/>
    <popup-item item-id="407" pos-id="" label-id="Exploser" icon-id="subshape.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
    <toolbutton-item item-id="4023" label-id="Sphère" icon-id="sphere.png" tooltip-id="Construction d'une sphère" accel-id="" toggle-id="" execute-action=""/>
    <toolbutton-item item-id="4024" label-id="Tore" icon-id="torus.png" tooltip-id="Construction d'un tore" accel-id="" toggle-id="" execute-action=""/> 
    <toolbutton-item item-id="4025" label-id="Cone" icon-id="cone.png" tooltip-id="Cone" accel-id="" toggle-id="" execute-action=""/> 
+   <toolbutton-item item-id="4026" label-id="Face" icon-id="face.png" tooltip-id="Face" accel-id="" toggle-id="" execute-action=""/> 
+   <toolbutton-item item-id="4027" label-id="Disk" icon-id="disk.png" tooltip-id="Disk" accel-id="" toggle-id="" execute-action=""/> 
 </toolbar>
 
 <toolbar label-id="Opé. Booléennes">
index 2fbc6564c68b48d0b05420a834b9db43a65e0a68..4dd5020f59da50f70af7a1b4a31927dd7fef3bfc 100644 (file)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 # -* Makefile *- 
-#
 # Author : Patrick GOLDBRONN (CEA)
 # Date : 28/06/2001
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-# $Header$
+# Modified by : Alexander BORODIN (OCN) - autotools usage
 #
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-dist_salomeres_DATA = \
-GEOM_en.xml \
-GEOM_fr.xml \
-GEOM.config \
-SalomeApp.xml \
-Plugin \
-GEOMDS_Resources \
-ImportExport \
-ShHealing \
-angle.png \
-arc.png \
-archimede.png \
-axisinertia.png \
-basicproperties.png \
-bounding.png \
-box.png \
-box2points.png \
-boxdxyz.png \
-build_compound.png \
-build_edge.png \
-build_face.png \
-build_shell.png \
-build_solid.png \
-build_wire.png \
-centergravity.png \
-chamfer.png \
-chamferall.png \
-chamferedge.png \
-chamferface.png \
-chamferedgefromface.png \
-change_orientation.png \
-check.png \
-circle.png \
-circlepointvector.png \
-circle3points.png \
-circlecenter2pnts.png \
-common.png \
-cone.png \
-conedxyz.png \
-conepointvector.png \
-cut.png \
-cylinder.png \
-cylinderdxyz.png \
-cylinderpointvector.png \
-delete.png \
-display.png \
-displayonly.png \
-displayall.png \
-erase.png \
-eraseall.png \
-fillet.png \
-filletall.png \
-filletedge.png \
-filletface.png \
-filling.png \
-fuse.png \
-geometry.png \
-line.png \
-line2points.png \
-line2faces.png \
-lineedge.png \
-linepointvector.png \
-mindist.png \
-mirrorPoint.png \
-mirrorAxe.png \
-mirrorPlane.png \
-ModuleGeom.png \
-multirotation.png \
-multirotationdouble.png \
-multirotationsimple.png \
-multitranslation.png \
-multitranslationdouble.png \
-multitranslationsimple.png \
-normale.png \
-offset.png \
-orientation.png \
-partition.png \
-partitionkeep.png \
-partitionplane.png \
-pipe.png \
-plane.png \
-planeWorking.png \
-planedxyz.png \
-plane3points.png \
-planeface.png \
-planepointvector.png \
-planeworkingface.png \
-planeworkingvector.png \
-planeworkingorigin.png \
-point2.png \
-pointonedge.png \
-point_line_intersection.png \
-polyline.png \
-prism.png \
-prism2.png \
-revol.png \
-rotate.png \
-rotatepnt.png \
-scale.png \
-section.png \
-select1.png \
-sewing.png \
-shading.png \
-sketch.png \
-sphere.png \
-spheredxyz.png \
-spherepoint.png \
-subshape.png \
-supressHolesOnFaceShell.png \
-supressface.png \
-supresshole.png \
-tolerance.png \
-torus.png \
-torusdxyz.png \
-toruspointvector.png \
-translationDxyz.png \
-translationPoints.png \
-translationVector.png \
-tree_compound.png \
-tree_compsolid.png \
-tree_edge.png \
-tree_face.png \
-tree_shape.png \
-tree_shell.png \
-tree_solid.png \
-tree_vertex.png \
-tree_wire.png \
-tree_group_vertex.png \
-tree_group_edge.png \
-tree_group_face.png \
-tree_group_solid.png \
-tree_lcs.png \
-vector.png \
-vector2points.png \
-vectordxyz.png \
-whatis.png \
-ellipse.png \
-ellipsepointvector.png \
-bezier.png \
-interpol.png \
-spline.png \
-closecontour.png \
-suppressintwires.png \
-marker.png \
-marker2.png \
-marker3.png \
-position.png \
-position2.png \
-free_bound.png \
-point_coord.png \
-point3.png \
-shapeprocess.png \
-block_2f.png \
-block_6f.png \
-block_face_2e.png \
-block_face_4e.png \
-block_face_4v.png \
-block_multitrsf_double.png \
-block_multitrsf_simple.png \
-tree_block.png \
-subblock.png \
-group_new.png \
-group_edit.png \
-glue.png \
-check_blocks_compound.png \
-free_faces.png \
-propagate.png \
-redo.png \
-undo.png \
-arccenter.png \
-glue2.png \
-remove_extra_edges.png
+dist_salomeres_DATA =          \
+GEOM_en.xml                    \
+GEOM_fr.xml                    \
+GEOM.config                    \
+SalomeApp.xml                  \
+Plugin                         \
+GEOMDS_Resources               \
+ImportExport                   \
+ShHealing                      \
+3dsketch.png                   \
+angle.png                      \
+arc.png                                \
+arccenter.png                  \
+arcofellipse.png               \
+archimede.png                  \
+axisinertia.png                        \
+basicproperties.png            \
+bounding.png                   \
+box.png                                \
+box2points.png                 \
+boxdxyz.png                    \
+build_compound.png             \
+build_edge.png                 \
+build_face.png                 \
+build_shell.png                        \
+build_solid.png                        \
+build_wire.png                 \
+centergravity.png              \
+chamfer.png                    \
+chamferall.png                 \
+chamferedge.png                        \
+chamferface.png                        \
+chamferedgefromface.png                \
+change_orientation.png         \
+check.png                      \
+circle.png                     \
+circlepointvector.png          \
+circle3points.png              \
+circlecenter2pnts.png          \
+common.png                     \
+cone.png                       \
+conedxyz.png                   \
+conepointvector.png            \
+cut.png                                \
+cylinder.png                   \
+cylinderdxyz.png               \
+cylinderpointvector.png                \
+delete.png                     \
+disk.png                       \
+disk3points.png                        \
+disk_pntvecr.png               \
+disk_r.png                     \
+display.png                    \
+displayonly.png                        \
+displayall.png                 \
+erase.png                      \
+eraseall.png                   \
+face_hw.png                    \
+face_vechw.png                 \
+fillet.png                     \
+fillet2d.png                   \
+filletall.png                  \
+filletedge.png                 \
+filletface.png                 \
+filling.png                    \
+fuse.png                       \
+geometry.png                   \
+line.png                       \
+line2points.png                        \
+line2faces.png                 \
+mindist.png                    \
+mirrorPoint.png                        \
+mirrorAxe.png                  \
+mirrorPlane.png                        \
+ModuleGeom.png                 \
+multirotation.png              \
+multirotationdouble.png                \
+multirotationsimple.png                \
+multitranslation.png           \
+multitranslationdouble.png     \
+multitranslationsimple.png     \
+normale.png                    \
+offset.png                     \
+partition.png                  \
+partitionkeep.png              \
+partitionplane.png             \
+pipe.png                       \
+pipebinormal.png               \
+plane.png                      \
+planeWorking.png               \
+plane3points.png               \
+planeface.png                  \
+planepointvector.png           \
+planeworkingface.png           \
+planeworkingvector.png         \
+planeworkingorigin.png         \
+point2.png                     \
+pointonedge.png                        \
+pointonface.png                        \
+point_line_intersection.png    \
+polyline.png                   \
+prism.png                      \
+prism2.png                     \
+prism3.png                     \
+revol.png                      \
+rotate.png                     \
+rotatepnt.png                  \
+scale.png                      \
+scale_along_axes.png           \
+section.png                    \
+select1.png                    \
+sewing.png                     \
+shading.png                    \
+shapesonshape.png              \
+sketch.png                     \
+sphere.png                     \
+spheredxyz.png                 \
+spherepoint.png                        \
+subshape.png                   \
+supressHolesOnFaceShell.png    \
+supressface.png                        \
+supresshole.png                        \
+tolerance.png                  \
+torus.png                      \
+torusdxyz.png                  \
+toruspointvector.png           \
+translationDxyz.png            \
+translationPoints.png          \
+translationVector.png          \
+tree_compound.png              \
+tree_compsolid.png             \
+tree_edge.png                  \
+tree_face.png                  \
+tree_shape.png                 \
+tree_shell.png                 \
+tree_solid.png                 \
+tree_vertex.png                        \
+tree_wire.png                  \
+tree_group_vertex.png          \
+tree_group_edge.png            \
+tree_group_face.png            \
+tree_group_solid.png           \
+tree_lcs.png                   \
+vector.png                     \
+vector2points.png              \
+vectordxyz.png                 \
+whatis.png                     \
+ellipse.png                    \
+ellipsepointvector.png         \
+bezier.png                     \
+interpol.png                   \
+spline.png                     \
+closecontour.png               \
+suppressintwires.png           \
+marker.png                     \
+marker2.png                    \
+marker3.png                    \
+position.png                   \
+position2.png                  \
+position3.png                   \
+free_bound.png                 \
+point_coord.png                        \
+point3.png                     \
+shapeprocess.png               \
+block_2f.png                   \
+block_6f.png                   \
+block_face_2e.png              \
+block_face_4e.png              \
+block_face_4v.png              \
+block_multitrsf_double.png     \
+block_multitrsf_simple.png     \
+tree_block.png                 \
+subblock.png                   \
+group_new.png                  \
+group_edit.png                 \
+glue.png                       \
+check_blocks_compound.png      \
+free_faces.png                 \
+propagate.png                  \
+redo.png                       \
+undo.png                       \
+glue2.png                      \
+remove_extra_edges.png         \
+coordsys.png                   \
+translation.png
 
-nodist_salomeres_DATA = GEOMCatalog.xml
+# VSR: little trick to avoid putting if GEOMCatalog.xml to the distribution archive
+nodist_salomeres_SCRIPTS = GEOMCatalog.xml
index 4cf6099f858e9d05d2eda0e267525267a04badd8..fe470ef5c2a5bf4dfab707ccd04f2636c335b2af 100644 (file)
Binary files a/resources/ModuleGeom.png and b/resources/ModuleGeom.png differ
index 3c3b60aede752f181a8cf09f0d06c2e37941b750..d4f9707a10021c506c79c42397ee7b0ae46421e4 100644 (file)
@@ -1,3 +1,26 @@
+<!--
+  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+
+  Copyright (C) 2003-2007  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
+
+-->
 <document>
   <section name="GEOM">
     <!-- Major module parameters -->
index 9ec01ae67210a449c8f3de704cd6991345c274ce..4ea0ef8c5cbc10a2e8d8ec926b3cd1a09ebf8dbf 100644 (file)
Binary files a/resources/angle.png and b/resources/angle.png differ
index 03aef73736246e8b88cd5d04a18539a7697118c4..074c67dea0a71899291df86473acc5ff17550356 100644 (file)
Binary files a/resources/arc.png and b/resources/arc.png differ
index 88ead9a7b7ab6394c9d34f381aed472c87c4cfd6..3ae5793e384ee007d893d60b9ea6260410725624 100644 (file)
Binary files a/resources/arccenter.png and b/resources/arccenter.png differ
index 8760ada60a12b99333d747f1e82b1af9cace232a..5fb79d292ae4dc2534628668cb6706d4a7df51df 100644 (file)
Binary files a/resources/archimede.png and b/resources/archimede.png differ
diff --git a/resources/arcofellipse.png b/resources/arcofellipse.png
new file mode 100755 (executable)
index 0000000..3f15b6e
Binary files /dev/null and b/resources/arcofellipse.png differ
index 22f1a96e4b21c5bd621adb152dc5418f18a74c20..79971f455114113107c4361a0450930f03ff7e79 100644 (file)
Binary files a/resources/axisinertia.png and b/resources/axisinertia.png differ
index 3b72b8d216697cd7fedfb3eb95327e520f689a17..f46c0da7a378a05f515f1b3583cec1a34526ddd7 100644 (file)
Binary files a/resources/basicproperties.png and b/resources/basicproperties.png differ
index 2629a2b594fabede3e57ca1c5eafa11ce8b3d299..3ca0d75f5c254ed74b4af2de059e9e85a68049be 100644 (file)
Binary files a/resources/bezier.png and b/resources/bezier.png differ
index cd3b49247f2269e381d93450410a41e9374d701c..b7719b8b49c4511471848afeb18e47ef4a456e1b 100644 (file)
Binary files a/resources/block_2f.png and b/resources/block_2f.png differ
index 877add13732479db3258451ce61012cbc57ce7d0..774160e4b109a1edc453f50b8646d226a63661b8 100644 (file)
Binary files a/resources/block_6f.png and b/resources/block_6f.png differ
index 5d704844e7335c71f61ffa0f781105e0fd443d69..38ec5728d19d564cfe6d2c3281331bbcfadd8a65 100644 (file)
Binary files a/resources/block_face_2e.png and b/resources/block_face_2e.png differ
index c81fa4a2597966ece245850fa29eb190b609f05c..c09f27399570262bde1ff77c7ca681037c840c6b 100644 (file)
Binary files a/resources/block_face_4e.png and b/resources/block_face_4e.png differ
index 24f5c65135afe70f0c71cd8c3ea2fdd371f30044..8f3a517e6f438e7268e277343c49e87bdad1d852 100644 (file)
Binary files a/resources/block_face_4v.png and b/resources/block_face_4v.png differ
index a148c710205af61ad6ae0572356d76862d71c93c..38f9deb11d3b8dc722e043c5640ba3c1f268240f 100644 (file)
Binary files a/resources/block_multitrsf_double.png and b/resources/block_multitrsf_double.png differ
index 7efa63269e235ccace3de4c24badb291b3052343..db6eae99acd8cf14d21f0a405c62f37291880223 100644 (file)
Binary files a/resources/block_multitrsf_simple.png and b/resources/block_multitrsf_simple.png differ
index 7d55637945d7476e974f6038ee9b33cffa634ba7..5a77a4542187d3e1c39e684aaa911f20a81931c0 100644 (file)
Binary files a/resources/bounding.png and b/resources/bounding.png differ
index ac562fc29ad6d5f3c235426834f5963849c16a9d..3047d921234a9c96d98dd0aedbc595d060d76aa8 100644 (file)
Binary files a/resources/box.png and b/resources/box.png differ
index 8fe93676ddd235916940dc98391254e4d2493150..39c4ef74f89827ff317e8f6ce0781e16df25ed93 100644 (file)
Binary files a/resources/box2points.png and b/resources/box2points.png differ
index c84482ac52b852cef4571355f1bab075bcab7fe5..bc236b7d145d8c69db7557444469fe4c17f5de82 100644 (file)
Binary files a/resources/boxdxyz.png and b/resources/boxdxyz.png differ
index 82591b753692b41d9ff2db52554385090b9268b3..b13b294f21933b19b982b85add00ee6b12bc2d7f 100644 (file)
Binary files a/resources/build_compound.png and b/resources/build_compound.png differ
index 877c1f702f8aa641f88edbddfac8f35d4d04604b..386f04669149add86419567093df472aeb6a530e 100644 (file)
Binary files a/resources/build_edge.png and b/resources/build_edge.png differ
index 5f12c70dfcfeb10809a6d5f622497564658ce67d..328f5a9441c3cac59049c755ba73f297c46bec0f 100644 (file)
Binary files a/resources/build_face.png and b/resources/build_face.png differ
index fc13a46f5cb4c0de7206c124a4589ae0014bd6a9..043d3cd3647092396aef85783a1dde48dac8efc0 100644 (file)
Binary files a/resources/build_shell.png and b/resources/build_shell.png differ
index 14b89582da26fa7f60b950a9c38954dc874457d4..3047d921234a9c96d98dd0aedbc595d060d76aa8 100644 (file)
Binary files a/resources/build_solid.png and b/resources/build_solid.png differ
index ca881f8b04898f0932648d4fce8fbe082761e964..52d8ff8daa9e75bf4df166dc4f3ef8841831e68f 100644 (file)
Binary files a/resources/build_wire.png and b/resources/build_wire.png differ
index 8f76214045199904d26b43996be23e3a54dd46fd..68a785bac0c55eb30ed64509d84f8e1b6210bb0c 100644 (file)
Binary files a/resources/centergravity.png and b/resources/centergravity.png differ
index ccea754110acf9aca95d59ab9aa037a2f468e94f..f39ddd5883c6345c5aaaca3f76a235db8fc1b895 100644 (file)
Binary files a/resources/chamfer.png and b/resources/chamfer.png differ
index 7fdbd13256086392e51f32832f660bf448ea2eb1..1d3954adca7ea52efedeb87770d8e274e05aefc9 100644 (file)
Binary files a/resources/chamferall.png and b/resources/chamferall.png differ
index c6ea12222f96e37e922ec887b0a595a6b67e8aec..58299576d74731cf738e1a9f878a6bf2acc9b709 100644 (file)
Binary files a/resources/chamferedge.png and b/resources/chamferedge.png differ
index 816125a027b08f1708fbdd98b54f6df0a6e53454..51da08f0d7a1fa4f3d94873372c3a2cbb166e0fb 100755 (executable)
Binary files a/resources/chamferedgefromface.png and b/resources/chamferedgefromface.png differ
index 68d5959cda5991c7b428dd6702b3082fa8013d01..eec6c5680bc81784e903dcf282f73add886e7b4d 100644 (file)
Binary files a/resources/chamferface.png and b/resources/chamferface.png differ
index a2ce2c9509544ac69f59213e473ebc3a5c6558cd..b5e45f854b716fb6739306443b3145e80d33733f 100755 (executable)
Binary files a/resources/change_orientation.png and b/resources/change_orientation.png differ
index fe4a73b08cd88a6c0e1a4f91d547871ac9a1dbc8..ac318731dab6e2ca573fe8be66d5710f792dc31b 100644 (file)
Binary files a/resources/check.png and b/resources/check.png differ
index 8196d7e52b88f9e3a17d5aaf8bdba8bef1810870..576e7509307986b32e4347f1d17eeed7effb0a65 100644 (file)
Binary files a/resources/check_blocks_compound.png and b/resources/check_blocks_compound.png differ
index b040939af184575fbe0058df80360f56116ba99e..35f20804e63c150e81b78be80e32474caa2c1c46 100644 (file)
Binary files a/resources/circle.png and b/resources/circle.png differ
index a14c41b487f84a6e27d3e8f4d965e47cb7fac8c5..a8face82f2166d54b37b87e88ca742315517f5ac 100644 (file)
Binary files a/resources/circle3points.png and b/resources/circle3points.png differ
index 7b3daa2d530c4e2f4285f3359e01c82583489d99..3bfd323d5117bf09a2040457aaa1a1f4bd69ac3c 100755 (executable)
Binary files a/resources/circlecenter2pnts.png and b/resources/circlecenter2pnts.png differ
index 8cd0e4aed0361b14d436e09871985a0c9ba1b5f4..8877b94e32966724bb4ad2d29235dbb25f41bb06 100644 (file)
Binary files a/resources/circlepointvector.png and b/resources/circlepointvector.png differ
index 9ab62f9a0367d8917269f124cfca463203e8e6c4..ad245e364770b2ccd703eab09247f9ad7e828791 100644 (file)
Binary files a/resources/closecontour.png and b/resources/closecontour.png differ
index ead31c848b72f295ccc11b3f11ba03ab88cce221..f9d0957e768a43e9742037343967c1773228352e 100644 (file)
Binary files a/resources/common.png and b/resources/common.png differ
index a150f54cd4b7b1150124eb83be1cc3afbea90c21..677e2c729d1513d07a93f16018755b5c1840975c 100644 (file)
Binary files a/resources/cone.png and b/resources/cone.png differ
index f8ab8e21df3baeefd5f9fcd31e43f9cedde76526..2d4683429d14a0deb1bade17c9169852c0eafff6 100755 (executable)
Binary files a/resources/conedxyz.png and b/resources/conedxyz.png differ
index b727f53a32528cc17c62f9c00610368233cb142d..4df785131e7e26ef602e8b61bcaa473dfc444ca4 100644 (file)
Binary files a/resources/conepointvector.png and b/resources/conepointvector.png differ
index 823b377867e9d705364c5d3fbc3c2ed5c77574d0..25704286dc346be6608430518c937014d0eadc0c 100755 (executable)
Binary files a/resources/coordsys.png and b/resources/coordsys.png differ
index 4370b7ca37325c722d3d7f6ef4f6854da2798ba5..77086195f92e492ba482984bf9ba035e607ff9b0 100644 (file)
Binary files a/resources/cut.png and b/resources/cut.png differ
index 3981e4cdd658816f1e0413774629552883ea7716..a00136dabb748f65b7f966bb32d1222e7b40920f 100644 (file)
Binary files a/resources/cylinder.png and b/resources/cylinder.png differ
index fa84a2ebd059b20691c279d5406891ebcb61ca25..207c20aa20311875da46ad02bb8823170623199c 100755 (executable)
Binary files a/resources/cylinderdxyz.png and b/resources/cylinderdxyz.png differ
index 524074ac7a15969877bc9653ca1b88705f5b4245..e37f46577d390d108707edf944e83ae86b633925 100644 (file)
Binary files a/resources/cylinderpointvector.png and b/resources/cylinderpointvector.png differ
index 8ae8475270846e746507f5bdd7752821fb1e88c9..54dac86a2a9054b5d136cb5bdcb10e86a68aca75 100644 (file)
Binary files a/resources/delete.png and b/resources/delete.png differ
diff --git a/resources/disk.png b/resources/disk.png
new file mode 100644 (file)
index 0000000..8aad056
Binary files /dev/null and b/resources/disk.png differ
diff --git a/resources/disk3points.png b/resources/disk3points.png
new file mode 100644 (file)
index 0000000..a0d54e4
Binary files /dev/null and b/resources/disk3points.png differ
diff --git a/resources/disk_pntvecr.png b/resources/disk_pntvecr.png
new file mode 100644 (file)
index 0000000..52fb8d4
Binary files /dev/null and b/resources/disk_pntvecr.png differ
diff --git a/resources/disk_r.png b/resources/disk_r.png
new file mode 100644 (file)
index 0000000..3d52a2d
Binary files /dev/null and b/resources/disk_r.png differ
index 6028075510b221a8b27f8aba539d25aa09535518..7354e65f0c3a46f67965730027c75d0befbae59d 100644 (file)
Binary files a/resources/display.png and b/resources/display.png differ
index b2f001dc714b406e8c6c91c0fdd4f97d7213bcdd..36e60b6b050e0f4cdf4fa61587899196f54aff1f 100644 (file)
Binary files a/resources/displayall.png and b/resources/displayall.png differ
index 6028075510b221a8b27f8aba539d25aa09535518..b8c3106ad878fa9fac2bd8d1d3bab171b88beabe 100644 (file)
Binary files a/resources/displayonly.png and b/resources/displayonly.png differ
index 1d6f199fc84b150e5c18f1277bb6325970f6de7a..913c3cd923e3874d96f130ef4b11c23cb23d68e2 100755 (executable)
Binary files a/resources/ellipse.png and b/resources/ellipse.png differ
index 1d6f199fc84b150e5c18f1277bb6325970f6de7a..913c3cd923e3874d96f130ef4b11c23cb23d68e2 100755 (executable)
Binary files a/resources/ellipsepointvector.png and b/resources/ellipsepointvector.png differ
index 7f21be762b8ebe3065f588db3c2e132075a2cf3f..7f34b8b5356b047e912d5487457891b1aa4b5e74 100644 (file)
Binary files a/resources/erase.png and b/resources/erase.png differ
index 3173050c5020753559d29b35486eaffbb3c983f9..8b714aade4726c49b07ae22f89833d1333d41c83 100644 (file)
Binary files a/resources/eraseall.png and b/resources/eraseall.png differ
diff --git a/resources/face_hw.png b/resources/face_hw.png
new file mode 100644 (file)
index 0000000..23ae0c2
Binary files /dev/null and b/resources/face_hw.png differ
diff --git a/resources/face_vechw.png b/resources/face_vechw.png
new file mode 100644 (file)
index 0000000..d674d17
Binary files /dev/null and b/resources/face_vechw.png differ
index d5af8aeab071baf31adb9227e5f4619ea0632cd5..f4cf209e7d36212e25f235ed59635537b6f263ac 100644 (file)
Binary files a/resources/fillet.png and b/resources/fillet.png differ
diff --git a/resources/fillet2d.png b/resources/fillet2d.png
new file mode 100755 (executable)
index 0000000..a17cef6
Binary files /dev/null and b/resources/fillet2d.png differ
index c90b6740ee7c5d52d46bb167e5cf423353a41e44..1d3954adca7ea52efedeb87770d8e274e05aefc9 100644 (file)
Binary files a/resources/filletall.png and b/resources/filletall.png differ
index e8d5ccd579df606e77d6e7355ce281fadce21507..58299576d74731cf738e1a9f878a6bf2acc9b709 100644 (file)
Binary files a/resources/filletedge.png and b/resources/filletedge.png differ
index 4e3f36b25f47ef5667acc116e9ad160b66c79f49..eec6c5680bc81784e903dcf282f73add886e7b4d 100644 (file)
Binary files a/resources/filletface.png and b/resources/filletface.png differ
index eaa725c328f18597842679fc1865117720f64828..469e0d7742fcc47b640b9d50f24e9e04d9d21c14 100644 (file)
Binary files a/resources/filling.png and b/resources/filling.png differ
index 15b634ac8f061d724d3c991f4008e989db0181cf..164126294edb018c1fd4554e483d692c7b1759b7 100755 (executable)
Binary files a/resources/free_bound.png and b/resources/free_bound.png differ
index aa13084b04777c34f09422ba8a9e7a3fb8440e2f..1b8f371088f08a15a812549a6ab6c68a35c8a589 100644 (file)
Binary files a/resources/free_faces.png and b/resources/free_faces.png differ
index d71f7d1ccdfbea365a2a3331bb4a37ab51481426..6c531310c6924aab7b8a051644c7e6dfac27602a 100644 (file)
Binary files a/resources/fuse.png and b/resources/fuse.png differ
index 86746f0b0b64a734d647978ecd8acbf194569065..5732d5dfc8caf038120a893e4deae175189e00ff 100644 (file)
Binary files a/resources/geometry.png and b/resources/geometry.png differ
index 8c9a1518dea0b82095b8b60b6312de9a9bf1774d..0d66a119b07a8dab28ea41d5bf263d8b4bd272e8 100644 (file)
Binary files a/resources/glue.png and b/resources/glue.png differ
index f251415112699fb2e395d1c9026d24f5be00c4ef..a953de704580624eb8b1b0072b8a3e1134c9c3e4 100644 (file)
Binary files a/resources/glue2.png and b/resources/glue2.png differ
index 24f273613fbe05efde41340f9e648581cb991ee4..3b8f4158a444d5953da12d2eb7e34cdbd822672c 100644 (file)
Binary files a/resources/group_edit.png and b/resources/group_edit.png differ
index 1ccac8fc670a2f6d4cc378da68ce236f201658aa..9e365e1d166ea159d558cac2e3b78fd82f6a4a7b 100644 (file)
Binary files a/resources/group_new.png and b/resources/group_new.png differ
index 0fe35f2f4bc535d7f18551e628403e67de5371bb..e5c5374b978367f79f571175cc13eb6bcfd99061 100644 (file)
Binary files a/resources/interpol.png and b/resources/interpol.png differ
index f5a295c477f7c0e825470fc094d2723cb9582547..6176fb62db49ec8daebfdb8e60c6cee2eb1f75e7 100644 (file)
Binary files a/resources/line.png and b/resources/line.png differ
index f5a295c477f7c0e825470fc094d2723cb9582547..6176fb62db49ec8daebfdb8e60c6cee2eb1f75e7 100644 (file)
Binary files a/resources/line2points.png and b/resources/line2points.png differ
diff --git a/resources/lineedge.png b/resources/lineedge.png
deleted file mode 100644 (file)
index 66a8d5e..0000000
Binary files a/resources/lineedge.png and /dev/null differ
diff --git a/resources/linepointvector.png b/resources/linepointvector.png
deleted file mode 100644 (file)
index 054bc84..0000000
Binary files a/resources/linepointvector.png and /dev/null differ
index e9da6369f549375646a7ff532ea84fafa2d2860b..d203073ec14e45351032b86d41a2240d28601f46 100644 (file)
Binary files a/resources/marker.png and b/resources/marker.png differ
index 4755c7916b82c81cc878872af6fd69b06ec75ca4..e757ae980fd2fa7a8eaf5b29856605f154054b75 100644 (file)
Binary files a/resources/marker2.png and b/resources/marker2.png differ
index 835ea28bb5bf5c2ffae95bf16ae51c6c33938b8c..d203073ec14e45351032b86d41a2240d28601f46 100644 (file)
Binary files a/resources/marker3.png and b/resources/marker3.png differ
index 9ec01ae67210a449c8f3de704cd6991345c274ce..a338be06d83c3121a2e53daa166a1feb672e38ec 100644 (file)
Binary files a/resources/mindist.png and b/resources/mindist.png differ
index 6b6901647ecefcb0bb80e2425efdc0c373798da8..45a49798a390ea27adcc91984d4791283a8092d9 100644 (file)
Binary files a/resources/mirrorAxe.png and b/resources/mirrorAxe.png differ
index edbb4f2dc818fba94104c3bdf20daf708849c7b6..29f129627c45f09c402f584136a26b8571a0ce40 100644 (file)
Binary files a/resources/mirrorPlane.png and b/resources/mirrorPlane.png differ
index cdffc171abc1b4a4c2db2890892a4cc0d5be209d..1fda32bbac04b1e3f6a1647ba1545549c886d01a 100644 (file)
Binary files a/resources/mirrorPoint.png and b/resources/mirrorPoint.png differ
index 612ba7c32b333e37d2c907d7793cd4feff776438..f16881ffe98cabd9fc8311be95e958a9635972a6 100644 (file)
Binary files a/resources/multirotation.png and b/resources/multirotation.png differ
index a148c710205af61ad6ae0572356d76862d71c93c..d5ef8bede69d1eca641e37fe5a28428c5f907de6 100644 (file)
Binary files a/resources/multirotationdouble.png and b/resources/multirotationdouble.png differ
index 7efa63269e235ccace3de4c24badb291b3052343..f70f58c2660856b01d9e248fd26b576f8b704b1e 100644 (file)
Binary files a/resources/multirotationsimple.png and b/resources/multirotationsimple.png differ
index 7d0e54b6e9a0a0b50aa4d190d6d006b29ed997a6..4f56d7bd58b564b9d2474e91f5b753496a1e6fdc 100644 (file)
Binary files a/resources/multitranslation.png and b/resources/multitranslation.png differ
index 3d7b91d5bcd9b0d55d83bf082469762845135db5..62030b2cb4141332a037ddf011a26c13bf2b81cc 100644 (file)
Binary files a/resources/multitranslationdouble.png and b/resources/multitranslationdouble.png differ
index a33c9cf144f2aea48c57fa73765d5c759d3b3263..de744f9764ba46f95c953b070cace05234b18522 100644 (file)
Binary files a/resources/multitranslationsimple.png and b/resources/multitranslationsimple.png differ
index 7db7fb21f1f19efcda943b8a174188d6098f6ba7..16080764e8d275a433c96cfb3c849a9d1bd931e0 100644 (file)
Binary files a/resources/normale.png and b/resources/normale.png differ
index 6ce1561ad08e26876e64c6deb7e60b740f04586e..47e03cc92dd49e1ddaf5246475fa2ae2acaab8eb 100644 (file)
Binary files a/resources/offset.png and b/resources/offset.png differ
diff --git a/resources/orientation.png b/resources/orientation.png
deleted file mode 100644 (file)
index bd0954c..0000000
Binary files a/resources/orientation.png and /dev/null differ
index ccc0b8d35f5545dada0cbed28a8f5ae1b77e5077..17cbcd02ddf7ea478bbc66a2db06f7a62bac0c48 100644 (file)
Binary files a/resources/partition.png and b/resources/partition.png differ
index 2fc91e0f718daeb59f9897c055654ff503f302f4..890e1862a075a5911465e8240d3e3ab035292907 100644 (file)
Binary files a/resources/partitionkeep.png and b/resources/partitionkeep.png differ
index 96e8d663fa4b9ebf150da4283dab3c42ee8055a5..bc3ce0188c613faadfb1b4b4230bbc7a9b09f5bb 100644 (file)
Binary files a/resources/partitionplane.png and b/resources/partitionplane.png differ
index 494a8461a79262ecef7da4835ec75459d23cccf5..793874472db39ad07fa0bec82ed8a31bf85345c6 100755 (executable)
Binary files a/resources/pipe.png and b/resources/pipe.png differ
diff --git a/resources/pipebinormal.png b/resources/pipebinormal.png
new file mode 100644 (file)
index 0000000..b262ec9
Binary files /dev/null and b/resources/pipebinormal.png differ
index eb538d005eea2f26a19d9c2ce4e95d48846627cc..3075a34aab64f7d69b4e5bd89b900a554cfa436f 100644 (file)
Binary files a/resources/plane.png and b/resources/plane.png differ
index d5b5d45dcf4786a1796e81554bee774700dfb1ad..ec42dcdefb17a9b5a0f417a7bed068bb56ca52a7 100644 (file)
Binary files a/resources/plane3points.png and b/resources/plane3points.png differ
index d64aad9b686b16eefbcb98c58ca4a80bedecc2d8..f48bcde056f92528c5d0a156f163d6c80e61ecaa 100644 (file)
Binary files a/resources/planeWorking.png and b/resources/planeWorking.png differ
diff --git a/resources/planedxyz.png b/resources/planedxyz.png
deleted file mode 100644 (file)
index 409d7e8..0000000
Binary files a/resources/planedxyz.png and /dev/null differ
index 2ab9ec62a1d7589de82ba2925c1dc44d3f12269f..ea3db4e963834878bee3f16257f783dda887d3e9 100644 (file)
Binary files a/resources/planeface.png and b/resources/planeface.png differ
index 7db7fb21f1f19efcda943b8a174188d6098f6ba7..62550d9762e5b4af4510aa5ac70a5a38bbc6d502 100644 (file)
Binary files a/resources/planepointvector.png and b/resources/planepointvector.png differ
index 4eb8bd46eeab5430f7d5868a152d2575371e898a..86bb0c2530f9b60ef95d1c44d15d6fd481e7bdec 100644 (file)
Binary files a/resources/planeworkingface.png and b/resources/planeworkingface.png differ
index 14370a348695e1cba85af334d1c8077c38990162..b6a84145f7ce58064d314560b85e39398d3240b6 100644 (file)
Binary files a/resources/planeworkingorigin.png and b/resources/planeworkingorigin.png differ
index 3ae81b68c88c573a6c33caf79221bf6bb0f1cc6b..59a2e1850026cf2d66418c091afab5ed37244a97 100644 (file)
Binary files a/resources/planeworkingvector.png and b/resources/planeworkingvector.png differ
index ae02c47246d9dd0db61b5819fcaa4c34252c35da..bdd5659d1d93e39f814cd44c324c494d62ff3198 100644 (file)
Binary files a/resources/point2.png and b/resources/point2.png differ
index 53d5bab2c13db08e1960932f42f2c546dc5a4e84..de84d9652ed8697df71d5ab5fae610b2f8a826d0 100644 (file)
Binary files a/resources/point3.png and b/resources/point3.png differ
index ae02c47246d9dd0db61b5819fcaa4c34252c35da..a3fe457be0b30902036513910cb610044bae418b 100644 (file)
Binary files a/resources/point_coord.png and b/resources/point_coord.png differ
index 31f6c194411376d873fb0a54e067f1d142bc2d37..82071b1856445d531280e56d8b134e60d18364b2 100755 (executable)
Binary files a/resources/point_line_intersection.png and b/resources/point_line_intersection.png differ
index 50bab61b04cbf87e2c0a94223bd1f986ec8c8ba8..a6541d8013b820418751b61f52a83d04ed892cdb 100755 (executable)
Binary files a/resources/pointonedge.png and b/resources/pointonedge.png differ
diff --git a/resources/pointonface.png b/resources/pointonface.png
new file mode 100755 (executable)
index 0000000..fa0f8cb
Binary files /dev/null and b/resources/pointonface.png differ
index 6e21c6b25ce9e68d57e977a09cd6754ef0acb4b6..14eced89e1004dcd10bd42557d2350b74782b994 100644 (file)
Binary files a/resources/polyline.png and b/resources/polyline.png differ
index 5c308d745de0fd803423d8d54ab7ed75889feedc..3c44a9d064e008b979b32f89c7ae4a164cbe0043 100644 (file)
Binary files a/resources/position.png and b/resources/position.png differ
index 12f4a0a8b65f9ae6e39e3afe22bd90d94db2d714..23fd57366db7a125d51b5aac8cc876ab74c7bf27 100644 (file)
Binary files a/resources/position2.png and b/resources/position2.png differ
diff --git a/resources/position3.png b/resources/position3.png
new file mode 100644 (file)
index 0000000..301a3bf
Binary files /dev/null and b/resources/position3.png differ
index fdbe72eac5ff95bd8f3b99234f27e5370ebc6b1b..12bbe4530abf1b5b0e8a64528c9fc6c1ee093df1 100644 (file)
Binary files a/resources/prism.png and b/resources/prism.png differ
index 5d2f366af289732afd6a5ae5234c99e647b0d7a7..d808677d70fddc9422c261e965595c4e692a3ad1 100644 (file)
Binary files a/resources/prism2.png and b/resources/prism2.png differ
diff --git a/resources/prism3.png b/resources/prism3.png
new file mode 100644 (file)
index 0000000..4df2542
Binary files /dev/null and b/resources/prism3.png differ
index c3ff01c597ea20642cd529281610d23d28ba44a0..6a6b583d7bfe92632ac7e60bdab3b6f73c838894 100644 (file)
Binary files a/resources/propagate.png and b/resources/propagate.png differ
index ac72e5c27cb02fdb6aebd6fdf3a8f08b4a4bb2fb..3753bb923cd9e03192cfe0d8cb013ae6813ddd51 100644 (file)
Binary files a/resources/redo.png and b/resources/redo.png differ
index fedd8ae13e79b8634cb37e09f9f0b3b7cbac61e7..bdb821e09e66a65d574e7c773b2c54b36466f67a 100644 (file)
Binary files a/resources/remove_extra_edges.png and b/resources/remove_extra_edges.png differ
index 887d64038238bb63915bfaa0108930e9869460d5..3400b6200e3a902c870fcbf4ffbcdac9a33d629c 100644 (file)
Binary files a/resources/revol.png and b/resources/revol.png differ
index fccff20d63c35b104cc38662275c95f83ad7be4b..7905fa1a0705e03030059d175a6a8fb69131acad 100644 (file)
Binary files a/resources/rotate.png and b/resources/rotate.png differ
index 2d4d2899ac3e855f67bd820b69a7bddeafa6b941..9bb9ff37f152d69eb761a8c01b8a5c6ac1885553 100755 (executable)
Binary files a/resources/rotatepnt.png and b/resources/rotatepnt.png differ
index 4c898723589885bc31ce539eb6c09eba5320427b..d838d9f89d3d35370a21123d25dc802b44d48c67 100644 (file)
Binary files a/resources/scale.png and b/resources/scale.png differ
diff --git a/resources/scale_along_axes.png b/resources/scale_along_axes.png
new file mode 100644 (file)
index 0000000..04a4ae0
Binary files /dev/null and b/resources/scale_along_axes.png differ
index 4a2b7828e8fb5c82bb3e00d344c3e8e04d702a60..16ea2c5cdbcec1c62800d05f9da0e3897af94c6a 100644 (file)
Binary files a/resources/section.png and b/resources/section.png differ
index a1a4ee1d52bb1642c35e59cbd98a6d61e1cbbf3c..ecb252ab77e4d4b1c8b37de449155e4e77806fd8 100644 (file)
Binary files a/resources/select1.png and b/resources/select1.png differ
index 5da9eaa68f170da404ef6fb9e7d64a52b531ad63..f9d9ca78da6302c5ec02edc6e3a20d3d63bf135f 100644 (file)
Binary files a/resources/sewing.png and b/resources/sewing.png differ
index 11ca2685f9c1566dd84344e15517becb9a41e392..27ca4e1d16d9cc5af0256a0649e3b6a7934e0fcb 100755 (executable)
Binary files a/resources/shading.png and b/resources/shading.png differ
index d9fa256ffcb03e3e9de5bfc483a8956b78e242a2..2ef384bde95f8b2543c0e9ed2c81a995cd21549a 100644 (file)
Binary files a/resources/shapeprocess.png and b/resources/shapeprocess.png differ
diff --git a/resources/shapesonshape.png b/resources/shapesonshape.png
new file mode 100755 (executable)
index 0000000..05ac193
Binary files /dev/null and b/resources/shapesonshape.png differ
index 683ec72689f7ce0dcf98a2440e8a28fa0e1cefe2..f2964c744f94c68e79bfac572cfc1f6d974d018d 100644 (file)
Binary files a/resources/sketch.png and b/resources/sketch.png differ
index 335570e2de6b872abfc4064cc3cd23f18c6bce17..7af366483cd3b27801c93b702b9920dd306a5953 100644 (file)
Binary files a/resources/sphere.png and b/resources/sphere.png differ
index 2eb4404a0c67ce004626aa7336dfa1259df353ff..01acb09c84d8d474b8888180ad14f4525f3ff04b 100644 (file)
Binary files a/resources/spheredxyz.png and b/resources/spheredxyz.png differ
index 947410006b4d6756f3edeb299c0bdb3f335b848d..a942d2903643aca8c055aefcb4712bc47af62c19 100644 (file)
Binary files a/resources/spherepoint.png and b/resources/spherepoint.png differ
index 0fe35f2f4bc535d7f18551e628403e67de5371bb..e5c5374b978367f79f571175cc13eb6bcfd99061 100644 (file)
Binary files a/resources/spline.png and b/resources/spline.png differ
index 6c75aa4bf06b4fa25aec8b30f2d5ee34331fc1ac..528fe308a45b25256eb4a6d9035120708837d3d7 100755 (executable)
Binary files a/resources/subblock.png and b/resources/subblock.png differ
index 6c75aa4bf06b4fa25aec8b30f2d5ee34331fc1ac..528fe308a45b25256eb4a6d9035120708837d3d7 100755 (executable)
Binary files a/resources/subshape.png and b/resources/subshape.png differ
index 9ab62f9a0367d8917269f124cfca463203e8e6c4..dc8d445ed89ba4a3013eb4a986004553c6b79997 100644 (file)
Binary files a/resources/suppressintwires.png and b/resources/suppressintwires.png differ
index 358793969b9770baffd9f9b6cbae6d7bd2118164..ef3e48af2eb2f39f2ab9bb53491aeb406bb0116b 100755 (executable)
Binary files a/resources/supressHolesOnFaceShell.png and b/resources/supressHolesOnFaceShell.png differ
index 9ab62f9a0367d8917269f124cfca463203e8e6c4..9bc4e71f06ba1eb0bd7d5ece67f99a2807da531e 100644 (file)
Binary files a/resources/supressface.png and b/resources/supressface.png differ
index 071790cf1db5eeb8ac29eff7ed13c377c86baebc..d2a6347b7df18b4bb2b72c99991c3443a1be3f95 100755 (executable)
Binary files a/resources/supresshole.png and b/resources/supresshole.png differ
index fd75ba4626877a128ec1ae4f004dbfcea37e643c..a8c91cb03dd2b826979bed9360847006e689a9a3 100644 (file)
Binary files a/resources/tolerance.png and b/resources/tolerance.png differ
index b4585cdb86d4e7e64a9992ce3275d469ad5fb661..af76fc00c1367863c65397f9d8108c04caac744b 100644 (file)
Binary files a/resources/torus.png and b/resources/torus.png differ
index 8b6c79b993dd0adeb853e8bad42eecefacca55a6..a927cbc374b7304df35a79e9a6ad4d4ed45ba6b2 100755 (executable)
Binary files a/resources/torusdxyz.png and b/resources/torusdxyz.png differ
index 843d71ad904169c58c9907beee0d55e60c150b9e..138b52042d4fde5102e7492ebd13262a10c2b3c7 100644 (file)
Binary files a/resources/toruspointvector.png and b/resources/toruspointvector.png differ
index 78e6f9012b78ce543e1556cfdbd55460ef3bb485..7f114323183957d699cf185a4a1c95b6131b7036 100644 (file)
Binary files a/resources/translation.png and b/resources/translation.png differ
index 99549ed5e806a15bb165e1fd5deb83593e4f3e2f..ee5b7d70251325cdb761f2377781db97cd1a14b3 100644 (file)
Binary files a/resources/translationDxyz.png and b/resources/translationDxyz.png differ
index 9474b113296c3487c5788ef94fa1bedf27990056..eb02035428448bffea8783e6177ff315e22e4647 100644 (file)
Binary files a/resources/translationPoints.png and b/resources/translationPoints.png differ
index 78e6f9012b78ce543e1556cfdbd55460ef3bb485..bec1385f2072c6b2e9351295c451e8a31602fdc2 100644 (file)
Binary files a/resources/translationVector.png and b/resources/translationVector.png differ
index aa74e796eb2f3c04d186cb2bf110a0434d02b814..2a0b03a453fb7c667a624725fc6881df53312c14 100644 (file)
Binary files a/resources/tree_block.png and b/resources/tree_block.png differ
index 1dd78eb3f8d4706e9e6f6c85a3f29706bf996dba..08b0c2d933468a10d9ab626d4defad7ea076c133 100644 (file)
Binary files a/resources/tree_compound.png and b/resources/tree_compound.png differ
index 87ec8684f098413251ae0471c1a954043b50e0c8..39c2b2817962a74b7e4d2c578248d540990f21ee 100644 (file)
Binary files a/resources/tree_compsolid.png and b/resources/tree_compsolid.png differ
index df9741d768116f313858e987b615e1aa4e3cf567..f0fe7058fd3c86cc797be9e7edc1d6bbc543cfd8 100644 (file)
Binary files a/resources/tree_edge.png and b/resources/tree_edge.png differ
index e9dc9a880b2be059033ef58f5f6877ba4bedb6df..b79d18e7a651ede8d5217b6048c918993c7b4b10 100644 (file)
Binary files a/resources/tree_face.png and b/resources/tree_face.png differ
index 214be938a476686730b611a414a7035efaafaabd..410c233ada26a03b579d86a69debbe6c3bd2c482 100644 (file)
Binary files a/resources/tree_group_edge.png and b/resources/tree_group_edge.png differ
index debb48ddfc31ab21ae8b9f734b5e3231aef52e7d..0f1743c6b8022bc650c1286a5090b36a61f5cdd4 100644 (file)
Binary files a/resources/tree_group_face.png and b/resources/tree_group_face.png differ
index d68588346cd94ec2b0a276972ef21d0587a52e2e..c64d0eab349d658c96a0485acb24c1b202eabf81 100644 (file)
Binary files a/resources/tree_group_solid.png and b/resources/tree_group_solid.png differ
index 553a4b9d3132d0b767f4ce57e1ec733b59d7c135..68933dbd0bffa637013c209422cdced92929282e 100644 (file)
Binary files a/resources/tree_group_vertex.png and b/resources/tree_group_vertex.png differ
index 853d47e0aca08506df2ed2ab32aae7a4c5155bb8..6534b9c18acb69d1b526de5979906002b48aa56d 100644 (file)
Binary files a/resources/tree_lcs.png and b/resources/tree_lcs.png differ
index 0ece93b756c4e14ec4f1972d960d61c7ed74c84b..0aef4c5d582c11e3868a37c9ed9db38958fc9953 100644 (file)
Binary files a/resources/tree_shape.png and b/resources/tree_shape.png differ
index 59992de3660d815473929e2498b9915a4be6d6fb..5c467dd7054077b60137770f75c657d7e2940c4e 100644 (file)
Binary files a/resources/tree_shell.png and b/resources/tree_shell.png differ
index aa74e796eb2f3c04d186cb2bf110a0434d02b814..2a0b03a453fb7c667a624725fc6881df53312c14 100644 (file)
Binary files a/resources/tree_solid.png and b/resources/tree_solid.png differ
index 6a112b51df98fe072e86103b5d1fc6a4ccd8cc91..223235ff280af5a4651abdf2c062808f45a150c7 100644 (file)
Binary files a/resources/tree_vertex.png and b/resources/tree_vertex.png differ
index 9416d0e3928a132965dc95b913a6ebba8ed14fc8..1c97948f1f05347bb02d5c04c5f21f1d1a0f5a49 100644 (file)
Binary files a/resources/tree_wire.png and b/resources/tree_wire.png differ
index 61b19777e4f9527d8961358b7dde84d4af2d16e6..9b60fbd5d01059c8cc35f2dfa10f27626a498577 100644 (file)
Binary files a/resources/undo.png and b/resources/undo.png differ
index 9a1a7e85a951160215e000b7b44b62a932e4ba63..1c01c13f495c4d53218d98c0992e2060a2dcd1c2 100644 (file)
Binary files a/resources/vector.png and b/resources/vector.png differ
index ff58a8ad4ed629d39d07434923c54ec57699a22a..2475d4a9819582b14446ca0e20791da2505d0ba8 100644 (file)
Binary files a/resources/vector2points.png and b/resources/vector2points.png differ
index e37e015cbc3b3f2f3f9284ad9a6817b93d458e4a..034e6a1dc49541b567c36f9e352286fe17b474fd 100644 (file)
Binary files a/resources/vectordxyz.png and b/resources/vectordxyz.png differ
index 1b39f3544c0fc3c9c78be530a9531b9e5e767c32..d213e309ba3fc9d6333147efee21e58bea9fc111 100644 (file)
Binary files a/resources/whatis.png and b/resources/whatis.png differ
diff --git a/src/ARCHIMEDE/ARCHIMEDE.pro b/src/ARCHIMEDE/ARCHIMEDE.pro
new file mode 100644 (file)
index 0000000..bbcdfab
--- /dev/null
@@ -0,0 +1,58 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = GEOMArchimede
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
+
+CAS_MODELER = -L$${CASROOT}/Linux/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBO -lTKBool -lTKHLR -lTKFillet -lTKOffset -lTKFeat
+
+STDLIB = -lstdc++
+
+INCLUDEPATH +=         $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS}
+
+LIBS += $${KERNEL_LDFLAGS} -lSALOMELocalTrace $${CAS_KERNEL} $${CAS_MODELER} -lTKMesh $${STDLIB} 
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+HEADERS  = Archimede_VolumeSection.hxx
+
+SOURCES  = Archimede_VolumeSection.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index ec5fbdbea6c752d9841c72221219bcbe79f0fbc0..92209893496dd479e345c17c2381b50eaf220a74 100644 (file)
@@ -1,33 +1,30 @@
-//  GEOM ARCHIMEDE : algorithm implementation
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
+//
+//  GEOM ARCHIMEDE : algorithm implementation
 //  File   : Archimede_VolumeSection.cxx
 //  Author : Nicolas REJNERI
 //  Module : GEOM
 //  $Header$
-
-#include <Standard_OStream.hxx>
-
+//
 #include "Archimede_VolumeSection.hxx"
 #include "utilities.h"
 
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <math_Matrix.hxx>
-#include <math.h>
-#include <GC_MakePlane.hxx>
-#include <stdlib.h>
 #include <gp_Trsf.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Pln.hxx>
 
 #include <GeomAPI_ProjectPointOnSurf.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
index 6dc4c8799255872a7752e7641a08879cc21b9bd3..70790e4f89ba2562744281d712d4bccbcc02b476 100644 (file)
@@ -1,31 +1,30 @@
-//  GEOM ARCHIMEDE : algorithm implementation
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
+//
+//  GEOM ARCHIMEDE : algorithm implementation
 //  File   : Archimede_VolumeSection.hxx
 //  Author : Nicolas REJNERI
 //  Module : GEOM
 //  $Header$
-
+//
 #ifndef ARCHIMEDE_VOLUMESECTION_HXX
 #define ARCHIMEDE_VOLUMESECTION_HXX
 
@@ -33,7 +32,8 @@
 #include <gp_Dir.hxx>
 #include <TopoDS_Shape.hxx>
 #include <Geom_Plane.hxx>
-#include <Geom_RectangularTrimmedSurface.hxx>
+
+class Handle(Geom_RectangularTrimmedSurface);
 
 class VolumeSection{
 
index 63d6d9d08d241a4ed16c2ebaafb7571c305415a4..51f12a39403db354d32526a4295c4cac569b3120 100644 (file)
@@ -1,35 +1,34 @@
-#  GEOM ARCHIMEDE : algorithm implementation
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 #
-#  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
+#  This library is free software; you can redistribute it and/or
+#  modify it 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
+#
+#  GEOM ARCHIMEDE : algorithm implementation
 #  File   : Makefile.am
 #  Author : Nicolas REJNERI
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-salomeinclude_HEADERS = \
+salomeinclude_HEADERS =        \
        Archimede_VolumeSection.hxx
 
 # Libraries targets
@@ -37,17 +36,18 @@ salomeinclude_HEADERS = \
 lib_LTLIBRARIES = libGEOMArchimede.la
 
 # sources files
-dist_libGEOMArchimede_la_SOURCES = \
+dist_libGEOMArchimede_la_SOURCES =     \
        Archimede_VolumeSection.cxx
 
 
-# additionnal information to compil and link file
-libGEOMArchimede_la_CPPFLAGS = \
-       $(CAS_CPPFLAGS) \
+# additional information to compile and link file
+
+libGEOMArchimede_la_CPPFLAGS = \
+       $(CAS_CPPFLAGS)         \
        $(KERNEL_CXXFLAGS)
 
-libGEOMArchimede_la_LDFLAGS  = \
-       $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
-       $(CAS_KERNEL) \
-       $(CAS_MODELER) -lTKMesh \
+libGEOMArchimede_la_LDFLAGS  =                 \
+       $(KERNEL_LDFLAGS) -lSALOMELocalTrace    \
+       $(CAS_KERNEL)                           \
+       $(CAS_MODELER) -lTKMesh                 \
        $(STDLIB)
index c7d25b655a853788b4c665a66eabdb78e72360ea..bce5d516e8a50d5b3ee2f7bcf20f4d0229d89d79 100644 (file)
@@ -1,27 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       BREPExport.cxx
 // Created:    Wed May 19 13:10:05 2004
 // Author:     Pavel TELKOV
 //             <ptv@mutex.nnov.opencascade.com>
-
+//
 #include "utilities.h"
 
 #include <BRepTools.hxx>
diff --git a/src/BREPExport/BREPExport.pro b/src/BREPExport/BREPExport.pro
new file mode 100644 (file)
index 0000000..72dc646
--- /dev/null
@@ -0,0 +1,49 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = BREPExport
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+STDLIB = -lstdc++
+
+CAS_LDPATH = -L$$(CASROOT)/Linux/lib
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS}
+
+LIBS += $${KERNEL_LDFLAGS} -lSALOMELocalTrace $${STDLIB} $${CAS_LDPATH} -lTKBRep
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += BREPEXPORT_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+SOURCES  = BREPExport.cxx
index fa1ce21e35c38b4f0672dcd073c14afe29a5fa81..239baba5a95ad5637a2bb4bb3a467b44ca096a6a 100644 (file)
@@ -1,44 +1,46 @@
-#  Copyright (C) 2003  CEA
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it 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
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
+#  Copyright (C) 2003-2007  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 : Pavel TELKOV
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
 lib_LTLIBRARIES = libBREPExport.la
 
 # Sources files
-dist_libBREPExport_la_SOURCES = \
+dist_libBREPExport_la_SOURCES =        \
        BREPExport.cxx
 
-# additionnal information to compil and link file
-libBREPExport_la_CPPFLAGS = \
-       $(CAS_CPPFLAGS) \
+# additional information to compile and link file
+
+libBREPExport_la_CPPFLAGS =    \
+       $(CAS_CPPFLAGS)         \
        $(KERNEL_CXXFLAGS)
 
-libBREPExport_la_LDFLAGS  = \
-       $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
-       $(STDLIB) \
+libBREPExport_la_LDFLAGS  =                    \
+       $(KERNEL_LDFLAGS) -lSALOMELocalTrace    \
+       $(STDLIB)                               \
        $(CAS_LDPATH) -lTKBRep
index cd78468bad78772d030b07da48d88f735cbb9f39..ecc09a6e2497b1ab1795f57f2006973cf1fce54e 100644 (file)
@@ -1,27 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       BREPImport.cxx
 // Created:    Wed May 19 14:29:52 2004
 // Author:     Pavel TELKOV
 //             <ptv@mutex.nnov.opencascade.com>
-
+//
 #include "utilities.h"
 
 #include <BRepTools.hxx>
diff --git a/src/BREPImport/BREPImport.pro b/src/BREPImport/BREPImport.pro
new file mode 100644 (file)
index 0000000..dc2fe28
--- /dev/null
@@ -0,0 +1,49 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = BREPImport
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+STDLIB = -lstdc++
+
+CAS_LDPATH = -L$$(CASROOT)/Linux/lib
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS}
+
+LIBS += $${KERNEL_LDFLAGS} -lSALOMELocalTrace $${STDLIB} $${CAS_LDPATH} -lTKBRep
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += BREPIMPORT_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+SOURCES  = BREPImport.cxx
index 610cddfb4d7895473e72c45c80bc0bb46ebb55a6..6d5eaf220149e5d6982c14afe9c8e126ce8e2f80 100644 (file)
@@ -1,44 +1,46 @@
-#  Copyright (C) 2003  CEA
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it 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
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
+#  Copyright (C) 2003-2007  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 : Pavel TELKOV
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
 lib_LTLIBRARIES = libBREPImport.la
 
 # Sources files
-dist_libBREPImport_la_SOURCES = \
+dist_libBREPImport_la_SOURCES =        \
        BREPImport.cxx
 
-# additionnal information to compil and link file
-libBREPImport_la_CPPFLAGS = \
-       $(KERNEL_CXXFLAGS) \
+# additional information to compile and link file
+
+libBREPImport_la_CPPFLAGS =    \
+       $(KERNEL_CXXFLAGS)      \
        $(CAS_CPPFLAGS)
 
-libBREPImport_la_LDFLAGS  = \
-       $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
-       $(CAS_LDPATH) -lTKBRep \
+libBREPImport_la_LDFLAGS  =                    \
+       $(KERNEL_LDFLAGS) -lSALOMELocalTrace    \
+       $(CAS_LDPATH) -lTKBRep                  \
        $(STDLIB)
index 41b484848580dcdc38986992e21545a7083d72d0..47c7e1135039c41188ac7913da05c49510fcbcb9 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
@@ -10,7 +10,7 @@
 //
 //  This library is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//
-//  File   : BasicGUI.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "BasicGUI.h"
-#include "GeometryGUI.h"
-
-#include "SUIT_Session.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_ViewWindow.h"
-#include "OCCViewer_ViewWindow.h"
-#include "OCCViewer_ViewModel.h"
-#include "OCCViewer_ViewManager.h"
-#include "OCCViewer_ViewPort3d.h"
-#include "utilities.h"
-
-#include <Precision.hxx>
-#include <BRep_Tool.hxx>
-#include <ProjLib.hxx>
-#include <ElSLib.hxx>
-#include <TopoDS.hxx>
 
 #include "BasicGUI_PointDlg.h"        // Method POINT
 #include "BasicGUI_LineDlg.h"         // Method LINE
 #include "BasicGUI_WorkingPlaneDlg.h" // Method WORKING PLANE
 #include "BasicGUI_MarkerDlg.h"       // Method REPAIR
 
-using namespace std;
+#include <GeometryGUI.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ViewWindow.h>
+#include <OCCViewer_ViewWindow.h>
+#include <OCCViewer_ViewModel.h>
+#include <OCCViewer_ViewManager.h>
+#include <OCCViewer_ViewPort3d.h>
+
+#include <BRep_Tool.hxx>
+#include <ProjLib.hxx>
+#include <ElSLib.hxx>
+#include <TopoDS.hxx>
+
+#include <QMouseEvent>
 
 //=======================================================================
 // function : BasicGUI()
 // purpose  : Constructor
 //=======================================================================
-BasicGUI::BasicGUI( GeometryGUI* parent ) :
-  GEOMGUI(parent)
+BasicGUI::BasicGUI( GeometryGUI* parent )
+  : GEOMGUI( parent )
 {
 }
 
@@ -79,51 +75,50 @@ BasicGUI::~BasicGUI()
 // function : OnGUIEvent()
 // purpose  : 
 //=======================================================================
-bool BasicGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
+bool BasicGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 {
   getGeometryGUI()->EmitSignalDeactivateDialog();
   QDialog* aDlg = NULL;
 
-  switch ( theCommandID )
-    {
-    case 4011: // POINT
-      aDlg = new BasicGUI_PointDlg( getGeometryGUI(), parent, "" ); 
-      break;
-    case 4012:  // LINE
-      aDlg = new BasicGUI_LineDlg( getGeometryGUI(), parent, "" );
-      break;
-    case 4013:  // CIRCLE
-      aDlg = new BasicGUI_CircleDlg( getGeometryGUI(), parent, "");
-      break;
-    case 4014:  // ELLIPSE
-      aDlg = new BasicGUI_EllipseDlg( getGeometryGUI(), parent, "" );
-      break;
-    case 4015:  // ARC
-      aDlg = new BasicGUI_ArcDlg( getGeometryGUI(), parent, "" );
-      break ;
-    case 4016: // VECTOR
-      aDlg = new BasicGUI_VectorDlg( getGeometryGUI(), parent, "" );
-      break;
-    case 4017: // PLANE
-      aDlg = new BasicGUI_PlaneDlg( getGeometryGUI(), parent, "");
-      break;
-    case 4018: // WORKING PLANE
-      aDlg = new BasicGUI_WorkingPlaneDlg( getGeometryGUI(), parent, "" );
-      break;
-    case 4019: // CURVE
-      aDlg = new BasicGUI_CurveDlg( getGeometryGUI(), parent, "" );
-      break;
-    case 4020: // REPAIR
-      aDlg = new BasicGUI_MarkerDlg( getGeometryGUI(), parent );
-      break;      
-    default:
-      SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
-      break;
-    }
-
+  switch ( theCommandID ) {
+  case 4011: // POINT
+    aDlg = new BasicGUI_PointDlg( getGeometryGUI(), parent ); 
+    break;
+  case 4012:  // LINE
+    aDlg = new BasicGUI_LineDlg( getGeometryGUI(), parent );
+    break;
+  case 4013:  // CIRCLE
+    aDlg = new BasicGUI_CircleDlg( getGeometryGUI(), parent );
+    break;
+  case 4014:  // ELLIPSE
+    aDlg = new BasicGUI_EllipseDlg( getGeometryGUI(), parent );
+    break;
+  case 4015:  // ARC
+    aDlg = new BasicGUI_ArcDlg( getGeometryGUI(), parent );
+    break ;
+  case 4016: // VECTOR
+    aDlg = new BasicGUI_VectorDlg( getGeometryGUI(), parent );
+    break;
+  case 4017: // PLANE
+    aDlg = new BasicGUI_PlaneDlg( getGeometryGUI(), parent );
+    break;
+  case 4018: // WORKING PLANE
+    aDlg = new BasicGUI_WorkingPlaneDlg( getGeometryGUI(), parent );
+    break;
+  case 4019: // CURVE
+    aDlg = new BasicGUI_CurveDlg( getGeometryGUI(), parent );
+    break;
+  case 4020: // REPAIR
+    aDlg = new BasicGUI_MarkerDlg( getGeometryGUI(), parent );
+    break;      
+  default:
+    SUIT_Session::session()->activeApplication()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
+    break;
+  }
+  
   if ( aDlg != NULL )
     aDlg->show();
-
+  
   return true;
 }
 
@@ -137,34 +132,30 @@ bool BasicGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWin
   QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox();
 
   // Create Point dialog, OCC viewer 
-  if ( aDlg && aDlg->isA( "BasicGUI_PointDlg" ) &&
+  if ( aDlg && ( QString( aDlg->metaObject()->className() ).compare( "BasicGUI_PointDlg" ) == 0 ) &&
        theViewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() &&
-       pe->state() != Qt::ControlButton )
-  {
+       pe->modifiers() != Qt::ControlModifier ) {
     BasicGUI_PointDlg* aPntDlg = (BasicGUI_PointDlg*) aDlg;
-    if ( aPntDlg->acceptMouseEvent() )
-    {
+    if ( aPntDlg->acceptMouseEvent() ) {
       OCCViewer_Viewer* anOCCViewer =
-        ((OCCViewer_ViewManager*)(theViewWindow->getViewManager()))->getOCCViewer();
+        ( (OCCViewer_ViewManager*)( theViewWindow->getViewManager() ) )->getOCCViewer();
       Handle(AIS_InteractiveContext) ic = anOCCViewer->getAISContext();
 
       gp_Pnt aPnt;    
 
       ic->InitSelected();
-      if ( pe->state() == Qt::ShiftButton )
+      if ( pe->modifiers() == Qt::ShiftModifier )
         ic->ShiftSelect();  // Append selection
       else
         ic->Select();       // New selection
 
       ic->InitSelected();
-      if ( ic->MoreSelected() )
-      {
+      if ( ic->MoreSelected() ) {
         TopoDS_Shape aShape = ic->SelectedShape();
         if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX )
           aPnt = BRep_Tool::Pnt( TopoDS::Vertex( ic->SelectedShape() ) );
       }
-      else
-      {
+      else {
         OCCViewer_ViewPort3d* vp =  ((OCCViewer_ViewWindow*)theViewWindow)->getViewPort();
         aPnt = ConvertClickToPoint( pe->x(), pe->y(), vp->getView() );
       }
@@ -180,25 +171,25 @@ bool BasicGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWin
 // function : ConvertClickToPoint()
 // purpose  : Returns the point clicked in 3D view
 //=======================================================================
-gp_Pnt BasicGUI::ConvertClickToPoint( int x, int y, Handle(V3d_View) aView)
+gp_Pnt BasicGUI::ConvertClickToPoint( int x, int y, Handle(V3d_View) aView )
 {
   V3d_Coordinate XEye, YEye, ZEye, XAt, YAt, ZAt;
-  aView->Eye(XEye, YEye, ZEye);
+  aView->Eye( XEye, YEye, ZEye );
 
-  aView->At(XAt, YAt, ZAt);
-  gp_Pnt EyePoint(XEye, YEye, ZEye);
-  gp_Pnt AtPoint(XAt, YAt, ZAt);
+  aView->At( XAt, YAt, ZAt );
+  gp_Pnt EyePoint( XEye, YEye, ZEye );
+  gp_Pnt AtPoint( XAt, YAt, ZAt );
 
-  gp_Vec EyeVector(EyePoint, AtPoint);
-  gp_Dir EyeDir(EyeVector);
+  gp_Vec EyeVector( EyePoint, AtPoint );
+  gp_Dir EyeDir( EyeVector );
 
-  gp_Pln PlaneOfTheView = gp_Pln(AtPoint,EyeDir);
+  gp_Pln PlaneOfTheView = gp_Pln( AtPoint, EyeDir );
   Standard_Real X, Y, Z;
-  aView->Convert(x, y, X, Y, Z);
-  gp_Pnt ConvertedPoint(X, Y, Z);
+  aView->Convert( x, y, X, Y, Z );
+  gp_Pnt ConvertedPoint( X, Y, Z );
 
-  gp_Pnt2d ConvertedPointOnPlane = ProjLib::Project(PlaneOfTheView, ConvertedPoint);
-  gp_Pnt ResultPoint = ElSLib::Value(ConvertedPointOnPlane.X(), ConvertedPointOnPlane.Y(), PlaneOfTheView);
+  gp_Pnt2d ConvertedPointOnPlane = ProjLib::Project( PlaneOfTheView, ConvertedPoint );
+  gp_Pnt ResultPoint = ElSLib::Value( ConvertedPointOnPlane.X(), ConvertedPointOnPlane.Y(), PlaneOfTheView );
   return ResultPoint;
 }
 
@@ -207,7 +198,9 @@ gp_Pnt BasicGUI::ConvertClickToPoint( int x, int y, Handle(V3d_View) aView)
 //=====================================================================================
 extern "C"
 {
-GEOM_BASICGUI_EXPORT
+#ifdef WIN32
+  __declspec( dllexport )
+#endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
     return new BasicGUI( parent );
index 73a16e6bd77f69faf468f9a599b497c4c3aca3a6..1b95e5fbfa84e4fca7dbbd7adbc2b535e7d7a280 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
@@ -10,7 +10,7 @@
 //
 //  This library is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//
-//  File   : BasicGUI.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
 #ifndef BASICGUI_H
 #define BASICGUI_H
 
-#include "GEOM_BasicGUI.hxx"
-
-#include "GEOMGUI.h"
-#include "GEOMBase.h"
+#include <GEOMGUI.h>
 #include <V3d_View.hxx>
 
 //=================================================================================
 // class    : BasicGUI
 // purpose  :
 //=================================================================================
-class GEOM_BASICGUI_EXPORT BasicGUI : public GEOMGUI
+class BasicGUI : public GEOMGUI
 {
 public:
-  BasicGUI( GeometryGUI* parent );
+  BasicGUI( GeometryGUI* );
   ~BasicGUI();
 
-  bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent);
-  bool OnMousePress(QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow);
+  bool   OnGUIEvent( int, SUIT_Desktop* );
+  bool   OnMousePress( QMouseEvent*, SUIT_Desktop*, SUIT_ViewWindow* );
 
-  gp_Pnt ConvertClickToPoint( int x, int y, Handle(V3d_View) aView );
+  gp_Pnt ConvertClickToPoint( int, int, Handle(V3d_View) );
 };
 
-#endif
+#endif // BASICGUI_H
diff --git a/src/BasicGUI/BasicGUI.pro b/src/BasicGUI/BasicGUI.pro
new file mode 100644 (file)
index 0000000..2ef9147
--- /dev/null
@@ -0,0 +1,75 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = BasicGUI
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+GUI_LDFLAGS = -L$$(GUI_ROOT_DIR)/lib/salome
+
+INCLUDEPATH += $${QT_INCLUDES} $${VTK_INCLUDES} $${CAS_CPPFLAGS} $${PYTHON_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} $${CORBA_INCLUDES} ../OBJECT ../DlgRef ../GEOMGUI ../GEOMFiltersSelection ../GEOMBase ../GEOMImpl ../GEOMClient $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lGEOMFiltersSelection -lGEOMBase -lGEOM $${GUI_LDFLAGS} -lsuit
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += BASICGUI_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+HEADERS  = BasicGUI_PointDlg.h
+HEADERS += GEOM_BasicGUI.hxx
+
+SOURCES  = BasicGUI.cxx
+SOURCES += BasicGUI_PointDlg.cxx
+SOURCES += BasicGUI_LineDlg.cxx
+SOURCES += BasicGUI_CircleDlg.cxx
+SOURCES += BasicGUI_EllipseDlg.cxx
+SOURCES += BasicGUI_ArcDlg.cxx
+SOURCES += BasicGUI_VectorDlg.cxx
+SOURCES += BasicGUI_PlaneDlg.cxx
+SOURCES += BasicGUI_WorkingPlaneDlg.cxx
+SOURCES += BasicGUI_CurveDlg.cxx
+SOURCES += BasicGUI_MarkerDlg.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index f9668b5cebc93cdcfa303d64f1d89c5a6a442ec3..7326a37e2a4578b78f7429f3cd3efeaefc9a2d3c 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_ArcDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//
-//  File   : BasicGUI_ArcDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "BasicGUI_ArcDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopoDS.hxx>
 #include <TopExp.hxx>
 
-#include <qlabel.h>
-#include <qcheckbox.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : BasicGUI_ArcDlg()
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-BasicGUI_ArcDlg::BasicGUI_ArcDlg(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)
+BasicGUI_ArcDlg::BasicGUI_ArcDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                 bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
 {
   SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
-  QPixmap image0(aResMgr->loadPixmap("GEOM",tr("ICON_DLG_ARC")));
-  QPixmap image1(aResMgr->loadPixmap("GEOM",tr("ICON_DLG_ARC_CENTER")));
-  QPixmap image2(aResMgr->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0( aResMgr->loadPixmap( "GEOM", tr( "ICON_DLG_ARC" ) ) );
+  QPixmap image1( aResMgr->loadPixmap( "GEOM", tr( "ICON_DLG_ARC_CENTER" ) ) );
+  QPixmap image2( aResMgr->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
+  QPixmap image3( aResMgr->loadPixmap( "GEOM", tr( "ICON_DLG_ARC_OF_ELLIPSE" ) ) );
 
-  setCaption(tr("GEOM_ARC_TITLE"));
+  setWindowTitle( tr( "GEOM_ARC_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_ARC"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_ARC" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setIcon( image1 );
+  mainFrame()->RadioButton3->setIcon( image3 );
+
+  Group3Pnts = new DlgRef_3Sel( centralWidget() );
 
-  Group3Pnts = new DlgRef_3Sel_QTD(this, "Group3Pnts");
-  Group3Pnts->GroupBox1->setTitle(tr("GEOM_POINTS"));
-  Group3Pnts->TextLabel1->setText(tr("GEOM_POINT_I").arg("1"));
-  Group3Pnts->TextLabel2->setText(tr("GEOM_POINT_I").arg("2"));
-  Group3Pnts->TextLabel3->setText(tr("GEOM_POINT_I").arg("3"));
+  Group3Pnts->GroupBox1->setTitle( tr( "GEOM_POINTS" ) );
+  Group3Pnts->TextLabel1->setText( tr( "GEOM_POINT_I" ).arg( 1 ) );
+  Group3Pnts->TextLabel2->setText( tr( "GEOM_POINT_I" ).arg( 2 ) );
+  Group3Pnts->TextLabel3->setText( tr( "GEOM_POINT_I" ).arg( 3 ) );
 
   Group3Pnts->LineEdit1->setReadOnly( true );
   Group3Pnts->LineEdit2->setReadOnly( true );
   Group3Pnts->LineEdit3->setReadOnly( true );
 
-  Group3Pnts->PushButton1->setPixmap(image2);
-  Group3Pnts->PushButton2->setPixmap(image2);
-  Group3Pnts->PushButton3->setPixmap(image2);
+  Group3Pnts->LineEdit1->setEnabled(true);
+  Group3Pnts->LineEdit2->setEnabled(false);
+  Group3Pnts->LineEdit3->setEnabled(false);
+
+  Group3Pnts->PushButton1->setIcon(image2);
+  Group3Pnts->PushButton2->setIcon(image2);
+  Group3Pnts->PushButton3->setIcon(image2);
 
 
-  Group3Pnts2 = new DlgRef_3Sel1Check_QTD(this, "Group3Pnts2");
-  Group3Pnts2->GroupBox1->setTitle(tr("GEOM_POINTS"));
-  Group3Pnts2->TextLabel1->setText(tr("GEOM_CENTER_POINT"));
-  Group3Pnts2->TextLabel2->setText(tr("GEOM_POINT_I").arg("Start"));
-  Group3Pnts2->TextLabel3->setText(tr("GEOM_POINT_I").arg("End"));
+  Group3Pnts2 = new DlgRef_3Sel1Check( centralWidget() );
+
+  Group3Pnts2->GroupBox1->setTitle( tr( "GEOM_POINTS" ) );
+  Group3Pnts2->TextLabel1->setText( tr( "GEOM_CENTER_POINT" ) );
+  Group3Pnts2->TextLabel2->setText( tr( "GEOM_POINT_I" ).arg( "Start" ) );
+  Group3Pnts2->TextLabel3->setText( tr( "GEOM_POINT_I" ).arg( "End" ) );
 
   Group3Pnts2->LineEdit1->setReadOnly( true );
   Group3Pnts2->LineEdit2->setReadOnly( true );
   Group3Pnts2->LineEdit3->setReadOnly( true );
 
-  Group3Pnts2->PushButton1->setPixmap(image2);
-  Group3Pnts2->PushButton2->setPixmap(image2);
-  Group3Pnts2->PushButton3->setPixmap(image2);
+  Group3Pnts2->LineEdit1->setEnabled(true);
+  Group3Pnts2->LineEdit2->setEnabled(false);
+  Group3Pnts2->LineEdit3->setEnabled(false);
 
-  Group3Pnts2->CheckButton1->setText(tr("GEOM_REVERSE"));
+  Group3Pnts2->PushButton1->setIcon( image2 );
+  Group3Pnts2->PushButton2->setIcon( image2 );
+  Group3Pnts2->PushButton3->setIcon( image2 );
+  
+  Group3Pnts2->CheckButton1->setText( tr( "GEOM_REVERSE" ) );
 
-  Layout1->addWidget( Group3Pnts, 2, 0 );
-  Layout1->addWidget( Group3Pnts2, 2, 0 );
-  /***************************************************************/
+  Group3Pnts3 = new DlgRef_3Sel( centralWidget() );
+
+  Group3Pnts3->GroupBox1->setTitle( tr( "GEOM_POINTS" ) );
+  Group3Pnts3->TextLabel1->setText( tr( "GEOM_CENTER_POINT" ) );
+  Group3Pnts3->TextLabel2->setText( tr( "GEOM_POINT_I" ).arg( 1 ) );
+  Group3Pnts3->TextLabel3->setText( tr( "GEOM_POINT_I" ).arg( 2 ) );
+
+  Group3Pnts3->LineEdit1->setReadOnly( true );
+  Group3Pnts3->LineEdit2->setReadOnly( true );
+  Group3Pnts3->LineEdit3->setReadOnly( true );
+
+  Group3Pnts3->LineEdit1->setEnabled(true);
+  Group3Pnts3->LineEdit2->setEnabled(false);
+  Group3Pnts3->LineEdit3->setEnabled(false);
+
+  Group3Pnts3->PushButton1->setIcon(image2);
+  Group3Pnts3->PushButton2->setIcon(image2);
+  Group3Pnts3->PushButton3->setIcon(image2);
 
-  setHelpFileName("create_arc_page.html");
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( Group3Pnts );
+  layout->addWidget( Group3Pnts2 );
+  layout->addWidget( Group3Pnts3 );
+
+  setHelpFileName( "create_arc_page.html" );
 
   Init();
 }
@@ -130,102 +157,56 @@ void BasicGUI_ArcDlg::Init()
 {
   /* init variables */
   myEditCurrentArgument = Group3Pnts->LineEdit1;
+
   myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
-  Group3Pnts2->CheckButton1->setChecked(FALSE);
+  Group3Pnts2->CheckButton1->setChecked( false );
+  Group3Pnts->PushButton1->setDown(true);
 
   /* 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(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
-
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-
-  connect(Group3Pnts->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group3Pnts->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group3Pnts->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-
-  connect(Group3Pnts->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group3Pnts->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group3Pnts->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-
-  connect(Group3Pnts2->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group3Pnts2->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group3Pnts2->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
+  connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
+  connect( this,           SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
+  connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+
+  connect( Group3Pnts->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts->PushButton3, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+
+  connect( Group3Pnts->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts->LineEdit3, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  
+  connect( Group3Pnts2->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts2->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts2->PushButton3, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+
+  connect( Group3Pnts2->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts2->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts2->LineEdit3, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+
+  connect( Group3Pnts2->CheckButton1, SIGNAL( toggled( bool ) ), this, SLOT( ReverseSense() ) );
+
+  connect( Group3Pnts3->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts3->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts3->PushButton3, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+
+  connect( Group3Pnts3->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts3->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts3->LineEdit3, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
+  initName( tr( "GEOM_ARC" ) ); 
+  
 
-  connect(Group3Pnts2->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group3Pnts2->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group3Pnts2->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-
-  connect(Group3Pnts2->CheckButton1, SIGNAL(stateChanged(int)), this, SLOT(ReverseSense(int)));
-
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
-
-  initName( tr( "GEOM_ARC" ));
   ConstructorsClicked( 0 );
 }
 
 
-//=================================================================================
-// function : ConstructorsClicked()
-// purpose  : Radio button management
-//=================================================================================
-void BasicGUI_ArcDlg::ConstructorsClicked (int constructorId)
-{
-  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
-
-  switch (constructorId)
-  {
-  case 0:
-    {
-      globalSelection(); // close local contexts, if any
-      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX); //Select Vertex on All Shapes
-
-      Group3Pnts->show();
-      resize(0, 0);
-      Group3Pnts2->hide();
-
-      Group3Pnts->LineEdit1->setText(Group3Pnts2->LineEdit1->text());
-      Group3Pnts->LineEdit2->setText(Group3Pnts2->LineEdit2->text());
-      Group3Pnts->LineEdit3->setText(Group3Pnts2->LineEdit3->text());
-
-      myEditCurrentArgument = Group3Pnts->LineEdit1;
-
-      break;
-    }
-  case 1:
-    {
-      globalSelection(); // close local contexts, if any
-      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX); //Select Vertex on All Shapes
-
-      Group3Pnts->hide();
-      resize(0, 0);
-      Group3Pnts2->show();
-
-      Group3Pnts2->LineEdit1->setText(Group3Pnts->LineEdit1->text());
-      Group3Pnts2->LineEdit2->setText(Group3Pnts->LineEdit2->text());
-      Group3Pnts2->LineEdit3->setText(Group3Pnts->LineEdit3->text());
-
-      myEditCurrentArgument = Group3Pnts2->LineEdit1;
-
-      break;
-    }
-  }
-
-  myEditCurrentArgument->setFocus();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
-
-  if (CORBA::is_nil(myPoint1))
-    SelectionIntoArgument();
-
-  displayPreview();
-}
-
-
 //=================================================================================
 // function : ClickOnOk()
 // purpose  :
@@ -246,57 +227,58 @@ bool BasicGUI_ArcDlg::ClickOnApply()
     return false;
 
   initName();
+  ConstructorsClicked( getConstructorId() );
+
   return true;
 }
 
+
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection as changed or other case
 //=================================================================================
 void BasicGUI_ArcDlg::SelectionIntoArgument()
 {
-  if ((getConstructorId() != 0) && (getConstructorId() != 1))
-    return;
+  myEditCurrentArgument->setText( "" );
 
-  myEditCurrentArgument->setText("");
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
 
-  if (IObjectCount() != 1)
-  {
-    switch (getConstructorId())
-    {
+  if (aSelList.Extent() != 1) {
+    switch (getConstructorId()) {
     case 0:
-      {
-        if      ( myEditCurrentArgument == Group3Pnts->LineEdit1 )   myPoint1 = GEOM::GEOM_Object::_nil();
-        else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 )   myPoint2 = GEOM::GEOM_Object::_nil();
-        else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 )   myPoint3 = GEOM::GEOM_Object::_nil();
-        return;
-        break;
-      }
+      if      ( myEditCurrentArgument == Group3Pnts->LineEdit1 )   myPoint1 = GEOM::GEOM_Object::_nil();
+      else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 )   myPoint2 = GEOM::GEOM_Object::_nil();
+      else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 )   myPoint3 = GEOM::GEOM_Object::_nil();
+      return;
+      break;
     case 1:
-      {
-        if      ( myEditCurrentArgument == Group3Pnts2->LineEdit1 )   myPoint1 = GEOM::GEOM_Object::_nil();
-        else if ( myEditCurrentArgument == Group3Pnts2->LineEdit2 )   myPoint2 = GEOM::GEOM_Object::_nil();
-        else if ( myEditCurrentArgument == Group3Pnts2->LineEdit3 )   myPoint3 = GEOM::GEOM_Object::_nil();
-        return;
-        break;
-      }
+      if      ( myEditCurrentArgument == Group3Pnts2->LineEdit1 )   myPoint1 = GEOM::GEOM_Object::_nil();
+      else if ( myEditCurrentArgument == Group3Pnts2->LineEdit2 )   myPoint2 = GEOM::GEOM_Object::_nil();
+      else if ( myEditCurrentArgument == Group3Pnts2->LineEdit3 )   myPoint3 = GEOM::GEOM_Object::_nil();
+      return;
+      break;
+    case 2:
+      if      ( myEditCurrentArgument == Group3Pnts3->LineEdit1 )   myPoint1 = GEOM::GEOM_Object::_nil();
+      else if ( myEditCurrentArgument == Group3Pnts3->LineEdit2 )   myPoint2 = GEOM::GEOM_Object::_nil();
+      else if ( myEditCurrentArgument == Group3Pnts3->LineEdit3 )   myPoint3 = GEOM::GEOM_Object::_nil();
+      return;
+      break;
     }
-  }
-
+  }   
   // nbSel == 1
   Standard_Boolean aRes = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), aRes);
-  if (!CORBA::is_nil(aSelectedObject) && aRes)
-  {
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aRes);
+  if ( !CORBA::is_nil( aSelectedObject ) && aRes ) {
     QString aName = GEOMBase::GetName(aSelectedObject);
 
     // Get Selected object if selected subshape
     TopoDS_Shape aShape;
     if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
     {
-      LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
       TColStd_IndexedMapOfInteger aMap;
-      aSelMgr->GetIndexes(firstIObject(), aMap);
+      aSelMgr->GetIndexes(aSelList.First(), aMap);
       if (aMap.Extent() == 1) // Local Selection
       {
         int anIndex = aMap(1);
@@ -323,70 +305,180 @@ void BasicGUI_ArcDlg::SelectionIntoArgument()
 
     myEditCurrentArgument->setText(aName);
 
-    switch (getConstructorId())
-    {
-      case 0:
-      {
-        if      ( myEditCurrentArgument == Group3Pnts->LineEdit1 )   myPoint1 = aSelectedObject;
-        else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 )   myPoint2 = aSelectedObject;
-        else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 )   myPoint3 = aSelectedObject;
-        break;
+    if (!aSelectedObject->_is_nil()) { // clear selection if something selected
+      globalSelection();
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );      
+    }
+
+    switch ( getConstructorId() ) {
+    case 0:
+      if      ( myEditCurrentArgument == Group3Pnts->LineEdit1 ) {
+       myPoint1 = aSelectedObject;
+       if ( !myPoint1->_is_nil() && myPoint2->_is_nil() )
+         Group3Pnts->PushButton2->click();
       }
-      case 1:
-      {
-        if      ( myEditCurrentArgument == Group3Pnts2->LineEdit1 )   myPoint1 = aSelectedObject;
-        else if ( myEditCurrentArgument == Group3Pnts2->LineEdit2 )   myPoint2 = aSelectedObject;
-        else if ( myEditCurrentArgument == Group3Pnts2->LineEdit3 )   myPoint3 = aSelectedObject;
-        break;
+      else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 ) {
+       myPoint2 = aSelectedObject;
+       if ( !myPoint2->_is_nil() && myPoint3->_is_nil() )
+         Group3Pnts->PushButton3->click();
+      }
+      else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 ) {
+       myPoint3 = aSelectedObject;
+       if ( !myPoint3->_is_nil() && myPoint1->_is_nil() )
+         Group3Pnts->PushButton1->click();
+      }
+      break;
+    case 1:
+      if ( myEditCurrentArgument == Group3Pnts2->LineEdit1 ) {
+       myPoint1 = aSelectedObject;
+       if ( !myPoint1->_is_nil() && myPoint2->_is_nil() )
+         Group3Pnts2->PushButton2->click();
+      }
+      else if ( myEditCurrentArgument == Group3Pnts2->LineEdit2 ) {
+       myPoint2 = aSelectedObject;
+       if ( !myPoint2->_is_nil() && myPoint3->_is_nil() )
+         Group3Pnts2->PushButton3->click();
+      }
+      else if ( myEditCurrentArgument == Group3Pnts2->LineEdit3 ) {
+       myPoint3 = aSelectedObject;
+       if ( !myPoint3->_is_nil() && myPoint1->_is_nil() )
+         Group3Pnts2->PushButton1->click();
+      }
+      break;
+    case 2:
+      if ( myEditCurrentArgument == Group3Pnts3->LineEdit1 ) {
+       myPoint1 = aSelectedObject;
+       if ( !myPoint1->_is_nil() && myPoint2->_is_nil() )
+         Group3Pnts3->PushButton2->click();
       }
+      else if ( myEditCurrentArgument == Group3Pnts3->LineEdit2 ) {
+       myPoint2 = aSelectedObject;
+       if ( !myPoint2->_is_nil() && myPoint3->_is_nil() )
+         Group3Pnts3->PushButton3->click();
+      }
+      else if ( myEditCurrentArgument == Group3Pnts3->LineEdit3 ) {
+       myPoint3 = aSelectedObject;
+       if ( !myPoint3->_is_nil() && myPoint1->_is_nil() )
+         Group3Pnts3->PushButton1->click();
+      }
+      break;
     }
   }
 
   displayPreview();
 }
 
+
 //=================================================================================
-// function : LineEditReturnPressed()
+// function : SetEditCurrentArgument()
 // purpose  :
 //=================================================================================
-void BasicGUI_ArcDlg::LineEditReturnPressed()
+void BasicGUI_ArcDlg::SetEditCurrentArgument()
 {
-  QLineEdit* send = (QLineEdit*)sender();
-  if (send == Group3Pnts->LineEdit1  || send == Group3Pnts->LineEdit2  || send == Group3Pnts->LineEdit3 ||
-      send == Group3Pnts2->LineEdit1 || send == Group3Pnts2->LineEdit2 || send == Group3Pnts2->LineEdit3)
-  {
-    myEditCurrentArgument = send;
-    GEOMBase_Skeleton::LineEditReturnPressed();
+  globalSelection(); // close local selection to clear it
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+
+  QPushButton* send = (QPushButton*)sender();
+  switch ( getConstructorId() ) {
+  case 0:
+    if      ( send == Group3Pnts->PushButton1 ) {
+      myEditCurrentArgument = Group3Pnts->LineEdit1;
+      Group3Pnts->PushButton2->setDown(false);
+      Group3Pnts->PushButton3->setDown(false);
+      Group3Pnts->LineEdit1->setEnabled(true);
+      Group3Pnts->LineEdit2->setEnabled(false);
+      Group3Pnts->LineEdit3->setEnabled(false);
+    }
+    else if ( send == Group3Pnts->PushButton2 ) {
+      myEditCurrentArgument = Group3Pnts->LineEdit2;
+      Group3Pnts->PushButton1->setDown(false);
+      Group3Pnts->PushButton3->setDown(false);
+      Group3Pnts->LineEdit1->setEnabled(false);
+      Group3Pnts->LineEdit2->setEnabled(true);
+      Group3Pnts->LineEdit3->setEnabled(false);
+    }
+    else if ( send == Group3Pnts->PushButton3 ) {
+      myEditCurrentArgument = Group3Pnts->LineEdit3;
+      Group3Pnts->PushButton1->setDown(false);
+      Group3Pnts->PushButton2->setDown(false);
+      Group3Pnts->LineEdit1->setEnabled(false);
+      Group3Pnts->LineEdit2->setEnabled(false);
+      Group3Pnts->LineEdit3->setEnabled(true);
+    }
+    break;
+  case 1:
+    if      ( send == Group3Pnts2->PushButton1 ) {
+      myEditCurrentArgument = Group3Pnts2->LineEdit1;
+      Group3Pnts2->PushButton2->setDown(false);
+      Group3Pnts2->PushButton3->setDown(false);
+      Group3Pnts2->LineEdit1->setEnabled(true);
+      Group3Pnts2->LineEdit2->setEnabled(false);
+      Group3Pnts2->LineEdit3->setEnabled(false);
+    }
+    else if ( send == Group3Pnts2->PushButton2 ) {
+      myEditCurrentArgument = Group3Pnts2->LineEdit2;
+      Group3Pnts2->PushButton1->setDown(false);
+      Group3Pnts2->PushButton3->setDown(false);
+      Group3Pnts2->LineEdit1->setEnabled(false);
+      Group3Pnts2->LineEdit2->setEnabled(true);
+      Group3Pnts2->LineEdit3->setEnabled(false);
+    }
+    else if ( send == Group3Pnts2->PushButton3 ) {
+      myEditCurrentArgument = Group3Pnts2->LineEdit3;
+      Group3Pnts2->PushButton1->setDown(false);
+      Group3Pnts2->PushButton2->setDown(false);
+      Group3Pnts2->LineEdit1->setEnabled(false);
+      Group3Pnts2->LineEdit2->setEnabled(false);
+      Group3Pnts2->LineEdit3->setEnabled(true);
+    }
+    break;
+  case 2:
+    if ( send == Group3Pnts3->PushButton1 ) {
+      myEditCurrentArgument = Group3Pnts3->LineEdit1;
+      Group3Pnts3->PushButton2->setDown(false);
+      Group3Pnts3->PushButton3->setDown(false);
+      Group3Pnts3->LineEdit1->setEnabled(true);
+      Group3Pnts3->LineEdit2->setEnabled(false);
+      Group3Pnts3->LineEdit3->setEnabled(false);
+    }
+    else if ( send == Group3Pnts3->PushButton2 ) {
+      myEditCurrentArgument = Group3Pnts3->LineEdit2;
+      Group3Pnts3->PushButton1->setDown(false);
+      Group3Pnts3->PushButton3->setDown(false);
+      Group3Pnts3->LineEdit1->setEnabled(false);
+      Group3Pnts3->LineEdit2->setEnabled(true);
+      Group3Pnts3->LineEdit3->setEnabled(false);
+    }
+    else if ( send == Group3Pnts3->PushButton3 ) {
+      myEditCurrentArgument = Group3Pnts3->LineEdit3;
+      Group3Pnts3->PushButton1->setDown(false);
+      Group3Pnts3->PushButton2->setDown(false);
+      Group3Pnts3->LineEdit1->setEnabled(false);
+      Group3Pnts3->LineEdit2->setEnabled(false);
+      Group3Pnts3->LineEdit3->setEnabled(true);
+    }
+    break;
   }
+  myEditCurrentArgument->setFocus();
+  //  SelectionIntoArgument();
+  send->setDown(true);
+  displayPreview();
 }
 
 
 //=================================================================================
-// function : SetEditCurrentArgument()
+// function : LineEditReturnPressed()
 // purpose  :
 //=================================================================================
-void BasicGUI_ArcDlg::SetEditCurrentArgument()
+void BasicGUI_ArcDlg::LineEditReturnPressed()
 {
-  QPushButton* send = (QPushButton*)sender();
-  switch (getConstructorId())
-  {
-    case 0:
-    {
-      if      ( send == Group3Pnts->PushButton1 )   myEditCurrentArgument = Group3Pnts->LineEdit1;
-      else if ( send == Group3Pnts->PushButton2 )   myEditCurrentArgument = Group3Pnts->LineEdit2;
-      else if ( send == Group3Pnts->PushButton3 )   myEditCurrentArgument = Group3Pnts->LineEdit3;
-      break;
-    }
-    case 1:
-    {
-      if      ( send == Group3Pnts2->PushButton1 )   myEditCurrentArgument = Group3Pnts2->LineEdit1;
-      else if ( send == Group3Pnts2->PushButton2 )   myEditCurrentArgument = Group3Pnts2->LineEdit2;
-      else if ( send == Group3Pnts2->PushButton3 )   myEditCurrentArgument = Group3Pnts2->LineEdit3;
-      break;
-    }
+  QLineEdit* send = (QLineEdit*)sender();
+  if ( send == Group3Pnts->LineEdit1 || send == Group3Pnts->LineEdit2 || send == Group3Pnts->LineEdit3 ||
+       send == Group3Pnts2->LineEdit1 || send == Group3Pnts2->LineEdit2 || send == Group3Pnts2->LineEdit3 ||
+       send == Group3Pnts3->LineEdit1 || send == Group3Pnts3->LineEdit2 || send == Group3Pnts3->LineEdit3 ) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
   }
-  myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
 }
 
 
@@ -398,24 +490,24 @@ void BasicGUI_ArcDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
 
-  connect(myGeomGUI->getApp()->selectionMgr(),
-          SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ),
+          this,
+          SLOT(SelectionIntoArgument() ) );
 
   ConstructorsClicked( getConstructorId() );
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BasicGUI_ArcDlg::enterEvent(QEvent* e)
+void BasicGUI_ArcDlg::enterEvent( QEvent* )
 {
-  if (!GroupConstructors->isEnabled())
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
-
 //=================================================================================
 // function : createOperation
 // purpose  :
@@ -440,6 +532,32 @@ static bool isEqual( const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Obje
 //=================================================================================
 bool BasicGUI_ArcDlg::isValid( QString& msg )
 {
+  switch (getConstructorId()) {
+  case 0:
+    {
+      if (Group3Pnts->LineEdit1->text().trimmed().isEmpty() ||
+         Group3Pnts->LineEdit2->text().trimmed().isEmpty() ||
+         Group3Pnts->LineEdit3->text().trimmed().isEmpty())
+       return false;
+      break;
+    }
+  case 1:
+    {
+      if (Group3Pnts2->LineEdit1->text().trimmed().isEmpty() ||
+         Group3Pnts2->LineEdit2->text().trimmed().isEmpty() ||
+         Group3Pnts2->LineEdit3->text().trimmed().isEmpty())
+       return false;
+      break;
+    }
+  case 2:
+    {
+      if (Group3Pnts3->LineEdit1->text().trimmed().isEmpty() ||
+         Group3Pnts3->LineEdit2->text().trimmed().isEmpty() ||
+         Group3Pnts3->LineEdit3->text().trimmed().isEmpty())
+       return false;
+      break;
+    }
+  }
   return !myPoint1->_is_nil() && !myPoint2->_is_nil() && !myPoint3->_is_nil() &&
     !isEqual( myPoint1, myPoint2 ) && !isEqual( myPoint1, myPoint3 ) && !isEqual( myPoint2, myPoint3 );
 }
@@ -453,42 +571,135 @@ bool BasicGUI_ArcDlg::execute( ObjectList& objects )
   bool res = false;
   GEOM::GEOM_Object_var anObj;
 
-  switch (getConstructorId())
-  {
+  switch ( getConstructorId() ) {
   case 0:
     {
-      if ( !CORBA::is_nil(myPoint1) && !CORBA::is_nil(myPoint2) &&!CORBA::is_nil(myPoint3) )
-      {
-        anObj = GEOM::GEOM_ICurvesOperations::_narrow(getOperation())->
-          MakeArc(myPoint1, myPoint2, myPoint3);
-        res = true;
+      if ( !CORBA::is_nil( myPoint1 ) && !CORBA::is_nil( myPoint2 ) && !CORBA::is_nil( myPoint3 ) ) {
+       anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeArc( myPoint1, myPoint2, myPoint3 );
+       res = true;
       }
       break;
     }
   case 1:
     {
-      bool Sense;
-      (Group3Pnts2->CheckButton1->isChecked()) ? Sense = true : Sense = false;
-      if ( !CORBA::is_nil(myPoint1) && !CORBA::is_nil(myPoint2) &&!CORBA::is_nil(myPoint3) )
-      {
-        anObj = GEOM::GEOM_ICurvesOperations::_narrow(getOperation())->
-          MakeArcCenter(myPoint1, myPoint2, myPoint3, Sense);
-        res = true;
+      bool Sense = Group3Pnts2->CheckButton1->isChecked();
+      if ( !CORBA::is_nil( myPoint1 ) && !CORBA::is_nil( myPoint2 ) && !CORBA::is_nil( myPoint3 ) ) {
+       anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeArcCenter( myPoint1, myPoint2, myPoint3, Sense );
+       res = true;
+      }
+      break;
+    }
+  case 2:
+    {
+      if ( !CORBA::is_nil( myPoint1 ) && !CORBA::is_nil( myPoint2 ) && !CORBA::is_nil( myPoint3 ) ) {
+       anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeArcOfEllipse( myPoint1, myPoint2, myPoint3 );
+       res = true;
       }
       break;
     }
   }
-  if ( !anObj->_is_nil() )
+  if ( !anObj->_is_nil() ) {
     objects.push_back( anObj._retn() );
-
+  }
   return res;
 }
 
+//=================================================================================
+// function : ConstructorsClicked()
+// purpose  : Radio button management
+//=================================================================================
+void BasicGUI_ArcDlg::ConstructorsClicked( int constructorId )
+{
+  disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
+
+  switch ( constructorId ) {
+  case 0:
+    {
+      globalSelection(); // close local contexts, if any
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); //Select Vertex on All Shapes
+
+      Group3Pnts->show();
+      Group3Pnts2->hide();
+      Group3Pnts3->hide();
+      Group3Pnts->PushButton1->setDown(true);
+      Group3Pnts->PushButton2->setDown(false);
+      Group3Pnts->PushButton3->setDown(false);
+      Group3Pnts->LineEdit1->setText( "" );
+      Group3Pnts->LineEdit2->setText( "" );
+      Group3Pnts->LineEdit3->setText( "" );
+      Group3Pnts->LineEdit1->setEnabled(true);
+      Group3Pnts->LineEdit2->setEnabled(false);
+      Group3Pnts->LineEdit3->setEnabled(false);
+      myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
+
+      myEditCurrentArgument = Group3Pnts->LineEdit1;
+      break;
+    }
+  case 1:
+    {
+      globalSelection(); // close local contexts, if any
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); //Select Vertex on All Shapes
+
+      Group3Pnts->hide();
+      Group3Pnts2->show();
+      Group3Pnts3->hide();
+      Group3Pnts2->PushButton1->setDown(true);
+      Group3Pnts2->PushButton2->setDown(false);
+      Group3Pnts2->PushButton3->setDown(false);
+      Group3Pnts2->LineEdit1->setText( "" );
+      Group3Pnts2->LineEdit2->setText( "" );
+      Group3Pnts2->LineEdit3->setText( "" );
+      Group3Pnts2->LineEdit1->setEnabled(true);
+      Group3Pnts2->LineEdit2->setEnabled(false);
+      Group3Pnts2->LineEdit3->setEnabled(false);
+      myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
+      
+      myEditCurrentArgument = Group3Pnts2->LineEdit1;
+      break;
+    }
+  case 2:
+    {
+      globalSelection(); // close local contexts, if any
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); //Select Vertex on All Shapes
+
+      Group3Pnts->hide();
+      Group3Pnts2->hide();
+      Group3Pnts3->show();
+      Group3Pnts3->PushButton1->setDown(true);
+      Group3Pnts3->PushButton2->setDown(false);
+      Group3Pnts3->PushButton3->setDown(false);
+      Group3Pnts3->LineEdit1->setText( "" );
+      Group3Pnts3->LineEdit2->setText( "" );
+      Group3Pnts3->LineEdit3->setText( "" );
+      Group3Pnts3->LineEdit1->setEnabled(true);
+      Group3Pnts3->LineEdit2->setEnabled(false);
+      Group3Pnts3->LineEdit3->setEnabled(false);
+      myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
+
+      myEditCurrentArgument = Group3Pnts3->LineEdit1;
+      break;
+    }
+  }
+
+  qApp->processEvents();
+  updateGeometry();
+  resize( minimumSizeHint() );
+
+  myEditCurrentArgument->setFocus();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
+  if ( CORBA::is_nil( myPoint1 ) )
+    SelectionIntoArgument();
+
+  displayPreview();
+}
+
 //=================================================================================
 // function : ReverseSense()
 // purpose  : Orientation of the arc
 //=================================================================================
-void BasicGUI_ArcDlg::ReverseSense(int sense)
+void BasicGUI_ArcDlg::ReverseSense()
 {
   displayPreview();
 }
@@ -501,8 +712,7 @@ void BasicGUI_ArcDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
 
-switch (getConstructorId())
-  {
+  switch ( getConstructorId() ) {
   case 0:
     objMap[Group3Pnts->LineEdit1->text()] = myPoint1;
     objMap[Group3Pnts->LineEdit2->text()] = myPoint2;
@@ -513,6 +723,11 @@ switch (getConstructorId())
     objMap[Group3Pnts2->LineEdit2->text()] = myPoint2;
     objMap[Group3Pnts2->LineEdit3->text()] = myPoint3;
     break;
+  case 2:
+    objMap[Group3Pnts3->LineEdit1->text()] = myPoint1;
+    objMap[Group3Pnts3->LineEdit2->text()] = myPoint2;
+    objMap[Group3Pnts3->LineEdit3->text()] = myPoint3;
+    break;
   }
- addSubshapesToFather( objMap );
 addSubshapesToFather( objMap );
 }
index fcead28cceba42eb7eaa1b467f4da295cd1d0f95..49828b720ab26fd62c0eb0bc0a85ee0e3e2ee295 100644 (file)
@@ -1,78 +1,76 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BasicGUI_ArcDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_ARC_H
-#define DIALOGBOX_ARC_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_ArcDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef BASICGUI_ARCDLG_H
+#define BASICGUI_ARCDLG_H
 
-#include "GEOM_BasicGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_3Sel_QTD.h"
-#include "DlgRef_3Sel1Check_QTD.h"
+class DlgRef_3Sel;
+class DlgRef_3Sel1Check;
 
 //=================================================================================
 // class    : BasicGUI_ArcDlg
 // purpose  : 
 //=================================================================================
-class GEOM_BASICGUI_EXPORT BasicGUI_ArcDlg : public GEOMBase_Skeleton
+class BasicGUI_ArcDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BasicGUI_ArcDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                    const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
-    ~BasicGUI_ArcDlg();
+  BasicGUI_ArcDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~BasicGUI_ArcDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
-
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
+  
 private:
-    void Init();
-    void enterEvent(QEvent* e);
+  void                               Init();
+  void                               enterEvent( QEvent* );
 
-    GEOM::GEOM_Object_var myPoint1, myPoint2, myPoint3;
+private:
+  GEOM::GEOM_Object_var              myPoint1, myPoint2, myPoint3;
 
-    DlgRef_3Sel_QTD* Group3Pnts;
-    DlgRef_3Sel1Check_QTD* Group3Pnts2;
+  DlgRef_3Sel*                       Group3Pnts;
+  DlgRef_3Sel1Check*                 Group3Pnts2;
+  DlgRef_3Sel*                       Group3Pnts3;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-
-    void ActivateThisDialog();
-    void ConstructorsClicked(int);
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ReverseSense(int);
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  
+  void                               ActivateThisDialog();
+  void                               ConstructorsClicked( int );
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ReverseSense();
 };
 
-#endif // DIALOGBOX_ARC_H
+#endif // BASICGUI_ARCDLG_H
index 450ffd984526772ceb472c55724ffa70b3415b7f..3c18582039c4cf5f87acce48ebf07e94aa21a660 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_CircleDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : BasicGUI_CircleDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "BasicGUI_CircleDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <qlabel.h>
-
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TopExp.hxx>
 
-//#include <GEOMImpl_ILocalOperations.hxx>
-
-//#include "GEOMImpl_Types.hxx"
-#include "utilities.h"
-
 //=================================================================================
 // class    : BasicGUI_CircleDlg()
-// purpose  : Constructs a BasicGUI_CircleDlg which is a child of 'parent', with the
+// purpose  : Constructs a BasicGUI_CircleDlg which is 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.
 //=================================================================================
-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)
+BasicGUI_CircleDlg::BasicGUI_CircleDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                       bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
 {
-  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")));
-  QPixmap image3(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CIRCLE_C2P")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  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" ) ) );
+  QPixmap image3( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_CIRCLE_C2P" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_CIRCLE_TITLE"));
+  setWindowTitle( tr( "GEOM_CIRCLE_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_CIRCLE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image2);
-  RadioButton3->setPixmap(image3);
-
-  GroupPntVecR = new DlgRef_2Sel1Spin(this, "GroupPntVecR");
-  GroupPntVecR->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
-
-  GroupPntVecR->TextLabel1->setText(tr("GEOM_CENTER_POINT"));
-  GroupPntVecR->TextLabel2->setText(tr("GEOM_VECTOR"));
-  GroupPntVecR->TextLabel3->setText(tr("GEOM_RADIUS"));
-  GroupPntVecR->PushButton1->setPixmap(image1);
-  GroupPntVecR->PushButton2->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_CIRCLE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setIcon( image2 );
+  mainFrame()->RadioButton3->setIcon( image3 );
+
+  GroupPntVecR = new DlgRef_2Sel1Spin( centralWidget() );
+  GroupPntVecR->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
+  
+  GroupPntVecR->TextLabel1->setText( tr( "GEOM_CENTER_POINT" ) + " (Origin by default)" );
+  GroupPntVecR->TextLabel2->setText( tr( "GEOM_VECTOR" ) + " (Z axis by default)" );
+  GroupPntVecR->TextLabel3->setText( tr( "GEOM_RADIUS" ) );
+  GroupPntVecR->PushButton1->setIcon( image1 );
+  GroupPntVecR->PushButton2->setIcon( image1 );
+  GroupPntVecR->PushButton1->setDown( true );
 
   GroupPntVecR->LineEdit1->setReadOnly( true );
   GroupPntVecR->LineEdit2->setReadOnly( true );
 
-  Group3Pnts = new DlgRef_3Sel_QTD(this, "Group3Pnts");
-  Group3Pnts->GroupBox1->setTitle(tr("GEOM_3_POINTS"));
-  Group3Pnts->TextLabel1->setText(tr("GEOM_POINT1"));
-  Group3Pnts->TextLabel2->setText(tr("GEOM_POINT2"));
-  Group3Pnts->TextLabel3->setText(tr("GEOM_POINT3"));
-  Group3Pnts->PushButton1->setPixmap(image1);
-  Group3Pnts->PushButton2->setPixmap(image1);
-  Group3Pnts->PushButton3->setPixmap(image1);
+  GroupPntVecR->LineEdit1->setEnabled( true );
+  GroupPntVecR->LineEdit2->setEnabled( false );
+
+  Group3Pnts = new DlgRef_3Sel( centralWidget() );
+
+  Group3Pnts->GroupBox1->setTitle( tr( "GEOM_3_POINTS" ) );
+  Group3Pnts->TextLabel1->setText( tr( "GEOM_POINT1" ) );
+  Group3Pnts->TextLabel2->setText( tr( "GEOM_POINT2" ) );
+  Group3Pnts->TextLabel3->setText( tr( "GEOM_POINT3" ) );
+  Group3Pnts->PushButton1->setIcon( image1 );
+  Group3Pnts->PushButton2->setIcon( image1 );
+  Group3Pnts->PushButton3->setIcon( image1 );
+  Group3Pnts->PushButton1->setDown( true );
 
   Group3Pnts->LineEdit1->setReadOnly( true );
   Group3Pnts->LineEdit2->setReadOnly( true );
   Group3Pnts->LineEdit3->setReadOnly( true );
-
-  GroupCenter2Pnts = new DlgRef_3Sel_QTD(this, "GroupCenter2Pnts");
-  GroupCenter2Pnts->GroupBox1->setTitle(tr("GEOM_CENTER_2POINTS"));
-  GroupCenter2Pnts->TextLabel1->setText(tr("GEOM_CENTER_POINT"));
-  GroupCenter2Pnts->TextLabel2->setText(tr("GEOM_POINT1"));
-  GroupCenter2Pnts->TextLabel3->setText(tr("GEOM_POINT2"));
-  GroupCenter2Pnts->PushButton1->setPixmap(image1);
-  GroupCenter2Pnts->PushButton2->setPixmap(image1);
-  GroupCenter2Pnts->PushButton3->setPixmap(image1);
+  Group3Pnts->LineEdit1->setEnabled( true );
+  Group3Pnts->LineEdit2->setEnabled( false );
+  Group3Pnts->LineEdit3->setEnabled( false );
+
+  GroupCenter2Pnts = new DlgRef_3Sel( centralWidget() );
+  GroupCenter2Pnts->GroupBox1->setTitle( tr( "GEOM_CENTER_2POINTS" ) );
+  GroupCenter2Pnts->TextLabel1->setText( tr( "GEOM_CENTER_POINT" ) );
+  GroupCenter2Pnts->TextLabel2->setText( tr( "GEOM_POINT1" ) );
+  GroupCenter2Pnts->TextLabel3->setText( tr( "GEOM_POINT2" ) );
+  GroupCenter2Pnts->PushButton1->setIcon( image1 );
+  GroupCenter2Pnts->PushButton2->setIcon( image1 );
+  GroupCenter2Pnts->PushButton3->setIcon( image1 );
+  GroupCenter2Pnts->PushButton1->setDown( true );
 
   GroupCenter2Pnts->LineEdit1->setReadOnly( true );
   GroupCenter2Pnts->LineEdit2->setReadOnly( true );
   GroupCenter2Pnts->LineEdit3->setReadOnly( true );
 
-  Layout1->addWidget( GroupPntVecR, 2, 0 );
-  Layout1->addWidget( Group3Pnts, 2, 0 );
-  Layout1->addWidget( GroupCenter2Pnts, 2, 0 );
+  GroupCenter2Pnts->LineEdit1->setEnabled( true );
+  GroupCenter2Pnts->LineEdit2->setEnabled( false );
+  GroupCenter2Pnts->LineEdit3->setEnabled( false );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPntVecR );
+  layout->addWidget( Group3Pnts );
+  layout->addWidget( GroupCenter2Pnts );
   /***************************************************************/
 
-  setHelpFileName("create_circle_page.html");
+  setHelpFileName( "create_circle_page.html" );
 
   Init();
 }
@@ -145,105 +155,130 @@ void BasicGUI_CircleDlg::Init()
 
   /* Get setting of step value from file configuration */
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double aStep = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
+  double aStep = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100 );
 
   /* min, max, step and decimals for spin boxes & initial values */
-  GroupPntVecR->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, aStep, DBL_DIGITS_DISPLAY);
-  GroupPntVecR->SpinBox_DX->SetValue( 100 );
+  initSpinBox( GroupPntVecR->SpinBox_DX, 0.000001, COORD_MAX, aStep, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupPntVecR->SpinBox_DX->setValue( 100 );
 
   /* 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( 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() ) );
 
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-  connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
+  connect( this,           SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
 
-  connect(GroupPntVecR->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPntVecR->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group3Pnts->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group3Pnts->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group3Pnts->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect( GroupPntVecR->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPntVecR->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts->PushButton1,   SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts->PushButton2,   SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts->PushButton3,   SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
 
-  connect(GroupCenter2Pnts->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupCenter2Pnts->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupCenter2Pnts->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect( GroupCenter2Pnts->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupCenter2Pnts->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupCenter2Pnts->PushButton3, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
 
-  connect(GroupPntVecR->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPntVecR->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPntVecR->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( GroupPntVecR->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
-  connect(GroupPntVecR->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
-  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)),
-          GroupPntVecR->SpinBox_DX, SLOT(SetStep(double)));
+  connect( GroupPntVecR->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT(ValueChangedInSpinBox() ) );
+  connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
 
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+           this, SLOT( SelectionIntoArgument() ) );
 
   initName( tr( "GEOM_CIRCLE" ) );
 
-  Group3Pnts->hide();
-  GroupCenter2Pnts->hide();
   ConstructorsClicked( 0 );
 }
 
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void BasicGUI_CircleDlg::SetDoubleSpinBoxStep( double step )
+{
+  GroupPntVecR->SpinBox_DX->setSingleStep(step);
+}
+
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
 void BasicGUI_CircleDlg::ConstructorsClicked( int constructorId )
 {
-  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
 
-  disconnect(aSelMgr, 0, this, 0);
   myPoint = myDir = myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
 
-  switch (constructorId)
-  {
+  switch ( constructorId ) {
   case 0:
     {
       Group3Pnts->hide();
       GroupCenter2Pnts->hide();
-      resize(0, 0);
       GroupPntVecR->show();
       
       myEditCurrentArgument = GroupPntVecR->LineEdit1;
-      GroupPntVecR->LineEdit1->setText("");
-      GroupPntVecR->LineEdit2->setText("");
+      GroupPntVecR->LineEdit1->setText( "" );
+      GroupPntVecR->LineEdit2->setText( "" );
+      GroupPntVecR->PushButton1->setDown( true );
+      GroupPntVecR->PushButton2->setDown( false );
+      GroupPntVecR->LineEdit1->setEnabled( true );
+      GroupPntVecR->LineEdit2->setEnabled( false );
       break;
     }
   case 1:
     {
       GroupPntVecR->hide();
       GroupCenter2Pnts->hide();
-      resize( 0, 0 );
       Group3Pnts->show();
       
       myEditCurrentArgument = Group3Pnts->LineEdit1;
-      Group3Pnts->LineEdit1->setText("");
-      Group3Pnts->LineEdit2->setText("");
-      Group3Pnts->LineEdit3->setText("");
+      Group3Pnts->LineEdit1->setText( "" );
+      Group3Pnts->LineEdit2->setText( "" );
+      Group3Pnts->LineEdit3->setText( "" );
+      Group3Pnts->PushButton1->setDown( true );
+      Group3Pnts->PushButton2->setDown( false );
+      Group3Pnts->PushButton3->setDown( false );
+      Group3Pnts->LineEdit1->setEnabled( true );
+      Group3Pnts->LineEdit2->setEnabled( false );
+      Group3Pnts->LineEdit3->setEnabled( false );
       break;
     }
   case 2:
     {
       GroupPntVecR->hide();
       Group3Pnts->hide();              
-      resize( 0, 0 );
       GroupCenter2Pnts->show();
       
       myEditCurrentArgument = GroupCenter2Pnts->LineEdit1;
-      GroupCenter2Pnts->LineEdit1->setText("");
-      GroupCenter2Pnts->LineEdit2->setText("");
-      GroupCenter2Pnts->LineEdit3->setText("");
+      GroupCenter2Pnts->LineEdit1->setText( "" );
+      GroupCenter2Pnts->LineEdit2->setText( "" );
+      GroupCenter2Pnts->LineEdit3->setText( "" );
+      GroupCenter2Pnts->PushButton1->setDown( true );
+      GroupCenter2Pnts->PushButton2->setDown( false );
+      GroupCenter2Pnts->PushButton3->setDown( false );
+      GroupCenter2Pnts->LineEdit1->setEnabled( true );
+      GroupCenter2Pnts->LineEdit2->setEnabled( false );
+      GroupCenter2Pnts->LineEdit3->setEnabled( false );
       break;
     }
   }
+  
+  qApp->processEvents();
+  updateGeometry();
+  resize( minimumSizeHint() );
 
   myEditCurrentArgument->setFocus();
   globalSelection(); // close local contexts, if any
-  localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
-  connect(aSelMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
+  displayPreview();
 }
 
 //=================================================================================
@@ -266,41 +301,31 @@ bool BasicGUI_CircleDlg::ClickOnApply()
     return false;
 
   initName();
-  ConstructorsClicked(getConstructorId());
+  ConstructorsClicked( getConstructorId() );
   return true;
 }
 
-//=================================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=================================================================================
-void BasicGUI_CircleDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection as changed or other case
 //=================================================================================
 void BasicGUI_CircleDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
-
+  myEditCurrentArgument->setText( "" );
+  
   LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
   SALOME_ListIO aList;
-  aSelMgr->selectedObjects(aList);
-
-  if (aList.Extent() != 1)
-  {
-    if      (myEditCurrentArgument == GroupPntVecR->LineEdit1)     myPoint  = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == GroupPntVecR->LineEdit2)     myDir    = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == Group3Pnts->LineEdit1)       myPoint1 = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == Group3Pnts->LineEdit2)       myPoint2 = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == Group3Pnts->LineEdit3)       myPoint3 = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == GroupCenter2Pnts->LineEdit1) myPoint4 = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == GroupCenter2Pnts->LineEdit2) myPoint5 = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == GroupCenter2Pnts->LineEdit3) myPoint6 = GEOM::GEOM_Object::_nil();
+  aSelMgr->selectedObjects( aList );
+
+  if ( aList.Extent() != 1 ) {
+    if      ( myEditCurrentArgument == GroupPntVecR->LineEdit1 )     myPoint  = GEOM::GEOM_Object::_nil();
+    else if ( myEditCurrentArgument == GroupPntVecR->LineEdit2 )     myDir    = GEOM::GEOM_Object::_nil();
+    else if ( myEditCurrentArgument == Group3Pnts->LineEdit1 )       myPoint1 = GEOM::GEOM_Object::_nil();
+    else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 )       myPoint2 = GEOM::GEOM_Object::_nil();
+    else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 )       myPoint3 = GEOM::GEOM_Object::_nil();
+    else if ( myEditCurrentArgument == GroupCenter2Pnts->LineEdit1 ) myPoint4 = GEOM::GEOM_Object::_nil();
+    else if ( myEditCurrentArgument == GroupCenter2Pnts->LineEdit2 ) myPoint5 = GEOM::GEOM_Object::_nil();
+    else if ( myEditCurrentArgument == GroupCenter2Pnts->LineEdit3 ) myPoint6 = GEOM::GEOM_Object::_nil();
     return;
   }
 
@@ -309,58 +334,93 @@ void BasicGUI_CircleDlg::SelectionIntoArgument()
 
   Standard_Boolean aRes = Standard_False;
   GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
-  if (!CORBA::is_nil(aSelectedObject) && aRes)
-  {
-    QString aName = GEOMBase::GetName(aSelectedObject);
+  if ( !CORBA::is_nil( aSelectedObject ) && aRes ) {
+    QString aName = GEOMBase::GetName( aSelectedObject );
+
+    TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
+    if ( myEditCurrentArgument == GroupPntVecR->LineEdit2 )
+      aNeedType = TopAbs_EDGE;
 
     // If selected Vertex or Edge on the some Shape Get selection Subshape
     TopoDS_Shape aShape;
-    if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
-    {
-      TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
-      if (myEditCurrentArgument == GroupPntVecR->LineEdit2)
-        aNeedType = TopAbs_EDGE;
-
+    if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) {
       TColStd_IndexedMapOfInteger aMap;
       aSelMgr->GetIndexes(anIO, aMap);
-      if (aMap.Extent() == 1) // Local Selection
-      {
+      if ( aMap.Extent() == 1 ) { // Local Selection
         int anIndex = aMap(1);
-        if (aNeedType == TopAbs_EDGE)
-          aName += QString(":edge_%1").arg(anIndex);
+        if ( aNeedType == TopAbs_EDGE )
+          aName += QString( ":edge_%1" ).arg( anIndex );
         else
-          aName += QString(":vertex_%1").arg(anIndex);
+          aName += QString( ":vertex_%1" ).arg( anIndex );
 
        //Find SubShape Object in Father
-       GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
+       GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather( aSelectedObject, aName );
 
        if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-         GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
-         aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+         GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
+         aSelectedObject = aShapesOp->GetSubShape( aSelectedObject, anIndex );
        }
-       else
+       else {
          aSelectedObject = aFindedObject; // get Object from study
+       }
       }
-      else // Global Selection
-      {
-        if (aShape.ShapeType() != aNeedType) {
+      else { // Global Selection
+        if ( aShape.ShapeType() != aNeedType ) {
           aSelectedObject = GEOM::GEOM_Object::_nil();
           aName = "";
         }
       }
     }
+    
+    myEditCurrentArgument->setText( aName );
 
-    myEditCurrentArgument->setText(aName);
+    if (!aSelectedObject->_is_nil()) { // clear selection if something selected
+      globalSelection();
+      localSelection( GEOM::GEOM_Object::_nil(), aNeedType );
+    }
 
-    if      (myEditCurrentArgument == GroupPntVecR->LineEdit1)     myPoint  = aSelectedObject;
-    else if (myEditCurrentArgument == GroupPntVecR->LineEdit2)     myDir    = aSelectedObject;
-    else if (myEditCurrentArgument == Group3Pnts->LineEdit1)       myPoint1 = aSelectedObject;
-    else if (myEditCurrentArgument == Group3Pnts->LineEdit2)       myPoint2 = aSelectedObject;
-    else if (myEditCurrentArgument == Group3Pnts->LineEdit3)       myPoint3 = aSelectedObject;
-    else if (myEditCurrentArgument == GroupCenter2Pnts->LineEdit1) myPoint4 = aSelectedObject;
-    else if (myEditCurrentArgument == GroupCenter2Pnts->LineEdit2) myPoint5 = aSelectedObject;
-    else if (myEditCurrentArgument == GroupCenter2Pnts->LineEdit3) myPoint6 = aSelectedObject;
+    if      ( myEditCurrentArgument == GroupPntVecR->LineEdit1 ) {
+      myPoint  = aSelectedObject;
+      if ( !myPoint->_is_nil() && myDir->_is_nil() )
+       GroupPntVecR->PushButton2->click();
+    }
+    else if ( myEditCurrentArgument == GroupPntVecR->LineEdit2 ) {
+      myDir    = aSelectedObject;
+      if ( !myDir->_is_nil() && myPoint->_is_nil() )
+       GroupPntVecR->PushButton1->click();
+    }
+    else if ( myEditCurrentArgument == Group3Pnts->LineEdit1 ) {
+      myPoint1 = aSelectedObject;
+      if ( !myPoint1->_is_nil() && myPoint2->_is_nil() )
+       Group3Pnts->PushButton2->click();
+    }
+    else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 ) {
+      myPoint2 = aSelectedObject;
+      if ( !myPoint2->_is_nil() && myPoint3->_is_nil() )
+       Group3Pnts->PushButton3->click();
+    }
+    else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 ) {
+      myPoint3 = aSelectedObject;
+      if ( !myPoint3->_is_nil() && myPoint1->_is_nil() )
+       Group3Pnts->PushButton1->click();
+    }
+    else if ( myEditCurrentArgument == GroupCenter2Pnts->LineEdit1 ) {
+      myPoint4 = aSelectedObject;
+      if ( !myPoint4->_is_nil() && myPoint5->_is_nil() )
+       GroupCenter2Pnts->PushButton2->click();
+    }
+    else if ( myEditCurrentArgument == GroupCenter2Pnts->LineEdit2 ) {
+      myPoint5 = aSelectedObject;
+      if ( !myPoint5->_is_nil() && myPoint6->_is_nil() )
+       GroupCenter2Pnts->PushButton3->click();
+    }
+    else if ( myEditCurrentArgument == GroupCenter2Pnts->LineEdit3 ) {
+      myPoint6 = aSelectedObject;
+      if ( !myPoint6->_is_nil() && myPoint4->_is_nil() )
+       GroupCenter2Pnts->PushButton1->click();
+    }
   }
+
   displayPreview();
 }
 
@@ -373,26 +433,84 @@ void BasicGUI_CircleDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
 
-  if ( send == GroupPntVecR->PushButton1 )      myEditCurrentArgument = GroupPntVecR->LineEdit1;
-  else if ( send == GroupPntVecR->PushButton2 ) myEditCurrentArgument = GroupPntVecR->LineEdit2;
-  else if ( send == Group3Pnts->PushButton1 )   myEditCurrentArgument = Group3Pnts->LineEdit1;
-  else if ( send == Group3Pnts->PushButton2 )   myEditCurrentArgument = Group3Pnts->LineEdit2;
-  else if ( send == Group3Pnts->PushButton3 )   myEditCurrentArgument = Group3Pnts->LineEdit3;
-  else if ( send == GroupCenter2Pnts->PushButton1 )   myEditCurrentArgument = GroupCenter2Pnts->LineEdit1;
-  else if ( send == GroupCenter2Pnts->PushButton2 )   myEditCurrentArgument = GroupCenter2Pnts->LineEdit2;
-  else if ( send == GroupCenter2Pnts->PushButton3 )   myEditCurrentArgument = GroupCenter2Pnts->LineEdit3;
+  if ( send == GroupPntVecR->PushButton1 ) {
+    myEditCurrentArgument = GroupPntVecR->LineEdit1;
+    GroupPntVecR->PushButton2->setDown(false);
+    GroupPntVecR->LineEdit1->setEnabled( true );
+    GroupPntVecR->LineEdit2->setEnabled( false );
+  }
+  else if ( send == GroupPntVecR->PushButton2 ) {
+    myEditCurrentArgument = GroupPntVecR->LineEdit2;
+    GroupPntVecR->PushButton1->setDown(false);
+    GroupPntVecR->LineEdit1->setEnabled( false );
+    GroupPntVecR->LineEdit2->setEnabled( true );
+  }
+  else if ( send == Group3Pnts->PushButton1 ) {
+    myEditCurrentArgument = Group3Pnts->LineEdit1;
+    Group3Pnts->PushButton2->setDown( false );
+    Group3Pnts->PushButton3->setDown( false );
+    Group3Pnts->LineEdit1->setEnabled( true );
+    Group3Pnts->LineEdit2->setEnabled( false );
+    Group3Pnts->LineEdit3->setEnabled( false );
+  }
+  else if ( send == Group3Pnts->PushButton2 )  {
+    myEditCurrentArgument = Group3Pnts->LineEdit2;
+    Group3Pnts->PushButton1->setDown( false );
+    Group3Pnts->PushButton3->setDown( false );
+    Group3Pnts->LineEdit1->setEnabled( false );
+    Group3Pnts->LineEdit2->setEnabled( true );
+    Group3Pnts->LineEdit3->setEnabled( false );
+  }
+  else if ( send == Group3Pnts->PushButton3 ) {
+    myEditCurrentArgument = Group3Pnts->LineEdit3;
+    Group3Pnts->PushButton1->setDown( false );
+    Group3Pnts->PushButton2->setDown( false );
+    Group3Pnts->LineEdit1->setEnabled( false );
+    Group3Pnts->LineEdit2->setEnabled( false );
+    Group3Pnts->LineEdit3->setEnabled( true );
+  }
+  else if ( send == GroupCenter2Pnts->PushButton1 ) {
+    myEditCurrentArgument = GroupCenter2Pnts->LineEdit1;
+    GroupCenter2Pnts->PushButton2->setDown( false );
+    GroupCenter2Pnts->PushButton3->setDown( false );
+    GroupCenter2Pnts->LineEdit1->setEnabled( true );
+    GroupCenter2Pnts->LineEdit2->setEnabled( false );
+    GroupCenter2Pnts->LineEdit3->setEnabled( false );
+  }
+  else if ( send == GroupCenter2Pnts->PushButton2 ) {
+    myEditCurrentArgument = GroupCenter2Pnts->LineEdit2;
+    GroupCenter2Pnts->PushButton1->setDown( false );
+    GroupCenter2Pnts->PushButton3->setDown( false );
+    GroupCenter2Pnts->LineEdit1->setEnabled( false );
+    GroupCenter2Pnts->LineEdit2->setEnabled( true );
+    GroupCenter2Pnts->LineEdit3->setEnabled( false );
+    
+  }
+  else if ( send == GroupCenter2Pnts->PushButton3 ) {
+    myEditCurrentArgument = GroupCenter2Pnts->LineEdit3;
+    GroupCenter2Pnts->PushButton1->setDown( false );
+    GroupCenter2Pnts->PushButton2->setDown( false );
+    GroupCenter2Pnts->LineEdit1->setEnabled( false );
+    GroupCenter2Pnts->LineEdit2->setEnabled( false );
+    GroupCenter2Pnts->LineEdit3->setEnabled( true );
+  }
 
+  
   myEditCurrentArgument->setFocus();
 
-  if (myEditCurrentArgument == GroupPntVecR->LineEdit2) {
+  if ( myEditCurrentArgument == GroupPntVecR->LineEdit2 ) {
     globalSelection(); // close local contexts, if any
-    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
+    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
   }
   else {
     globalSelection(); // close local contexts, if any
-    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
   }
-  SelectionIntoArgument();
+
+  myEditCurrentArgument->setFocus();
+  //  SelectionIntoArgument();
+  send->setDown(true);
+  displayPreview();
 }
 
 //=================================================================================
@@ -409,13 +527,13 @@ void BasicGUI_CircleDlg::LineEditReturnPressed()
        send == Group3Pnts->LineEdit3 ||
        send == GroupCenter2Pnts->LineEdit1 ||
        send == GroupCenter2Pnts->LineEdit2 ||
-       send == GroupCenter2Pnts->LineEdit3 )
-  {
+       send == GroupCenter2Pnts->LineEdit3 ) {
     myEditCurrentArgument = send;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
 }
 
+
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -423,19 +541,21 @@ void BasicGUI_CircleDlg::LineEditReturnPressed()
 void BasicGUI_CircleDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
+
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
   ConstructorsClicked( getConstructorId() );
 }
 
+
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BasicGUI_CircleDlg::enterEvent(QEvent* e)
+void BasicGUI_CircleDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
@@ -464,12 +584,12 @@ void BasicGUI_CircleDlg::ValueChangedInSpinBox()
 //=================================================================================
 double BasicGUI_CircleDlg::getRadius() const
 {
-  switch (getConstructorId())
-  {
+  double r = 0.;
+  switch ( getConstructorId() ) {
   case 0:
-    return GroupPntVecR->SpinBox_DX->GetValue();
+    r = GroupPntVecR->SpinBox_DX->value(); break;
   }
-  return 0.;
+  return r;
 }
 
 //=================================================================================
@@ -494,16 +614,21 @@ static bool isEqual( const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Obje
 // function : isValid
 // purpose  :
 //=================================================================================
-bool BasicGUI_CircleDlg::isValid(QString& msg)
+bool BasicGUI_CircleDlg::isValid( QString& msg )
 {
   const int id = getConstructorId();
-  if ( id == 0 )
-    return !myPoint->_is_nil() && !myDir->_is_nil() && getRadius() > 0;
+  if ( id == 0 ) {
+    //return !myPoint->_is_nil() && !myDir->_is_nil() && getRadius() > 0;
+    //nil point means origin of global CS
+    //nil vector means Z axis
+    bool ok = GroupPntVecR->SpinBox_DX->isValid(msg, !IsPreview());
+    return getRadius() > 0 && ok;
+  }
   else if ( id == 1 )
     return !myPoint1->_is_nil() && !myPoint2->_is_nil() && !myPoint3->_is_nil() &&
       !isEqual( myPoint1, myPoint2 ) && !isEqual( myPoint1, myPoint3 ) && !isEqual( myPoint2, myPoint3 );
   else if ( id == 2 )
-      return !myPoint4->_is_nil() && !myPoint5->_is_nil() && !myPoint6->_is_nil() &&
+    return !myPoint4->_is_nil() && !myPoint5->_is_nil() && !myPoint6->_is_nil() &&
       !isEqual( myPoint4, myPoint5 ) && !isEqual( myPoint5, myPoint6 ) && !isEqual( myPoint4, myPoint6 );
   return false;
 }
@@ -512,49 +637,42 @@ bool BasicGUI_CircleDlg::isValid(QString& msg)
 // function : execute
 // purpose  :
 //=================================================================================
-bool BasicGUI_CircleDlg::execute(ObjectList& objects)
+bool BasicGUI_CircleDlg::execute( ObjectList& objects )
 {
   bool res = false;
-
+  
   GEOM::GEOM_Object_var anObj;
-
-  switch (getConstructorId())
-  {
-  case 0:
-    anObj = GEOM::GEOM_ICurvesOperations::_narrow(getOperation())->
-      MakeCirclePntVecR(myPoint, myDir, getRadius());
-    res = true;
-    break;
-  case 1:
-    anObj = GEOM::GEOM_ICurvesOperations::_narrow(getOperation())->
-      MakeCircleThreePnt(myPoint1, myPoint2, myPoint3);
+  
+  switch ( getConstructorId() ) {
+  case 0 :
+    {
+      QStringList aParameters;
+      aParameters << GroupPntVecR->SpinBox_DX->text();
+      anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeCirclePntVecR( myPoint, myDir, getRadius() );
+      if ( !anObj->_is_nil() && !IsPreview() )
+        anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+      res = true;
+      break;
+    }
+  case 1 :
+    anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeCircleThreePnt( myPoint1, myPoint2, myPoint3 );
     res = true;
     break;
   case 2:
-    anObj = GEOM::GEOM_ICurvesOperations::_narrow(getOperation())->
-      MakeCircleCenter2Pnt(myPoint4, myPoint5, myPoint6);
+    anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeCircleCenter2Pnt( myPoint4, myPoint5, myPoint6 );
     res = true;
     break;
   }
-
-  if (!anObj->_is_nil())
-    objects.push_back(anObj._retn());
+  
+  if ( !anObj->_is_nil() )
+    objects.push_back( anObj._retn() );
   else {
-    MESSAGE("Execute Object is NULL!");
+    MESSAGE( "Execute Object is NULL!" );
   }
-
+  
   return res;
 }
 
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void BasicGUI_CircleDlg::closeEvent (QCloseEvent* e)
-{
-  GEOMBase_Skeleton::closeEvent(e);
-}
-
 //=================================================================================
 // function : addSubshapeToStudy
 // purpose  : virtual method to add new SubObjects if local selection
@@ -563,11 +681,12 @@ void BasicGUI_CircleDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
 
-switch (getConstructorId())
-  {
+  switch ( getConstructorId() ) {
   case 0:
-    objMap[GroupPntVecR->LineEdit1->text()] = myPoint;
-    objMap[GroupPntVecR->LineEdit2->text()] = myDir;
+    if (!CORBA::is_nil(myPoint))
+      objMap[GroupPntVecR->LineEdit1->text()] = myPoint;
+    if (!CORBA::is_nil(myDir))
+      objMap[GroupPntVecR->LineEdit2->text()] = myDir;
     break;
   case 1:
     objMap[Group3Pnts->LineEdit1->text()] = myPoint1;
@@ -580,5 +699,5 @@ switch (getConstructorId())
     objMap[GroupCenter2Pnts->LineEdit3->text()] = myPoint6;
     break;
   }
- addSubshapesToFather( objMap );
 addSubshapesToFather( objMap );
 }
index cbe68d98b20c21c90cb361ce8b9af7c88bb601de..b1574fd6db05de7172f859255ce43da60888c65c 100644 (file)
@@ -1,88 +1,82 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BasicGUI_CircleDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_CIRCLE_H
-#define DIALOGBOX_CIRCLE_H
-
-#include "GEOM_BasicGUI.hxx"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_CircleDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef BASICGUI_CIRCLEDLG_H
+#define BASICGUI_CIRCLEDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel1Spin.h"
-#include "DlgRef_3Sel_QTD.h"
+#include <GEOMBase_Skeleton.h>
 
-#include "BasicGUI.h"
+class DlgRef_3Sel;
+class DlgRef_2Sel1Spin;
 
 //=================================================================================
 // class    : BasicGUI_CircleDlg
 // purpose  :
 //=================================================================================
-class GEOM_BASICGUI_EXPORT BasicGUI_CircleDlg : public GEOMBase_Skeleton
+class BasicGUI_CircleDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BasicGUI_CircleDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                      const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~BasicGUI_CircleDlg();
+  BasicGUI_CircleDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~BasicGUI_CircleDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void closeEvent( QCloseEvent* e );    
-    virtual void addSubshapesToStudy();
-
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  
+  virtual void                       addSubshapesToStudy();
+  
 private:
-    void   Init();
-    void   enterEvent(QEvent* e);
-    double getRadius() const;
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  double                             getRadius() const;
 
-    GEOM::GEOM_Object_var myPoint, myDir, myPoint1, myPoint2, myPoint3, myPoint4, myPoint5, myPoint6;
-    CORBA::Double myRadius;
+private:
+  GEOM::GEOM_Object_var              myPoint, myDir, myPoint1, myPoint2, myPoint3, myPoint4, myPoint5, myPoint6;
 
-    DlgRef_2Sel1Spin* GroupPntVecR;
-    DlgRef_3Sel_QTD*  Group3Pnts;
-    DlgRef_3Sel_QTD*  GroupCenter2Pnts;
+  DlgRef_2Sel1Spin*                  GroupPntVecR;
+  DlgRef_3Sel*                       Group3Pnts;
+  DlgRef_3Sel*                       GroupCenter2Pnts;
 
 private slots:
-    void ClickOnOk();
-    void ClickOnCancel();
-    bool ClickOnApply();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
 
-    void ActivateThisDialog();
-    void DeactivateActiveDialog();
+  void                               ActivateThisDialog();
+  void                               DeactivateActiveDialog();
     
-    void SelectionIntoArgument();
+  void                               SelectionIntoArgument();
 
-    void ConstructorsClicked( int );
-    void LineEditReturnPressed();
-    void SetEditCurrentArgument();
-    void ValueChangedInSpinBox();
+  void                               ConstructorsClicked( int );
+  void                               LineEditReturnPressed();
+  void                               SetEditCurrentArgument();
+  void                               ValueChangedInSpinBox();
+  void                               SetDoubleSpinBoxStep( double );
 };
 
-#endif // DIALOGBOX_CIRCLE_H
+#endif // BASICGUI_CIRCLEDLG_H
index 49d8bf5cc928cf1261a9a726ce2984311390a69a..05a7baf26c76cc831bf7a27618bafffbd2f99275 100644 (file)
@@ -1,44 +1,42 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it 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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_CurveDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : BasicGUI_CurveDlg.cxx
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
-
 #include "BasicGUI_CurveDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "SalomeApp_Study.h"
-#include "LightApp_SelectionMgr.h"
-
-#include <qlabel.h>
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include "utilities.h"
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <SalomeApp_Study.h>
+#include <LightApp_SelectionMgr.h>
 
-#include "SALOME_ListIteratorOfListIO.hxx"
-#include "SALOME_ListIO.hxx"
+#include <SALOME_ListIteratorOfListIO.hxx>
+#include <SALOME_ListIO.hxx>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include "GEOMImpl_Types.hxx"
-
-using namespace std;
-#include <string>
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : BasicGUI_CurveDlg()
@@ -58,35 +53,37 @@ 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(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BasicGUI_CurveDlg::BasicGUI_CurveDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                     bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
 {
-  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 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" ) ) );
 
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
-
-  setCaption(tr("GEOM_CURVE_TITLE"));
+  setWindowTitle( tr( "GEOM_CURVE_TITLE" ) );
 
   /***************************************************************/
-  RadioButton1->setPixmap( image0 );
-  RadioButton2->setPixmap( image3 );
-  RadioButton3->setPixmap( image2 );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setIcon( image3 );
+  mainFrame()->RadioButton3->setIcon( image2 );
+
+  GroupPoints = new DlgRef_1Sel( centralWidget() );
 
-  GroupPoints = new DlgRef_1Sel_QTD( this, "GroupPoints" );
   GroupPoints->GroupBox1->setTitle( tr( "GEOM_NODES" ) );
-  GroupPoints->TextLabel1->setText( tr("GEOM_POINTS") );
-  GroupPoints->PushButton1->setPixmap(image1);
+  GroupPoints->TextLabel1->setText( tr( "GEOM_POINTS" ) );
+  GroupPoints->PushButton1->setIcon( image1 );
+  GroupPoints->PushButton1->setDown( true );
 
   GroupPoints->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget(GroupPoints, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
   /***************************************************************/
 
-  setHelpFileName("create_curve_page.html");
+  setHelpFileName( "create_curve_page.html" );
 
   Init();
 }
@@ -114,23 +111,23 @@ void BasicGUI_CurveDlg::Init()
   myPoints->length( 0 );
 
   globalSelection(); // close local contexts, if any
-  localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
 
   /* 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( 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()));
-  connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
+  connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( this,           SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
 
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( GroupPoints->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
+  connect( myGeomGUI->getApp()->selectionMgr(), 
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) ) ;
   initName( tr( "GEOM_CURVE" ) );
   ConstructorsClicked( 0 );
 }
@@ -142,12 +139,12 @@ void BasicGUI_CurveDlg::Init()
 void BasicGUI_CurveDlg::ConstructorsClicked( int id )
 {
   QString aTitle = tr( id == 0 ? "GEOM_POLYLINE" : id == 1 ? "GEOM_BEZIER" : "GEOM_INTERPOL" );
-  GroupConstructors->setTitle( aTitle );
+  mainFrame()->GroupConstructors->setTitle( aTitle );
        
-       myPoints = new GEOM::ListOfGO();
+  myPoints = new GEOM::ListOfGO();
   myPoints->length( 0 );  
 
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
 }
 
 
@@ -197,21 +194,11 @@ bool BasicGUI_CurveDlg::ClickOnApply()
     return false;
 
   initName();
-  ConstructorsClicked( getConstructorId() );
   globalSelection(); // close local contexts, if any
-  localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
   return true;
 }
 
-//=======================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=======================================================================
-void BasicGUI_CurveDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 /*! function : isPointInList()
  *  purpose  : Check is point (theObject) in the list \a thePoints.
@@ -219,23 +206,23 @@ void BasicGUI_CurveDlg::ClickOnCancel()
  * \retval -1, if point not in list, else 1 in list
  */
 //=================================================================================
-static int isPointInList(list<GEOM::GEOM_Object_var>& thePoints,
-                        GEOM::GEOM_Object_var& theObject)
+static int isPointInList( std::list<GEOM::GEOM_Object_var>& thePoints,
+                         GEOM::GEOM_Object_var& theObject )
 {
   int len = thePoints.size();
   
-  if(len<1){
+  if ( len < 1 ) {
     return -1;
   }
   
-  for(list<GEOM::GEOM_Object_var>::iterator i=thePoints.begin();i!=thePoints.end();i++)
-    if (string((*i)->GetEntry()) == string(theObject->GetEntry())){
+  for ( std::list<GEOM::GEOM_Object_var>::iterator i = thePoints.begin(); i != thePoints.end(); i++ ) {
+    if ( std::string( (*i)->GetEntry() ) == std::string( theObject->GetEntry() ) ) {
       return 1;
     }
+  }
 
   return -1;
 }
-
 //=================================================================================
 /*! function : removeUnnecessaryPnt()
  *  purpose  : Remove unnecessary points from list \a theOldPoints
@@ -244,24 +231,24 @@ static int isPointInList(list<GEOM::GEOM_Object_var>& thePoints,
  * \li \a theNewPoints - not ordered sequence with necessary points
  */
 //=================================================================================
-static void removeUnnecessaryPnt(list<GEOM::GEOM_Object_var>& theOldPoints,
-                                GEOM::ListOfGO_var& theNewPoints)
+static void removeUnnecessaryPnt( std::list<GEOM::GEOM_Object_var>& theOldPoints,
+                                 GEOM::ListOfGO_var& theNewPoints )
 {
-  list<GEOM::GEOM_Object_var> objs_to_remove;
-  for(list<GEOM::GEOM_Object_var>::iterator i=theOldPoints.begin();i!=theOldPoints.end();i++){
+  std::list<GEOM::GEOM_Object_var> objs_to_remove;
+  for ( std::list<GEOM::GEOM_Object_var>::iterator i = theOldPoints.begin(); i != theOldPoints.end(); i++ ) {
     bool found = false;
-    for (int j=0;j<theNewPoints->length() && !found ; j++){
-      if(string((*i)->GetEntry()) == string(theNewPoints[j]->GetEntry())){
+    for ( int j = 0; j < theNewPoints->length() && !found ; j++ ) {
+      if ( std::string( (*i)->GetEntry() ) == std::string( theNewPoints[j]->GetEntry() ) ) {
        found = true;
       }
     }
-    if(!found){
-      objs_to_remove.push_back(*i);
+    if ( !found ) {
+      objs_to_remove.push_back( *i );
       //cout << "removed: " << (*i)->GetEntry() << endl;
     }
   }
-  for(list<GEOM::GEOM_Object_var>::iterator i=objs_to_remove.begin();i!=objs_to_remove.end();i++){
-    theOldPoints.remove(*i);
+  for ( std::list<GEOM::GEOM_Object_var>::iterator i = objs_to_remove.begin(); i != objs_to_remove.end(); i++ ) {
+    theOldPoints.remove( *i );
   }
 }
 
@@ -271,102 +258,99 @@ static void removeUnnecessaryPnt(list<GEOM::GEOM_Object_var>& theOldPoints,
 //=================================================================================
 void BasicGUI_CurveDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
 
   Standard_Boolean aRes = Standard_False;
-  int IOC = IObjectCount();
-  //  bool is_append = myPoints->length() < IOC; // if true - add point, else remove
-  //  myPoints->length( IOC ); // this length may be greater than number of objects,
-                           // that will actually be put into myPoints
 
-  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-  SalomeApp_Application* app =
-    dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
-  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
+  SalomeApp_Application* app = myGeomGUI->getApp();
+  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>(app->activeStudy());
   _PTR(Study) aDStudy = appStudy->studyDS();
-  GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
+  GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
 
   int anIndex;
   TopoDS_Shape aShape;
   TColStd_IndexedMapOfInteger aMapIndexes;
   GEOM::GEOM_Object_var anObject;
   std::list<GEOM::GEOM_Object_var> aList;
+  LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
   SALOME_ListIO selected;
-  aSelMgr->selectedObjects( selected, QString::null, false );
-
-  for ( SALOME_ListIteratorOfListIO anIt( selected ); anIt.More(); anIt.Next() )
-    {
-      GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( anIt.Value(), aRes );
-
-      if ( !CORBA::is_nil( aSelectedObject ) && aRes )
-       {
-         if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
-           {
-             aSelMgr->GetIndexes( anIt.Value(), aMapIndexes );
-
-             if ( aMapIndexes.Extent() > 0 )
-               {
-                 for (int ii=1; ii <= aMapIndexes.Extent(); ii++) {
-                   anIndex = aMapIndexes(ii);
-                   QString aName = GEOMBase::GetName( aSelectedObject );
-                   aName = aName + ":vertex_" + QString::number( anIndex );
-                   anObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-                   //Find Object in study
-                   _PTR(SObject) obj ( aDStudy->FindObjectID( anIt.Value()->getEntry() ) );
-                   bool inStudy = false;
-                   for (_PTR(ChildIterator) iit (aDStudy->NewChildIterator(obj)); iit->More(); iit->Next()) {
-                     _PTR(SObject) child (iit->Value());
-                     QString aChildName = child->GetName();
-                     if (aChildName == aName) {
-                       inStudy = true;
-                       CORBA::Object_var corbaObj = GeometryGUI::ClientSObjectToObject(iit->Value());
-                       anObject = GEOM::GEOM_Object::_narrow( corbaObj );
-                     }
-                   }
-
-                   if (!inStudy)
-                     GeometryGUI::GetGeomGen()->AddInStudy(GeometryGUI::ClientStudyToStudy(aDStudy),
-                                                           anObject, aName, aSelectedObject);
-                   
-                   int pos = isPointInList(myOrderedSel, anObject);
-                   if (pos==-1) {
-                     myOrderedSel.push_back(anObject);
-                   }
-                   //              if (!inStudy)
-                   aList.push_back(anObject);
-                 }
-               } else { // aMap.Extent() == 0
-                 int pos = isPointInList(myOrderedSel,aSelectedObject);
-                 if(pos==-1)
-                   myOrderedSel.push_back(aSelectedObject);
-                 aList.push_back(aSelectedObject);
-               } 
+  aSelMgr->selectedObjects(selected, QString::null, false);
+
+  int IOC = selected.Extent();
+  // bool is_append = myPoints->length() < IOC; // if true - add point, else remove
+  // myPoints->length( IOC ); // this length may be greater than number of objects,
+                           // that will actually be put into myPoints
+  
+  for (SALOME_ListIteratorOfListIO anIt (selected); anIt.More(); anIt.Next()) {
+    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(anIt.Value(), aRes);
+    if (!CORBA::is_nil(aSelectedObject) && aRes) {
+      if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull()) {
+       aSelMgr->GetIndexes(anIt.Value(), aMapIndexes);
+       
+       if (aMapIndexes.Extent() > 0) {
+         for (int ii = 1; ii <= aMapIndexes.Extent(); ii++) {
+           anIndex = aMapIndexes(ii);
+           QString aName = GEOMBase::GetName( aSelectedObject );
+           aName = aName + ":vertex_" + QString::number( anIndex );
+           anObject = aShapesOp->GetSubShape( aSelectedObject, anIndex );
+           //Find Object in study
+           _PTR(SObject) obj ( aDStudy->FindObjectID( anIt.Value()->getEntry() ) );
+           bool inStudy = false;
+            _PTR(ChildIterator) iit( aDStudy->NewChildIterator( obj ) );
+            for (; iit->More() && !inStudy; iit->Next()) {
+             _PTR(SObject) child( iit->Value() );
+             QString aChildName = child->GetName().c_str();
+             if ( aChildName == aName ) {
+               inStudy = true;
+               CORBA::Object_var corbaObj = GeometryGUI::ClientSObjectToObject( iit->Value() );
+               anObject = GEOM::GEOM_Object::_narrow( corbaObj );
+             }
            }
-       }
+           
+           if ( !inStudy )
+             GeometryGUI::GetGeomGen()->AddInStudy( GeometryGUI::ClientStudyToStudy( aDStudy ),
+                                                    anObject, aName.toLatin1().data(), aSelectedObject );
+           
+           int pos = isPointInList( myOrderedSel, anObject );
+           if ( pos == -1 ) {
+             myOrderedSel.push_back( anObject );
+           }
+           //              if (!inStudy)
+           aList.push_back(anObject);
+         }
+       } 
+       else { // aMap.Extent() == 0
+         int pos = isPointInList( myOrderedSel, aSelectedObject );
+         if ( pos == -1 )
+           myOrderedSel.push_back( aSelectedObject );
+         aList.push_back( aSelectedObject );
+       } 
+      }
     }
-
+  }
+  
   myPoints->length( aList.size()  );  
 
-  int k=0;
-  for (list<GEOM::GEOM_Object_var>::iterator j=aList.begin();j!=aList.end();j++)
+  int k = 0;
+  for ( std::list<GEOM::GEOM_Object_var>::iterator j = aList.begin(); j != aList.end(); j++ )
     myPoints[k++] = *j;
 
-  if(IOC == 0)
+  if ( IOC == 0 )
     myOrderedSel.clear();
   else
-    removeUnnecessaryPnt(myOrderedSel, myPoints);
+    removeUnnecessaryPnt( myOrderedSel, myPoints );
 
   // if ( myOrderedSel.size() == myPoints->length() ) {
   myPoints->length( myOrderedSel.size()  );  
-  k=0;
-  for (list<GEOM::GEOM_Object_var>::iterator j=myOrderedSel.begin();j!=myOrderedSel.end();j++)
+  k = 0;
+  for ( std::list<GEOM::GEOM_Object_var>::iterator j = myOrderedSel.begin(); j != myOrderedSel.end(); j++ )
     myPoints[k++] = *j;
   //  }
 
   if ( myPoints->length() > 0  )
     GroupPoints->LineEdit1->setText( QString::number( myPoints->length() ) + "_" + tr( "GEOM_POINT" ) + tr( "_S_" ) );
-  
-  displayPreview(); 
+   
+displayPreview(); 
 }
 
 
@@ -377,11 +361,12 @@ void BasicGUI_CurveDlg::SelectionIntoArgument()
 void BasicGUI_CurveDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
   globalSelection(); // close local contexts, if any
   localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+
   ConstructorsClicked( getConstructorId() );
 }
 
@@ -399,9 +384,9 @@ void BasicGUI_CurveDlg::DeactivateActiveDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BasicGUI_CurveDlg::enterEvent(QEvent* e)
+void BasicGUI_CurveDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
@@ -433,8 +418,7 @@ bool BasicGUI_CurveDlg::execute( ObjectList& objects )
 
   GEOM::GEOM_Object_var anObj;
 
-  switch ( getConstructorId() )
-  {
+  switch ( getConstructorId() ) {
   case 0 :
     anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakePolyline( myPoints );
     res = true;
@@ -454,13 +438,3 @@ bool BasicGUI_CurveDlg::execute( ObjectList& objects )
 
   return res;
 }
-
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void BasicGUI_CurveDlg::closeEvent( QCloseEvent* e )
-{
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
index 6a1b6fa9b054cab14274291e9aefe0b85a485e57..5c37308599c7c9a7870bffeb7e9ee2ed64d41456 100644 (file)
@@ -1,83 +1,75 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it 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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BasicGUI_CurveDlg.h
-//  Author : Alexander SLADKOV
-//  Module : GEOM
-
-#ifndef BASICGUI_CURVE_H
-#define BASICGUI_CURVE_H
-
-#include "GEOM_BasicGUI.hxx"
-
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_QTD.h"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_CurveDlg.h
+// Author : Alexander SLADKOV, Open CASCADE S.A.S. (alexander.sladkov@opencascade.com)
+//
+#ifndef BASICGUI_CURVEDLG_H
+#define BASICGUI_CURVEDLG_H
 
-#include "BasicGUI.h"
+#include <GEOMBase_Skeleton.h>
 
 #include <list>
 
+class DlgRef_1Sel;
+
 //=================================================================================
 // class    : BasicGUI_CurveDlg
 // purpose  :
 //=================================================================================
-class GEOM_BASICGUI_EXPORT BasicGUI_CurveDlg : public GEOMBase_Skeleton
+class BasicGUI_CurveDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BasicGUI_CurveDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                     const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~BasicGUI_CurveDlg();
-
+  BasicGUI_CurveDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~BasicGUI_CurveDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-
-    virtual void closeEvent( QCloseEvent* e );    
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
 
-private :
-    void Init();
-    void enterEvent(QEvent* e);
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
 
-    DlgRef_1Sel_QTD* GroupPoints;
-    GEOM::ListOfGO_var myPoints;
-    list<GEOM::GEOM_Object_var> myOrderedSel;//!< This list used for managing orderes selection
+private:
+  DlgRef_1Sel*                       GroupPoints;
+  GEOM::ListOfGO_var                 myPoints;
+  std::list<GEOM::GEOM_Object_var>   myOrderedSel; //!< This list used for managing orderes selection
 
 private slots:
-    void ClickOnOk();
-    void ClickOnCancel();
-    bool ClickOnApply();
-
-    void ActivateThisDialog();
-    void DeactivateActiveDialog();    
-    
-    void ConstructorsClicked( int );
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  
+  void                               ActivateThisDialog();
+  void                               DeactivateActiveDialog();    
+  
+  void                               ConstructorsClicked( int );
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // BASICGUI_CURVE_H
+#endif // BASICGUI_CURVEDLG_H
index 04baab168000965646b83e32565d5252b324f69d..9b9eb6c07b7f2059c473b7060964722298eab5d7 100644 (file)
@@ -1,36 +1,39 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it 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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_EllipseDlg.cxx
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
 //
-//  File   : BasicGUI_EllipseDlg.cxx
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
-
 #include "BasicGUI_EllipseDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopoDS.hxx>
 #include <TopExp.hxx>
 
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : BasicGUI_EllipseDlg()
@@ -54,38 +51,43 @@ 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(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BasicGUI_EllipseDlg::BasicGUI_EllipseDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                         bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_ELLIPSE_PV")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  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"));
+  setWindowTitle( tr( "GEOM_ELLIPSE_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_ELLIPSE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_2Sel2Spin(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_CENTER"));
-  GroupPoints->TextLabel2->setText(tr("GEOM_VECTOR"));
-  GroupPoints->TextLabel3->setText(tr("GEOM_RADIUS_MAJOR"));
-  GroupPoints->TextLabel4->setText(tr("GEOM_RADIUS_MINOR"));
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->PushButton2->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_ELLIPSE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_2Sel2Spin( centralWidget() );
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_CENTER" ) + " (Origin by default)" );
+  GroupPoints->TextLabel2->setText( tr( "GEOM_VECTOR" ) + " (Z axis by default)" );
+  GroupPoints->TextLabel3->setText( tr( "GEOM_RADIUS_MAJOR" ) );
+  GroupPoints->TextLabel4->setText( tr( "GEOM_RADIUS_MINOR" ) );
+  GroupPoints->PushButton1->setIcon( image1 );
+  GroupPoints->PushButton2->setIcon( image1 );
 
   GroupPoints->LineEdit1->setReadOnly( true );
   GroupPoints->LineEdit2->setReadOnly( true );
+  GroupPoints->LineEdit1->setEnabled( true );
+  GroupPoints->LineEdit2->setEnabled( false );
 
-  Layout1->addWidget(GroupPoints, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
   /***************************************************************/
 
-  setHelpFileName("create_ellipse_page.html");
+  setHelpFileName( "create_ellipse_page.html" );
 
   Init();
 }
@@ -109,50 +111,60 @@ void BasicGUI_EllipseDlg::Init()
   /* init variables */
   myEditCurrentArgument = GroupPoints->LineEdit1;
   globalSelection(); // close local contexts, if any
-  localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+  GroupPoints->PushButton1->setDown(true);
 
   myPoint = myDir = GEOM::GEOM_Object::_nil();
 
   /* Get setting of step value from file configuration */
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
+  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100 );
   
   double aMajorR( 200. ), aMinorR( 100. );
 
   /* min, max, step and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator( 0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY );
-  GroupPoints->SpinBox_DY->RangeStepAndValidator( 0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY );
-  GroupPoints->SpinBox_DX->SetValue( aMajorR );
-  GroupPoints->SpinBox_DY->SetValue( aMinorR );
+  initSpinBox( GroupPoints->SpinBox_DX, 0.000001, COORD_MAX, step, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( GroupPoints->SpinBox_DY, 0.000001, COORD_MAX, step, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupPoints->SpinBox_DX->setValue( aMajorR );
+  GroupPoints->SpinBox_DY->setValue( aMinorR );
 
   /* 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( 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()));
+  connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
 
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPoints->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( GroupPoints->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
-  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+  connect( GroupPoints->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupPoints->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( 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 ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
   
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( myGeomGUI->getApp()->selectionMgr(), 
+         SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   initName( tr( "GEOM_ELLIPSE" ) );
+
+  displayPreview();
+}
+
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void BasicGUI_EllipseDlg::SetDoubleSpinBoxStep( double step )
+{
+  GroupPoints->SpinBox_DX->setSingleStep(step);
+  GroupPoints->SpinBox_DY->setSingleStep(step);
 }
 
+
 //=================================================================================
 // function : ClickOnOk()
 // purpose  :
@@ -163,6 +175,7 @@ void BasicGUI_EllipseDlg::ClickOnOk()
     ClickOnCancel();
 }
 
+
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
@@ -178,59 +191,54 @@ bool BasicGUI_EllipseDlg::ClickOnApply()
   myPoint = myDir = GEOM::GEOM_Object::_nil();
   GroupPoints->LineEdit1->setText( "" );
   GroupPoints->LineEdit2->setText( "" );
+  GroupPoints->PushButton1->setDown(true);
+  GroupPoints->PushButton2->setDown(false);
+  GroupPoints->LineEdit1->setEnabled( true );
+  GroupPoints->LineEdit2->setEnabled( false );
   myEditCurrentArgument = GroupPoints->LineEdit1;
-  //globalSelection(GEOM_POINT);
-  globalSelection(); // close local contexts, if any
-  localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
 
+  globalSelection(); // close local contexts, if any
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+  displayPreview();
+  
   return true;
 }
 
-//=======================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=======================================================================
-void BasicGUI_EllipseDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection as changed or other case
 //=================================================================================
 void BasicGUI_EllipseDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
 
-  if ( IObjectCount() != 1 )  
-  {
-    if      ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myPoint = GEOM::GEOM_Object::_nil();
-    else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) myDir   = GEOM::GEOM_Object::_nil();
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
+    if      (myEditCurrentArgument == GroupPoints->LineEdit1) myPoint = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == GroupPoints->LineEdit2) myDir   = GEOM::GEOM_Object::_nil();
     return;
   }
 
   Standard_Boolean aRes = Standard_False;
-  Handle(SALOME_InteractiveObject) anIO = firstIObject();
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), aRes);
-  if (!CORBA::is_nil(aSelectedObject) && aRes)
-  {  
+  Handle(SALOME_InteractiveObject) anIO = aSelList.First();
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
+  if (!CORBA::is_nil(aSelectedObject) && aRes) {
     QString aName = GEOMBase::GetName(aSelectedObject);
-
+    
     // Get Selected object if selected subshape
     TopoDS_Shape aShape;
 
-    if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
-    {
-      TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
-      if (myEditCurrentArgument == GroupPoints->LineEdit2)
-        aNeedType = TopAbs_EDGE;
-
-      LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+    TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
+    if ( myEditCurrentArgument == GroupPoints->LineEdit2 )
+      aNeedType = TopAbs_EDGE;
+    
+    if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) {
       TColStd_IndexedMapOfInteger aMap;
       aSelMgr->GetIndexes(anIO, aMap);
-      if (aMap.Extent() == 1)
-      {
+      if (aMap.Extent() == 1) {
         int anIndex = aMap(1);
         if (aNeedType == TopAbs_EDGE)
           aName += QString(":edge_%1").arg(anIndex);
@@ -240,26 +248,39 @@ void BasicGUI_EllipseDlg::SelectionIntoArgument()
        //Find SubShape Object in Father
        GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
 
-       if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-        GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
-        aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-       } else {
+       if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+          GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
+          aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+       } 
+       else {
          aSelectedObject = aFindedObject; // get Object from study
        }
       }
-      else // Global Selection
-      {
+      else { // Global Selection
         if (aShape.ShapeType() != aNeedType) {
           aSelectedObject = GEOM::GEOM_Object::_nil();
           aName = "";
         }
       }
     }
+    
+    myEditCurrentArgument->setText( aName );
 
-    myEditCurrentArgument->setText(aName);
+    if (!aSelectedObject->_is_nil()) { // clear selection if something selected
+      globalSelection();
+      localSelection( GEOM::GEOM_Object::_nil(), aNeedType );      
+    }
 
-    if      ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myPoint = aSelectedObject;
-    else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) myDir   = aSelectedObject;
+    if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) {
+      myPoint = aSelectedObject;
+      if ( !myPoint->_is_nil() && myDir->_is_nil() )
+       GroupPoints->PushButton2->click();
+    }
+    else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) {
+      myDir   = aSelectedObject;
+      if ( !myDir->_is_nil() && myPoint->_is_nil() )
+       GroupPoints->PushButton1->click();
+    }
   }
 
   displayPreview();
@@ -273,18 +294,30 @@ void BasicGUI_EllipseDlg::SelectionIntoArgument()
 void BasicGUI_EllipseDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  globalSelection( GEOM_POINT );
 
-  if      ( send == GroupPoints->PushButton1 ) myEditCurrentArgument = GroupPoints->LineEdit1;
-  else if ( send == GroupPoints->PushButton2 ) myEditCurrentArgument = GroupPoints->LineEdit2;
-  
-  myEditCurrentArgument->setFocus();
+  if ( send == GroupPoints->PushButton1 ) {
+    myEditCurrentArgument = GroupPoints->LineEdit1;
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit1->setEnabled( true );
+    GroupPoints->LineEdit2->setEnabled( false );
+  }
+  else if ( send == GroupPoints->PushButton2 ) {
+    myEditCurrentArgument = GroupPoints->LineEdit2;
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled( false );
+    GroupPoints->LineEdit2->setEnabled( true );
+  }
+
   globalSelection(); // close local contexts, if any
+  TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
   if ( myEditCurrentArgument == GroupPoints->LineEdit2 )
-    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
-  else
-    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
-  SelectionIntoArgument();
+    aNeedType = TopAbs_EDGE;
+  localSelection( GEOM::GEOM_Object::_nil(), aNeedType );
+  
+  myEditCurrentArgument->setFocus();
+  //SelectionIntoArgument();
+  send->setDown(true);
+  displayPreview();
 }
 
 //=================================================================================
@@ -295,8 +328,7 @@ void BasicGUI_EllipseDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
   if ( send == GroupPoints->LineEdit1 ||
-       send == GroupPoints->LineEdit2 )
-  {
+       send == GroupPoints->LineEdit2 ) {
     myEditCurrentArgument = send;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
@@ -310,9 +342,9 @@ void BasicGUI_EllipseDlg::LineEditReturnPressed()
 void BasicGUI_EllipseDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
-
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+  
   GroupPoints->LineEdit1->setFocus();
   myEditCurrentArgument = GroupPoints->LineEdit1;
 
@@ -322,7 +354,7 @@ void BasicGUI_EllipseDlg::ActivateThisDialog()
   myPoint = myDir = GEOM::GEOM_Object::_nil();
   //globalSelection( GEOM_POINT );
   globalSelection(); // close local contexts, if any
-  localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
 }
 
 //=================================================================================
@@ -339,9 +371,9 @@ void BasicGUI_EllipseDlg::DeactivateActiveDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BasicGUI_EllipseDlg::enterEvent(QEvent* e)
+void BasicGUI_EllipseDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
@@ -349,7 +381,7 @@ void BasicGUI_EllipseDlg::enterEvent(QEvent* e)
 // function : ValueChangedInSpinBox()
 // purpose  :
 //=================================================================================
-void BasicGUI_EllipseDlg::ValueChangedInSpinBox(double newValue)
+void BasicGUI_EllipseDlg::ValueChangedInSpinBox( double newValue )
 {
   displayPreview();
 }
@@ -369,14 +401,19 @@ GEOM::GEOM_IOperations_ptr BasicGUI_EllipseDlg::createOperation()
 //=================================================================================
 bool BasicGUI_EllipseDlg::isValid( QString& msg )
 {
-  double aMajorR = GroupPoints->SpinBox_DX->GetValue();
-  double aMinorR = GroupPoints->SpinBox_DY->GetValue();
-  if ( aMajorR < aMinorR )
-  {
-       msg = tr( "GEOM_ELLIPSE_ERROR_1" );
-       return false;
+  double aMajorR = GroupPoints->SpinBox_DX->value();
+  double aMinorR = GroupPoints->SpinBox_DY->value();
+  if ( aMajorR < aMinorR ) {
+    msg = tr( "GEOM_ELLIPSE_ERROR_1" );
+    return false;
   }
-  return !myPoint->_is_nil() && !myDir->_is_nil();
+  //return !myPoint->_is_nil() && !myDir->_is_nil();
+  //nil point means origin of global CS
+  //nil vector means Z axis
+  bool ok = true;
+  ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+  ok = GroupPoints->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+  return ok;
 }
 
 //=================================================================================
@@ -385,25 +422,22 @@ bool BasicGUI_EllipseDlg::isValid( QString& msg )
 //=================================================================================
 bool BasicGUI_EllipseDlg::execute( ObjectList& objects )
 {
-  double aMajorR = GroupPoints->SpinBox_DX->GetValue();
-  double aMinorR = GroupPoints->SpinBox_DY->GetValue();
-  GEOM::GEOM_Object_var anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeEllipse( myPoint, myDir, aMajorR, aMinorR );
+  double aMajorR = GroupPoints->SpinBox_DX->value();
+  double aMinorR = GroupPoints->SpinBox_DY->value();
 
-  if ( !anObj->_is_nil() )
+  QStringList aParameters;
+  aParameters<<GroupPoints->SpinBox_DX->text();
+  aParameters<<GroupPoints->SpinBox_DY->text();
+  
+  GEOM::GEOM_Object_var anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeEllipse( myPoint, myDir, aMajorR, aMinorR );
+  if ( !anObj->_is_nil() ) {
+    if ( !IsPreview() )
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
     objects.push_back( anObj._retn() );
-
+  }
   return true;
 }
 
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void BasicGUI_EllipseDlg::closeEvent( QCloseEvent* e )
-{
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : addSubshapeToStudy
 // purpose  : virtual method to add new SubObjects if local selection
@@ -412,8 +446,10 @@ void BasicGUI_EllipseDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
 
-  objMap[GroupPoints->LineEdit1->text()] = myPoint;
-  objMap[GroupPoints->LineEdit2->text()] = myDir;
+  if (!CORBA::is_nil(myPoint))
+    objMap[GroupPoints->LineEdit1->text()] = myPoint;
+  if (!CORBA::is_nil(myDir))
+    objMap[GroupPoints->LineEdit2->text()] = myDir;
 
   addSubshapesToFather( objMap );
 }
index 5cf4f5a7357ccac28f3bf83f0d496ce46b5bafd7..ab6ef7cb49ed8b6d425767126ba79c04b0c17480 100644 (file)
@@ -1,81 +1,75 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it 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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BasicGUI_EllipseDlg.h
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-
-#ifndef BASICGUI_ELLIPSE_H
-#define BASICGUI_ELLIPSE_H
-
-#include "GEOM_BasicGUI.hxx"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_EllipseDlg.h
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
+//
+#ifndef BASICGUI_ELLIPSEDLG_H
+#define BASICGUI_ELLIPSEDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel2Spin.h"
+#include <GEOMBase_Skeleton.h>
 
-#include "BasicGUI.h"
+class DlgRef_2Sel2Spin;
 
 //=================================================================================
 // class    : BasicGUI_EllipseDlg
 // purpose  :
 //=================================================================================
-class GEOM_BASICGUI_EXPORT BasicGUI_EllipseDlg : public GEOMBase_Skeleton
+class BasicGUI_EllipseDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BasicGUI_EllipseDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                       const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~BasicGUI_EllipseDlg();
+  BasicGUI_EllipseDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~BasicGUI_EllipseDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void closeEvent( QCloseEvent* e );
-    virtual void addSubshapesToStudy();
-
-private :
-    void Init();
-    void enterEvent(QEvent* e);
-
-    GEOM::GEOM_Object_var myPoint, myDir;
-
-    DlgRef_2Sel2Spin* GroupPoints;
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
+  
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
 
+private:
+  GEOM::GEOM_Object_var              myPoint, myDir;
+  
+  DlgRef_2Sel2Spin*                  GroupPoints;
+  
 private slots:
-    void ClickOnOk();
-    void ClickOnCancel();
-    bool ClickOnApply();
-
-    void ActivateThisDialog();
-    void DeactivateActiveDialog();
-    
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ValueChangedInSpinBox(double newValue);
-
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  
+  void                               ActivateThisDialog();
+  void                               DeactivateActiveDialog();
+  
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ValueChangedInSpinBox( double );
+  void                               SetDoubleSpinBoxStep( double );
 };
 
-#endif // BASICGUI_ELLIPSE_H
+#endif // BASICGUI_ELLIPSEDLG_H
index 1c5770ed92ab7ce784e7417c15372be330d6f4c9..03159903b6e043f960c48a460d9ed916f304a068 100644 (file)
@@ -1,37 +1,38 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_LineDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : BasicGUI_LineDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "BasicGUI_LineDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : BasicGUI_LineDlg()
@@ -54,53 +49,59 @@ 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(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BasicGUI_LineDlg::BasicGUI_LineDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                   bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr("ICON_DLG_LINE_2P")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr("ICON_SELECT")));
-  QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr("ICON_DLG_LINE_2F")));
-
-  setCaption(tr("GEOM_LINE_TITLE"));
-
-  QGroupBox* aFrame = new QGroupBox( 1, Qt::Horizontal, this );
-  aFrame->setInsideMargin( 0 );
-  aFrame->setFrameStyle( QFrame::NoFrame );
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_LINE_2P" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
+  QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_LINE_2F" ) ) );
 
+  setWindowTitle( tr( "GEOM_LINE_TITLE" ) );
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_LINE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image2);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_2Sel_QTD( aFrame, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_POINTS"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_POINT_I").arg("1"));
-  GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg("2"));
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->PushButton2->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_LINE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setIcon( image2 );
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_2Sel( centralWidget() );
+
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_POINTS" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_POINT_I" ).arg( 1 ) );
+  GroupPoints->TextLabel2->setText( tr( "GEOM_POINT_I" ).arg( 2 ) );
+  GroupPoints->PushButton1->setIcon( image1 );
+  GroupPoints->PushButton2->setIcon( image1 );
   GroupPoints->LineEdit1->setReadOnly( true );
   GroupPoints->LineEdit2->setReadOnly( true );
-
-  GroupFaces = new DlgRef_2Sel_QTD( aFrame, "GroupFaces");
-  GroupFaces->GroupBox1->setTitle(tr("GEOM_FACES"));
-  GroupFaces->TextLabel1->setText(tr("GEOM_FACE_I").arg("1"));
-  GroupFaces->TextLabel2->setText(tr("GEOM_FACE_I").arg("2"));
-  GroupFaces->PushButton1->setPixmap(image1);
-  GroupFaces->PushButton2->setPixmap(image1);
+  GroupPoints->LineEdit1->setEnabled( true );
+  GroupPoints->LineEdit2->setEnabled( false );
+
+  GroupFaces = new DlgRef_2Sel( centralWidget() );
+  GroupFaces->GroupBox1->setTitle( tr( "GEOM_FACES" ) );
+  GroupFaces->TextLabel1->setText( tr( "GEOM_FACE_I" ).arg( "1" ) );
+  GroupFaces->TextLabel2->setText( tr( "GEOM_FACE_I" ).arg( "2" ) );
+  GroupFaces->PushButton1->setIcon( image1 );
+  GroupFaces->PushButton2->setIcon( image1 );
   GroupFaces->LineEdit1->setReadOnly( true );
   GroupFaces->LineEdit2->setReadOnly( true );
+  GroupFaces->LineEdit1->setEnabled( true );
+  GroupFaces->LineEdit2->setEnabled( false );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
+  layout->addWidget( GroupFaces );
 
-  Layout1->addWidget(aFrame, 2, 0);
   /***************************************************************/
 
-  setHelpFileName("create_line_page.html");
+  setHelpFileName( "create_line_page.html" );
 
   Init();
 }
 
+
 //=================================================================================
 // function : ~BasicGUI_LineDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -109,6 +110,7 @@ BasicGUI_LineDlg::~BasicGUI_LineDlg()
 {  
 }
 
+
 //=================================================================================
 // function : Init()
 // purpose  :
@@ -116,37 +118,41 @@ BasicGUI_LineDlg::~BasicGUI_LineDlg()
 void BasicGUI_LineDlg::Init()
 {
   /* init variables */
-  //myEditCurrentArgument = GroupPoints->LineEdit1;
-  //myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
-  //globalSelection(); // close local contexts, if any
-  //localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+  myEditCurrentArgument = GroupPoints->LineEdit1;
+  myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
+  globalSelection(); // close local contexts, if any
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+  GroupPoints->PushButton1->setDown(true);
+  
        
   /* 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(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
-
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupFaces->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupFaces->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupFaces->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupFaces->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
+  connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
+
+  connect( this,           SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
+
+  connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+
+  connect( GroupPoints->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints->PushButton2, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupFaces->PushButton1,  SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupFaces->PushButton2,  SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+
+  connect( GroupPoints->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( GroupPoints->LineEdit2,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( GroupFaces->LineEdit1,    SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( GroupFaces->LineEdit2,    SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
   
-  ConstructorsClicked(0);
-  initName( tr("GEOM_LINE") );
+  initName( tr( "GEOM_LINE" ) );
+
+  ConstructorsClicked( 0 );
 }
 
+
 //=================================================================================
 // function : ClickOnOk()
 // purpose  :
@@ -157,28 +163,20 @@ void BasicGUI_LineDlg::ClickOnOk()
     ClickOnCancel();
 }
 
-//=================================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=================================================================================
-void BasicGUI_LineDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool BasicGUI_LineDlg::ClickOnApply()
 {
-
   if ( !onAccept() )
     return false;
-
+  
   initName();
-  myEditCurrentArgument->setText("");
-  ConstructorsClicked(getConstructorId());
+
+  myEditCurrentArgument->setText( "" );
+  ConstructorsClicked( getConstructorId() );
+
   return true;
 }
 
@@ -186,19 +184,23 @@ bool BasicGUI_LineDlg::ClickOnApply()
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void BasicGUI_LineDlg::ConstructorsClicked(int constructorId)
+void BasicGUI_LineDlg::ConstructorsClicked( int constructorId )
 {  
-  switch ( constructorId )
-  {
+  switch ( constructorId ) {
   case 0:
     {
       globalSelection(); // close local contexts, if any
       localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
-
+      
       myEditCurrentArgument = GroupPoints->LineEdit1;
-      myEditCurrentArgument->setText("");
+      myEditCurrentArgument->setText( "" );
+      GroupPoints->LineEdit2->setText( "" );
       myPoint1 = GEOM::GEOM_Object::_nil();
       myPoint2 = GEOM::GEOM_Object::_nil();
+      GroupPoints->PushButton1->setDown(true);
+      GroupPoints->PushButton2->setDown(false);
+      GroupPoints->LineEdit1->setEnabled(true);
+      GroupPoints->LineEdit2->setEnabled(false);
       GroupPoints->show();
       GroupFaces->hide();
       break;
@@ -212,14 +214,20 @@ void BasicGUI_LineDlg::ConstructorsClicked(int constructorId)
       myEditCurrentArgument->setText("");
       myFace1 = GEOM::GEOM_Object::_nil();
       myFace2 = GEOM::GEOM_Object::_nil();
+      GroupFaces->PushButton1->setDown(true);
+      GroupFaces->PushButton2->setDown(false);
+      GroupFaces->LineEdit1->setEnabled(true);
+      GroupFaces->LineEdit2->setEnabled(false);
       GroupPoints->hide();
       GroupFaces->show();
       break;
     }
   }
 
+  qApp->processEvents();
   updateGeometry();
-  resize(minimumSize());
+  resize( minimumSizeHint() );
+
   SelectionIntoArgument();
 }
 
@@ -229,73 +237,93 @@ void BasicGUI_LineDlg::ConstructorsClicked(int constructorId)
 //=================================================================================
 void BasicGUI_LineDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
-
-  if (IObjectCount() != 1) 
-  {
-    if      ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myPoint1 = GEOM::GEOM_Object::_nil();
-    else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) myPoint2 = GEOM::GEOM_Object::_nil();
-    else if ( myEditCurrentArgument == GroupFaces->LineEdit1 ) myFace1 = GEOM::GEOM_Object::_nil();
-    else if ( myEditCurrentArgument == GroupFaces->LineEdit2 ) myFace2 = GEOM::GEOM_Object::_nil();
+  myEditCurrentArgument->setText( "" );
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
+    if      (myEditCurrentArgument == GroupPoints->LineEdit1) myPoint1 = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == GroupPoints->LineEdit2) myPoint2 = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == GroupFaces->LineEdit1)  myFace1  = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == GroupFaces->LineEdit2)  myFace2  = GEOM::GEOM_Object::_nil();
+    displayPreview();
     return;
   }
 
-  // nbSel == 1 
   Standard_Boolean aRes = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), aRes);
-  if (!CORBA::is_nil(aSelectedObject) && aRes)
-  {
-    QString aName = GEOMBase::GetName(aSelectedObject);
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aRes);
+  if ( !CORBA::is_nil( aSelectedObject ) && aRes ) {
+    QString aName = GEOMBase::GetName( aSelectedObject );
+    TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
+    if ( myEditCurrentArgument == GroupFaces->LineEdit1 ||
+        myEditCurrentArgument == GroupFaces->LineEdit2 )
+      aNeedType = TopAbs_FACE;
     
     TopoDS_Shape aShape;
-    if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
-    {
-      TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
-      if (myEditCurrentArgument == GroupFaces->LineEdit1 ||
-          myEditCurrentArgument == GroupFaces->LineEdit2)
-        aNeedType = TopAbs_FACE;
-
-      LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+    if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) {
       TColStd_IndexedMapOfInteger aMap;
-      aSelMgr->GetIndexes(firstIObject(), aMap);
-      if (aMap.Extent() == 1) // Local Selection
-      {
+      aSelMgr->GetIndexes(aSelList.First(), aMap);
+      if ( aMap.Extent() == 1 ) { // Local Selection
        int anIndex = aMap( 1 );
-        if (aNeedType == TopAbs_FACE)
-          aName += QString(":face_%1").arg(anIndex);
+        if ( aNeedType == TopAbs_FACE )
+          aName += QString( ":face_%1" ).arg( anIndex );
         else
-          aName += QString(":vertex_%1").arg(anIndex);
+          aName += QString( ":vertex_%1" ).arg( anIndex );
 
        //Find SubShape Object in Father
-       GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
+       GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather( aSelectedObject, aName );
 
        if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-         GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
-         aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+         GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
+         aSelectedObject = aShapesOp->GetSubShape( aSelectedObject, anIndex );
        }
-       else
+       else {
          aSelectedObject = aFindedObject; // get Object from study
+       }
       }
-      else // Global Selection
-      {
-        if (aShape.ShapeType() != aNeedType) {
+      else { // Global Selection
+        if ( aShape.ShapeType() != aNeedType ) {
           aSelectedObject = GEOM::GEOM_Object::_nil();
           aName = "";
         }
       }
     }
 
-    myEditCurrentArgument->setText(aName);
+    myEditCurrentArgument->setText( aName );
+
+    if (!aSelectedObject->_is_nil()) { // clear selection if something selected
+      globalSelection();
+      localSelection( GEOM::GEOM_Object::_nil(), aNeedType );      
+    }
 
-    if      ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myPoint1 = aSelectedObject;
-    else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) myPoint2 = aSelectedObject;
-    else if ( myEditCurrentArgument == GroupFaces->LineEdit1 )  myFace1 = aSelectedObject;
-    else if ( myEditCurrentArgument == GroupFaces->LineEdit2 )  myFace2 = aSelectedObject;
+    if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) {
+      myPoint1 = aSelectedObject;
+      if ( !myPoint1->_is_nil() && myPoint2->_is_nil() )
+       GroupPoints->PushButton2->click();
+    }
+    else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) {
+      myPoint2 = aSelectedObject;
+      if ( !myPoint2->_is_nil() && myPoint1->_is_nil() )
+       GroupPoints->PushButton1->click();
+    }
+    else if ( myEditCurrentArgument == GroupFaces->LineEdit1 ) {
+      myFace1 = aSelectedObject;
+      if ( !myFace1->_is_nil() && myFace2->_is_nil() )
+       GroupFaces->PushButton2->click();
+    }
+    else if ( myEditCurrentArgument == GroupFaces->LineEdit2 ) {
+      myFace2 = aSelectedObject;
+      if ( !myFace2->_is_nil() && myFace1->_is_nil() )
+       GroupFaces->PushButton1->click();      
+    }
   }
   
   displayPreview();
 }
 
+
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -303,14 +331,44 @@ void BasicGUI_LineDlg::SelectionIntoArgument()
 void BasicGUI_LineDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  if      ( send == GroupPoints->PushButton1 ) myEditCurrentArgument = GroupPoints->LineEdit1;
-  else if ( send == GroupPoints->PushButton2 ) myEditCurrentArgument = GroupPoints->LineEdit2;
-  else if ( send == GroupFaces->PushButton1 ) myEditCurrentArgument = GroupFaces->LineEdit1;
-  else if ( send == GroupFaces->PushButton2 ) myEditCurrentArgument = GroupFaces->LineEdit2;
+  if ( send == GroupPoints->PushButton1 ) {
+    myEditCurrentArgument = GroupPoints->LineEdit1;
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(true);
+    GroupPoints->LineEdit2->setEnabled(false);
+  }
+  else if ( send == GroupPoints->PushButton2 ) {
+    myEditCurrentArgument = GroupPoints->LineEdit2;
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+    GroupPoints->LineEdit2->setEnabled(true);
+  }
+  else if ( send == GroupFaces->PushButton1 ) {
+    myEditCurrentArgument = GroupFaces->LineEdit1;
+    GroupFaces->PushButton2->setDown(false);
+    GroupFaces->LineEdit1->setEnabled(true);
+    GroupFaces->LineEdit2->setEnabled(false);
+  }
+  else if ( send == GroupFaces->PushButton2 ) {
+    myEditCurrentArgument = GroupFaces->LineEdit2;
+    GroupFaces->PushButton1->setDown(false);
+    GroupFaces->LineEdit1->setEnabled(false);
+    GroupFaces->LineEdit2->setEnabled(true);
+  }
+
+  globalSelection(); // close local selection to clear it
+  TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
+  if ( myEditCurrentArgument == GroupFaces->LineEdit1 || myEditCurrentArgument == GroupFaces->LineEdit2 )
+    aNeedType = TopAbs_FACE;
+  localSelection( GEOM::GEOM_Object::_nil(), aNeedType );
+
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
+  //  SelectionIntoArgument();
+  send->setDown(true);
+  displayPreview();
 }
 
+
 //=================================================================================
 // function : LineEditReturnPressed()
 // purpose  :
@@ -320,12 +378,13 @@ void BasicGUI_LineDlg::LineEditReturnPressed()
   QLineEdit* send = (QLineEdit*)sender();
   if      ( send == GroupPoints->LineEdit1 ) myEditCurrentArgument = GroupPoints->LineEdit1;
   else if ( send == GroupPoints->LineEdit2 ) myEditCurrentArgument = GroupPoints->LineEdit2;
-  else if ( send == GroupFaces->LineEdit1 ) myEditCurrentArgument = GroupFaces->LineEdit1;
-  else if ( send == GroupFaces->LineEdit2 ) myEditCurrentArgument = GroupFaces->LineEdit2;
+  else if ( send == GroupFaces->LineEdit1 )  myEditCurrentArgument = GroupFaces->LineEdit1;
+  else if ( send == GroupFaces->LineEdit2 )  myEditCurrentArgument = GroupFaces->LineEdit2;
   else return;
   GEOMBase_Skeleton::LineEditReturnPressed();
 }
 
+
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -333,10 +392,10 @@ void BasicGUI_LineDlg::LineEditReturnPressed()
 void BasicGUI_LineDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  ConstructorsClicked(getConstructorId());
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================
@@ -352,9 +411,9 @@ void BasicGUI_LineDlg::DeactivateActiveDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BasicGUI_LineDlg::enterEvent(QEvent* e)
+void BasicGUI_LineDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
@@ -389,36 +448,23 @@ bool BasicGUI_LineDlg::execute( ObjectList& objects )
 {
   bool res = false;
   GEOM::GEOM_Object_var anObj;
-  switch ( getConstructorId() )
-    {
-    case 0 :
-      {
-       anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakeLineTwoPnt( myPoint1, myPoint2 );
-       res = true;
-       break;
-      }
-    case 1 :
-      {
-       anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakeLineTwoFaces( myFace1, myFace2 );
-       res = true;
-       break;
-      }
-    }
+  switch ( getConstructorId() ) {
+  case 0 :
+    anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakeLineTwoPnt( myPoint1, myPoint2 );
+    res = true;
+    break;
+  case 1 :
+    anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakeLineTwoFaces( myFace1, myFace2 );
+    res = true;
+    break;
+  }
+  
   if ( !anObj->_is_nil() )
     objects.push_back( anObj._retn() );
 
   return res;
 }
 
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void BasicGUI_LineDlg::closeEvent( QCloseEvent* e )
-{
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : addSubshapeToStudy
 // purpose  : virtual method to add new SubObjects if local selection
@@ -426,16 +472,15 @@ void BasicGUI_LineDlg::closeEvent( QCloseEvent* e )
 void BasicGUI_LineDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
-  switch ( getConstructorId() )
-    {
-    case 0 :
-      objMap[GroupPoints->LineEdit1->text()] = myPoint1;
-      objMap[GroupPoints->LineEdit2->text()] = myPoint2;
-      break;
-    case 1 :
-      objMap[GroupFaces->LineEdit1->text()] = myFace1;
-      objMap[GroupFaces->LineEdit2->text()] = myFace2;
-      break;
-    }
+  switch ( getConstructorId() ) {
+  case 0 :
+    objMap[GroupPoints->LineEdit1->text()] = myPoint1;
+    objMap[GroupPoints->LineEdit2->text()] = myPoint2;
+    break;
+  case 1 :
+    objMap[GroupFaces->LineEdit1->text()] = myFace1;
+    objMap[GroupFaces->LineEdit2->text()] = myFace2;
+    break;
+  }
   addSubshapesToFather( objMap );
 }
index 9985759fd056b57ea3a7d3877e9e68d8553f8c2c..5b716f2060c8d0ff28296f82ad12524724b2242d 100644 (file)
@@ -1,84 +1,78 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BasicGUI_LineDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_LINE_H
-#define DIALOGBOX_LINE_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_LineDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef BASICGUI_LINEDLG_H
+#define BASICGUI_LINEDLG_H
 
-#include "GEOM_BasicGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel_QTD.h"
+class DlgRef_2Sel;
 
 //=================================================================================
 // class    : BasicGUI_LineDlg
 // purpose  :
 //=================================================================================
-class GEOM_BASICGUI_EXPORT BasicGUI_LineDlg : public GEOMBase_Skeleton
+class BasicGUI_LineDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BasicGUI_LineDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                    const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~BasicGUI_LineDlg();
-
+  BasicGUI_LineDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~BasicGUI_LineDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-
-    virtual void closeEvent( QCloseEvent* e );
-    virtual void addSubshapesToStudy();
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
     
-private :
-    void Init();
-    void enterEvent(QEvent* e);
-
-    GEOM::GEOM_Object_var myPoint1;   
-    GEOM::GEOM_Object_var myPoint2;
-    GEOM::GEOM_Object_var myFace1;   
-    GEOM::GEOM_Object_var myFace2;
-
-    DlgRef_2Sel_QTD* GroupPoints;
-    DlgRef_2Sel_QTD* GroupFaces;
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  
+private:
+  GEOM::GEOM_Object_var              myPoint1;   
+  GEOM::GEOM_Object_var              myPoint2;
+  GEOM::GEOM_Object_var              myFace1;
+  GEOM::GEOM_Object_var              myFace2;
+  
+  DlgRef_2Sel*                       GroupPoints;
+  DlgRef_2Sel*                       GroupFaces;
     
 private slots:
-    void ClickOnOk();
-    void ClickOnCancel();
-    bool ClickOnApply();
-
-    void ActivateThisDialog();
-    void DeactivateActiveDialog();
-    void ConstructorsClicked(int constructorId);    
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
 
+  void                               ActivateThisDialog();
+  void                               DeactivateActiveDialog();
+  void                               ConstructorsClicked( int );    
+    
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // DIALOGBOX_LINE_H
+#endif // BASICGUI_LINEDLG_H
index 7b6cf2766549c852b1803f11c1dd05413cdc768c..ecd49f54831710b55cbd895c92c97470c770e909 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_MarkerDlg.cxx
+// Author : Sergey LITONIN, Open CASCADE S.A.S. (sergey.litonin@opencascade.com)
 //
-//
-//  File   : BasicGUI_MarkerDlg.cxx
-//  Author : Sergey LITONIN
-//  Module : GEOM
-//  $Header$
-
 #include "BasicGUI_MarkerDlg.h"
-#include "DlgRef_SpinBox.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include <qlabel.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
-#include "GEOMImpl_Types.hxx"
+#include <QLabel>
 
-#include "utilities.h"
+#include <GEOMImpl_Types.hxx>
 
 // OCCT Includes
 #include <BRep_Tool.hxx>
 // purpose  : Constructor
 //=================================================================================
 BasicGUI_MarkerDlg::BasicGUI_MarkerDlg( GeometryGUI* theGeometryGUI, QWidget* theParent )
-  : GEOMBase_Skeleton(theGeometryGUI, theParent, "BasicGUI_MarkerDlg", false,
-                      WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+  : GEOMBase_Skeleton( theGeometryGUI, theParent, false,
+                      Qt::WindowTitleHint | Qt::WindowSystemMenuHint )
 {
   QPixmap iconCS1   ( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_MARKER" ) ) );
   QPixmap iconCS2   ( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_MARKER2" ) ) );
   QPixmap iconCS3   ( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_MARKER3" ) ) );
   QPixmap iconSelect( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption( tr( "CAPTION" ) );
-
-  GroupConstructors->setTitle( tr( "LOCALCS" ) );
-  RadioButton1->setPixmap( iconCS1 );
-  RadioButton2->setPixmap( iconCS2 );
-  RadioButton3->setPixmap( iconCS3 );
-
-  Group1 = new DlgRef_1Sel_QTD(this, "Group1");
-  Group1->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
-  Group1->TextLabel1->setText(tr("GEOM_OBJECT"));
-  Group1->PushButton1->setPixmap(iconSelect);
-
-  Group2 = new DlgRef_3Sel_QTD(this, "Group2");
-  Group2->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
-  Group2->TextLabel1->setText(tr("GEOM_POINT"));
-  Group2->TextLabel2->setText(tr("XDIR"));
-  Group2->TextLabel3->setText(tr("YDIR"));
-  Group2->PushButton1->setPixmap(iconSelect);
-  Group2->PushButton2->setPixmap(iconSelect);
-  Group2->PushButton3->setPixmap(iconSelect);
-
-  aMainGrp = new QGroupBox( 1, Qt::Horizontal, this );
-  aMainGrp->setFrameStyle( QFrame::NoFrame );
-  aMainGrp->setInsideMargin( 0 );
-
-  QGroupBox* anOriGrp = new QGroupBox( 1, Qt::Vertical, tr( "ORIGIN" ), aMainGrp );
-  new QLabel( tr( "GEOM_X" ), anOriGrp );
-  myData[ X ] = new DlgRef_SpinBox( anOriGrp );
-  new QLabel( tr( "GEOM_Y" ), anOriGrp );
-  myData[ Y ] = new DlgRef_SpinBox( anOriGrp );
-  new QLabel( tr( "GEOM_Z" ), anOriGrp );
-  myData[ Z ] = new DlgRef_SpinBox( anOriGrp );
-
-  QGroupBox* aXAxisGrp = new QGroupBox( 1, Qt::Vertical, tr( "XDIR" ), aMainGrp );
-  new QLabel( tr( "DX" ), aXAxisGrp );
-  myData[ DX1 ] = new DlgRef_SpinBox( aXAxisGrp );
-  new QLabel( tr( "DY" ), aXAxisGrp );
-  myData[ DY1 ] = new DlgRef_SpinBox( aXAxisGrp );
-  new QLabel( tr( "DZ" ), aXAxisGrp );
-  myData[ DZ1 ] = new DlgRef_SpinBox( aXAxisGrp );
-
-  QGroupBox* anYAxisGrp = new QGroupBox( 1, Qt::Vertical, tr( "YDIR" ), aMainGrp );
-  new QLabel( tr( "DX" ), anYAxisGrp );
-  myData[ DX2 ] = new DlgRef_SpinBox( anYAxisGrp );
-  new QLabel( tr( "DY" ), anYAxisGrp );
-  myData[ DY2 ] = new DlgRef_SpinBox( anYAxisGrp );
-  new QLabel( tr( "DZ" ), anYAxisGrp );
-  myData[ DZ2 ] = new DlgRef_SpinBox( anYAxisGrp );
-
-  Layout1->addWidget( aMainGrp, 2, 0 );
-  Layout1->addWidget( Group1, 2, 0 );
-  Layout1->addWidget( Group2, 2, 0 );
-
-  setHelpFileName("create_lcs_page.html");
+  setWindowTitle( tr( "CAPTION" ) );
+
+  mainFrame()->GroupConstructors->setTitle( tr( "LOCALCS" ) );
+  mainFrame()->RadioButton1->setIcon( iconCS1 );
+  mainFrame()->RadioButton2->setIcon( iconCS2 );
+  mainFrame()->RadioButton3->setIcon( iconCS3 );
+
+  Group1 = new DlgRef_1Sel( centralWidget() );
+
+  Group1->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
+  Group1->TextLabel1->setText( tr( "GEOM_OBJECT" ) );
+  Group1->PushButton1->setIcon( iconSelect );
+  Group1->PushButton1->setDown( true );
+
+  Group2 = new DlgRef_3Sel( centralWidget() );
+
+  Group2->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
+  Group2->TextLabel1->setText( tr( "GEOM_POINT" ) );
+  Group2->TextLabel2->setText( tr( "XDIR" ) );
+  Group2->TextLabel3->setText( tr( "YDIR" ) );
+  Group2->PushButton1->setIcon( iconSelect );
+  Group2->PushButton2->setIcon( iconSelect );
+  Group2->PushButton3->setIcon( iconSelect );
+  Group2->PushButton1->setDown( true );
+
+  aMainGrp = new QFrame( centralWidget() );
+  aMainGrp->setFrameStyle( QFrame::NoFrame | QFrame::Plain );
+  aMainGrp->setContentsMargins( 0, 0, 0, 0 );
+  QHBoxLayout* aMainGrpLayout = new QHBoxLayout( aMainGrp );
+  aMainGrpLayout->setMargin( 0 );
+  
+  QGroupBox* anOriGrp = new QGroupBox( tr( "ORIGIN" ), aMainGrp );
+  QVBoxLayout* anOriGrpLayout = new QVBoxLayout( anOriGrp );
+
+  anOriGrpLayout->addWidget( new QLabel( tr( "GEOM_X" ), anOriGrp ) );
+  myData[ X ] = new SalomeApp_DoubleSpinBox( anOriGrp );
+  anOriGrpLayout->addWidget( myData[ X ] );
+  anOriGrpLayout->addWidget( new QLabel( tr( "GEOM_Y" ), anOriGrp ) );
+  myData[ Y ] = new SalomeApp_DoubleSpinBox( anOriGrp );
+  anOriGrpLayout->addWidget( myData[ Y ] );
+  anOriGrpLayout->addWidget( new QLabel( tr( "GEOM_Z" ), anOriGrp ) );
+  myData[ Z ] = new SalomeApp_DoubleSpinBox( anOriGrp );
+  anOriGrpLayout->addWidget( myData[ Z ] );
+
+  aMainGrpLayout->addWidget( anOriGrp );
+
+  QGroupBox* aXAxisGrp = new QGroupBox( tr( "XDIR" ), aMainGrp );
+  QVBoxLayout* aXAxisGrpLayout = new QVBoxLayout( aXAxisGrp );
+
+  aXAxisGrpLayout->addWidget( new QLabel( tr( "DX" ), aXAxisGrp ) );
+  myData[ DX1 ] = new SalomeApp_DoubleSpinBox( aXAxisGrp );
+  aXAxisGrpLayout->addWidget( myData[ DX1 ] );
+  aXAxisGrpLayout->addWidget( new QLabel( tr( "DY" ), aXAxisGrp ) );
+  myData[ DY1 ] = new SalomeApp_DoubleSpinBox( aXAxisGrp );
+  aXAxisGrpLayout->addWidget( myData[ DY1 ] );
+  aXAxisGrpLayout->addWidget( new QLabel( tr( "DZ" ), aXAxisGrp ) );
+  myData[ DZ1 ] = new SalomeApp_DoubleSpinBox( aXAxisGrp );
+  aXAxisGrpLayout->addWidget( myData[ DZ1 ] );
+
+  aMainGrpLayout->addWidget( aXAxisGrp );
+
+  QGroupBox* anYAxisGrp = new QGroupBox( tr( "YDIR" ), aMainGrp );
+  QVBoxLayout* anYAxisGrpLayout = new QVBoxLayout( anYAxisGrp );
+
+  anYAxisGrpLayout->addWidget( new QLabel( tr( "DX" ), anYAxisGrp ) );
+  myData[ DX2 ] = new SalomeApp_DoubleSpinBox( anYAxisGrp );
+  anYAxisGrpLayout->addWidget( myData[ DX2 ] );
+  anYAxisGrpLayout->addWidget( new QLabel( tr( "DY" ), anYAxisGrp ) );
+  myData[ DY2 ] = new SalomeApp_DoubleSpinBox( anYAxisGrp );
+  anYAxisGrpLayout->addWidget( myData[ DY2 ] );
+  anYAxisGrpLayout->addWidget( new QLabel( tr( "DZ" ), anYAxisGrp ) );
+  myData[ DZ2 ] = new SalomeApp_DoubleSpinBox( anYAxisGrp );
+  anYAxisGrpLayout->addWidget( myData[ DZ2 ] );
+
+  aMainGrpLayout->addWidget( anYAxisGrp );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( aMainGrp );
+  layout->addWidget( Group1 );
+  layout->addWidget( Group2 );
+
+  setHelpFileName( "create_lcs_page.html" );
 
   Init();
 }
 
+
 //=================================================================================
 // function : ~BasicGUI_MarkerDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -132,6 +160,7 @@ BasicGUI_MarkerDlg::~BasicGUI_MarkerDlg()
 {
 }
 
+
 //=================================================================================
 // function : Init()
 // purpose  :
@@ -145,49 +174,52 @@ void BasicGUI_MarkerDlg::Init()
   Group2->LineEdit1->setReadOnly( true );
   Group2->LineEdit2->setReadOnly( true );
   Group2->LineEdit3->setReadOnly( true );
+  Group2->LineEdit1->setEnabled( true );
+  Group2->LineEdit2->setEnabled( false );
+  Group2->LineEdit3->setEnabled( false );
 
-  connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
-  connect(Group1->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group2->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group2->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group2->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect( this,                SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
 
-  connect(Group1->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group2->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group2->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group2->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( Group1->PushButton1, SIGNAL( clicked() ),      this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group2->PushButton1, SIGNAL( clicked() ),      this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group2->PushButton2, SIGNAL( clicked() ),      this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group2->PushButton3, SIGNAL( clicked() ),      this, SLOT( SetEditCurrentArgument() ) );
 
-  connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( onClose() ) );
-  connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( onDeactivate() ) );
-  connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( onClose() ) );
+  connect( Group1->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group2->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group2->LineEdit2,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group2->LineEdit3,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
-  connect( buttonOk, SIGNAL( clicked() ), this, SLOT( onOk() ) );
-  connect( buttonApply, SIGNAL( clicked() ), this, SLOT( onApply() ) );
+  connect( myGeomGUI,           SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( onDeactivate() ) );
+  connect( myGeomGUI,           SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
 
-  connect(myGeomGUI->getApp()->selectionMgr(),
+  connect( buttonOk(),          SIGNAL( clicked() ), this, SLOT( onOk() ) );
+  connect( buttonApply(),       SIGNAL( clicked() ), this, SLOT( onApply() ) );
+
+  connect( myGeomGUI->getApp()->selectionMgr(),
           SIGNAL( currentSelectionChanged() ), this, SLOT( onSelectionDone() ) );
 
   initName( tr( "LCS_NAME" ) );
 
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
+  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100 );
 
-  for ( DataMap::iterator anIter = myData.begin(); anIter != myData.end(); ++anIter )
-  {
-    anIter.data()->RangeStepAndValidator( COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY );
-    connect( anIter.data(), SIGNAL( valueChanged( double ) ),
+  for ( DataMap::iterator anIter = myData.begin(); anIter != myData.end(); ++anIter ) {
+    initSpinBox( anIter.value(), COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+    connect( anIter.value(), SIGNAL( valueChanged( double ) ),
              this, SLOT( onValueChanged( double ) ) );
   }
-
+  
   myBlockPreview = true;
   for ( DataMap::iterator anIter = myData.begin(); anIter != myData.end(); ++anIter )
-    anIter.data()->SetValue( 0 );
-  myData[ DX1 ]->SetValue( 1 );
-  myData[ DY2 ]->SetValue( 1 );
+    anIter.value()->setValue( 0 );
+  myData[ DX1 ]->setValue( 1 );
+  myData[ DY2 ]->setValue( 1 );
   myBlockPreview = false;
 
   ConstructorsClicked( 0 );
 
+
   //@
   /*
   QAD_ViewFrame* aFrame = QAD_Application::getDesktop()->getActiveApp()->
@@ -212,8 +244,7 @@ void BasicGUI_MarkerDlg::Init()
 //=================================================================================
 void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId )
 {
-  if ( myConstructorId == constructorId && myConstructorId == 0 )
-  {
+  if ( myConstructorId == constructorId && myConstructorId == 0 ) {
     globalSelection(); // close local contexts, if any
     localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
     activate( GEOM_MARKER );
@@ -223,15 +254,13 @@ void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId )
 
   myConstructorId = constructorId;
 
-  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
 
-  switch (constructorId)
-  {
+  switch ( constructorId ) {
   case 0:
     {
       Group1->hide();
       Group2->hide();
-      resize(0, 0);
       aMainGrp->show();
       globalSelection(); // close local contexts, if any
       localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
@@ -240,35 +269,42 @@ void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId )
     }
   case 1:
     {
-      Group2->hide();
       aMainGrp->hide();
-      //PAL6669: resize(0, 0);
+      Group2->hide();
       Group1->show();
-
+      Group1->PushButton1->setDown( true );
       globalSelection( GEOM_ALLGEOM );
       myEditCurrentArgument = Group1->LineEdit1;
-      Group1->LineEdit1->setText("");
+      Group1->LineEdit1->setText( "" );
       break;
     }
   case 2:
     {
       aMainGrp->hide();
-      Group1->show();
-      //PAL6669: resize(0, 0);
+      Group1->hide();
       Group2->show();
-
+      Group2->PushButton1->setDown( true );
+      Group2->PushButton2->setDown( false );
+      Group2->PushButton3->setDown( false );
       globalSelection(); // close local contexts, if any
       localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
       myEditCurrentArgument = Group2->LineEdit1;
-      Group2->LineEdit1->setText("");
-      Group2->LineEdit2->setText("");
-      Group2->LineEdit3->setText("");
+      Group2->LineEdit1->setText( "" );
+      Group2->LineEdit2->setText( "" );
+      Group2->LineEdit3->setText( "" );
+      Group2->LineEdit1->setEnabled( true );
+      Group2->LineEdit2->setEnabled( false );
+      Group2->LineEdit3->setEnabled( false );
       break;
     }
   }
 
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(onSelectionDone()));
+  qApp->processEvents();
+  updateGeometry();
+  resize( minimumSizeHint() );
+  
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( onSelectionDone() ) );
   onSelectionDone();
 }
 
@@ -279,16 +315,7 @@ void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId )
 void BasicGUI_MarkerDlg::onOk()
 {
   if ( onApply() )
-    onClose();
-}
-
-//=======================================================================
-// function : onClose()
-// purpose  :
-//=======================================================================
-void BasicGUI_MarkerDlg::onClose()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
+    ClickOnCancel();
 }
 
 //=================================================================================
@@ -312,201 +339,204 @@ bool BasicGUI_MarkerDlg::onApply()
 //=================================================================================
 void BasicGUI_MarkerDlg::onSelectionDone0()
 {
-  if (IObjectCount() == 1)
-  {
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() == 1) {
     Standard_Boolean aRes = Standard_False;
-    Handle(SALOME_InteractiveObject) anIO = firstIObject();
+    Handle(SALOME_InteractiveObject) anIO = aSelList.First();
     GEOM::GEOM_Object_var aSelectedObj = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
-
-    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-
-    if (aRes && !aSelectedObj->_is_nil())
-    {
+    
+    if ( aRes && !aSelectedObj->_is_nil() ) {
       TopoDS_Shape aShape;
-      if (GEOMBase::GetShape(aSelectedObj, aShape, TopAbs_SHAPE) && !aShape.IsNull())
-      {
+      if ( GEOMBase::GetShape( aSelectedObj, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) {
         // Existing LCS selected
-        if (aSelectedObj->GetType() == GEOM_MARKER && aShape.ShapeType() == TopAbs_FACE)
-        {
-          TopoDS_Face aFace = TopoDS::Face(aShape);
-          Handle(Geom_Plane) aPlane = Handle(Geom_Plane)::DownCast(BRep_Tool::Surface(aFace));
-
-          if (!aPlane.IsNull())
-          {
+        if ( aSelectedObj->GetType() == GEOM_MARKER && aShape.ShapeType() == TopAbs_FACE ) {
+          TopoDS_Face aFace = TopoDS::Face( aShape );
+          Handle(Geom_Plane) aPlane = Handle(Geom_Plane)::DownCast( BRep_Tool::Surface( aFace ) );
+         
+          if ( !aPlane.IsNull() ) {
             gp_Ax3 anAx3 = aPlane->Pln().Position();
             gp_Pnt aLoc = anAx3.Location();
             gp_Dir aXDir = anAx3.XDirection();
             gp_Dir aYDir = anAx3.YDirection();
-
-            myData[ X ]->SetValue( aLoc.X() );
-            myData[ Y ]->SetValue( aLoc.Y() );
-            myData[ Z ]->SetValue( aLoc.Z() );
-
-            myData[ DX1 ]->SetValue( aXDir.X() );
-            myData[ DY1 ]->SetValue( aXDir.Y() );
-            myData[ DZ1 ]->SetValue( aXDir.Z() );
-
-            myData[ DX2 ]->SetValue( aYDir.X() );
-            myData[ DY2 ]->SetValue( aYDir.Y() );
-            myData[ DZ2 ]->SetValue( aYDir.Z() );
+           
+            myData[ X ]->setValue( aLoc.X() );
+            myData[ Y ]->setValue( aLoc.Y() );
+            myData[ Z ]->setValue( aLoc.Z() );
+           
+            myData[ DX1 ]->setValue( aXDir.X() );
+            myData[ DY1 ]->setValue( aXDir.Y() );
+            myData[ DZ1 ]->setValue( aXDir.Z() );
+           
+            myData[ DX2 ]->setValue( aYDir.X() );
+            myData[ DY2 ]->setValue( aYDir.Y() );
+            myData[ DZ2 ]->setValue( aYDir.Z() );
            aSelMgr->clearSelected();
           }
         }
-        else
-        {
+        else {
          TColStd_IndexedMapOfInteger aMap;
-         aSelMgr->GetIndexes(anIO, aMap);
-         if (aMap.Extent() == 1) // Local Selection
-          {
-           int anIndex = aMap(1);
+         aSelMgr->GetIndexes( anIO, aMap );
+         if ( aMap.Extent() == 1 ) { // Local Selection
+           int anIndex = aMap( 1 );
            TopTools_IndexedMapOfShape aShapes;
-           TopExp::MapShapes(aShape, aShapes);
-           aShape = aShapes.FindKey(anIndex);
+           TopExp::MapShapes( aShape, aShapes );
+           aShape = aShapes.FindKey( anIndex );
            aSelMgr->clearSelected(); // ???
          }
 
-          if (!aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX)
-          {
-            gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aShape));
-            myData[ X ]->SetValue( aPnt.X() );
-            myData[ Y ]->SetValue( aPnt.Y() );
-            myData[ Z ]->SetValue( aPnt.Z() );
+          if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX ) {
+            gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) );
+            myData[ X ]->setValue( aPnt.X() );
+            myData[ Y ]->setValue( aPnt.Y() );
+            myData[ Z ]->setValue( aPnt.Z() );
           }
         }
       }
     }
   }
-
+  
   displayPreview();
 }
 
+
 //=================================================================================
 // function : onSelectionDone()
 // purpose  : Called when selection as changed or other case
 //=================================================================================
 void BasicGUI_MarkerDlg::onSelectionDone()
 {
-  if (getConstructorId() == 0) {
+  if ( getConstructorId() == 0 ) {
     onSelectionDone0();
     return;
   }
 
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
 
-  if (IObjectCount() == 1) {
-    Standard_Boolean aRes = Standard_False;
-    Handle(SALOME_InteractiveObject) anIO = firstIObject();
-    GEOM::GEOM_Object_var aSelectedObj = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
 
-    if (!CORBA::is_nil(aSelectedObj) && aRes) {
-      QString aName = GEOMBase::GetName(aSelectedObj);
+  if (aSelList.Extent() == 1) {
+    Standard_Boolean aRes = Standard_False;
+    Handle(SALOME_InteractiveObject) anIO = aSelList.First();
+    GEOM::GEOM_Object_var aSelectedObj = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
 
-      if (getConstructorId() == 1) { // by shape position
+    if ( !CORBA::is_nil( aSelectedObj ) && aRes ) {
+      QString aName = GEOMBase::GetName( aSelectedObj );
+      
+      if ( getConstructorId() == 1 ) { // by shape position
         // Get shape's position
-        CORBA::Double Ox,Oy,Oz, Zx,Zy,Zz, Xx,Xy,Xz, Yx,Yy,Yz;
+        CORBA::Double Ox, Oy, Oz,   Zx, Zy, Zz,   Xx, Xy, Xz,   Yx, Yy, Yz;
         Ox = Oy = Oz = Zx = Zy = Xy = Xz = Yx = Yz = 0;
         Zz = Xx = Yy = 1.;
-
+       
         GEOM::GEOM_IMeasureOperations_ptr aMeasureOp =
-          myGeomGUI->GetGeomGen()->GetIMeasureOperations(getStudyId());
-        aMeasureOp->GetPosition(aSelectedObj, Ox,Oy,Oz, Zx,Zy,Zz, Xx,Xy,Xz);
-
+          myGeomGUI->GetGeomGen()->GetIMeasureOperations( getStudyId() );
+        aMeasureOp->GetPosition( aSelectedObj, Ox, Oy, Oz, Zx, Zy, Zz, Xx, Xy, Xz );
+       
         // Calculate Y direction
-        if (aMeasureOp->IsDone()) {
-          gp_Pnt aPnt (Ox,Oy,Oz);
-          gp_Dir aDirN (Zx,Zy,Zz);
-          gp_Dir aDirX (Xx,Xy,Xz);
-          gp_Ax3 anAx3 (aPnt, aDirN, aDirX);
+        if ( aMeasureOp->IsDone() ) {
+          gp_Pnt aPnt  ( Ox, Oy, Oz );
+          gp_Dir aDirN ( Zx, Zy, Zz );
+          gp_Dir aDirX ( Xx, Xy, Xz );
+          gp_Ax3 anAx3 ( aPnt, aDirN, aDirX );
 
           gp_Dir aDirY = anAx3.YDirection();
           aDirY.Coord(Yx,Yy,Yz);
         }
 
         // Set values
-        myData[ X ]->SetValue( Ox );
-        myData[ Y ]->SetValue( Oy );
-        myData[ Z ]->SetValue( Oz );
+        myData[ X ]->setValue( Ox );
+        myData[ Y ]->setValue( Oy );
+        myData[ Z ]->setValue( Oz );
 
-        myData[ DX1 ]->SetValue( Xx );
-        myData[ DY1 ]->SetValue( Xy );
-        myData[ DZ1 ]->SetValue( Xz );
+        myData[ DX1 ]->setValue( Xx );
+        myData[ DY1 ]->setValue( Xy );
+        myData[ DZ1 ]->setValue( Xz );
 
-        myData[ DX2 ]->SetValue( Yx );
-        myData[ DY2 ]->SetValue( Yy );
-        myData[ DZ2 ]->SetValue( Yz );
+        myData[ DX2 ]->setValue( Yx );
+        myData[ DY2 ]->setValue( Yy );
+        myData[ DZ2 ]->setValue( Yz );
 
-        myEditCurrentArgument->setText(aName);
+        myEditCurrentArgument->setText( aName );
       }
-      else if (getConstructorId() == 2) { // by point and two vectors
+      else if ( getConstructorId() == 2 ) { // by point and two vectors
         TopoDS_Shape aShape;
-        if (GEOMBase::GetShape(aSelectedObj, aShape, TopAbs_SHAPE))
-        {
+        if ( GEOMBase::GetShape( aSelectedObj, aShape, TopAbs_SHAPE ) ) {
           TopAbs_ShapeEnum aNeedType = TopAbs_EDGE;
-          if (myEditCurrentArgument == Group2->LineEdit1)
+          if ( myEditCurrentArgument == Group2->LineEdit1 )
             aNeedType = TopAbs_VERTEX;
-
+         
           TColStd_IndexedMapOfInteger aMap;
-          LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-          aSelMgr->GetIndexes(anIO, aMap);
+          aSelMgr->GetIndexes( anIO, aMap );
 
-          if (!aMap.IsEmpty()) {
-            int anIndex = aMap(1);
-            if (aNeedType == TopAbs_EDGE)
-              aName += QString("_edge_%1").arg(anIndex);
+          if ( !aMap.IsEmpty() ) {
+            int anIndex = aMap( 1 );
+            if ( aNeedType == TopAbs_EDGE )
+              aName += QString( "_edge_%1" ).arg( anIndex );
             else
-              aName += QString("_vertex_%1").arg(anIndex);
+              aName += QString( "_vertex_%1" ).arg( anIndex );
 
             TopTools_IndexedMapOfShape aShapes;
-            TopExp::MapShapes(aShape, aShapes);
-            aShape = aShapes.FindKey(anIndex);
+            TopExp::MapShapes( aShape, aShapes );
+            aShape = aShapes.FindKey( anIndex );
           }
 
-          if (myEditCurrentArgument == Group2->LineEdit1) {
-           if (!aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX) {
-             gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aShape));
-             myData[ X ]->SetValue( aPnt.X() );
-             myData[ Y ]->SetValue( aPnt.Y() );
-             myData[ Z ]->SetValue( aPnt.Z() );
-             myEditCurrentArgument->setText(aName);
+          if ( myEditCurrentArgument == Group2->LineEdit1 ) {
+           if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX ) {
+             gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) );
+             myData[ X ]->setValue( aPnt.X() );
+             myData[ Y ]->setValue( aPnt.Y() );
+             myData[ Z ]->setValue( aPnt.Z() );
+             myEditCurrentArgument->setText( aName );
+             if (Group2->LineEdit2->text() == "")
+               Group2->PushButton2->click();
            }
            else {
-             myData[ X ]->SetValue( 0 );
-             myData[ Y ]->SetValue( 0 );
-             myData[ Z ]->SetValue( 0 );
+             myData[ X ]->setValue( 0 );
+             myData[ Y ]->setValue( 0 );
+             myData[ Z ]->setValue( 0 );
            }
          }
          else if (myEditCurrentArgument == Group2->LineEdit2) {
            if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_EDGE ) {
-             gp_Pnt aP1 = BRep_Tool::Pnt(TopExp::FirstVertex(TopoDS::Edge(aShape)));
-             gp_Pnt aP2 = BRep_Tool::Pnt(TopExp::LastVertex(TopoDS::Edge(aShape)));
-             gp_Dir aDir (gp_Vec(aP1, aP2));
-
-             myData[ DX1 ]->SetValue( aDir.X() );
-             myData[ DY1 ]->SetValue( aDir.Y() );
-             myData[ DZ1 ]->SetValue( aDir.Z() );
-             myEditCurrentArgument->setText(aName);
+             gp_Pnt aP1 = BRep_Tool::Pnt( TopExp::FirstVertex( TopoDS::Edge( aShape ) ) );
+             gp_Pnt aP2 = BRep_Tool::Pnt( TopExp::LastVertex( TopoDS::Edge( aShape ) ) );
+             gp_Dir aDir( gp_Vec( aP1, aP2 ) );
+
+             myData[ DX1 ]->setValue( aDir.X() );
+             myData[ DY1 ]->setValue( aDir.Y() );
+             myData[ DZ1 ]->setValue( aDir.Z() );
+             myEditCurrentArgument->setText( aName );
+             if (Group2->LineEdit3->text() == "")
+               Group2->PushButton3->click();
            }
            else {
-             myData[ DX1 ]->SetValue( 0 );
-             myData[ DY1 ]->SetValue( 0 );
-             myData[ DZ1 ]->SetValue( 0 );
+             myData[ DX1 ]->setValue( 0 );
+             myData[ DY1 ]->setValue( 0 );
+             myData[ DZ1 ]->setValue( 0 );
            }
          }
-         else if (myEditCurrentArgument == Group2->LineEdit3) {
+         else if ( myEditCurrentArgument == Group2->LineEdit3 ) {
            if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_EDGE ) {
-             gp_Pnt aP1 = BRep_Tool::Pnt(TopExp::FirstVertex(TopoDS::Edge(aShape)));
-             gp_Pnt aP2 = BRep_Tool::Pnt(TopExp::LastVertex(TopoDS::Edge(aShape)));
-             gp_Dir aDir(gp_Vec(aP1, aP2));
-
-             myData[ DX2 ]->SetValue( aDir.X() );
-             myData[ DY2 ]->SetValue( aDir.Y() );
-             myData[ DZ2 ]->SetValue( aDir.Z() );
-             myEditCurrentArgument->setText(aName);
+             gp_Pnt aP1 = BRep_Tool::Pnt( TopExp::FirstVertex( TopoDS::Edge( aShape ) ) );
+             gp_Pnt aP2 = BRep_Tool::Pnt( TopExp::LastVertex( TopoDS::Edge( aShape ) ) );
+             gp_Dir aDir(gp_Vec( aP1, aP2 ));
+
+             myData[ DX2 ]->setValue( aDir.X() );
+             myData[ DY2 ]->setValue( aDir.Y() );
+             myData[ DZ2 ]->setValue( aDir.Z() );
+             myEditCurrentArgument->setText( aName );
+             if (Group2->LineEdit1->text() == "")
+               Group2->PushButton1->click();
            }
            else {
-             myData[ DX2 ]->SetValue( 0 );
-             myData[ DY2 ]->SetValue( 0 );
-             myData[ DZ2 ]->SetValue( 0 );
+             myData[ DX2 ]->setValue( 0 );
+             myData[ DY2 ]->setValue( 0 );
+             myData[ DZ2 ]->setValue( 0 );
            }
          }
        }
@@ -515,33 +545,33 @@ void BasicGUI_MarkerDlg::onSelectionDone()
   }
   else {
     if ( getConstructorId() == 1 ) {
-      myData[ X ]->SetValue( 0 );
-      myData[ Y ]->SetValue( 0 );
-      myData[ Z ]->SetValue( 0 );
+      myData[ X ]->setValue( 0 );
+      myData[ Y ]->setValue( 0 );
+      myData[ Z ]->setValue( 0 );
 
-      myData[ DX1 ]->SetValue( 0 );
-      myData[ DY1 ]->SetValue( 0 );
-      myData[ DZ1 ]->SetValue( 0 );
+      myData[ DX1 ]->setValue( 0 );
+      myData[ DY1 ]->setValue( 0 );
+      myData[ DZ1 ]->setValue( 0 );
 
-      myData[ DX2 ]->SetValue( 0 );
-      myData[ DY2 ]->SetValue( 0 );
-      myData[ DZ2 ]->SetValue( 0 );
+      myData[ DX2 ]->setValue( 0 );
+      myData[ DY2 ]->setValue( 0 );
+      myData[ DZ2 ]->setValue( 0 );
     }
     else if ( getConstructorId() == 2 ) {
-      if (myEditCurrentArgument == Group2->LineEdit1) {
-       myData[ X ]->SetValue( 0 );
-       myData[ Y ]->SetValue( 0 );
-       myData[ Z ]->SetValue( 0 );
+      if ( myEditCurrentArgument == Group2->LineEdit1 ) {
+       myData[ X ]->setValue( 0 );
+       myData[ Y ]->setValue( 0 );
+       myData[ Z ]->setValue( 0 );
       }
-      else if (myEditCurrentArgument == Group2->LineEdit2) {
-       myData[ DX1 ]->SetValue( 0 );
-       myData[ DY1 ]->SetValue( 0 );
-       myData[ DZ1 ]->SetValue( 0 );
+      else if ( myEditCurrentArgument == Group2->LineEdit2 ) {
+       myData[ DX1 ]->setValue( 0 );
+       myData[ DY1 ]->setValue( 0 );
+       myData[ DZ1 ]->setValue( 0 );
       }
-      else if (myEditCurrentArgument == Group2->LineEdit3) {
-       myData[ DX2 ]->SetValue( 0 );
-       myData[ DY2 ]->SetValue( 0 );
-       myData[ DZ2 ]->SetValue( 0 );
+      else if ( myEditCurrentArgument == Group2->LineEdit3 ) {
+       myData[ DX2 ]->setValue( 0 );
+       myData[ DY2 ]->setValue( 0 );
+       myData[ DZ2 ]->setValue( 0 );
       }
     }
   }
@@ -556,30 +586,42 @@ void BasicGUI_MarkerDlg::onSelectionDone()
 void BasicGUI_MarkerDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
+  globalSelection(); // close local contexts, if any
 
-  if (send == Group1->PushButton1) {
+  if ( send == Group1->PushButton1 ) {
     myEditCurrentArgument = Group1->LineEdit1;
     globalSelection( GEOM_ALLGEOM );
   }
-  else if (send == Group2->PushButton1) {
+  else if ( send == Group2->PushButton1 ) {
     myEditCurrentArgument = Group2->LineEdit1;
-    //globalSelection( GEOM_POINT );
-    globalSelection(); // close local contexts, if any
     localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+    Group2->PushButton2->setDown( false );
+    Group2->PushButton3->setDown( false );
+    Group2->LineEdit1->setEnabled( true );
+    Group2->LineEdit2->setEnabled( false );
+    Group2->LineEdit3->setEnabled( false );
   }
-  else if (send == Group2->PushButton2) {
+  else if ( send == Group2->PushButton2 ) {
     myEditCurrentArgument = Group2->LineEdit2;
-    //globalSelection( GEOM_LINE );
-    globalSelection(); // close local contexts, if any
     localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+    Group2->PushButton1->setDown( false );
+    Group2->PushButton3->setDown( false );
+    Group2->LineEdit1->setEnabled( false );
+    Group2->LineEdit2->setEnabled( true );
+    Group2->LineEdit3->setEnabled( false );
   }
-  else if (send == Group2->PushButton3) {
+  else if ( send == Group2->PushButton3 ) {
     myEditCurrentArgument = Group2->LineEdit3;
-    globalSelection(); // close local contexts, if any
     localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+    Group2->PushButton1->setDown( false );
+    Group2->PushButton2->setDown( false );
+    Group2->LineEdit1->setEnabled( false );
+    Group2->LineEdit2->setEnabled( false );
+    Group2->LineEdit3->setEnabled( true );
   }
-
+  
   myEditCurrentArgument->setFocus();
+  send->setDown(true);
   onSelectionDone();
 }
 
@@ -602,10 +644,10 @@ void BasicGUI_MarkerDlg::LineEditReturnPressed()
 void BasicGUI_MarkerDlg::onActivate()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(onSelectionDone()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( onSelectionDone() ) );
 
-  ConstructorsClicked(getConstructorId());
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================
@@ -621,9 +663,9 @@ void BasicGUI_MarkerDlg::onDeactivate()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BasicGUI_MarkerDlg::enterEvent(QEvent* e)
+void BasicGUI_MarkerDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     onActivate();
 }
 
@@ -643,8 +685,8 @@ GEOM::GEOM_IOperations_ptr BasicGUI_MarkerDlg::createOperation()
 bool BasicGUI_MarkerDlg::isValid( QString& msg )
 {
   const int id = getConstructorId();
-  gp_Vec v1( myData[ DX1 ]->GetValue(), myData[ DY1 ]->GetValue(), myData[ DZ1 ]->GetValue() ),
-         v2( myData[ DX2 ]->GetValue(), myData[ DY2 ]->GetValue(), myData[ DZ2 ]->GetValue() );
+  gp_Vec v1( myData[ DX1 ]->value(), myData[ DY1 ]->value(), myData[ DZ1 ]->value() ),
+         v2( myData[ DX2 ]->value(), myData[ DY2 ]->value(), myData[ DZ2 ]->value() );
 
   bool isOk = false;
   // we will got exception if the magnitude of any of the 2 vectors <= gp::Resolution()
@@ -655,16 +697,19 @@ bool BasicGUI_MarkerDlg::isValid( QString& msg )
       msg += tr( "VEC_PARALLEL" );
   }
 
-  switch ( id )
-  {
-    case 0:
-      return isOk;
-    case 1:
-      return !Group1->LineEdit1->text().isEmpty() && isOk;
-    case 2:
-      return !Group2->LineEdit1->text().isEmpty() &&
-            !Group2->LineEdit2->text().isEmpty() &&
-            !Group2->LineEdit3->text().isEmpty() && isOk;
+  switch ( id ) {
+  case 0: {
+    bool ok = true;
+    for ( DataMap::iterator anIter = myData.begin(); anIter != myData.end(); ++anIter )
+      ok = anIter.value()->isValid( msg, !IsPreview()) && ok;
+    return isOk && ok;
+  }
+  case 1:
+    return !Group1->LineEdit1->text().isEmpty() && isOk;
+  case 2:
+    return !Group2->LineEdit1->text().isEmpty() &&
+      !Group2->LineEdit2->text().isEmpty() &&
+      !Group2->LineEdit3->text().isEmpty() && isOk;
   }
   return false;
 }
@@ -675,26 +720,30 @@ bool BasicGUI_MarkerDlg::isValid( QString& msg )
 //=================================================================================
 bool BasicGUI_MarkerDlg::execute( ObjectList& objects )
 {
-  GEOM::GEOM_Object_var anObj = GEOM::GEOM_IBasicOperations::_narrow(getOperation())->
-    MakeMarker(myData[ X   ]->GetValue(), myData[ Y   ]->GetValue(), myData[ Z   ]->GetValue(),
-               myData[ DX1 ]->GetValue(), myData[ DY1 ]->GetValue(), myData[ DZ1 ]->GetValue(),
-               myData[ DX2 ]->GetValue(), myData[ DY2 ]->GetValue(), myData[ DZ2 ]->GetValue());
-
-  if ( !anObj->_is_nil() )
+  GEOM::GEOM_Object_var anObj = GEOM::GEOM_IBasicOperations::_narrow(
+    getOperation() )->MakeMarker( myData[ X   ]->value(), myData[ Y   ]->value(), myData[ Z   ]->value(),
+                                  myData[ DX1 ]->value(), myData[ DY1 ]->value(), myData[ DZ1 ]->value(),
+                                  myData[ DX2 ]->value(), myData[ DY2 ]->value(), myData[ DZ2 ]->value() );
+  QStringList aParameters;
+  aParameters<<myData[X]->text();
+  aParameters<<myData[Y]->text();
+  aParameters<<myData[Z]->text();
+  aParameters<<myData[ DX1 ]->text(); 
+  aParameters<<myData[ DY1 ]->text(); 
+  aParameters<<myData[ DZ1 ]->text();
+  aParameters<<myData[ DX2 ]->text();
+  aParameters<<myData[ DY2 ]->text();
+  aParameters<<myData[ DZ2 ]->text();
+  
+  if ( !anObj->_is_nil() ) {
+    if ( !IsPreview() )
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
     objects.push_back( anObj._retn() );
+  }
 
   return true;
 }
 
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void BasicGUI_MarkerDlg::closeEvent( QCloseEvent* e )
-{
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : onValueChanged
 // purpose  :
@@ -713,12 +762,9 @@ void BasicGUI_MarkerDlg::displayPreview ( const bool   activate,
                                           const bool   toRemoveFromEngine,
                                           const double lineWidth )
 {
-  if ( !myBlockPreview )
-  {
+  if ( !myBlockPreview ) {
     GEOMBase_Skeleton::displayPreview( activate, update, toRemoveFromEngine, lineWidth );
     if ( myConstructorId == 0 )
-    {
       GEOMBase_Skeleton::activate( GEOM_MARKER );
-    }
   }
 }
index 7ba75b60b52fa548a15b4179ceb1136ede81e237..364b0d7375786a1e1bbaee3650b0dbe759f5c3ee 100644 (file)
@@ -1,73 +1,68 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BasicGUI_MarkerDlg.h
-//  Author : Sergey LITONIN
-//  Module : GEOM
-
-#ifndef DIALOGBOX_Marker_H
-#define DIALOGBOX_Marker_H
-
-#include "GEOM_BasicGUI.hxx"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_MarkerDlg.h
+// Author : Sergey LITONIN, Open CASCADE S.A.S. (sergey.litonin@opencascade.com)
+//
+#ifndef BASICGUI_MARKERDLG_H
+#define BASICGUI_MARKERDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_QTD.h"
-#include "DlgRef_3Sel_QTD.h"
+#include <GEOMBase_Skeleton.h>
 
-#include <qmap.h>
+#include <QMap>
 
-class DlgRef_SpinBox;
+class DlgRef_1Sel;
+class DlgRef_3Sel;
+class SalomeApp_DoubleSpinBox;
+class QFrame;
 
-class GEOM_BASICGUI_EXPORT BasicGUI_MarkerDlg : public GEOMBase_Skeleton
+class BasicGUI_MarkerDlg : public GEOMBase_Skeleton
 {
   Q_OBJECT
 
 private:
   enum { X, Y, Z, DX1, DY1, DZ1, DX2, DY2, DZ2 };
-  typedef QMap< int, DlgRef_SpinBox* > DataMap;
+  typedef QMap< int, SalomeApp_DoubleSpinBox* > DataMap;
 
 public:
-                                BasicGUI_MarkerDlg( GeometryGUI* theGeometryGUI, QWidget* );
+                                BasicGUI_MarkerDlg( GeometryGUI*, QWidget* );
   virtual                       ~BasicGUI_MarkerDlg();
   void                          Init();
 
 protected:
   virtual                       GEOM::GEOM_IOperations_ptr createOperation();
   virtual bool                  isValid( QString& );
-  virtual bool                  execute( ObjectList& objects );
-  virtual void                  closeEvent( QCloseEvent* e );
-  virtual void                  displayPreview ( const bool   activate = false,
-                                                 const bool   update = true,
-                                                 const bool   toRemoveFromEngine = true,
-                                                 const double lineWidth = -1 );
+  virtual bool                  execute( ObjectList& );
+  virtual void                  displayPreview ( const bool   = false,
+                                                 const bool   = true,
+                                                 const bool   = true,
+                                                 const double = -1 );
 
 private:
-  void                          enterEvent( QEvent* );
+  void                          enterEvent( QEvent* );
   void                          onSelectionDone0();
 
 private slots:
   void                          onOk();
-  void                          onClose();
   bool                          onApply();
   void                          onActivate();
   void                          onDeactivate();
@@ -82,10 +77,9 @@ private:
   int                           myConstructorId;
   int                           myBlockPreview;
 
-  QGroupBox*                    aMainGrp;
-  DlgRef_1Sel_QTD*              Group1;
-  DlgRef_3Sel_QTD*              Group2;
-
+  QFrame*                       aMainGrp;
+  DlgRef_1Sel*                  Group1;
+  DlgRef_3Sel*                  Group2;
 };
 
-#endif // DIALOGBOX_Marker_H
+#endif // BASICGUI_MARKERDLG_H
index 64936d546c3c3b0e6c5053c9f1b34aa716550b2f..8d5b14f37bdf17c11798a88ef6ba9f6bd7fa5512 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_PlaneDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//
-//  File   : BasicGUI_PlaneDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "BasicGUI_PlaneDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
 
-#include <TColStd_MapOfInteger.hxx>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+
+#include <TColStd_MapOfInteger.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : BasicGUI_PlaneDlg()
@@ -55,62 +52,75 @@ 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(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BasicGUI_PlaneDlg::BasicGUI_PlaneDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                     bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
 {
-  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")));
-  QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PLANE_FACE")));
-  QPixmap image3(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  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" ) ) );
+  QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_PLANE_FACE" ) ) );
+  QPixmap image3( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_PLANE_TITLE"));
+  setWindowTitle( tr( "GEOM_PLANE_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_PLANE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->setPixmap(image2);
-
-  GroupPntDir = new DlgRef_2Sel1Spin(this, "GroupPointDirection");
-  GroupPntDir->GroupBox1->setTitle(tr("GEOM_PLANE_PV"));
-  GroupPntDir->TextLabel1->setText(tr("GEOM_POINT"));
-  GroupPntDir->TextLabel2->setText(tr("GEOM_VECTOR"));
-  GroupPntDir->TextLabel3->setText(tr("GEOM_PLANE_SIZE"));
-  GroupPntDir->PushButton1->setPixmap(image3);
-  GroupPntDir->PushButton2->setPixmap(image3);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_PLANE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setIcon( image1 );
+  mainFrame()->RadioButton3->setIcon( image2 );
+
+  GroupPntDir = new DlgRef_2Sel1Spin( centralWidget() );
+  GroupPntDir->GroupBox1->setTitle( tr( "GEOM_PLANE_PV" ) );
+  GroupPntDir->TextLabel1->setText( tr( "GEOM_POINT" ) );
+  GroupPntDir->TextLabel2->setText( tr( "GEOM_VECTOR" ) );
+  GroupPntDir->TextLabel3->setText( tr( "GEOM_PLANE_SIZE" ) );
+  GroupPntDir->PushButton1->setIcon( image3 );
+  GroupPntDir->PushButton2->setIcon( image3 );
   GroupPntDir->LineEdit1->setReadOnly( true );
   GroupPntDir->LineEdit2->setReadOnly( true );
-
-  Group3Pnts = new DlgRef_3Sel1Spin(this, "Group3Pnts");
-  Group3Pnts->GroupBox1->setTitle(tr("GEOM_3_POINTS"));
-  Group3Pnts->TextLabel1->setText(tr("GEOM_POINT1"));
-  Group3Pnts->TextLabel2->setText(tr("GEOM_POINT2"));
-  Group3Pnts->TextLabel3->setText(tr("GEOM_POINT3"));
-  Group3Pnts->TextLabel4->setText(tr("GEOM_PLANE_SIZE"));
-  Group3Pnts->PushButton1->setPixmap(image3);
-  Group3Pnts->PushButton2->setPixmap(image3);
-  Group3Pnts->PushButton3->setPixmap(image3);
+  GroupPntDir->PushButton1->setDown( true );
+  GroupPntDir->LineEdit1->setEnabled( true );
+  GroupPntDir->LineEdit2->setEnabled( false );
+
+  Group3Pnts = new DlgRef_3Sel1Spin( centralWidget() );
+  Group3Pnts->GroupBox1->setTitle( tr( "GEOM_3_POINTS" ) );
+  Group3Pnts->TextLabel1->setText( tr( "GEOM_POINT1" ) );
+  Group3Pnts->TextLabel2->setText( tr( "GEOM_POINT2" ) );
+  Group3Pnts->TextLabel3->setText( tr( "GEOM_POINT3" ) );
+  Group3Pnts->TextLabel4->setText( tr( "GEOM_PLANE_SIZE" ) );
+  Group3Pnts->PushButton1->setIcon( image3 );
+  Group3Pnts->PushButton2->setIcon( image3 );
+  Group3Pnts->PushButton3->setIcon( image3 );
+  Group3Pnts->PushButton1->setDown( true );
 
   Group3Pnts->LineEdit1->setReadOnly( true );
   Group3Pnts->LineEdit2->setReadOnly( true );
   Group3Pnts->LineEdit3->setReadOnly( true );
-
-  GroupFace = new DlgRef_1Sel1Spin(this, "GroupFace");
-  GroupFace->GroupBox1->setTitle(tr("GEOM_FACE_OR_LCS"));
-  GroupFace->TextLabel1->setText(tr("GEOM_SELECTION"));
-  GroupFace->TextLabel2->setText(tr("GEOM_PLANE_SIZE"));
-  GroupFace->PushButton1->setPixmap(image3);
+  Group3Pnts->LineEdit1->setEnabled( true );
+  Group3Pnts->LineEdit2->setEnabled( false );
+  Group3Pnts->LineEdit3->setEnabled( false );
+
+  GroupFace = new DlgRef_3Radio1Sel1Spin( centralWidget() );
+  GroupFace->RadioButton1->setText(tr("GEOM_FACE"));
+  GroupFace->RadioButton2->setText(tr("GEOM_LCS"));
+  GroupFace->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  GroupFace->RadioButton3->close();
+  GroupFace->GroupBox1->setTitle( tr( "GEOM_FACE_OR_LCS" ) );
+  GroupFace->TextLabel1->setText( tr( "GEOM_SELECTION" ) );
+  GroupFace->TextLabel2->setText( tr( "GEOM_PLANE_SIZE" ) );
+  GroupFace->PushButton1->setIcon( image3 );
+  GroupFace->PushButton1->setDown( true );
 
   GroupFace->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget(GroupPntDir, 2, 0);
-  Layout1->addWidget(Group3Pnts, 2, 0);
-  Layout1->addWidget(GroupFace, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPntDir );
+  layout->addWidget( Group3Pnts );
+  layout->addWidget( GroupFace );
   /***************************************************************/
 
-  setHelpFileName("create_plane_page.html");
+  setHelpFileName( "create_plane_page.html" );
 
   Init();
 }
@@ -133,6 +143,7 @@ void BasicGUI_PlaneDlg::Init()
 {
   /* init variables */
   myEditCurrentArgument = GroupPntDir->LineEdit1;
+  GroupFace->RadioButton1->setChecked(true);
 
   myPoint = myDir = myPoint1 = myPoint2 = myPoint3 = myFace = GEOM::GEOM_Object::_nil();
 
@@ -140,81 +151,111 @@ void BasicGUI_PlaneDlg::Init()
 
   /* Get setting of step value from file configuration */
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double aStep = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
+  double aStep = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100 );
 
   double aTrimSize = 2000.0;
 
   /* min, max, step and decimals for spin boxes */
-  GroupPntDir->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, aStep, DBL_DIGITS_DISPLAY);
-  GroupPntDir->SpinBox_DX->SetValue( aTrimSize );
-  Group3Pnts->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, aStep, DBL_DIGITS_DISPLAY);
-  Group3Pnts->SpinBox_DX->SetValue( aTrimSize );
-  GroupFace->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, aStep, DBL_DIGITS_DISPLAY);
-  GroupFace->SpinBox_DX->SetValue( aTrimSize );
+  initSpinBox( GroupPntDir->SpinBox_DX, 0.000001, COORD_MAX, aStep, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupPntDir->SpinBox_DX->setValue( aTrimSize );
+  initSpinBox( Group3Pnts->SpinBox_DX, 0.000001, COORD_MAX, aStep, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  Group3Pnts->SpinBox_DX->setValue( aTrimSize );
+  initSpinBox( GroupFace->SpinBox_DX, 0.000001, COORD_MAX, aStep, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupFace->SpinBox_DX->setValue( aTrimSize );
 
   /* 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()));
-  connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
-
-  connect(GroupPntDir->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPntDir->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group3Pnts->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group3Pnts->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group3Pnts->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupFace->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-
-  connect(GroupPntDir->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPntDir->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group3Pnts->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group3Pnts->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group3Pnts->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupFace->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-
-  connect(GroupPntDir->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(Group3Pnts->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupFace->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(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(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  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() ) );
+
+  connect( this,           SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
+
+  connect( GroupPntDir->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPntDir->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts->PushButton1,  SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts->PushButton2,  SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group3Pnts->PushButton3,  SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupFace->PushButton1,   SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+
+  connect( GroupPntDir->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( GroupPntDir->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts->LineEdit1,  SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts->LineEdit2,  SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group3Pnts->LineEdit3,  SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( GroupFace->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( GroupFace->RadioButton1,SIGNAL( clicked() ), this, SLOT( SelectionTypeClicked() ) );
+  connect( GroupFace->RadioButton2,SIGNAL( clicked() ), this, SLOT( SelectionTypeClicked() ) );
+
+  connect( GroupPntDir->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( Group3Pnts->SpinBox_DX,  SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupFace->SpinBox_DX,   SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+
+  connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
+
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   initName( tr( "GEOM_PLANE" ) );
 
-  Group3Pnts->hide();
-  GroupFace->hide();
   ConstructorsClicked( 0 );
 }
 
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void BasicGUI_PlaneDlg::SetDoubleSpinBoxStep( double step )
+{
+  GroupPntDir->SpinBox_DX->setSingleStep(step);
+  Group3Pnts->SpinBox_DX->setSingleStep(step);
+  GroupFace->SpinBox_DX->setSingleStep(step);
+}
+
+//=================================================================================
+// function : SelectionTypeClicked()
+// purpose  : Selection type radio buttons managment
+//=================================================================================
+void BasicGUI_PlaneDlg::SelectionTypeClicked()
+{
+  myFace   = GEOM::GEOM_Object::_nil();
+  if ( GroupFace->RadioButton1->isChecked()) {
+    globalSelection(); // close local contexts, if any
+    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_FACE );
+  } else if ( GroupFace->RadioButton2->isChecked()) {
+    TColStd_MapOfInteger aMap;
+    aMap.Add( GEOM_PLANE );
+    aMap.Add( GEOM_MARKER );
+    globalSelection( aMap );
+  }
+  displayPreview();
+}
+
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void BasicGUI_PlaneDlg::ConstructorsClicked(int constructorId)
+void BasicGUI_PlaneDlg::ConstructorsClicked( int constructorId )
 {
-  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
   myPoint = myDir = myPoint1 = myPoint2 = myPoint3 = myFace = GEOM::GEOM_Object::_nil();
 
-  switch (constructorId)
-  {
+  switch ( constructorId ) {
   case 0: /* plane from a point and a direction (vector, edge...) */
     {
       Group3Pnts->hide();
       GroupFace->hide();
-      resize(0, 0);
       GroupPntDir->show();
-
+      
       myEditCurrentArgument = GroupPntDir->LineEdit1;
-      GroupPntDir->LineEdit1->setText(tr(""));
-      GroupPntDir->LineEdit2->setText(tr(""));
-
+      GroupPntDir->LineEdit1->setText( "" );
+      GroupPntDir->LineEdit2->setText( "" );
+      GroupPntDir->PushButton1->setDown( true );
+      GroupPntDir->PushButton2->setDown( false );
+      GroupPntDir->LineEdit1->setEnabled( true );
+      GroupPntDir->LineEdit2->setEnabled( false );
+      
       /* for the first argument */
       globalSelection(); // close local contexts, if any
       localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
@@ -224,44 +265,57 @@ void BasicGUI_PlaneDlg::ConstructorsClicked(int constructorId)
     {
       GroupPntDir->hide();
       GroupFace->hide();
-      resize(0, 0);
       Group3Pnts->show();
-
+      
       myEditCurrentArgument = Group3Pnts->LineEdit1;
-      Group3Pnts->LineEdit1->setText("");
-      Group3Pnts->LineEdit2->setText("");
-      Group3Pnts->LineEdit3->setText("");
-
+      Group3Pnts->LineEdit1->setText( "" );
+      Group3Pnts->LineEdit2->setText( "" );
+      Group3Pnts->LineEdit3->setText( "" );
+      Group3Pnts->PushButton1->setDown( true );
+      Group3Pnts->PushButton2->setDown( false );
+      Group3Pnts->PushButton3->setDown( false );
+      Group3Pnts->LineEdit1->setEnabled( true );
+      Group3Pnts->LineEdit2->setEnabled( false );
+      Group3Pnts->LineEdit3->setEnabled( false );
+      
       /* for the first argument */
       globalSelection(); // close local contexts, if any
       localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
       break;
     }
-  case 2: /* plane from a planar face selection */
+  case 2: /* plane from a planar face or LSC selection */
     {
       GroupPntDir->hide();
       Group3Pnts->hide();
-      resize(0, 0);
       GroupFace->show();
-
+      
       myEditCurrentArgument = GroupFace->LineEdit1;
-      GroupFace->LineEdit1->setText(tr(""));
-
-      /* for the first argument */
-      //globalSelection( GEOM_PLANE );
-      TColStd_MapOfInteger aMap;
-      aMap.Add( GEOM_PLANE );
-      aMap.Add( GEOM_MARKER );
-      globalSelection( aMap );
+      GroupFace->LineEdit1->setText( "" );
+      GroupFace->PushButton1->setDown( true );
+      
+      if ( GroupFace->RadioButton1->isChecked()) {
+       globalSelection(); // close local contexts, if any
+       localSelection( GEOM::GEOM_Object::_nil(), TopAbs_FACE );
+      } else if ( GroupFace->RadioButton2->isChecked()) {
+       TColStd_MapOfInteger aMap;
+       aMap.Add( GEOM_PLANE );
+       aMap.Add( GEOM_MARKER );
+       globalSelection( aMap );
+      }
       break;
     }
   }
+  
+  qApp->processEvents();
+  updateGeometry();
+  resize( minimumSizeHint() );
 
   myEditCurrentArgument->setFocus();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 }
 
+
 //=================================================================================
 // function : ClickOnOk()
 // purpose  :
@@ -272,6 +326,7 @@ void BasicGUI_PlaneDlg::ClickOnOk()
     ClickOnCancel();
 }
 
+
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
@@ -286,15 +341,6 @@ bool BasicGUI_PlaneDlg::ClickOnApply()
   return true;
 }
 
-//=======================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=======================================================================
-void BasicGUI_PlaneDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection has changed
@@ -303,8 +349,11 @@ void BasicGUI_PlaneDlg::SelectionIntoArgument()
 {
   myEditCurrentArgument->setText("");
 
-  if (IObjectCount() != 1)
-  {
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
     if      ( myEditCurrentArgument == GroupPntDir->LineEdit1 ) myPoint  = GEOM::GEOM_Object::_nil();
     else if ( myEditCurrentArgument == GroupPntDir->LineEdit2 ) myDir    = GEOM::GEOM_Object::_nil();
     else if ( myEditCurrentArgument == Group3Pnts->LineEdit1 )  myPoint1 = GEOM::GEOM_Object::_nil();
@@ -316,61 +365,88 @@ void BasicGUI_PlaneDlg::SelectionIntoArgument()
 
   // nbSel == 1
   Standard_Boolean aRes = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), aRes);
-  if (!CORBA::is_nil(aSelectedObject) && aRes)
-  {
-    QString aName = GEOMBase::GetName(aSelectedObject);
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aRes);
+  if ( !CORBA::is_nil( aSelectedObject ) && aRes ) {
+    QString aName = GEOMBase::GetName( aSelectedObject );
+    TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
+    if ( myEditCurrentArgument == GroupPntDir->LineEdit2 )
+      aNeedType = TopAbs_EDGE;
+    else if ( myEditCurrentArgument == GroupFace->LineEdit1 )
+      aNeedType = TopAbs_FACE;
 
     TopoDS_Shape aShape;
-    if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
-    {
-      TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
-      if (myEditCurrentArgument == GroupPntDir->LineEdit2)
-        aNeedType = TopAbs_EDGE;
-      else if (myEditCurrentArgument == GroupFace->LineEdit1)
-        aNeedType = TopAbs_FACE;
-
-      LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+    if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) {
       TColStd_IndexedMapOfInteger aMap;
-      aSelMgr->GetIndexes(firstIObject(), aMap);
-      if (aMap.Extent() == 1) // Local Selection
-      {
-
-        int anIndex = aMap(1);
-        if (aNeedType == TopAbs_EDGE)
-          aName += QString(":edge_%1").arg(anIndex);
+      aSelMgr->GetIndexes(aSelList.First(), aMap);
+      if ( aMap.Extent() == 1 ) { // Local Selection
+        int anIndex = aMap( 1 );
+        if ( aNeedType == TopAbs_EDGE )
+          aName += QString( ":edge_%1" ).arg( anIndex );
         else if (aNeedType == TopAbs_FACE)
-          aName += QString(":face_%1").arg(anIndex);
+          aName += QString( ":face_%1" ).arg( anIndex );
         else
-          aName += QString(":vertex_%1").arg(anIndex);
+          aName += QString( ":vertex_%1" ).arg( anIndex );
 
        //Find SubShape Object in Father
-       GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
+       GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather( aSelectedObject, aName );
 
        if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-        GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
-        aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+         GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
+         aSelectedObject = aShapesOp->GetSubShape( aSelectedObject, anIndex );
        } 
-       else
+       else {
          aSelectedObject = aFindedObject; // get Object from study
+       }
       }
-      else // Global Selection
-      {
-        if (aShape.ShapeType() != aNeedType) {
+      else { // Global Selection
+        if ( aShape.ShapeType() != aNeedType ) {
           aSelectedObject = GEOM::GEOM_Object::_nil();
           aName = "";
         }
       }
     }
 
-    myEditCurrentArgument->setText(aName);
+    myEditCurrentArgument->setText( aName );
 
-    if      ( myEditCurrentArgument == GroupPntDir->LineEdit1 ) myPoint  = aSelectedObject;
-    else if ( myEditCurrentArgument == GroupPntDir->LineEdit2 ) myDir    = aSelectedObject;
-    else if ( myEditCurrentArgument == Group3Pnts->LineEdit1 )  myPoint1 = aSelectedObject;
-    else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 )  myPoint2 = aSelectedObject;
-    else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 )  myPoint3 = aSelectedObject;
-    else if ( myEditCurrentArgument == GroupFace->LineEdit1 )   myFace   = aSelectedObject;
+    /*    if (!aSelectedObject->_is_nil()) { // clear selection if something selected
+      globalSelection();
+      if ( myEditCurrentArgument == GroupFace->LineEdit1 ) {
+       TColStd_MapOfInteger aMap;
+       aMap.Add( GEOM_PLANE );
+       aMap.Add( GEOM_MARKER );
+       globalSelection( aMap );
+      }
+      else
+       localSelection( GEOM::GEOM_Object::_nil(), aNeedType );
+       }*/
+
+    if      ( myEditCurrentArgument == GroupPntDir->LineEdit1 ) {
+      myPoint  = aSelectedObject;
+      if ( !myPoint->_is_nil() && myDir->_is_nil() )
+       GroupPntDir->PushButton2->click();
+    }
+    else if ( myEditCurrentArgument == GroupPntDir->LineEdit2 ) {
+      myDir    = aSelectedObject;
+      if ( !myDir->_is_nil() && myPoint->_is_nil() )
+       GroupPntDir->PushButton1->click();
+    }
+    else if ( myEditCurrentArgument == Group3Pnts->LineEdit1 ) {
+      myPoint1 = aSelectedObject;
+      if ( !myPoint1->_is_nil() && myPoint2->_is_nil() )
+       Group3Pnts->PushButton2->click();
+    }
+    else if ( myEditCurrentArgument == Group3Pnts->LineEdit2 ) {
+      myPoint2 = aSelectedObject;
+      if ( !myPoint2->_is_nil() && myPoint3->_is_nil() )
+       Group3Pnts->PushButton3->click();
+    }
+    else if ( myEditCurrentArgument == Group3Pnts->LineEdit3 ) {
+      myPoint3 = aSelectedObject;
+      if ( !myPoint3->_is_nil() && myPoint1->_is_nil() )
+       Group3Pnts->PushButton1->click();
+    }
+    else if ( myEditCurrentArgument == GroupFace->LineEdit1 )
+      myFace   = aSelectedObject;
   }
 
   displayPreview();
@@ -386,33 +462,69 @@ void BasicGUI_PlaneDlg::SetEditCurrentArgument()
   QPushButton* send = (QPushButton*)sender();
   globalSelection( GEOM_POINT );
 
-  if      ( send == GroupPntDir->PushButton1 ) myEditCurrentArgument = GroupPntDir->LineEdit1;
-  else if ( send == GroupPntDir->PushButton2 ) myEditCurrentArgument = GroupPntDir->LineEdit2;
-  else if ( send == Group3Pnts->PushButton1 )  myEditCurrentArgument = Group3Pnts->LineEdit1;
-  else if ( send == Group3Pnts->PushButton2 )  myEditCurrentArgument = Group3Pnts->LineEdit2;
-  else if ( send == Group3Pnts->PushButton3 )  myEditCurrentArgument = Group3Pnts->LineEdit3;
-  else if ( send == GroupFace->PushButton1 )   myEditCurrentArgument = GroupFace->LineEdit1;
+  if      ( send == GroupPntDir->PushButton1 ) {
+    myEditCurrentArgument = GroupPntDir->LineEdit1;
+    GroupPntDir->PushButton2->setDown( false );
+    GroupPntDir->LineEdit1->setEnabled( true );
+    GroupPntDir->LineEdit2->setEnabled( false );
+  }
+  else if ( send == GroupPntDir->PushButton2 ) {
+    myEditCurrentArgument = GroupPntDir->LineEdit2;
+    GroupPntDir->PushButton1->setDown( false );
+    GroupPntDir->LineEdit1->setEnabled( false );
+    GroupPntDir->LineEdit2->setEnabled( true );
+  }
+  else if ( send == Group3Pnts->PushButton1 ) {
+    myEditCurrentArgument = Group3Pnts->LineEdit1;
+    Group3Pnts->PushButton2->setDown( false );
+    Group3Pnts->PushButton3->setDown( false );
+    Group3Pnts->LineEdit1->setEnabled( true );
+    Group3Pnts->LineEdit2->setEnabled( false );
+    Group3Pnts->LineEdit3->setEnabled( false );
+  }
+  else if ( send == Group3Pnts->PushButton2 ) {
+    myEditCurrentArgument = Group3Pnts->LineEdit2;
+    Group3Pnts->PushButton1->setDown( false );
+    Group3Pnts->PushButton3->setDown( false );
+    Group3Pnts->LineEdit1->setEnabled( false );
+    Group3Pnts->LineEdit2->setEnabled( true );
+    Group3Pnts->LineEdit3->setEnabled( false );
+  }
+  else if ( send == Group3Pnts->PushButton3 ) {
+    myEditCurrentArgument = Group3Pnts->LineEdit3;
+    Group3Pnts->PushButton1->setDown( false );
+    Group3Pnts->PushButton2->setDown( false );
+    Group3Pnts->LineEdit1->setEnabled( false );
+    Group3Pnts->LineEdit2->setEnabled( false );
+    Group3Pnts->LineEdit3->setEnabled( true );
+  }
+  else if ( send == GroupFace->PushButton1 ) {
+    myEditCurrentArgument = GroupFace->LineEdit1;
+    GroupFace->PushButton1->setDown( true );
+  }
 
   myEditCurrentArgument->setFocus();
 
-  if (myEditCurrentArgument == GroupPntDir->LineEdit2) {
-    globalSelection(); // close local contexts, if any
-    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
+  if ( myEditCurrentArgument == GroupPntDir->LineEdit2 ) {
+    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
   }
-  else if (myEditCurrentArgument == GroupFace->LineEdit1) {
+  else if ( myEditCurrentArgument == GroupFace->LineEdit1 ) {
     TColStd_MapOfInteger aMap;
     aMap.Add( GEOM_PLANE );
     aMap.Add( GEOM_MARKER );
     globalSelection( aMap );
   }
   else { // 3 Pnts
-    globalSelection(); // close local contexts, if any
-    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
   }
 
-  SelectionIntoArgument();
+  //  SelectionIntoArgument();
+  myEditCurrentArgument->setFocus();
+  send->setDown(true);
+  displayPreview();
 }
 
+
 //=================================================================================
 // function : LineEditReturnPressed()
 // purpose  :
@@ -425,13 +537,13 @@ void BasicGUI_PlaneDlg::LineEditReturnPressed()
        send == Group3Pnts->LineEdit1 ||
        send == Group3Pnts->LineEdit2 ||
        send == Group3Pnts->LineEdit3 ||
-       send == GroupFace->LineEdit1 )
-  {
+       send == GroupFace->LineEdit1 ) {
     myEditCurrentArgument = send;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
 }
 
+
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -439,10 +551,10 @@ void BasicGUI_PlaneDlg::LineEditReturnPressed()
 void BasicGUI_PlaneDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  ConstructorsClicked(getConstructorId());
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================
@@ -458,9 +570,9 @@ void BasicGUI_PlaneDlg::DeactivateActiveDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BasicGUI_PlaneDlg::enterEvent(QEvent* e)
+void BasicGUI_PlaneDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
@@ -469,7 +581,7 @@ void BasicGUI_PlaneDlg::enterEvent(QEvent* e)
 // function : ValueChangedInSpinBox()
 // purpose  :
 //=================================================================================
-void BasicGUI_PlaneDlg::ValueChangedInSpinBox(double newValue)
+void BasicGUI_PlaneDlg::ValueChangedInSpinBox( double newValue )
 {
   displayPreview();
 }
@@ -480,15 +592,28 @@ void BasicGUI_PlaneDlg::ValueChangedInSpinBox(double newValue)
 //=================================================================================
 double BasicGUI_PlaneDlg::getSize() const
 {
-  switch ( getConstructorId() )
-  {
-  case 0 : return GroupPntDir->SpinBox_DX->GetValue();
-  case 1 : return Group3Pnts->SpinBox_DX->GetValue();
-  case 2 : return GroupFace->SpinBox_DX->GetValue();
+  switch ( getConstructorId() ) {
+  case 0 : return GroupPntDir->SpinBox_DX->value();
+  case 1 : return Group3Pnts->SpinBox_DX->value();
+  case 2 : return GroupFace->SpinBox_DX->value();
   }
   return 0.;
 }
 
+//=================================================================================
+// function : getSize()
+// purpose  :
+//=================================================================================
+QString BasicGUI_PlaneDlg::getSizeAsString() const
+{
+  switch ( getConstructorId() ) {
+  case 0 : return GroupPntDir->SpinBox_DX->text();
+  case 1 : return Group3Pnts->SpinBox_DX->text();
+  case 2 : return GroupFace->SpinBox_DX->text();
+  }
+  return QString();
+}
+
 //=================================================================================
 // function : createOperation
 // purpose  :
@@ -513,20 +638,26 @@ static bool isEqual( const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Obje
 //=================================================================================
 bool BasicGUI_PlaneDlg::isValid( QString& msg )
 {
-       const int id = getConstructorId();
-       if ( getSize() <= 0 )
-       {
-               msg = QString( "Please, enter size greater than 0." );
-               return false;
-       }
-       if ( id == 0 )
-               return !CORBA::is_nil( myPoint ) && !CORBA::is_nil( myDir );
-       else if ( id == 1 )
-               return !CORBA::is_nil( myPoint1  ) && !CORBA::is_nil( myPoint2 ) && !CORBA::is_nil( myPoint3 ) &&
-                      !isEqual( myPoint1, myPoint2 ) && !isEqual( myPoint1, myPoint3 ) && !isEqual( myPoint2, myPoint3 );
-       else if ( id == 2 )
-               return !CORBA::is_nil( myFace );
-       return false;
+  const int id = getConstructorId();
+  if ( getSize() <= 0 ) {
+    msg = QString( "Please, enter size greater than 0." );
+    return false;
+  }
+
+  if ( id == 0 ) { 
+    bool ok = GroupPntDir->SpinBox_DX->isValid( msg, !IsPreview() );
+    return !CORBA::is_nil( myPoint ) && !CORBA::is_nil( myDir ) && ok;
+  }
+  else if ( id == 1 ) {
+    bool ok = Group3Pnts->SpinBox_DX->isValid( msg, !IsPreview() );
+    return !CORBA::is_nil( myPoint1  ) && !CORBA::is_nil( myPoint2 ) && !CORBA::is_nil( myPoint3 ) &&
+      !isEqual( myPoint1, myPoint2 ) && !isEqual( myPoint1, myPoint3 ) && !isEqual( myPoint2, myPoint3 ) && ok;
+  }
+  else if ( id == 2 ) {
+    bool ok = GroupFace->SpinBox_DX->isValid( msg, !IsPreview() );
+    return !CORBA::is_nil( myFace ) && ok;
+  }
+  return false;
 }
 
 //=================================================================================
@@ -539,8 +670,7 @@ bool BasicGUI_PlaneDlg::execute( ObjectList& objects )
 
   GEOM::GEOM_Object_var anObj;
 
-  switch ( getConstructorId() )
-  {
+  switch ( getConstructorId() ) {
   case 0 :
     anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakePlanePntVec( myPoint, myDir, getSize() );
     res = true;
@@ -554,22 +684,14 @@ bool BasicGUI_PlaneDlg::execute( ObjectList& objects )
     res = true;
     break;
   }
-
-  if ( !anObj->_is_nil() )
+  
+  if ( !anObj->_is_nil() ) {
+    if ( !IsPreview() )
+      anObj->SetParameters(getSizeAsString().toLatin1().constData());
     objects.push_back( anObj._retn() );
-
+  }
   return res;
 }
-
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void BasicGUI_PlaneDlg::closeEvent( QCloseEvent* e )
-{
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : addSubshapeToStudy
 // purpose  : virtual method to add new SubObjects if local selection
@@ -578,8 +700,7 @@ void BasicGUI_PlaneDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
 
-switch (getConstructorId())
-  {
+  switch ( getConstructorId() ) {
   case 0:
     objMap[GroupPntDir->LineEdit1->text()] = myPoint;
     objMap[GroupPntDir->LineEdit2->text()] = myDir;
@@ -593,5 +714,5 @@ switch (getConstructorId())
     objMap[GroupFace->LineEdit1->text()] = myFace;
     break;
   }
- addSubshapesToFather( objMap );
 addSubshapesToFather( objMap );
 }
index 7eaf7ed3f12466474a41c9e112260663a2487a27..5d83df4e39d5630d81eeb85e1eb7011fd55ecb41 100644 (file)
@@ -1,86 +1,84 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BasicGUI_PlaneDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_PLANE_H
-#define DIALOGBOX_PLANE_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_PlaneDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef BASICGUI_PLANEDLG_H
+#define BASICGUI_PLANEDLG_H
 
-#include "GEOM_BasicGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel1Spin.h"
-#include "DlgRef_2Sel1Spin.h"
-#include "DlgRef_3Sel1Spin.h"
+class DlgRef_1Sel1Spin;
+class DlgRef_2Sel1Spin;
+class DlgRef_3Sel1Spin;
+class DlgRef_3Radio1Sel1Spin;
 
 //=================================================================================
 // class    : BasicGUI_PlaneDlg
 // purpose  :
 //=================================================================================
-class GEOM_BASICGUI_EXPORT BasicGUI_PlaneDlg : public GEOMBase_Skeleton
+class BasicGUI_PlaneDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BasicGUI_PlaneDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                      const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~BasicGUI_PlaneDlg();
-
+  BasicGUI_PlaneDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~BasicGUI_PlaneDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
-    virtual void closeEvent( QCloseEvent* e );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
 
-private :
-    void Init();
-    void enterEvent(QEvent* e);
-    double getSize() const;
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  double                             getSize() const;
+  QString                            getSizeAsString() const; 
 
-    GEOM::GEOM_Object_var myPoint, myDir, myPoint1, myPoint2, myPoint3, myFace;
+private:
+  GEOM::GEOM_Object_var              myPoint, myDir, myPoint1, myPoint2, myPoint3, myFace;
 
-    DlgRef_2Sel1Spin* GroupPntDir;
-    DlgRef_3Sel1Spin* Group3Pnts;
-    DlgRef_1Sel1Spin* GroupFace;
+  DlgRef_2Sel1Spin*                  GroupPntDir;
+  DlgRef_3Sel1Spin*                  Group3Pnts;
+  DlgRef_3Radio1Sel1Spin*            GroupFace;
 
 private slots:
-    void ClickOnOk();
-    void ClickOnCancel();
-    bool ClickOnApply();
-    
-    void ActivateThisDialog();
-    void DeactivateActiveDialog();
-    
-    void SelectionIntoArgument();
-    void LineEditReturnPressed();
-    void SetEditCurrentArgument();
-    void ConstructorsClicked(int constructorId);
-    void ValueChangedInSpinBox(double newValue);
-
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  
+  void                               ActivateThisDialog();
+  void                               DeactivateActiveDialog();
+  
+  void                               SelectionIntoArgument();
+  void                               LineEditReturnPressed();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               ValueChangedInSpinBox( double );
+  void                               SetDoubleSpinBoxStep( double );
+  void                               SelectionTypeClicked();
 };
 
-#endif // DIALOGBOX_PLANE_H
+#endif // BASICGUI_PLANEDLG_H
index 573e8bda857bd07bf51a38f6729d2a317a856fe6..9b2f525ac58cc383b30df860c32b9763828085e1 100644 (file)
@@ -1,15 +1,15 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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 
+//  Copyright (C) 2003-2007  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.
 //
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_PointDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//
-//  File   : BasicGUI_PointDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "BasicGUI_PointDlg.h"
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include "GEOMImpl_Types.hxx"
+#include <DlgRef.h>
 
-#include <qlabel.h>
+#include <GEOMImpl_Types.hxx>
 
-#include "utilities.h"
+#include <QApplication>
+#include <QLabel>
 
 #include <gp_Pnt.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopoDS.hxx>
 #include <BRep_Tool.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qapplication.h>
-
-using namespace std;
-
 //=================================================================================
 // class    : BasicGUI_PointDlg()
-// purpose  : Constructs a BasicGUI_PointDlg which is a child of 'parent', with the
+// purpose  : Constructs a BasicGUI_PointDlg which is 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.
 //=================================================================================
-BasicGUI_PointDlg::BasicGUI_PointDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
-                                     const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, fl )
+BasicGUI_PointDlg::BasicGUI_PointDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                     bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, 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")));
-  QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
-  QPixmap image3(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_POINT_REF")));
-  QPixmap image4(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_POINT_LINES")));
-
-  setCaption(tr("GEOM_POINT_TITLE"));
+  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" ) ) );
+  QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
+  QPixmap image3( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_POINT_REF" ) ) );
+  QPixmap image4( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_POINT_LINES") ) );
+  QPixmap image5( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_POINT_FACE" ) ) );
 
-  QGroupBox* aFrame = new QGroupBox( 1, Qt::Horizontal, this );
-  aFrame->setInsideMargin( 0 );
-  aFrame->setFrameStyle( QFrame::NoFrame );
+  setWindowTitle( tr( "GEOM_POINT_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_POINTS"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image3);
-  RadioButton3->setPixmap(image1);
-  RadioButton4->show();
-  RadioButton4->setPixmap(image4);
-
-  GroupXYZ = new DlgRef_3Spin( aFrame, "GroupXYZ" );
-  GroupXYZ->GroupBox1->setTitle(tr("GEOM_COORDINATES"));
-  GroupXYZ->TextLabel1->setText(tr("GEOM_X"));
-  GroupXYZ->TextLabel2->setText(tr("GEOM_Y"));
-  GroupXYZ->TextLabel3->setText(tr("GEOM_Z"));
-
-  GroupOnCurve = new DlgRef_1Sel1Spin( aFrame, "GroupOnCurve" );
-  GroupOnCurve->GroupBox1->setTitle(tr("GEOM_PARAM_POINT"));
-  GroupOnCurve->TextLabel1->setText(tr("GEOM_EDGE"));
-  GroupOnCurve->TextLabel2->setText(tr("GEOM_PARAMETER"));
-  GroupOnCurve->PushButton1->setPixmap(image2);
-
-  GroupRefPoint = new DlgRef_1Sel3Spin( aFrame, "GoupRefPoint" );
-  GroupRefPoint->GroupBox1->setTitle(tr("GEOM_REF_POINT"));
-  GroupRefPoint->TextLabel1->setText(tr("GEOM_POINT"));
-  GroupRefPoint->PushButton1->setPixmap(image2);
-  GroupRefPoint->TextLabel2->setText(tr("GEOM_DX"));
-  GroupRefPoint->TextLabel3->setText(tr("GEOM_DY"));
-  GroupRefPoint->TextLabel4->setText(tr("GEOM_DZ"));
-
-  GroupLineIntersection = new DlgRef_2Sel_QTD (aFrame, "GroupLineIntersection");
-  GroupLineIntersection->GroupBox1->setTitle(tr("GEOM_LINE_INTERSECTION"));
-  GroupLineIntersection->TextLabel1->setText(tr("GEOM_LINE1"));
-  GroupLineIntersection->PushButton1->setPixmap(image2);
-  GroupLineIntersection->TextLabel2->setText(tr("GEOM_LINE2"));
-  GroupLineIntersection->PushButton2->setPixmap(image2);
-
-  Layout1->addWidget( aFrame, 2, 0 );
-  /***************************************************************/
-
-  myCoordGrp = new QGroupBox( 2, Qt::Horizontal, tr( "GEOM_COORDINATES" ), aFrame );
-  new QLabel( tr( "GEOM_X" ), myCoordGrp );
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_POINTS" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setIcon( image3 );
+  mainFrame()->RadioButton3->setIcon( image1 );
+  mainFrame()->RadioButton4->show();
+  mainFrame()->RadioButton4->setIcon( image4 );
+  mainFrame()->RadioButton5->show();
+  mainFrame()->RadioButton5->setIcon( image5 );
+
+  GroupXYZ = new DlgRef_3Spin( centralWidget() );
+  GroupXYZ->GroupBox1->setTitle( tr( "GEOM_COORDINATES" ) );
+  GroupXYZ->TextLabel1->setText( tr( "GEOM_X" ) );
+  GroupXYZ->TextLabel2->setText( tr( "GEOM_Y" ) );
+  GroupXYZ->TextLabel3->setText( tr( "GEOM_Z" ) );
+
+  GroupOnCurve = new DlgRef_1Sel1Spin( centralWidget() );
+  GroupOnCurve->GroupBox1->setTitle( tr( "GEOM_PARAM_POINT" ) );
+  GroupOnCurve->TextLabel1->setText( tr( "GEOM_EDGE" ) );
+  GroupOnCurve->TextLabel2->setText( tr( "GEOM_PARAMETER" ) );
+  GroupOnCurve->PushButton1->setIcon( image2 );
+
+  GroupOnSurface = new DlgRef_1Sel2Spin( centralWidget() );
+  GroupOnSurface->GroupBox1->setTitle( tr( "GEOM_PARAM_POINT" ) );
+  GroupOnSurface->TextLabel1->setText( tr( "GEOM_FACE" ) );
+  GroupOnSurface->TextLabel2->setText( tr( "GEOM_UPARAMETER" ) );
+  GroupOnSurface->TextLabel3->setText( tr( "GEOM_VPARAMETER" ) );
+  GroupOnSurface->PushButton1->setIcon( image2 );
+
+  GroupRefPoint = new DlgRef_1Sel3Spin( centralWidget() );
+  GroupRefPoint->GroupBox1->setTitle( tr( "GEOM_REF_POINT" ) );
+  GroupRefPoint->TextLabel1->setText( tr( "GEOM_POINT" ) );
+  GroupRefPoint->PushButton1->setIcon( image2 );
+  GroupRefPoint->TextLabel2->setText( tr( "GEOM_DX" ) );
+  GroupRefPoint->TextLabel3->setText( tr( "GEOM_DY" ) );
+  GroupRefPoint->TextLabel4->setText( tr( "GEOM_DZ" ) );
+
+  GroupLineIntersection = new DlgRef_2Sel( centralWidget() );
+  GroupLineIntersection->GroupBox1->setTitle( tr( "GEOM_LINE_INTERSECTION" ) );
+  GroupLineIntersection->TextLabel1->setText( tr( "GEOM_LINE1" ) );
+  GroupLineIntersection->TextLabel2->setText( tr( "GEOM_LINE2" ) );
+  GroupLineIntersection->PushButton1->setIcon( image2 );
+  GroupLineIntersection->PushButton2->setIcon( image2 );
+  GroupLineIntersection->LineEdit2->setEnabled(false);
+
+  myCoordGrp = new QGroupBox( tr( "GEOM_COORDINATES" ), centralWidget() );
+  QGridLayout* myCoordGrpLayout = new QGridLayout( myCoordGrp );
+  myCoordGrpLayout->addWidget( new QLabel( tr( "GEOM_X" ), myCoordGrp ), 0, 0 );
   myX = new QLineEdit( myCoordGrp );
-  new QLabel( tr( "GEOM_Y" ), myCoordGrp );
+  myCoordGrpLayout->addWidget( myX, 0, 1 );
+  myCoordGrpLayout->addWidget( new QLabel( tr( "GEOM_Y" ), myCoordGrp ), 1, 0 );
   myY = new QLineEdit( myCoordGrp );
-  new QLabel( tr( "GEOM_Z" ), myCoordGrp );
+  myCoordGrpLayout->addWidget( myY, 1, 1 );
+  myCoordGrpLayout->addWidget( new QLabel( tr( "GEOM_Z" ), myCoordGrp ), 2, 0 );
   myZ = new QLineEdit( myCoordGrp );
+  myCoordGrpLayout->addWidget( myZ, 2, 1 );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupXYZ );
+  layout->addWidget( GroupOnCurve );
+  layout->addWidget( GroupOnSurface );
+  layout->addWidget( GroupRefPoint );
+  layout->addWidget( GroupLineIntersection );
+  layout->addWidget( myCoordGrp );
 
   myX->setReadOnly( true );
   myY->setReadOnly( true );
@@ -130,17 +144,17 @@ BasicGUI_PointDlg::BasicGUI_PointDlg(GeometryGUI* theGeometryGUI, QWidget* paren
   myZ->setEnabled( false );
 
   QPalette aPal = myX->palette();
-  aPal.setColor( QPalette::Disabled, QColorGroup::Text, QColor( 0, 0, 0 ) ) ;
+  aPal.setColor( QPalette::Disabled, QPalette::Text, QColor( 0, 0, 0 ) ) ;
   myX->setPalette( aPal );
   myY->setPalette( aPal );
   myZ->setPalette( aPal );
 
-  //  setHelpFileName("create_point_page.html");
-  setHelpFileName("point.htm");
-
+  setHelpFileName( "create_point_page.html" );
   Init();
 }
 
+
 //=================================================================================
 // function : ~BasicGUI_PointDlg()
 // purpose  : Destructor
@@ -149,6 +163,7 @@ BasicGUI_PointDlg::~BasicGUI_PointDlg()
 {
 }
 
+
 //=================================================================================
 // function : Init()
 // purpose  :
@@ -156,9 +171,12 @@ BasicGUI_PointDlg::~BasicGUI_PointDlg()
 void BasicGUI_PointDlg::Init()
 {
   GroupOnCurve->LineEdit1->setReadOnly( true );
+  GroupOnSurface->LineEdit1->setReadOnly( true );
   GroupRefPoint->LineEdit1->setReadOnly( true );
   GroupLineIntersection->LineEdit1->setReadOnly( true );
   GroupLineIntersection->LineEdit2->setReadOnly( true );
+  GroupLineIntersection->LineEdit1->setEnabled( true );
+  GroupLineIntersection->LineEdit2->setEnabled( false );
 
   myEdge = GEOM::GEOM_Object::_nil();
   myRefPoint = GEOM::GEOM_Object::_nil();
@@ -167,140 +185,191 @@ void BasicGUI_PointDlg::Init()
 
   /* Get setting of step value from file configuration */
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
-
+  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100 );
+  
   /* min, max, step and decimals for spin boxes */
-  GroupXYZ->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupXYZ->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupXYZ->SpinBox_DZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupXYZ->SpinBox_DX->SetValue(0.0);
-  GroupXYZ->SpinBox_DY->SetValue(0.0);
-  GroupXYZ->SpinBox_DZ->SetValue(0.0);
-
-  GroupRefPoint->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupRefPoint->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupRefPoint->SpinBox_DZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupRefPoint->SpinBox_DX->SetValue(0.0);
-  GroupRefPoint->SpinBox_DY->SetValue(0.0);
-  GroupRefPoint->SpinBox_DZ->SetValue(0.0);
+  initSpinBox( GroupXYZ->SpinBox_DX, COORD_MIN, COORD_MAX, step, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( GroupXYZ->SpinBox_DY, COORD_MIN, COORD_MAX, step, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( GroupXYZ->SpinBox_DZ, COORD_MIN, COORD_MAX, step, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupXYZ->SpinBox_DX->setValue( 0.0 );
+  GroupXYZ->SpinBox_DY->setValue( 0.0 );
+  GroupXYZ->SpinBox_DZ->setValue( 0.0 );
+
+  initSpinBox( GroupRefPoint->SpinBox_DX, COORD_MIN, COORD_MAX, step, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( GroupRefPoint->SpinBox_DY, COORD_MIN, COORD_MAX, step, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( GroupRefPoint->SpinBox_DZ, COORD_MIN, COORD_MAX, step, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupRefPoint->SpinBox_DX->setValue( 0.0 );
+  GroupRefPoint->SpinBox_DY->setValue( 0.0 );
+  GroupRefPoint->SpinBox_DZ->setValue( 0.0 );
 
   step = 0.1;
-  GroupOnCurve->SpinBox_DX->RangeStepAndValidator(0., 1., step, DBL_DIGITS_DISPLAY);
-  GroupOnCurve->SpinBox_DX->SetValue( 0.5 );
+
+  initSpinBox( GroupOnCurve->SpinBox_DX, 0., 1., step, 6 ); // VSR:TODO : DBL_DIGITS_DISPLAY
+  GroupOnCurve->SpinBox_DX->setValue( 0.5 );
+
+  initSpinBox( GroupOnSurface->SpinBox_DX, 0., 1., step, 6 ); // VSR:TODO : DBL_DIGITS_DISPLAY
+  GroupOnSurface->SpinBox_DX->setValue( 0.5 );
+  initSpinBox( GroupOnSurface->SpinBox_DY, 0., 1., step, 6 ); // VSR:TODO : DBL_DIGITS_DISPLAY
+  GroupOnSurface->SpinBox_DY->setValue( 0.5 );
 
   /* 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()));
-  connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
-
-  connect(GroupOnCurve->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupOnCurve->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupLineIntersection->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupLineIntersection->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupLineIntersection->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupLineIntersection->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-
-  connect(GroupOnCurve->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupXYZ->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupXYZ->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupXYZ->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupRefPoint->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupRefPoint->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupRefPoint->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(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(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
-
-  initName( tr("GEOM_VERTEX") );
+  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() ) );
+
+  connect( this,           SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
+
+  connect( GroupOnCurve->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupOnCurve->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+
+  connect( GroupOnSurface->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupOnSurface->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
+  connect( GroupLineIntersection->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupLineIntersection->PushButton2, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupLineIntersection->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( GroupLineIntersection->LineEdit2,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+
+  connect( GroupOnCurve->SpinBox_DX,   SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupOnSurface->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupOnSurface->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupXYZ->SpinBox_DX,       SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupXYZ->SpinBox_DY,       SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupXYZ->SpinBox_DZ,       SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupRefPoint->SpinBox_DX,  SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupRefPoint->SpinBox_DY,  SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupRefPoint->SpinBox_DZ,  SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+
+  connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this,  SLOT( SetDoubleSpinBoxStep( double ) ) );
+
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged() ),
+          this,  SLOT(SelectionIntoArgument() ) );
+
+  
+  initName( tr( "GEOM_VERTEX" ) );
+  
   ConstructorsClicked( 0 );
 }
 
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void BasicGUI_PointDlg::SetDoubleSpinBoxStep( double step )
+{
+  GroupOnCurve->SpinBox_DX->setSingleStep(step);
+  GroupXYZ->SpinBox_DX->setSingleStep(step);
+  GroupXYZ->SpinBox_DY->setSingleStep(step);
+  GroupXYZ->SpinBox_DZ->setSingleStep(step);
+  GroupRefPoint->SpinBox_DX->setSingleStep(step);
+  GroupRefPoint->SpinBox_DY->setSingleStep(step);
+  GroupRefPoint->SpinBox_DZ->setSingleStep(step);
+  GroupOnSurface->SpinBox_DX->setSingleStep(step);
+  GroupOnSurface->SpinBox_DY->setSingleStep(step);
+}
+
+
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void BasicGUI_PointDlg::ConstructorsClicked (int constructorId)
-{
+void BasicGUI_PointDlg::ConstructorsClicked(int constructorId)
+{  
   globalSelection(); // close local contexts, if any
 
-  switch (constructorId)
-  {
+  switch ( constructorId ) {
   case 0:
     {
-      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
-
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+      
       GroupRefPoint->hide();
       GroupOnCurve->hide();
       GroupLineIntersection->hide();
-      GroupXYZ->show();
+      GroupOnSurface->hide();
+
       myCoordGrp->hide();
+
+      GroupXYZ->show();
       break;
     }
   case 1:
     {
       myEditCurrentArgument = GroupRefPoint->LineEdit1;
-      myEditCurrentArgument->setText("");
+      myEditCurrentArgument->setText( "" );
       myRefPoint = GEOM::GEOM_Object::_nil();
-
-      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
-
+      GroupRefPoint->PushButton1->setDown(true);      
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+      
       GroupXYZ->hide();
       GroupOnCurve->hide();
-      GroupRefPoint->show();
       GroupLineIntersection->hide();
+      GroupOnSurface->hide();
+      
+      GroupRefPoint->show();
+      
       myCoordGrp->show();
       break;
     }
   case 2:
     {
       myEditCurrentArgument = GroupOnCurve->LineEdit1;
-      myEditCurrentArgument->setText("");
+      myEditCurrentArgument->setText( "" );
       myEdge = GEOM::GEOM_Object::_nil();
-
-      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
+      GroupOnCurve->PushButton1->setDown(true);
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
 
       GroupXYZ->hide();
       GroupRefPoint->hide();
-      GroupOnCurve->show();
       GroupLineIntersection->hide();
+      GroupOnSurface->hide();
+
+      GroupOnCurve->show();
+      
       myCoordGrp->show();
       break;
     }
   case 3:
     {
       myEditCurrentArgument = GroupLineIntersection->LineEdit1;
-      GroupLineIntersection->LineEdit1->setText("");
-      GroupLineIntersection->LineEdit2->setText("");
+      GroupLineIntersection->LineEdit1->setText( "" );
+      GroupLineIntersection->LineEdit2->setText( "" );
+      GroupLineIntersection->LineEdit1->setEnabled( true );
+      GroupLineIntersection->LineEdit2->setEnabled( false );
       myLine1 = GEOM::GEOM_Object::_nil();
       myLine2 = GEOM::GEOM_Object::_nil();
+      GroupLineIntersection->PushButton1->setDown(true);
+      GroupLineIntersection->PushButton2->setDown(false);
 
-      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
 
       GroupXYZ->hide();
       GroupRefPoint->hide();
       GroupOnCurve->hide();
-      GroupLineIntersection->show();
+      GroupOnSurface->hide();
+
       myCoordGrp->hide();
+
+      GroupLineIntersection->show();
+      break;
+    }
+  case 4:
+    {
+      myEditCurrentArgument = GroupOnSurface->LineEdit1;
+      myEditCurrentArgument->setText( "" );
+      myFace = GEOM::GEOM_Object::_nil();
+      GroupOnSurface->PushButton1->setDown(true);
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_FACE );
+
+      GroupXYZ->hide();
+      GroupRefPoint->hide();
+      GroupOnCurve->hide();
+      GroupLineIntersection->hide();
+
+      GroupOnSurface->show();
+
+      myCoordGrp->show();
       break;
     }
   }
@@ -311,43 +380,37 @@ void BasicGUI_PointDlg::ConstructorsClicked (int constructorId)
 
   qApp->processEvents();
   updateGeometry();
-  resize( minimumSize() );
+  resize( minimumSizeHint() );
 
   SelectionIntoArgument();
 }
 
+
 //=================================================================================
 // function : ClickOnOk()
 // purpose  :
 //=================================================================================
 void BasicGUI_PointDlg::ClickOnOk()
 {
-  if (onAccept())
+  if ( onAccept() )
     ClickOnCancel();
 }
 
+
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool BasicGUI_PointDlg::ClickOnApply()
 {
-  if (!onAccept())
+  if ( !onAccept() )
     return false;
-
+  
   initName();
-  ConstructorsClicked(getConstructorId());
+  ConstructorsClicked( getConstructorId() );
   return true;
 }
 
-//=================================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=================================================================================
-void BasicGUI_PointDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
 
 //=================================================================================
 // function : SelectionIntoArgument()
@@ -357,97 +420,108 @@ void BasicGUI_PointDlg::SelectionIntoArgument()
 {
   const int id = getConstructorId();
 
-  if ((id == 1 || id == 2) && myEditCurrentArgument != 0)
+  if ( ( id == 1 || id == 2 || id == 4 ) && myEditCurrentArgument != 0 )
   {
-    myEditCurrentArgument->setText("");
+    myEditCurrentArgument->setText( "" );
     myX->setText( "" );
     myY->setText( "" );
     myZ->setText( "" );
-    myRefPoint = myEdge = GEOM::GEOM_Object::_nil();
+    myRefPoint = myEdge = myFace = GEOM::GEOM_Object::_nil();
   }
 
-  if (IObjectCount() == 1)
-  {
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() == 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)
-    {
+    Handle(SALOME_InteractiveObject) anIO = aSelList.First();
+    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
+    if ( !CORBA::is_nil( aSelectedObject ) && aRes ) {
       QString aName = GEOMBase::GetName(aSelectedObject);
-
+      TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
       TopoDS_Shape aShape;
-      if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
-      {
-        TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
-        if (id == 2 || id == 3)
+      if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) {
+        if ( id == 2 || id == 3 )
           aNeedType = TopAbs_EDGE;
+        else if ( id == 4 )
+          aNeedType = TopAbs_FACE;
 
-        LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
         TColStd_IndexedMapOfInteger aMap;
-        aSelMgr->GetIndexes(firstIObject(), aMap);
-        if (aMap.Extent() == 1) // Local Selection
-        {
-          int anIndex = aMap(1);
-          if (aNeedType == TopAbs_EDGE)
-            aName += QString(":edge_%1").arg(anIndex);
+        aSelMgr->GetIndexes(anIO, aMap);
+        if ( aMap.Extent() == 1 ) { // Local Selection
+          int anIndex = aMap( 1 );
+          if ( aNeedType == TopAbs_EDGE )
+            aName += QString( ":edge_%1" ).arg( anIndex );
           else
-            aName += QString(":vertex_%1").arg(anIndex);
+            aName += QString( ":vertex_%1" ).arg( anIndex );
 
          //Find SubShape Object in Father
          GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
          
          if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-           GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
+           GEOM::GEOM_IShapesOperations_var aShapesOp =
+              getGeomEngine()->GetIShapesOperations(getStudyId());
            aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
          }
-         else
+         else {
            aSelectedObject = aFindedObject; // get Object from study
+         }
+         GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE );
         }
-        else // Global Selection
-        {
-          if (aShape.ShapeType() != aNeedType) {
+        else { // Global Selection
+          if ( aShape.ShapeType() != aNeedType ) {
             aSelectedObject = GEOM::GEOM_Object::_nil();
             aName = "";
-            if (id == 0) return;
+            if ( id == 0 ) return;
           }
         }
       }
 
-      if (id == 0)
-      {
-        if (aShape.IsNull()) return;
+      if ( aShape.IsNull() || aShape.ShapeType() != aNeedType)
+       return;
+
+      if ( id == 0 ) {
         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() );
+        GroupXYZ->SpinBox_DX->setValue( aPnt.X() );
+        GroupXYZ->SpinBox_DY->setValue( aPnt.Y() );
+        GroupXYZ->SpinBox_DZ->setValue( aPnt.Z() );
       }
-      else if (id == 1)
-      {
+      else if ( id == 1 ) {
         myRefPoint = aSelectedObject;
-        GroupRefPoint->LineEdit1->setText(aName);
+        GroupRefPoint->LineEdit1->setText( aName );
       }
-      else if (id == 2)
-      {
+      else if ( id == 2 ) {
         myEdge = aSelectedObject;
-        GroupOnCurve->LineEdit1->setText(aName);
+        GroupOnCurve->LineEdit1->setText( aName );
       }
-      else if (id == 3)
-      {
-        if (myEditCurrentArgument == GroupLineIntersection->LineEdit1) {
+      else if ( id == 3 ) {
+       myEditCurrentArgument->setText( aName );
+       globalSelection();
+       localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+        if ( myEditCurrentArgument == GroupLineIntersection->LineEdit1 ) {
           myLine1 = aSelectedObject;
-          myEditCurrentArgument->setText(aName);
+         if ( !myLine1->_is_nil() && myLine2->_is_nil() )
+           GroupLineIntersection->PushButton2->click();
         }
-        else if (myEditCurrentArgument == GroupLineIntersection->LineEdit2) {
+        else if ( myEditCurrentArgument == GroupLineIntersection->LineEdit2 ) {
           myLine2 = aSelectedObject;
-          myEditCurrentArgument->setText(aName);
+         if ( !myLine2->_is_nil() && myLine1->_is_nil() )
+           GroupLineIntersection->PushButton1->click();
         }
       }
+      else if ( id == 4 )
+      {
+       myFace = aSelectedObject;
+       GroupOnSurface->LineEdit1->setText( aName );
+      }
     }
   }
-
+  
   displayPreview();
 }
 
+
 //=================================================================================
 // function : LineEditReturnPressed()
 // purpose  :
@@ -455,14 +529,16 @@ void BasicGUI_PointDlg::SelectionIntoArgument()
 void BasicGUI_PointDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if ( send == GroupRefPoint->LineEdit1 || send == GroupOnCurve->LineEdit1 ||
-       send == GroupLineIntersection->LineEdit1 || send == GroupLineIntersection->LineEdit2  )
-  {
+  if ( send == GroupRefPoint->LineEdit1         || 
+       send == GroupOnCurve->LineEdit1          ||
+       send == GroupLineIntersection->LineEdit1 || 
+       send == GroupLineIntersection->LineEdit2  ) {
     myEditCurrentArgument = send;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
 }
 
+
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -472,48 +548,57 @@ void BasicGUI_PointDlg::SetEditCurrentArgument()
   globalSelection(); // close local contexts, if any
 
   QPushButton* send = (QPushButton*)sender();
-  globalSelection( GEOM_POINT); // to break previous local selection
 
-  if ( send == GroupRefPoint->PushButton1 )
-  {
+  if ( send == GroupRefPoint->PushButton1 ) {
     GroupRefPoint->LineEdit1->setFocus();
     myEditCurrentArgument = GroupRefPoint->LineEdit1;
-
+    
     localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
   }
-  else if ( send == GroupOnCurve->PushButton1 )
-  {
+  else if ( send == GroupOnCurve->PushButton1 ) {
     GroupOnCurve->LineEdit1->setFocus();
     myEditCurrentArgument = GroupOnCurve->LineEdit1;
-
+    
     localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
   }
-  else if ( send == GroupLineIntersection->PushButton1 )
+  else if ( send == GroupOnSurface->PushButton1 )
   {
+    GroupOnSurface->LineEdit1->setFocus();
+    myEditCurrentArgument = GroupOnSurface->LineEdit1;
+
+    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_FACE );
+  }
+  else if ( send == GroupLineIntersection->PushButton1 ) {
     GroupLineIntersection->LineEdit1->setFocus();
     myEditCurrentArgument = GroupLineIntersection->LineEdit1;
-
+    GroupLineIntersection->PushButton2->setDown( false );
+    GroupLineIntersection->LineEdit1->setEnabled(true);
+    GroupLineIntersection->LineEdit2->setEnabled(false);
     localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
   }
-  else if ( send == GroupLineIntersection->PushButton2 )
-  {
+  else if ( send == GroupLineIntersection->PushButton2 ) {
     GroupLineIntersection->LineEdit2->setFocus();
     myEditCurrentArgument = GroupLineIntersection->LineEdit2;
-
+    GroupLineIntersection->PushButton1->setDown( false );
+    GroupLineIntersection->LineEdit1->setEnabled(false);
+    GroupLineIntersection->LineEdit2->setEnabled(true);
     localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
   }
+  send->setDown(true);
 }
 
+
 //=================================================================================
 // function : enterEvent()
 // purpose  : to reactivate this dialog box when mouse enter onto the window
 //=================================================================================
-void BasicGUI_PointDlg::enterEvent(QEvent* e)
+void BasicGUI_PointDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
+
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -525,6 +610,7 @@ void BasicGUI_PointDlg::ActivateThisDialog( )
   ConstructorsClicked( getConstructorId() );
 }
 
+
 //=================================================================================
 // function : DeactivateActiveDialog()
 // purpose  : public slot to deactivate if active
@@ -535,6 +621,7 @@ void BasicGUI_PointDlg::DeactivateActiveDialog()
   GEOMBase_Skeleton::DeactivateActiveDialog();
 }
 
+
 //=================================================================================
 // function : ValueChangedInSpinBox()
 // purpose  :
@@ -550,20 +637,40 @@ void BasicGUI_PointDlg::ValueChangedInSpinBox(double newValue)
 //=================================================================================
 double BasicGUI_PointDlg::getParameter() const
 {
-  return GroupOnCurve->SpinBox_DX->GetValue();
+  return GroupOnCurve->SpinBox_DX->value();
 }
 
+
+//=================================================================================
+// funcion  : getUParameter()
+// purpose  :
+//=================================================================================
+double BasicGUI_PointDlg::getUParameter() const
+{
+  return GroupOnSurface->SpinBox_DX->value();
+}
+
+
+//=================================================================================
+// funcion  : getVParameter()
+// purpose  :
+//=================================================================================
+double BasicGUI_PointDlg::getVParameter() const
+{
+  return GroupOnSurface->SpinBox_DY->value();
+}
+
+
 //=================================================================================
 // function : OnPointSelected
 // purpose  :
 //=================================================================================
 void BasicGUI_PointDlg::OnPointSelected( const gp_Pnt& thePnt )
 {
-  if ( getConstructorId() == 0 )
-  {
-    GroupXYZ->SpinBox_DX->SetValue( thePnt.X() );
-    GroupXYZ->SpinBox_DY->SetValue( thePnt.Y() );
-    GroupXYZ->SpinBox_DZ->SetValue( thePnt.Z() );
+  if ( getConstructorId() == 0 ) {
+    GroupXYZ->SpinBox_DX->setValue( thePnt.X() );
+    GroupXYZ->SpinBox_DY->setValue( thePnt.Y() );
+    GroupXYZ->SpinBox_DZ->setValue( thePnt.Z() );
 
     displayPreview();
   }
@@ -585,14 +692,34 @@ GEOM::GEOM_IOperations_ptr BasicGUI_PointDlg::createOperation()
 bool BasicGUI_PointDlg::isValid( QString& msg )
 {
   const int id = getConstructorId();
-  if ( id == 0 )
-    return true;
-  else if ( id == 1 )
-    return !myRefPoint->_is_nil();
-  else if ( id == 2 )
-    return !myEdge->_is_nil();
-  else if ( id == 3)
+  if ( id == 0 ) {
+    bool ok = true;
+    ok = GroupXYZ->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupXYZ->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupXYZ->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok;
+    return ok;
+  }
+  else if ( id == 1 ) {
+    bool ok = true;
+    ok = GroupRefPoint->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupRefPoint->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupRefPoint->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok;
+
+    return !myRefPoint->_is_nil() && ok;
+  }
+  else if ( id == 2 ) {
+    bool ok = GroupOnCurve->SpinBox_DX->isValid( msg, !IsPreview() );
+    return !myEdge->_is_nil() && ok;
+  }
+  else if ( id == 3 )
     return ( !myLine1->_is_nil() && !myLine2->_is_nil() );
+  else if ( id == 4 ) {
+    bool ok = true;
+    ok = GroupOnSurface->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupOnSurface->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+    return !myFace->_is_nil() && ok;
+    
+  }
   return false;
 }
 
@@ -605,78 +732,90 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects )
   bool res = false;
 
   GEOM::GEOM_Object_var anObj;
+  QStringList aParameters;
 
-  switch ( getConstructorId() )
-  {
+  switch ( getConstructorId() ) {
   case 0 :
-  {
-    double x = GroupXYZ->SpinBox_DX->GetValue();
-    double y = GroupXYZ->SpinBox_DY->GetValue();
-    double z = GroupXYZ->SpinBox_DZ->GetValue();
-
-    anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakePointXYZ( x,y,z );
-    res = true;
-    break;
-  }
+    {
+      double x = GroupXYZ->SpinBox_DX->value();
+      double y = GroupXYZ->SpinBox_DY->value();
+      double z = GroupXYZ->SpinBox_DZ->value();
+
+      aParameters << GroupXYZ->SpinBox_DX->text();
+      aParameters << GroupXYZ->SpinBox_DY->text();
+      aParameters << GroupXYZ->SpinBox_DZ->text();
+      
+      anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakePointXYZ( x, y, z );
+      res = true;
+      break;
+    }
   case 1 :
-  {
-    double dx = GroupRefPoint->SpinBox_DX->GetValue();
-    double dy = GroupRefPoint->SpinBox_DY->GetValue();
-    double dz = GroupRefPoint->SpinBox_DZ->GetValue();
-
-    anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->
-      MakePointWithReference( myRefPoint, dx, dy, dz );
-    res = true;
-    break;
-  }
+    {
+      double dx = GroupRefPoint->SpinBox_DX->value();
+      double dy = GroupRefPoint->SpinBox_DY->value();
+      double dz = GroupRefPoint->SpinBox_DZ->value();
+
+      aParameters << GroupRefPoint->SpinBox_DX->text();
+      aParameters << GroupRefPoint->SpinBox_DY->text();
+      aParameters << GroupRefPoint->SpinBox_DZ->text();
+      
+      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() );
+    aParameters<<GroupOnCurve->SpinBox_DX->text();
     res = true;
     break;
   case 3 :
     anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->
       MakePointOnLinesIntersection( myLine1, myLine2 );
-      res = true;
-      break;
+    res = true;
+    break;
+  case 4 :
+    anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->
+      MakePointOnSurface( myFace, getUParameter(), getVParameter() );
+    aParameters<<GroupOnSurface->SpinBox_DX->text();
+    aParameters<<GroupOnSurface->SpinBox_DY->text();
+    res = true;
+    break;
   }
+  
+  if(!anObj->_is_nil() && !IsPreview() && (getConstructorId()==0 || 
+                                          getConstructorId() == 1 ||
+                                          getConstructorId() == 2 ||
+                                          getConstructorId() == 4) ) {
+    anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+  }
+  
 
-  if ( getConstructorId() == 1 || getConstructorId() == 2 )
-  {
+  if ( getConstructorId() == 1 || getConstructorId() == 2 ||
+       getConstructorId() == 4 ) {
     TopoDS_Shape aShape;
-    if ( GEOMBase::GetShape( anObj, aShape ) && !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX )
-    {
+    if ( GEOMBase::GetShape( anObj, aShape ) && !aShape.IsNull() &&
+         aShape.ShapeType() == TopAbs_VERTEX ) {
       gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) );
       myX->setText( QString( "%1" ).arg( aPnt.X() ) );
       myY->setText( QString( "%1" ).arg( aPnt.Y() ) );
       myZ->setText( QString( "%1" ).arg( aPnt.Z() ) );
     }
-    else
-    {
+    else {
       myX->setText( "" );
       myY->setText( "" );
       myZ->setText( "" );
     }
   }
-
-  if ( !anObj->_is_nil() )
-  {
-    //printf( "--> a valid point is created\n" );
+  
+  if ( !anObj->_is_nil() ) {
     objects.push_back( anObj._retn() );
   }
-
+  
   return res;
 }
 
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void BasicGUI_PointDlg::closeEvent( QCloseEvent* e )
-{
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : addSubshapeToStudy
 // purpose  : virtual method to add new SubObjects if local selection
@@ -685,8 +824,7 @@ void BasicGUI_PointDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
 
-switch (getConstructorId())
-  {
+  switch ( getConstructorId() ) {
   case 0:
     break;
   case 1:
@@ -699,6 +837,9 @@ switch (getConstructorId())
     objMap[GroupLineIntersection->LineEdit1->text()] = myLine1;
     objMap[GroupLineIntersection->LineEdit2->text()] = myLine2;
     break;
+  case 4:
+    objMap[GroupOnSurface->LineEdit1->text()] = myFace;
+    break;
   }
- addSubshapesToFather( objMap );
 addSubshapesToFather( objMap );
 }
index 8a19f1ab96612c2f9945ae736e658fd1ddac354b..1dfd48618edb751d4a937f9159797903097f1a4d 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BasicGUI_PointDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_POINT_H
-#define DIALOGBOX_POINT_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_PointDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef BASICGUI_POINTDLG_H
+#define BASICGUI_POINTDLG_H
 
-#include "GEOM_BasicGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel1Spin.h"
-#include "DlgRef_3Spin.h"
-#include "DlgRef_2Sel_QTD.h"
-#include "DlgRef_1Sel3Spin.h"
+class DlgRef_1Sel1Spin;
+class DlgRef_3Spin;
+class DlgRef_2Sel;
+class DlgRef_1Sel3Spin;
+class DlgRef_1Sel2Spin;
 
 class QLineEdit;
 class QGroupBox;
 
+class gp_Pnt;
+
 //=================================================================================
 // class    : BasicGUI_PointDlg
 // purpose  :
 //=================================================================================
-class GEOM_BASICGUI_EXPORT BasicGUI_PointDlg : public GEOMBase_Skeleton
+class BasicGUI_PointDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BasicGUI_PointDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                     const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+  BasicGUI_PointDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
 
-    ~BasicGUI_PointDlg();
+  ~BasicGUI_PointDlg();
 
-    bool acceptMouseEvent() const { return ( getConstructorId() == 0 );  };
-    void OnPointSelected( const gp_Pnt& ); // called by BasicGUI::OnMousePress()
+  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();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
-    virtual void closeEvent( QCloseEvent* e );
-
-private :
-    void Init();
-    void enterEvent(QEvent* e);
-    double getParameter() const;
-
-    GEOM::GEOM_Object_var myEdge;
-    GEOM::GEOM_Object_var myRefPoint; 
-    GEOM::GEOM_Object_var myLine1; 
-    GEOM::GEOM_Object_var myLine2;
-
-    DlgRef_3Spin*     GroupXYZ;
-    DlgRef_1Sel3Spin* GroupRefPoint;
-    DlgRef_1Sel1Spin* GroupOnCurve;
-    DlgRef_2Sel_QTD*  GroupLineIntersection;
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
 
-    QGroupBox*        myCoordGrp;
-    QLineEdit*        myX;
-    QLineEdit*        myY;
-    QLineEdit*        myZ;
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  double                             getParameter() const;
+  double                             getUParameter() const;
+  double                             getVParameter() const;
 
+private:
+  GEOM::GEOM_Object_var              myEdge;
+  GEOM::GEOM_Object_var              myFace;
+  GEOM::GEOM_Object_var              myRefPoint; 
+  GEOM::GEOM_Object_var              myLine1; 
+  GEOM::GEOM_Object_var              myLine2;
+  
+  DlgRef_3Spin*                      GroupXYZ;
+  DlgRef_1Sel3Spin*                  GroupRefPoint;
+  DlgRef_1Sel1Spin*                  GroupOnCurve;
+  DlgRef_2Sel*                       GroupLineIntersection;
+  DlgRef_1Sel2Spin*                  GroupOnSurface;
+  
+  QGroupBox*                         myCoordGrp;
+  QLineEdit*                         myX;
+  QLineEdit*                         myY;
+  QLineEdit*                         myZ;
+  
 private slots:
-    void ClickOnOk();
-    void ClickOnCancel();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void DeactivateActiveDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ConstructorsClicked(int constructorId);
-    void ValueChangedInSpinBox(double newValue);
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               DeactivateActiveDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               ValueChangedInSpinBox( double );
+  void                               SetDoubleSpinBoxStep( double );
 };
 
-#endif // DIALOGBOX_POINT_H
+#endif // BASICGUI_POINTDLG_H
index f5bb3bb449fd84ae5166212479b1423afbdb3489..23a1a8492bf73ab79c6e4ad6330939ee18aebf55 100644 (file)
@@ -1,37 +1,38 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_VectorDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : BasicGUI_VectorDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "BasicGUI_VectorDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : BasicGUI_VectorDlg()
-// purpose  : Constructs a BasicGUI_VectorDlg which is a child of 'parent', with the 
+// purpose  : Constructs a BasicGUI_VectorDlg which is 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.
 //=================================================================================
-BasicGUI_VectorDlg::BasicGUI_VectorDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
-                                       const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, fl)
+BasicGUI_VectorDlg::BasicGUI_VectorDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                       bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, 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")));
+  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"));
+  setWindowTitle( tr( "GEOM_VECTOR_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_VECTOR"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_2Sel_QTD(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_POINTS"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_POINT_I").arg("1"));
-  GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg("2"));
-  GroupPoints->PushButton1->setPixmap(image2);
-  GroupPoints->PushButton2->setPixmap(image2);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_VECTOR"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image1);
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
 
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
+  GroupPoints = new DlgRef_2Sel( centralWidget() );
 
-  GroupDimensions = new DlgRef_3Spin1Check(this, "GroupDimensions");
-  GroupDimensions->GroupBox1->setTitle(tr("GEOM_COORDINATES"));
-  GroupDimensions->TextLabel1->setText(tr("GEOM_DX"));
-  GroupDimensions->TextLabel2->setText(tr("GEOM_DY"));
-  GroupDimensions->TextLabel3->setText(tr("GEOM_DZ"));
-  GroupDimensions->CheckBox1->setText(tr("GEOM_REVERSE_VECTOR"));
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_POINTS" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_POINT_I" ).arg( 1 ) );
+  GroupPoints->TextLabel2->setText( tr( "GEOM_POINT_I" ).arg( 2 ) );
+  GroupPoints->PushButton1->setIcon( image2 );
+  GroupPoints->PushButton2->setIcon( image2 );
+  GroupPoints->PushButton1->setDown( true );
 
-  Layout1->addWidget(GroupPoints, 2, 0);
-  Layout1->addWidget(GroupDimensions, 2, 0);
+  GroupPoints->LineEdit1->setReadOnly( true );
+  GroupPoints->LineEdit2->setReadOnly( true );
+  GroupPoints->LineEdit1->setEnabled( true );
+  GroupPoints->LineEdit2->setEnabled( false );
+
+  GroupDimensions = new DlgRef_3Spin1Check( centralWidget() );
+  GroupDimensions->GroupBox1->setTitle( tr( "GEOM_COORDINATES" ) );
+  GroupDimensions->TextLabel1->setText( tr( "GEOM_DX" ) );
+  GroupDimensions->TextLabel2->setText( tr( "GEOM_DY" ) );
+  GroupDimensions->TextLabel3->setText( tr( "GEOM_DZ" ) );
+  GroupDimensions->CheckButton1->setText( tr( "GEOM_REVERSE_VECTOR" ) );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
+  layout->addWidget( GroupDimensions );
   /***************************************************************/
 
-  setHelpFileName("create_vector_page.html");
-  
+  setHelpFileName( "create_vector_page.html" );
+
   /* Initialisations */
   Init();
 }
@@ -103,7 +105,7 @@ BasicGUI_VectorDlg::BasicGUI_VectorDlg(GeometryGUI* theGeometryGUI, QWidget* par
 // purpose  : Destroys the object and frees any allocated resources
 //=================================================================================
 BasicGUI_VectorDlg::~BasicGUI_VectorDlg()
-{  
+{
 }
 
 
@@ -121,52 +123,61 @@ void BasicGUI_VectorDlg::Init()
 
   /* Get setting of step value from file configuration */
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
+  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100 );
+
   /* min, max, step and decimals for spin boxes */
-  GroupDimensions->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupDimensions->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupDimensions->SpinBox_DZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
+  initSpinBox( GroupDimensions->SpinBox_DX, COORD_MIN, COORD_MAX, step, 6 ); // VSR:TODO : DBL_DIGITS_DISPLAY
+  initSpinBox( GroupDimensions->SpinBox_DY, COORD_MIN, COORD_MAX, step, 6 ); // VSR:TODO : DBL_DIGITS_DISPLAY
+  initSpinBox( GroupDimensions->SpinBox_DZ, COORD_MIN, COORD_MAX, step, 6 ); // VSR:TODO : DBL_DIGITS_DISPLAY
 
   double dx( 0. ), dy( 0. ), dz( 200. );
-  GroupDimensions->SpinBox_DX->SetValue( dx );
-  GroupDimensions->SpinBox_DY->SetValue( dy );
-  GroupDimensions->SpinBox_DZ->SetValue( dz );
+  GroupDimensions->SpinBox_DX->setValue( dx );
+  GroupDimensions->SpinBox_DY->setValue( dy );
+  GroupDimensions->SpinBox_DZ->setValue( dz );
 
-  GroupDimensions->CheckBox1->setChecked(FALSE);
+  GroupDimensions->CheckButton1->setChecked( 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()));
-  connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
+  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() ) );
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect( this,           SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
 
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
 
-  connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+  connect( GroupPoints->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( GroupPoints->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
-  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->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupDimensions->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupDimensions->SpinBox_DZ, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
 
-  connect(GroupDimensions->CheckBox1, SIGNAL(stateChanged(int)), this, SLOT(ReverseVector(int)));
+  connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
 
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( GroupDimensions->CheckButton1, SIGNAL( stateChanged( int ) ), this, SLOT( ReverseVector( int ) ) );
+
+  connect( myGeomGUI->getApp()->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   initName( tr("GEOM_VECTOR") );
 
-  GroupDimensions->hide();
-  ConstructorsClicked( 0 );
+  setConstructorId( 1 ); // simplest constructor
+  ConstructorsClicked( 1 );
+}
+
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void BasicGUI_VectorDlg::SetDoubleSpinBoxStep( double step )
+{
+  GroupDimensions->SpinBox_DX->setSingleStep(step);
+  GroupDimensions->SpinBox_DY->setSingleStep(step);
+  GroupDimensions->SpinBox_DZ->setSingleStep(step);
 }
 
 
@@ -176,45 +187,50 @@ void BasicGUI_VectorDlg::Init()
 //=================================================================================
 void BasicGUI_VectorDlg::ConstructorsClicked( int constructorId )
 {
-  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
   myPoint1 = GEOM::GEOM_Object::_nil();
   myPoint2 = GEOM::GEOM_Object::_nil();
 
-  switch (constructorId)
-  {
-    case 0:
+  switch ( constructorId ) {
+  case 0:
     {
       GroupDimensions->hide();
-      resize(0, 0);
       GroupPoints->show();
 
       myEditCurrentArgument = GroupPoints->LineEdit1;
-      GroupPoints->LineEdit1->setText("");
-      GroupPoints->LineEdit2->setText("");
+      GroupPoints->LineEdit1->setText( "" );
+      GroupPoints->LineEdit2->setText( "" );
+      GroupPoints->PushButton1->setDown( true );
+      GroupPoints->PushButton2->setDown( false );
+      GroupPoints->LineEdit1->setEnabled( true );
+      GroupPoints->LineEdit2->setEnabled( false );
 
       globalSelection(); // close local contexts, if any
-      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
-      connect(myGeomGUI->getApp()->selectionMgr(), 
-              SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+      connect( myGeomGUI->getApp()->selectionMgr(),
+              SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
       break;
     }
-    case 1:
+  case 1:
     {
       GroupPoints->hide();
-      resize( 0, 0 );
       GroupDimensions->show();
       globalSelection(); // close local contexts, if any
 
-      double dx( 0. ), dy( 0. ), dz( 0. ); 
-      GroupDimensions->SpinBox_DX->SetValue( dx );
-      GroupDimensions->SpinBox_DY->SetValue( dy );
-      GroupDimensions->SpinBox_DZ->SetValue( dz );
+      double dx( 0. ), dy( 0. ), dz( 0. );
+      GroupDimensions->SpinBox_DX->setValue( dx );
+      GroupDimensions->SpinBox_DY->setValue( dy );
+      GroupDimensions->SpinBox_DZ->setValue( dz );
 
-      GroupDimensions->CheckBox1->setChecked( FALSE );
+      GroupDimensions->CheckButton1->setChecked( false );
       break;
     }
   }
 
+  qApp->processEvents();
+  updateGeometry();
+  resize( minimumSizeHint() );
+
   displayPreview();
 }
 
@@ -229,29 +245,20 @@ void BasicGUI_VectorDlg::ClickOnOk()
     ClickOnCancel();
 }
 
-//=======================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=======================================================================
-void BasicGUI_VectorDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool BasicGUI_VectorDlg::ClickOnApply()
 {
-  buttonApply->setFocus();
+  buttonApply()->setFocus();
 
   if ( !onAccept() )
     return false;
 
   initName();
   if ( getConstructorId() != 1 )
-       ConstructorsClicked( getConstructorId() );
+    ConstructorsClicked( getConstructorId() );
   return true;
 }
 
@@ -262,10 +269,13 @@ bool BasicGUI_VectorDlg::ClickOnApply()
 //=================================================================================
 void BasicGUI_VectorDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
 
-  if (IObjectCount() != 1) 
-  {
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
     if (myEditCurrentArgument == GroupPoints->LineEdit1)
       myPoint1 = GEOM::GEOM_Object::_nil();
     else if (myEditCurrentArgument == GroupPoints->LineEdit2)
@@ -273,37 +283,32 @@ void BasicGUI_VectorDlg::SelectionIntoArgument()
     return;
   }
 
-  // nbSel == 1 
+  // nbSel == 1
   Standard_Boolean aRes = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), aRes);
-  if (!CORBA::is_nil(aSelectedObject) && aRes)
-  {
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aRes);
+  if (!CORBA::is_nil(aSelectedObject) && aRes) {
     QString aName = GEOMBase::GetName(aSelectedObject);
 
     TopoDS_Shape aShape;
-    if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
-    {
-      LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+    if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull()) {
       TColStd_IndexedMapOfInteger aMap;
-      aSelMgr->GetIndexes(firstIObject(), aMap);
-      if (aMap.Extent() == 1) // Local Selection
-      {
-
+      aSelMgr->GetIndexes(aSelList.First(), aMap);
+      if (aMap.Extent() == 1) { // Local Selection
         int anIndex = aMap(1);
         aName += QString(":vertex_%1").arg(anIndex);
 
        //Find SubShape Object in Father
        GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
        
-       if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
+       if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
          GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
          aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
        }
-       else
+       else {
          aSelectedObject = aFindedObject; // get Object from study
+       }
       }
-      else // Global Selection
-      {
+      else { // Global Selection
         if (aShape.ShapeType() != TopAbs_VERTEX) {
           aSelectedObject = GEOM::GEOM_Object::_nil();
           aName = "";
@@ -313,8 +318,21 @@ void BasicGUI_VectorDlg::SelectionIntoArgument()
 
     myEditCurrentArgument->setText(aName);
 
-    if      ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myPoint1 = aSelectedObject;
-    else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) myPoint2 = aSelectedObject;
+    if (!aSelectedObject->_is_nil()) { // clear selection if something selected
+      globalSelection();
+      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+    }
+
+    if      (myEditCurrentArgument == GroupPoints->LineEdit1) {
+      myPoint1 = aSelectedObject;
+      if (!myPoint1->_is_nil() && myPoint2->_is_nil())
+       GroupPoints->PushButton2->click();
+    }
+    else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
+      myPoint2 = aSelectedObject;
+      if (!myPoint2->_is_nil() && myPoint1->_is_nil())
+       GroupPoints->PushButton1->click();
+    }
   }
 
   displayPreview();
@@ -327,10 +345,24 @@ void BasicGUI_VectorDlg::SelectionIntoArgument()
 void BasicGUI_VectorDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  if      ( send == GroupPoints->PushButton1 ) myEditCurrentArgument = GroupPoints->LineEdit1;
-  else if ( send == GroupPoints->PushButton2 ) myEditCurrentArgument = GroupPoints->LineEdit2;
+  if      ( send == GroupPoints->PushButton1 ) {
+    myEditCurrentArgument = GroupPoints->LineEdit1;
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(true);
+    GroupPoints->LineEdit2->setEnabled(false);
+  }
+  else if ( send == GroupPoints->PushButton2 ) {
+    myEditCurrentArgument = GroupPoints->LineEdit2;
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+    GroupPoints->LineEdit2->setEnabled(true);
+  }
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
+  //  SelectionIntoArgument();
+  globalSelection(); // close local selection to clear it
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+  send->setDown(true);
+  displayPreview();
 }
 
 
@@ -339,7 +371,7 @@ void BasicGUI_VectorDlg::SetEditCurrentArgument()
 // purpose  :
 //=================================================================================
 void BasicGUI_VectorDlg::LineEditReturnPressed()
-{ 
+{
   QLineEdit* send = (QLineEdit*)sender();
   if      ( send == GroupPoints->LineEdit1 ) myEditCurrentArgument = GroupPoints->LineEdit1;
   else if ( send == GroupPoints->LineEdit2 ) myEditCurrentArgument = GroupPoints->LineEdit2;
@@ -347,6 +379,7 @@ void BasicGUI_VectorDlg::LineEditReturnPressed()
   GEOMBase_Skeleton::LineEditReturnPressed();
 }
 
+
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -354,10 +387,10 @@ void BasicGUI_VectorDlg::LineEditReturnPressed()
 void BasicGUI_VectorDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+           this, SLOT( SelectionIntoArgument() ) );
        
-  ConstructorsClicked(getConstructorId());
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================
@@ -373,9 +406,9 @@ void BasicGUI_VectorDlg::DeactivateActiveDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BasicGUI_VectorDlg::enterEvent(QEvent* e)
+void BasicGUI_VectorDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
@@ -392,16 +425,16 @@ void BasicGUI_VectorDlg::ValueChangedInSpinBox( double newValue )
 // function : ReverseVector()
 // purpose  : 'state' not used here
 //=================================================================================
-void BasicGUI_VectorDlg::ReverseVector(int state)
+void BasicGUI_VectorDlg::ReverseVector( int state )
 {
-  double dx = -GroupDimensions->SpinBox_DX->GetValue();
-  double dy = -GroupDimensions->SpinBox_DY->GetValue();
-  double dz = -GroupDimensions->SpinBox_DZ->GetValue();
-
-  GroupDimensions->SpinBox_DX->SetValue( dx );
-  GroupDimensions->SpinBox_DY->SetValue( dy );
-  GroupDimensions->SpinBox_DZ->SetValue( dz );
-  
+  double dx = -GroupDimensions->SpinBox_DX->value();
+  double dy = -GroupDimensions->SpinBox_DY->value();
+  double dz = -GroupDimensions->SpinBox_DZ->value();
+
+  GroupDimensions->SpinBox_DX->setValue( dx );
+  GroupDimensions->SpinBox_DY->setValue( dy );
+  GroupDimensions->SpinBox_DZ->setValue( dz );
+
   displayPreview();
 }
 
@@ -420,7 +453,17 @@ GEOM::GEOM_IOperations_ptr BasicGUI_VectorDlg::createOperation()
 //=================================================================================
 bool BasicGUI_VectorDlg::isValid( QString& msg )
 {
-  return getConstructorId() == 0 ? !myPoint1->_is_nil() && !myPoint2->_is_nil(): true;
+  if(getConstructorId() == 0) 
+    return !myPoint1->_is_nil() && !myPoint2->_is_nil();
+  else if(getConstructorId() == 1)
+  {
+    bool ok = true;
+    ok = GroupDimensions->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok;
+    return ok;
+  }
+  return false;
 }
 
 //=================================================================================
@@ -430,21 +473,31 @@ bool BasicGUI_VectorDlg::isValid( QString& msg )
 bool BasicGUI_VectorDlg::execute( ObjectList& objects )
 {
   bool res = false;
-  
+
   GEOM::GEOM_Object_var anObj;
 
   switch ( getConstructorId() ) {
   case 0 :
-    anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakeVectorTwoPnt( myPoint1, myPoint2 );
-    res = true;
-    break;
-
+    {
+      anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakeVectorTwoPnt( myPoint1, myPoint2 );
+      res = true;
+      break;
+    }
   case 1 :
     {
-      double dx = GroupDimensions->SpinBox_DX->GetValue();
-      double dy = GroupDimensions->SpinBox_DY->GetValue();
-      double dz = GroupDimensions->SpinBox_DZ->GetValue();
-      anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakeVectorDXDYDZ( dx,dy,dz );
+      double dx = GroupDimensions->SpinBox_DX->value();
+      double dy = GroupDimensions->SpinBox_DY->value();
+      double dz = GroupDimensions->SpinBox_DZ->value();
+      
+      QStringList aParameters;
+      aParameters << GroupDimensions->SpinBox_DX->text();
+      aParameters << GroupDimensions->SpinBox_DY->text();
+      aParameters << GroupDimensions->SpinBox_DZ->text();
+      anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakeVectorDXDYDZ( dx, dy, dz );
+
+      if ( !anObj->_is_nil() && !IsPreview() )
+        anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+      
       res = true;
       break;
     }
@@ -464,14 +517,13 @@ void BasicGUI_VectorDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
 
-switch (getConstructorId())
-  {
+  switch ( getConstructorId() ) {
   case 0:
-     objMap[GroupPoints->LineEdit1->text()] = myPoint1;
-     objMap[GroupPoints->LineEdit2->text()] = myPoint2;
+    objMap[GroupPoints->LineEdit1->text()] = myPoint1;
+    objMap[GroupPoints->LineEdit2->text()] = myPoint2;
     break;
   case 1:
     return;
   }
- addSubshapesToFather( objMap );
 addSubshapesToFather( objMap );
 }
index b0dc0dcd02e5bdc9d46c91f8658a3b4faef3045d..747ef534b6d9bb0bfe6e92f15c75ecbbd9900769 100644 (file)
@@ -1,86 +1,79 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BasicGUI_VectorDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_VECTOR_H
-#define DIALOGBOX_VECTOR_H
-
-#include "GEOM_BasicGUI.hxx"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_VectorDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef BASICGUI_VECTORDLG_H
+#define BASICGUI_VECTORDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel_QTD.h"
-#include "DlgRef_3Spin1Check.h"
+#include <GEOMBase_Skeleton.h>
 
-#include "BasicGUI.h"
+class DlgRef_2Sel;
+class DlgRef_3Spin1Check;
 
 //=================================================================================
 // class    : BasicGUI_VectorDlg
 // purpose  :
 //=================================================================================
-class GEOM_BASICGUI_EXPORT BasicGUI_VectorDlg : public GEOMBase_Skeleton
+class BasicGUI_VectorDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BasicGUI_VectorDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                      const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~BasicGUI_VectorDlg();
-
+  BasicGUI_VectorDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~BasicGUI_VectorDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
-
-private :
-    void Init();
-    void enterEvent(QEvent* e);
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
 
-    GEOM::GEOM_Object_var myPoint1;   
-    GEOM::GEOM_Object_var myPoint2;
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
 
-    DlgRef_2Sel_QTD* GroupPoints;
-    DlgRef_3Spin1Check* GroupDimensions;
+  GEOM::GEOM_Object_var              myPoint1;   
+  GEOM::GEOM_Object_var              myPoint2;
 
+  DlgRef_2Sel*                       GroupPoints;
+  DlgRef_3Spin1Check*                GroupDimensions;
+    
 private slots:
-    void ClickOnOk();
-    void ClickOnCancel();
-    bool ClickOnApply();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
 
-    void ActivateThisDialog();
-    void DeactivateActiveDialog();
+  void                               ActivateThisDialog();
+  void                               DeactivateActiveDialog();
     
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ConstructorsClicked(int constructorId);
-    void ValueChangedInSpinBox(double newValue);
-    void ReverseVector(int state);
-
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               ValueChangedInSpinBox( double );
+  void                               ReverseVector( int );
+  void                               SetDoubleSpinBoxStep( double );
 };
 
-#endif // DIALOGBOX_VECTOR_H
+#endif // BASICGUI_VECTORDLG_H
index 31c84cb9e1dd6ea2e7f59db123d1522d967b27c8..5fd3838c9f1fa26e8532835d78804de6e20899f6 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_WorkingPlaneDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//
-//  File   : BasicGUI_WorkingPlaneDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
 #include "BasicGUI_WorkingPlaneDlg.h"
 
-#include "GEOMBase.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <BRep_Tool.hxx>
-#include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopExp.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
 // QT Includes
-#include <qcheckbox.h>
-#include <qlabel.h>
+#include <QCheckBox>
 
-#include "GEOMImpl_Types.hxx"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : BasicGUI_WorkingPlaneDlg()
@@ -62,61 +58,68 @@ 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(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BasicGUI_WorkingPlaneDlg::BasicGUI_WorkingPlaneDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                   bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_WPLANE_FACE")));
-  QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_WPLANE_VECTOR")));
-  QPixmap image3(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_WPLANE_ORIGIN")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_WPLANE_FACE" ) ) );
+  QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_WPLANE_VECTOR" ) ) );
+  QPixmap image3( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_WPLANE_ORIGIN" ) ) );
 
-  setCaption(tr("GEOM_WPLANE_TITLE"));
+  setWindowTitle( tr( "GEOM_WPLANE_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_WPLANE"));
-  RadioButton1->setPixmap(image1);
-  RadioButton2->setPixmap(image2);
-  RadioButton3->setPixmap(image3);
-
-  Group1 = new DlgRef_1Sel_QTD(this, "Group1");
-  Group1->GroupBox1->setTitle(tr("GEOM_WPLANE_FACE"));
-  Group1->TextLabel1->setText(tr("GEOM_SELECTION"));
-  Group1->PushButton1->setPixmap(image0);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_WPLANE" ) );
+  mainFrame()->RadioButton1->setIcon( image1 );
+  mainFrame()->RadioButton2->setIcon( image2 );
+  mainFrame()->RadioButton3->setIcon( image3 );
+
+  Group1 = new DlgRef_1Sel( centralWidget() );
+
+  Group1->GroupBox1->setTitle( tr( "GEOM_WPLANE_FACE" ) );
+  Group1->TextLabel1->setText( tr( "GEOM_SELECTION" ) );
+  Group1->PushButton1->setIcon( image0 );
   Group1->LineEdit1->setReadOnly( true );
 
-  Group2 = new DlgRef_2Sel_QTD(this, "Group2");
-  Group2->GroupBox1->setTitle(tr("GEOM_WPLANE_VECTOR"));
-  Group2->TextLabel1->setText(tr("GEOM_WPLANE_VX"));
-  Group2->TextLabel2->setText(tr("GEOM_WPLANE_VZ"));
-  Group2->PushButton1->setPixmap(image0);
-  Group2->PushButton2->setPixmap(image0);
+  Group2 = new DlgRef_2Sel( centralWidget() );
+
+  Group2->GroupBox1->setTitle( tr( "GEOM_WPLANE_VECTOR" ) );
+  Group2->TextLabel1->setText( tr( "GEOM_WPLANE_VX" ) );
+  Group2->TextLabel2->setText( tr( "GEOM_WPLANE_VZ" ) );
+  Group2->PushButton1->setIcon( image0 );
+  Group2->PushButton2->setIcon( image0 );
   Group2->LineEdit1->setReadOnly( true );
   Group2->LineEdit2->setReadOnly( true );
+  Group2->PushButton1->setDown( true );
+  Group2->LineEdit1->setEnabled( true );
+  Group2->LineEdit2->setEnabled( false );
+
+  Group3 = new DlgRef_3Check( centralWidget() );
 
-  Group3 = new DlgRef_3Check_QTD(this, "Group3");
-  Group3->GroupBox1->setTitle(tr("GEOM_WPLANE_ORIGIN"));
-  Group3->RadioButton1->setText(tr("GEOM_WPLANE_OXY"));
-  Group3->RadioButton2->setText(tr("GEOM_WPLANE_OYZ"));
-  Group3->RadioButton3->setText(tr("GEOM_WPLANE_OZX"));
+  Group3->GroupBox1->setTitle( tr( "GEOM_WPLANE_ORIGIN" ) );
+  Group3->RadioButton1->setText( tr( "GEOM_WPLANE_OXY" ) );
+  Group3->RadioButton2->setText( tr( "GEOM_WPLANE_OYZ" ) );
+  Group3->RadioButton3->setText( tr( "GEOM_WPLANE_OZX" ) );
 
-  Layout1->addWidget(Group1, 1, 0);
-  Layout1->addWidget(Group2, 1, 0);
-  Layout1->addWidget(Group3, 1, 0);
   /***************************************************************/
-  QGroupBox* aReverseGroupBox = new QGroupBox(this, "aReverseGroupBox");
-  aReverseGroupBox->setTitle(tr(""));
-  aReverseGroupBox->setColumnLayout(1, Qt::Horizontal);
-  aReverseGroupBox->setInsideMargin(10);
-  
-  myReverseCB = new QCheckBox(aReverseGroupBox, "myReverseCB");
-  myReverseCB->setText(tr("GEOM_REVERSE_PLANE"));
-    
-  Layout1->addWidget(aReverseGroupBox, 2, 0);
-  
-
-  setHelpFileName("create_wplane_page.html");
+  QGroupBox* aReverseGroupBox = new QGroupBox( centralWidget() );
+  QHBoxLayout* aReverseGroupBoxLayout = new QHBoxLayout( aReverseGroupBox );
+  aReverseGroupBoxLayout->setMargin( 9 );
+  aReverseGroupBoxLayout->setSpacing( 6 );
+
+  myReverseCB = new QCheckBox( aReverseGroupBox );
+  myReverseCB->setText( tr( "GEOM_REVERSE_PLANE" ) );
+  aReverseGroupBoxLayout->addWidget( myReverseCB );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( Group1 );
+  layout->addWidget( Group2 );
+  layout->addWidget( Group3 );
+  layout->addWidget( aReverseGroupBox );
+
+  setHelpFileName( "create_wplane_page.html" );
 
   Init();
 }
@@ -141,7 +144,7 @@ void BasicGUI_WorkingPlaneDlg::Init()
 
   // myGeomGUI->SetState( 0 );
 
-  myFace = GEOM::GEOM_Object::_nil();
+  myFace  = GEOM::GEOM_Object::_nil();
   myVectX = GEOM::GEOM_Object::_nil();
   myVectZ = GEOM::GEOM_Object::_nil();
 
@@ -151,98 +154,96 @@ void BasicGUI_WorkingPlaneDlg::Init()
   globalSelection( GEOM_PLANE );
 
    /* 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(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
+  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()));
+  connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
-  connect(Group1->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group1->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect( this,           SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
 
-  connect(Group2->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group2->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group2->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group2->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect( Group1->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group1->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group2->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group2->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( Group2->LineEdit2,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group2->PushButton2, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
 
-  connect(Group3->GroupBox1, SIGNAL(clicked(int)), this, SLOT(GroupClicked(int)));
+  connect( Group3->GroupBox1, SIGNAL( clicked( int ) ), this, SLOT( GroupClicked( int ) ) );
 
-  connect(myReverseCB, SIGNAL(clicked()), this, SLOT(onReverse()));
+  connect( myReverseCB, SIGNAL( clicked() ), this, SLOT( onReverse() ) );
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   initName( tr( "GEOM_WPLANE" ) );
-  ConstructorsClicked(0);
+
+  setConstructorId( 2 ); // simplest constructor
+  ConstructorsClicked( 2 );
 }
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void BasicGUI_WorkingPlaneDlg::ConstructorsClicked(int constructorId)
+void BasicGUI_WorkingPlaneDlg::ConstructorsClicked( int constructorId )
 {
   LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
 
-  disconnect(aSelMgr, 0, this, 0);
+  disconnect( aSelMgr, 0, this, 0 );
 
-  switch (constructorId)
+  switch ( constructorId ) {
+  case 0:
     {
-    case 0:
-      {
-        //globalSelection( GEOM_PLANE );
-        TColStd_MapOfInteger aMap;
-        aMap.Add( GEOM_PLANE );
-        aMap.Add( GEOM_MARKER );
-        globalSelection( aMap );
-
-        Group2->hide();
-        Group3->hide();
-        resize(0, 0);
-        Group1->show();
-
-        myEditCurrentArgument = Group1->LineEdit1;
-        Group1->LineEdit1->setText("");
-        myFace = GEOM::GEOM_Object::_nil();
-
-        connect(aSelMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-        break;
-      }
-    case 1:
-      {
-       //globalSelection( GEOM_LINE );
-       GEOM::GEOM_Object_var anObj;
-       localSelection( anObj, TopAbs_EDGE );
-
-        Group1->hide();
-        Group3->hide();
-        resize(0, 0);
-        Group2->show();
-
-        myEditCurrentArgument = Group2->LineEdit1;
-        Group2->LineEdit1->setText("");
-       Group2->LineEdit2->setText("");
-        myVectX = GEOM::GEOM_Object::_nil();
-        myVectZ = GEOM::GEOM_Object::_nil();
+      TColStd_MapOfInteger aMap;
+      aMap.Add( GEOM_PLANE );
+      aMap.Add( GEOM_MARKER );
+      globalSelection( aMap );
+      Group2->hide();
+      Group3->hide();
+      Group1->show();
+      Group1->PushButton1->setDown(true);
+      myEditCurrentArgument = Group1->LineEdit1;
+      Group1->LineEdit1->setText( "" );
+      myFace = GEOM::GEOM_Object::_nil();
 
-        connect(aSelMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-        break;
-      }
-    case 2:
-      {
-        Group1->hide();
-        Group2->hide();
-        resize(0, 0);
-        Group3->show();
-
-        Group3->RadioButton1->setChecked(true);
-        aOriginType = 1;
-        break;
-      }
+      connect( aSelMgr, SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+      break;
+    }
+  case 1:
+    {
+      globalSelection( GEOM_LINE );
+      Group1->hide();
+      Group3->hide();
+      Group2->show();
+      myEditCurrentArgument = Group2->LineEdit1;
+      Group2->LineEdit1->setText( "" );
+      Group2->LineEdit2->setText( "" );
+      Group2->PushButton1->setDown( true );
+      Group2->PushButton2->setDown( false );
+      Group2->LineEdit1->setEnabled( true );
+      Group2->LineEdit2->setEnabled( false );
+      myVectX = GEOM::GEOM_Object::_nil();
+      myVectZ = GEOM::GEOM_Object::_nil();
+
+      connect( aSelMgr, SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+      break;
+    }
+  case 2:
+    {
+      Group1->hide();
+      Group2->hide();
+      Group3->show();
+      Group3->RadioButton1->setChecked( true );
+      aOriginType = 1;
+      break;
     }
-  
+  }
+
+  qApp->processEvents();
+  updateGeometry();
+  resize( minimumSizeHint() );
+
   updateWPlane();
 }
 
@@ -250,7 +251,7 @@ void BasicGUI_WorkingPlaneDlg::ConstructorsClicked(int constructorId)
 // function : GroupClicked()
 // purpose  : Radio button management
 //=================================================================================
-void BasicGUI_WorkingPlaneDlg::GroupClicked(int groupId)
+void BasicGUI_WorkingPlaneDlg::GroupClicked( int groupId )
 {
   aOriginType = groupId;
   updateWPlane();
@@ -272,14 +273,14 @@ void BasicGUI_WorkingPlaneDlg::ClickOnOk()
 //=================================================================================
 bool BasicGUI_WorkingPlaneDlg::ClickOnApply()
 {
-  buttonApply->setFocus();
-  myGeomGUI->application()->putInfo(tr(""));
-  if (updateWPlane(false)){
-    myGeomGUI->SetWorkingPlane(myWPlane);
+  buttonApply()->setFocus();
+  myGeomGUI->application()->putInfo( "" );
+
+  if ( updateWPlane( false ) ) {
+    myGeomGUI->SetWorkingPlane( myWPlane );
     myGeomGUI->ActiveWorkingPlane();
   }
-  
+
   return true;
 }
 
@@ -289,17 +290,21 @@ bool BasicGUI_WorkingPlaneDlg::ClickOnApply()
 //=================================================================================
 void BasicGUI_WorkingPlaneDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   QString aName;
 
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
   const int id = getConstructorId();
-  if (IObjectCount() != 1) {
-    if (id == 0)
+  if (aSelList.Extent() != 1) {
+    if ( id == 0 )
       myFace = GEOM::GEOM_Object::_nil();
-    else if (id == 1) {
-      if (myEditCurrentArgument == Group2->LineEdit1)
+    else if ( id == 1 ) {
+      if ( myEditCurrentArgument == Group2->LineEdit1 )
         myVectX = GEOM::GEOM_Object::_nil();
-      else if (myEditCurrentArgument == Group2->LineEdit2)
+      else if ( myEditCurrentArgument == Group2->LineEdit2 )
         myVectZ = GEOM::GEOM_Object::_nil();
     }
     return;
@@ -307,42 +312,38 @@ void BasicGUI_WorkingPlaneDlg::SelectionIntoArgument()
 
   // nbSel == 1
   Standard_Boolean aRes = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), aRes);
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aRes);
 
-  if (!aRes || CORBA::is_nil(aSelectedObject))
+  if ( !aRes || CORBA::is_nil( aSelectedObject ) )
     return;
 
   aName = GEOMBase::GetName(aSelectedObject);
 
-  if (myEditCurrentArgument == Group1->LineEdit1)
+  if ( myEditCurrentArgument == Group1->LineEdit1 )
     myFace = aSelectedObject;
-  else if (myEditCurrentArgument == Group2->LineEdit1 || myEditCurrentArgument == Group2->LineEdit2)
-  {
-    if ( aRes && !aSelectedObject->_is_nil() )
-    {
+  else if ( myEditCurrentArgument == Group2->LineEdit1 ||
+           myEditCurrentArgument == Group2->LineEdit2 ) {
+    if ( aRes && !aSelectedObject->_is_nil() ) {
       TopoDS_Shape aShape;
-      if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
-      {
-        LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+      if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) {
         TColStd_IndexedMapOfInteger aMap;
-        aSelMgr->GetIndexes( firstIObject(), aMap );
-        if ( aMap.Extent() == 1 )
-        {
+        aSelMgr->GetIndexes(aSelList.First(), aMap);
+        if ( aMap.Extent() == 1 ) {
           int anIndex = aMap( 1 );
           aName = aName + ":edge_" + QString::number( anIndex );
 
          GEOM::GEOM_IShapesOperations_var aShapesOp =
            getGeomEngine()->GetIShapesOperations( getStudyId() );
-         if(myEditCurrentArgument == Group2->LineEdit1)
-           myVectX = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+         if ( myEditCurrentArgument == Group2->LineEdit1 )
+           myVectX = aShapesOp->GetSubShape( aSelectedObject, anIndex );
          else
-           myVectZ = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+           myVectZ = aShapesOp->GetSubShape( aSelectedObject, anIndex );
         }
         else {
-          if (myEditCurrentArgument == Group2->LineEdit1)
-            myVectX = aSelectedObject;
-          else
-            myVectZ = aSelectedObject;
+         if ( aShape.ShapeType() != TopAbs_EDGE ) {
+           aSelectedObject = GEOM::GEOM_Object::_nil();
+           aName = "";
+         }
         }
         aSelMgr->clearSelected();
       }
@@ -351,9 +352,21 @@ void BasicGUI_WorkingPlaneDlg::SelectionIntoArgument()
 
   myEditCurrentArgument->setText( aName );
 
+  if ( myEditCurrentArgument == Group2->LineEdit1 ) {
+    myVectX = aSelectedObject;
+    if ( !myVectX->_is_nil() && myVectZ->_is_nil() )
+      Group2->PushButton2->click();
+  }
+  else {
+    myVectZ = aSelectedObject;
+    if ( !myVectZ->_is_nil() && myVectX->_is_nil() )
+      Group2->PushButton1->click();
+  }
+
   updateWPlane();
 }
 
+
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -362,25 +375,36 @@ void BasicGUI_WorkingPlaneDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
 
-  if (send == Group1->PushButton1) {
+  if ( send == Group1->PushButton1 ) {
     myEditCurrentArgument = Group1->LineEdit1;
     globalSelection( GEOM_PLANE );
   }
-  else if (send == Group2->PushButton1) {
+  else if ( send == Group2->PushButton1 ) {
     myEditCurrentArgument = Group2->LineEdit1;
     GEOM::GEOM_Object_var anObj;
-    localSelection( anObj, TopAbs_EDGE );
+    //    localSelection( anObj, TopAbs_EDGE );
+    globalSelection( GEOM_LINE );
+    Group2->PushButton2->setDown( false );
+    Group2->LineEdit1->setEnabled( true );
+    Group2->LineEdit2->setEnabled( false );
   }
-  else if (send == Group2->PushButton2) {
+  else if ( send == Group2->PushButton2 ) {
     myEditCurrentArgument = Group2->LineEdit2;
     GEOM::GEOM_Object_var anObj;
-    localSelection( anObj, TopAbs_EDGE );
+    //    localSelection( anObj, TopAbs_EDGE );
+    globalSelection( GEOM_LINE );
+    Group2->PushButton1->setDown( false );
+    Group2->LineEdit1->setEnabled( false );
+    Group2->LineEdit2->setEnabled( true );
   }
 
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
+  //  SelectionIntoArgument();
+  send->setDown(true);
+  displayPreview();
 }
 
+
 //=================================================================================
 // function : LineEditReturnPressed()
 // purpose  :
@@ -388,12 +412,13 @@ void BasicGUI_WorkingPlaneDlg::SetEditCurrentArgument()
 void BasicGUI_WorkingPlaneDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if(send == Group1->LineEdit1 || send == Group2->LineEdit1 || send == Group2->LineEdit2) {
+  if ( send == Group1->LineEdit1 || send == Group2->LineEdit1 || send == Group2->LineEdit2 ) {
     myEditCurrentArgument = send;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
 }
 
+
 //=================================================================================
 // function : onReverse()
 // purpose  :
@@ -403,6 +428,7 @@ void BasicGUI_WorkingPlaneDlg::onReverse()
   updateWPlane();
 }
 
+
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -410,49 +436,33 @@ void BasicGUI_WorkingPlaneDlg::onReverse()
 void BasicGUI_WorkingPlaneDlg::ActivateThisDialog( )
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication( ) ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   ConstructorsClicked( getConstructorId() );
 }
 
+
 //=================================================================================
 // function : DeactivateActiveDialog()
 // purpose  : public slot to deactivate if active
 //=================================================================================
 void BasicGUI_WorkingPlaneDlg::DeactivateActiveDialog()
 {
+  // myGeomGUI->SetState( -1 );
   GEOMBase_Skeleton::DeactivateActiveDialog();
 }
 
-//=================================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=================================================================================
-void BasicGUI_WorkingPlaneDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BasicGUI_WorkingPlaneDlg::enterEvent(QEvent* e)
+void BasicGUI_WorkingPlaneDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void BasicGUI_WorkingPlaneDlg::closeEvent( QCloseEvent* e )
-{
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : updateWPlane
 // purpose  :
@@ -460,40 +470,41 @@ void BasicGUI_WorkingPlaneDlg::closeEvent( QCloseEvent* e )
 bool BasicGUI_WorkingPlaneDlg::updateWPlane( const bool showPreview )
 {
   erasePreview();
-  
+
   const int id = getConstructorId();
 
-  if (id == 0) { // by planar face selection
-    if (CORBA::is_nil(myFace)) {
-      if(!showPreview)
+  if ( id == 0 ) { // by planar face selection
+    if ( CORBA::is_nil( myFace ) ) {
+      if ( !showPreview )
        showError( "Face has to be selected" );
       return false;
     }
 
     // PAL12781: set center of WPL to face's center of mass
     // like it is done for LCS creation
-    CORBA::Double Ox,Oy,Oz, Zx,Zy,Zz, Xx,Xy,Xz;
+    CORBA::Double Ox, Oy, Oz,   Zx, Zy, Zz,   Xx, Xy, Xz;
     Ox = Oy = Oz = Zx = Zy = Xy = Xz = 0.;
     Zz = Xx = 1.;
 
     GEOM::GEOM_IMeasureOperations_ptr aMeasureOp =
-      myGeomGUI->GetGeomGen()->GetIMeasureOperations(getStudyId());
-    aMeasureOp->GetPosition(myFace, Ox,Oy,Oz, Zx,Zy,Zz, Xx,Xy,Xz);
-
-    if (aMeasureOp->IsDone()) {
-      gp_Pnt aPnt (Ox,Oy,Oz);
-      gp_Dir aDirN (Zx,Zy,Zz);
-      gp_Dir aDirX (Xx,Xy,Xz);
-      myWPlane = gp_Ax3(aPnt, aDirN, aDirX);
-    } else {
-      if(!showPreview)
+      myGeomGUI->GetGeomGen()->GetIMeasureOperations( getStudyId() );
+    aMeasureOp->GetPosition( myFace, Ox, Oy, Oz, Zx, Zy, Zz, Xx, Xy, Xz);
+
+    if ( aMeasureOp->IsDone() ) {
+      gp_Pnt aPnt ( Ox, Oy, Oz );
+      gp_Dir aDirN ( Zx, Zy, Zz );
+      gp_Dir aDirX ( Xx, Xy, Xz );
+      myWPlane = gp_Ax3( aPnt, aDirN, aDirX );
+    }
+    else {
+      if ( !showPreview )
        showError( "Wrong shape selected (has to be a planar face)" );
       return false;
     }
   }
-  else if (id == 1) { // by two vectors (Ox & Oz)
+  else if ( id == 1 ) { // by two vectors (Ox & Oz)
     if ( CORBA::is_nil( myVectX ) || CORBA::is_nil( myVectZ ) ) {
-      if(!showPreview)
+      if ( !showPreview )
        showError( "Two vectors have to be selected" );
       return false;
     }
@@ -502,81 +513,80 @@ bool BasicGUI_WorkingPlaneDlg::updateWPlane( const bool showPreview )
     TopoDS_Vertex VX1, VX2, VZ1, VZ2;
     gp_Vec aVX, aVZ;
 
-    if (!GEOMBase::GetShape( myVectX, aVectX, TopAbs_EDGE ) ||
-        !GEOMBase::GetShape( myVectZ, aVectZ, TopAbs_EDGE )) {
-      if(!showPreview)
+    if ( !GEOMBase::GetShape( myVectX, aVectX, TopAbs_EDGE ) ||
+        !GEOMBase::GetShape( myVectZ, aVectZ, TopAbs_EDGE ) ) {
+      if ( !showPreview )
        showError( "Wrong shape selected (two vectors(edges) have to be selected)" );
       return false;
     }
 
-    TopExp::Vertices(aVectX, VX1, VX2, Standard_True);
-    TopExp::Vertices(aVectZ, VZ1, VZ2, Standard_True);
+    TopExp::Vertices( aVectX, VX1, VX2, Standard_True );
+    TopExp::Vertices( aVectZ, VZ1, VZ2, Standard_True );
 
-    if (VX1.IsNull() || VX2.IsNull()) {
-      if(!showPreview)
+    if ( VX1.IsNull() || VX2.IsNull() ) {
+      if ( !showPreview )
        showError( "Bad OX vector" );
       return false;
     }
-    if (VZ1.IsNull() || VZ2.IsNull()) {
-      if(!showPreview)
+    if ( VZ1.IsNull() || VZ2.IsNull() ) {
+      if ( !showPreview )
        showError( "Bad OZ vector" );
       return false;
     }
 
-    aVX = gp_Vec(BRep_Tool::Pnt(VX1), BRep_Tool::Pnt(VX2));
-    aVZ = gp_Vec(BRep_Tool::Pnt(VZ1), BRep_Tool::Pnt(VZ2));
+    aVX = gp_Vec( BRep_Tool::Pnt( VX1 ), BRep_Tool::Pnt( VX2 ) );
+    aVZ = gp_Vec( BRep_Tool::Pnt( VZ1 ), BRep_Tool::Pnt( VZ2 ) );
 
-    if (aVX.Magnitude() < Precision::Confusion()) {
-      if(!showPreview)
+    if ( aVX.Magnitude() < Precision::Confusion() ) {
+      if ( !showPreview )
        showError( "Bad OX vector" );
       return false;
     }
-    if (aVZ.Magnitude() < Precision::Confusion()) {
-      if(!showPreview)
+    if ( aVZ.Magnitude() < Precision::Confusion() ) {
+      if ( !showPreview )
        showError( "Bad OZ vector" );
       return false;
     }
 
-    gp_Dir aDirX = gp_Dir(aVX.X(), aVX.Y(), aVX.Z());
-    gp_Dir aDirZ = gp_Dir(aVZ.X(), aVZ.Y(), aVZ.Z());
+    gp_Dir aDirX = gp_Dir( aVX.X(), aVX.Y(), aVX.Z() );
+    gp_Dir aDirZ = gp_Dir( aVZ.X(), aVZ.Y(), aVZ.Z() );
 
-    if (aDirX.IsParallel(aDirZ, Precision::Angular())) {
-      if(!showPreview)
+    if ( aDirX.IsParallel( aDirZ, Precision::Angular() ) ) {
+      if ( !showPreview )
        showError( "Parallel vectors selected" );
       return false;
     }
 
-    myWPlane = gp_Ax3(BRep_Tool::Pnt(VX1), aDirZ, aDirX);
+    myWPlane = gp_Ax3( BRep_Tool::Pnt( VX1 ), aDirZ, aDirX );
+
   }
-  else if (id == 2) { // by selection from standard (OXY or OYZ, or OZX)
+  else if ( id == 2 ) { // by selection from standard (OXY or OYZ, or OZX)
     gp_Ax2 anAx2;
 
-    if      (aOriginType == 1) anAx2 = gp::XOY();
-    else if (aOriginType == 2) anAx2 = gp::YOZ();
-    else if (aOriginType == 0) anAx2 = gp::ZOX();
+    if      ( aOriginType == 1 ) anAx2 = gp::XOY();
+    else if ( aOriginType == 2 ) anAx2 = gp::YOZ();
+    else if ( aOriginType == 0 ) anAx2 = gp::ZOX();
+
+    myWPlane = gp_Ax3( anAx2 );
 
-    myWPlane = gp_Ax3(anAx2);
   }
   else {
     return false;
   }
 
-  if (myReverseCB->isChecked())
-  {
+  if ( myReverseCB->isChecked() ) {
     myWPlane.YReverse();
     myWPlane.ZReverse();
   }
 
-  if (showPreview)
-  {
-    GEOM::GEOM_IBasicOperations_var aBasicOp = getGeomEngine()->GetIBasicOperations(getStudyId());
+  if ( showPreview ) {
+    GEOM::GEOM_IBasicOperations_var aBasicOp = getGeomEngine()->GetIBasicOperations( getStudyId() );
     GEOM::GEOM_Object_var anObj = aBasicOp->MakeMarker
-      (myWPlane.Location().X()  , myWPlane.Location().Y()  , myWPlane.Location().Z(),
-       myWPlane.XDirection().X(), myWPlane.XDirection().Y(), myWPlane.XDirection().Z(),
-       myWPlane.YDirection().X(), myWPlane.YDirection().Y(), myWPlane.YDirection().Z());
-    displayPreview(anObj);
+      ( myWPlane.Location().X(),   myWPlane.Location().Y(),   myWPlane.Location().Z(),
+        myWPlane.XDirection().X(), myWPlane.XDirection().Y(), myWPlane.XDirection().Z(),
+        myWPlane.YDirection().X(), myWPlane.YDirection().Y(), myWPlane.YDirection().Z() );
+    displayPreview( anObj );
   }
 
   return true;
 }
-
index 40cddf74307d1b751fb9b03f0f0737baafdda803..e125b8c7c04558af7058e16fc368d05d1683c3d0 100644 (file)
@@ -1,91 +1,85 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BasicGUI_WorkingPlaneDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_WORKINGPLANE_H
-#define DIALOGBOX_WORKINGPLANE_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_WorkingPlaneDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef BASICGUI_WORKINGPLANEDLG_H
+#define BASICGUI_WORKINGPLANEDLG_H
 
-#include "GEOM_BasicGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_QTD.h"
-#include "DlgRef_2Sel_QTD.h"
-#include "DlgRef_3Check_QTD.h"
+#include <gp_Ax3.hxx>
 
+class DlgRef_1Sel;
+class DlgRef_2Sel;
+class DlgRef_3Check;
 class QCheckBox;
 
 //=================================================================================
 // class    : BasicGUI_WorkingPlaneDlg
 // purpose  :
 //=================================================================================
-class GEOM_BASICGUI_EXPORT BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton
+class BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BasicGUI_WorkingPlaneDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                             const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
-    ~BasicGUI_WorkingPlaneDlg();
-    virtual void closeEvent( QCloseEvent* e );
+  BasicGUI_WorkingPlaneDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~BasicGUI_WorkingPlaneDlg();
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-
-    bool updateWPlane(const bool showPreview = true);
-
-    GEOM::GEOM_Object_var myFace;
-    GEOM::GEOM_Object_var myVectX;
-    GEOM::GEOM_Object_var myVectZ;
-
-    int aOriginType;
-
-    DlgRef_1Sel_QTD* Group1;
-    DlgRef_2Sel_QTD* Group2;
-    DlgRef_3Check_QTD* Group3;
-
-    QCheckBox* myReverseCB;
-
-    gp_Ax3 myWPlane;
-
+  void                  Init();
+  void                  enterEvent( QEvent* );
+  
+  bool                  updateWPlane( const bool = true );
+
+  GEOM::GEOM_Object_var myFace;
+  GEOM::GEOM_Object_var myVectX;
+  GEOM::GEOM_Object_var myVectZ;
+  
+  int                   aOriginType;
+  
+  DlgRef_1Sel*          Group1;
+  DlgRef_2Sel*          Group2;
+  DlgRef_3Check*        Group3;
+  
+  QCheckBox*            myReverseCB;
+  
+  gp_Ax3                myWPlane;
+  
 private slots:
-    void ClickOnOk();
-    void ClickOnCancel();
-    bool ClickOnApply();
-
-    void ConstructorsClicked(int constructorId);
-    void GroupClicked(int groupId);
-    void SetEditCurrentArgument();
-    void SelectionIntoArgument();
-    void LineEditReturnPressed();
-    void onReverse();
-
-    void ActivateThisDialog();
-    void DeactivateActiveDialog();
-
+  void                  ClickOnOk();
+  bool                  ClickOnApply();
+  
+  void                  ConstructorsClicked( int );
+  void                  GroupClicked( int );
+  void                  SetEditCurrentArgument();
+  void                  SelectionIntoArgument();
+  void                  LineEditReturnPressed();
+  void                  onReverse();
+  
+  void                  ActivateThisDialog();
+  void                  DeactivateActiveDialog();
 };
 
-#endif // DIALOGBOX_WORKINGPLANE_H
+#endif // BASICGUI_WORKINGPLANEDLG_H
diff --git a/src/BasicGUI/GEOM_BasicGUI.hxx b/src/BasicGUI/GEOM_BasicGUI.hxx
deleted file mode 100755 (executable)
index ba917e5..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-//  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_BasicGUI.hxx
-//  Author : Alexander A. BORODIN
-//  Module : GEOM
-
-#ifndef _GEOM_BasicGUI_HXX_
-#define _GEOM_BasicGUI_HXX_
-
-#ifdef WNT
- #if defined BASICGUI_EXPORTS
-  #if defined WIN32
-   #define GEOM_BASICGUI_EXPORT __declspec( dllexport )
-  #else
-   #define GEOM_BASICGUI_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define GEOM_BASICGUI_EXPORT __declspec( dllimport )
-  #else
-   #define GEOM_BASICGUI_EXPORT
-  #endif
- #endif
-#else
- #define GEOM_BASICGUI_EXPORT
-#endif
-
-#endif
index ab4659b1328b28b0ea10c868382c4fd2762ed541..2d364c18e16de2bf9fe09291e0f15a137b23e832 100644 (file)
-#  GEOM BASICGUI : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : BasicGUI
 #
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS = BasicGUI_PointDlg.h \
-                       GEOM_BasicGUI.hxx
+
+
+salomeinclude_HEADERS =                        \
+       BasicGUI.h                      \
+       BasicGUI_ArcDlg.h               \
+       BasicGUI_CircleDlg.h            \
+       BasicGUI_CurveDlg.h             \
+       BasicGUI_EllipseDlg.h           \
+       BasicGUI_LineDlg.h              \
+       BasicGUI_MarkerDlg.h            \
+       BasicGUI_PlaneDlg.h             \
+       BasicGUI_PointDlg.h             \
+       BasicGUI_VectorDlg.h            \
+       BasicGUI_WorkingPlaneDlg.h
 
 # Libraries targets
+
 lib_LTLIBRARIES = libBasicGUI.la
 
 # Sources files
-dist_libBasicGUI_la_SOURCES = \
-       BasicGUI.cxx \
-       BasicGUI_PointDlg.cxx \
-       BasicGUI_LineDlg.cxx \
-       BasicGUI_CircleDlg.cxx \
-       BasicGUI_EllipseDlg.cxx \
-       BasicGUI_ArcDlg.cxx \
-       BasicGUI_VectorDlg.cxx \
-       BasicGUI_PlaneDlg.cxx \
-       BasicGUI_WorkingPlaneDlg.cxx \
-       BasicGUI_CurveDlg.cxx \
+dist_libBasicGUI_la_SOURCES =          \
+       BasicGUI.cxx                    \
+       BasicGUI_PointDlg.cxx           \
+       BasicGUI_LineDlg.cxx            \
+       BasicGUI_CircleDlg.cxx          \
+       BasicGUI_EllipseDlg.cxx         \
+       BasicGUI_ArcDlg.cxx             \
+       BasicGUI_VectorDlg.cxx          \
+       BasicGUI_PlaneDlg.cxx           \
+       BasicGUI_WorkingPlaneDlg.cxx    \
+       BasicGUI_CurveDlg.cxx           \
        BasicGUI_MarkerDlg.cxx
 
-MOC_FILES = \
-       BasicGUI_PointDlg_moc.cxx \
-       BasicGUI_LineDlg_moc.cxx \
-       BasicGUI_CircleDlg_moc.cxx \
-       BasicGUI_EllipseDlg_moc.cxx \
-       BasicGUI_ArcDlg_moc.cxx \
-       BasicGUI_VectorDlg_moc.cxx \
-       BasicGUI_PlaneDlg_moc.cxx \
-       BasicGUI_WorkingPlaneDlg_moc.cxx \
-       BasicGUI_CurveDlg_moc.cxx \
+MOC_FILES =                                    \
+       BasicGUI_PointDlg_moc.cxx               \
+       BasicGUI_LineDlg_moc.cxx                \
+       BasicGUI_CircleDlg_moc.cxx              \
+       BasicGUI_EllipseDlg_moc.cxx             \
+       BasicGUI_ArcDlg_moc.cxx                 \
+       BasicGUI_VectorDlg_moc.cxx              \
+       BasicGUI_PlaneDlg_moc.cxx               \
+       BasicGUI_WorkingPlaneDlg_moc.cxx        \
+       BasicGUI_CurveDlg_moc.cxx               \
        BasicGUI_MarkerDlg_moc.cxx
 
-nodist_libBasicGUI_la_SOURCES= \
+nodist_libBasicGUI_la_SOURCES =                        \
        $(MOC_FILES)
 
+# additional information to compile and link file
 
-# LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Exception.idl SALOME_Component.idl
-
-# LIB_SERVER_IDL = 
-
-# additionnal information to compil and link file
-
-libBasicGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../DlgRef \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../GEOMFiltersSelection \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(srcdir)/../GEOMClient \
-       -I$(top_builddir)/idl \
+libBasicGUI_la_CPPFLAGS =                      \
+       $(QT_INCLUDES)                          \
+       $(VTK_INCLUDES)                         \
+       $(CAS_CPPFLAGS)                         \
+       $(PYTHON_INCLUDES)                      \
+       $(BOOST_CPPFLAGS)                       \
+       $(KERNEL_CXXFLAGS)                      \
+       $(GUI_CXXFLAGS)                         \
+       $(CORBA_CXXFLAGS)                       \
+       $(CORBA_INCLUDES)                       \
+       -I$(srcdir)/../OBJECT                   \
+       -I$(srcdir)/../DlgRef                   \
+       -I$(srcdir)/../GEOMGUI                  \
+       -I$(srcdir)/../GEOMFiltersSelection     \
+       -I$(srcdir)/../GEOMBase                 \
+       -I$(srcdir)/../GEOMImpl                 \
+       -I$(srcdir)/../GEOMClient               \
+       -I$(top_builddir)/src/DlgRef            \
+       -I$(top_builddir)/idl                   \
        -I$(top_builddir)/salome_adm/unix
 
 
-libBasicGUI_la_LDFLAGS  = \
-       ../GEOMFiltersSelection/libGEOMFiltersSelection.la \
-       ../GEOMBase/libGEOMBase.la \
-       ../GEOMGUI/libGEOM.la \
+libBasicGUI_la_LDFLAGS  =                                      \
+       ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \
+       ../GEOMBase/libGEOMBase.la                              \
+       ../GEOMGUI/libGEOM.la                                   \
        $(GUI_LDFLAGS) -lsuit
index 2ab3c1db05770f6e54e796891ca0450b49c8ca72..547510dc8a876e715f9f86e4ea5f5dcb56e7f09f 100644 (file)
@@ -1,6 +1,7 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  CEA
+//  Copyright (C) 2003-2007  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 along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BooleanGUI.cxx
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
 //
-//
-//  File   : BooleanGUI.cxx
-//  Author : Julia DOOVSKIKH
-//  Module : GEOM
-//  $Header$
-
 #include "BlocksGUI.h"
 
 #include "BlocksGUI_QuadFaceDlg.h"
 #include "BlocksGUI_ExplodeDlg.h"
 #include "BlocksGUI_PropagateDlg.h"
 
-#include "GeometryGUI.h"
-
-#include "SUIT_Desktop.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_Session.h"
+#include <GeometryGUI.h>
 
-#include "SalomeApp_Application.h"
+#include <SUIT_Desktop.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
 
 //=======================================================================
 // function : BlocksGUI()
 // purpose  : Constructor
 //=======================================================================
 BlocksGUI::BlocksGUI( GeometryGUI* parent )
-     : GEOMGUI( parent )
+  : GEOMGUI( parent )
 {
 }
 
@@ -66,22 +63,24 @@ bool BlocksGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 {
   getGeometryGUI()->EmitSignalDeactivateDialog();
 
-  QDialog* aDlg = NULL;
+  QDialog* aDlg = 0;
 
-  switch (theCommandID)
-  {
-    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:
-      getGeometryGUI()->getApp()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
-      break;
+  switch ( theCommandID ) {
+  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:
+    getGeometryGUI()->getApp()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
+    break;
   }
 
-  if (aDlg != NULL)
+  if ( aDlg ) {
+    aDlg->updateGeometry();
+    aDlg->resize( aDlg->minimumSizeHint() );
     aDlg->show();
+  }
 
   return true;
 }
@@ -91,7 +90,9 @@ bool BlocksGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 //=====================================================================================
 extern "C"
 {
- GEOM_BLOCKSGUI_EXPORT
+#ifdef WIN32
+  __declspec( dllexport )
+#endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
     return new BlocksGUI( parent );
index 9d546a29882ce8cd3a2a2ef67bc81b48f821354a..b9d48fb0e3454a2caee6b5780d4828dca14dda55 100644 (file)
@@ -1,6 +1,7 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  CEA
+//  Copyright (C) 2003-2007  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 along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BuildGUI.h
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
 //
-//
-//  File   : BuildGUI.h
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-
 #ifndef BLOCKSGUI_H
 #define BLOCKSGUI_H
 
-#include "GEOM_BlocksGUI.hxx"
-
-#include "GEOMGUI.h"
+#include <GEOMGUI.h>
 
 //=================================================================================
 // class    : BlocksGUI
 // purpose  :
 //=================================================================================
-class GEOM_BLOCKSGUI_EXPORT BlocksGUI : public GEOMGUI
+class BlocksGUI : public GEOMGUI
 {
- public:
-  BlocksGUI( GeometryGUI* parent );
+public:
+  BlocksGUI( GeometryGUI* );
   ~BlocksGUI();
 
-  bool OnGUIEvent (int theCommandID, SUIT_Desktop* parent);
+  bool OnGUIEvent( int, SUIT_Desktop* );
 };
 
-#endif
+#endif // BLOCKSGUI_H
index decb907fc97ce30d0863ba83fdad648c45498211..5ebb5f4ceb4074052a94508ab7262a5706553af3 100644 (file)
@@ -1,6 +1,7 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  CEA
+//  Copyright (C) 2003-2007  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 along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BlocksGUI_BlockDlg.cxx
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
 //
-//
-//  File   : BlocksGUI_BlockDlg.cxx
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-//  $Header$
-
 #include "BlocksGUI_BlockDlg.h"
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include "GEOMImpl_Types.hxx"
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
-#include <qlabel.h>
+// OCCT Includes
+#include <TColStd_IndexedMapOfInteger.hxx>
 
 //=================================================================================
 // class    : BlocksGUI_BlockDlg()
 // purpose  : Constructs a BlocksGUI_BlockDlg which is a child of 'parent'.
 //=================================================================================
-BlocksGUI_BlockDlg::BlocksGUI_BlockDlg (GeometryGUI* theGeometryGUI, QWidget* parent, bool modal)
-     : GEOMBase_Skeleton(theGeometryGUI, parent, "BlockDlg", modal,
-                         WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BlocksGUI_BlockDlg::BlocksGUI_BlockDlg (GeometryGUI* theGeometryGUI, QWidget* parent)
+  : GEOMBase_Skeleton(theGeometryGUI, parent),
+    myInitial(true)
 {
   QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_2F")));
   QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_6F")));
   QPixmap imageS (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_BLOCK_TITLE"));
+  setWindowTitle(tr("GEOM_BLOCK_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_BLOCK"));
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_BLOCK"));
 
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->close(TRUE);
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image1);
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
 
   // Create first group
-  Group2F = new DlgRef_2Sel_QTD(this, "Group2F");
+  Group2F = new DlgRef_2Sel (centralWidget());
   Group2F->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   Group2F->TextLabel1->setText(tr("FACE_1"));
   Group2F->TextLabel2->setText(tr("FACE_2"));
-  Group2F->PushButton1->setPixmap(imageS);
-  Group2F->PushButton2->setPixmap(imageS);
+  Group2F->PushButton1->setIcon(imageS);
+  Group2F->PushButton2->setIcon(imageS);
 
   // Create second group
-  Group6F = new DlgRef_6Sel_QTD(this, "Group2F");
+  Group6F = new DlgRef_6Sel (centralWidget());
   Group6F->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   Group6F->TextLabel1->setText(tr("FACE_1"));
   Group6F->TextLabel2->setText(tr("FACE_2"));
@@ -75,16 +78,19 @@ BlocksGUI_BlockDlg::BlocksGUI_BlockDlg (GeometryGUI* theGeometryGUI, QWidget* pa
   Group6F->TextLabel4->setText(tr("FACE_4"));
   Group6F->TextLabel5->setText(tr("FACE_5"));
   Group6F->TextLabel6->setText(tr("FACE_6"));
-  Group6F->PushButton1->setPixmap(imageS);
-  Group6F->PushButton2->setPixmap(imageS);
-  Group6F->PushButton3->setPixmap(imageS);
-  Group6F->PushButton4->setPixmap(imageS);
-  Group6F->PushButton5->setPixmap(imageS);
-  Group6F->PushButton6->setPixmap(imageS);
+  Group6F->PushButton1->setIcon(imageS);
+  Group6F->PushButton2->setIcon(imageS);
+  Group6F->PushButton3->setIcon(imageS);
+  Group6F->PushButton4->setIcon(imageS);
+  Group6F->PushButton5->setIcon(imageS);
+  Group6F->PushButton6->setIcon(imageS);
 
   // Add groups to layout
-  Layout1->addWidget(Group2F, 2, 0);
-  Layout1->addWidget(Group6F, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout (centralWidget());
+  layout->setMargin(0);
+  layout->setSpacing(6);
+  layout->addWidget(Group2F);
+  layout->addWidget(Group6F);
   /***************************************************************/
 
   setHelpFileName("build_by_blocks_page.html#hexa_solid_anchor");
@@ -119,9 +125,10 @@ void BlocksGUI_BlockDlg::Init()
   Group6F->LineEdit6->setReadOnly(true);
 
   // 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(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
 
   connect(Group2F->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(Group2F->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
@@ -133,9 +140,6 @@ void BlocksGUI_BlockDlg::Init()
   connect(Group6F->PushButton5, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(Group6F->PushButton6, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-
   // init controls and fields
   initName(tr("GEOM_BLOCK"));
 
@@ -154,41 +158,43 @@ void BlocksGUI_BlockDlg::ConstructorsClicked (int constructorId)
 
   myConstructorId = constructorId;
 
+  // init fields
+  myFace1 = myFace2 = GEOM::GEOM_Object::_nil();
+  myFace3 = myFace4 = myFace5 = myFace6 = myFace1;
+
   switch (constructorId) {
   case 0:
     Group6F->hide();
-    resize(0, 0);
     Group2F->show();
 
-    myEditCurrentArgument = Group2F->LineEdit1;
     Group2F->LineEdit1->setText(tr(""));
     Group2F->LineEdit2->setText(tr(""));
+
+    Group2F->PushButton1->click();
     break;
   case 1:
     Group2F->hide();
-    resize(0, 0);
     Group6F->show();
 
-    myEditCurrentArgument = Group6F->LineEdit1;
     Group6F->LineEdit1->setText(tr(""));
     Group6F->LineEdit2->setText(tr(""));
     Group6F->LineEdit3->setText(tr(""));
     Group6F->LineEdit4->setText(tr(""));
     Group6F->LineEdit5->setText(tr(""));
     Group6F->LineEdit6->setText(tr(""));
+
+    Group6F->PushButton1->click();
     break;
   default:
     break;
   }
 
-  // init fields
-  myFace1 = myFace2 = GEOM::GEOM_Object::_nil();
-  myFace3 = myFace4 = myFace5 = myFace6 = myFace1;
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
 
-  globalSelection(GEOM_FACE);
+  // on dialog initialization we init the first field with a selected object (if any)
   SelectionIntoArgument();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 }
 
 //=================================================================================
@@ -216,56 +222,111 @@ bool BlocksGUI_BlockDlg::ClickOnApply()
 
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed or other case
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void BlocksGUI_BlockDlg::SelectionIntoArgument()
 {
   erasePreview();
   myEditCurrentArgument->setText("");
 
-  if (IObjectCount() != 1)
-  {
-    if (myEditCurrentArgument == Group2F->LineEdit1 ||
-        myEditCurrentArgument == Group6F->LineEdit1)
-      myFace1 = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == Group2F->LineEdit2 ||
-             myEditCurrentArgument == Group6F->LineEdit2)
-      myFace2 = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == Group6F->LineEdit3)
-      myFace3 = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == Group6F->LineEdit4)
-      myFace4 = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == Group6F->LineEdit5)
-      myFace5 = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == Group6F->LineEdit6)
-      myFace6 = GEOM::GEOM_Object::_nil();
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
+    if      (myEditCurrentArgument == Group2F->LineEdit1) myFace1 = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == Group2F->LineEdit2) myFace2 = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == Group6F->LineEdit1) myFace1 = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == Group6F->LineEdit2) myFace2 = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == Group6F->LineEdit3) myFace3 = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == Group6F->LineEdit4) myFace4 = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == Group6F->LineEdit5) myFace5 = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == Group6F->LineEdit6) myFace6 = 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(aSelList.First(), testResult);
 
-  if (!testResult || CORBA::is_nil( aSelectedObject ))
+  if (!testResult || CORBA::is_nil(aSelectedObject))
     return;
 
-  if (myEditCurrentArgument == Group2F->LineEdit1 ||
-      myEditCurrentArgument == Group6F->LineEdit1)
+  QString aName = GEOMBase::GetName(aSelectedObject);
+
+  // Get Selected object if selected subshape
+  TopoDS_Shape aShape;
+  if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
+  {
+    TColStd_IndexedMapOfInteger aMap;
+    aSelMgr->GetIndexes(aSelList.First(), aMap);
+    if (aMap.Extent() == 1) // Local Selection
+    {
+      int anIndex = aMap(1);
+      aName += QString(":face_%1").arg(anIndex);
+
+      //Find SubShape Object in Father
+      GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
+
+      if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+        GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
+        aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+      }
+      else {
+        aSelectedObject = aFindedObject; // get Object from study
+      }
+    }
+    else // Global Selection
+    {
+      if (aShape.ShapeType() != TopAbs_FACE) {
+        aSelectedObject = GEOM::GEOM_Object::_nil();
+        aName = "";
+      }
+    }
+  }
+
+  myEditCurrentArgument->setText(aName);
+
+  if (myEditCurrentArgument == Group2F->LineEdit1) {
     myFace1 = aSelectedObject;
-  else if (myEditCurrentArgument == Group2F->LineEdit2 ||
-           myEditCurrentArgument == Group6F->LineEdit2)
+    if (!myFace1->_is_nil() && myFace2->_is_nil())
+      Group2F->PushButton2->click();
+  }
+  else if (myEditCurrentArgument == Group2F->LineEdit2) {
     myFace2 = aSelectedObject;
-  else if (myEditCurrentArgument == Group6F->LineEdit3)
+    if (!myFace2->_is_nil() && myFace1->_is_nil())
+      Group2F->PushButton1->click();
+  }
+  else if (myEditCurrentArgument == Group6F->LineEdit1) {
+    myFace1 = aSelectedObject;
+    if (!myFace1->_is_nil() && myFace2->_is_nil())
+      Group6F->PushButton2->click();
+  }
+  else if (myEditCurrentArgument == Group6F->LineEdit2) {
+    myFace2 = aSelectedObject;
+    if (!myFace2->_is_nil() && myFace3->_is_nil())
+      Group6F->PushButton3->click();
+  }
+  else if (myEditCurrentArgument == Group6F->LineEdit3) {
     myFace3 = aSelectedObject;
-  else if (myEditCurrentArgument == Group6F->LineEdit4)
+    if (!myFace3->_is_nil() && myFace4->_is_nil())
+      Group6F->PushButton4->click();
+  }
+  else if (myEditCurrentArgument == Group6F->LineEdit4) {
     myFace4 = aSelectedObject;
-  else if (myEditCurrentArgument == Group6F->LineEdit5)
+    if (!myFace4->_is_nil() && myFace5->_is_nil())
+      Group6F->PushButton5->click();
+  }
+  else if (myEditCurrentArgument == Group6F->LineEdit5) {
     myFace5 = aSelectedObject;
-  else if (myEditCurrentArgument == Group6F->LineEdit6)
+    if (!myFace5->_is_nil() && myFace6->_is_nil())
+      Group6F->PushButton6->click();
+  }
+  else if (myEditCurrentArgument == Group6F->LineEdit6) {
     myFace6 = aSelectedObject;
-
-  myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
+    if (!myFace6->_is_nil() && myFace1->_is_nil())
+      Group6F->PushButton1->click();
+  }
 
   displayPreview();
 }
@@ -278,29 +339,77 @@ void BlocksGUI_BlockDlg::SetEditCurrentArgument()
 {
   QPushButton* aSender = (QPushButton*)sender();
 
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  if (myInitial)
+    myInitial = false;
+  else
+    myGeomGUI->getApp()->selectionMgr()->clearSelected();
+
+  // disable all
+  switch (myConstructorId) {
+  case 0:
+    Group2F->PushButton1->setDown(false);
+    Group2F->PushButton2->setDown(false);
+
+    Group2F->LineEdit1->setEnabled(false);
+    Group2F->LineEdit2->setEnabled(false);
+    break;
+  case 1:
+    Group6F->PushButton1->setDown(false);
+    Group6F->PushButton2->setDown(false);
+    Group6F->PushButton3->setDown(false);
+    Group6F->PushButton4->setDown(false);
+    Group6F->PushButton5->setDown(false);
+    Group6F->PushButton6->setDown(false);
+
+    Group6F->LineEdit1->setEnabled(false);
+    Group6F->LineEdit2->setEnabled(false);
+    Group6F->LineEdit3->setEnabled(false);
+    Group6F->LineEdit4->setEnabled(false);
+    Group6F->LineEdit5->setEnabled(false);
+    Group6F->LineEdit6->setEnabled(false);
+    break;
+  default:
+    break;
+  }
+
+  // set line edit as current argument
   if (aSender == Group2F->PushButton1) {
     myEditCurrentArgument = Group2F->LineEdit1;
-  } else if (aSender == Group2F->PushButton2) {
+  }
+  else if (aSender == Group2F->PushButton2) {
     myEditCurrentArgument = Group2F->LineEdit2;
-
-  else if (aSender == Group6F->PushButton1) {
+  }
+  else if (aSender == Group6F->PushButton1) {
     myEditCurrentArgument = Group6F->LineEdit1;
-  } else if (aSender == Group6F->PushButton2) {
+  }
+  else if (aSender == Group6F->PushButton2) {
     myEditCurrentArgument = Group6F->LineEdit2;
-  } else if (aSender == Group6F->PushButton3) {
+  }
+  else if (aSender == Group6F->PushButton3) {
     myEditCurrentArgument = Group6F->LineEdit3;
-  } else if (aSender == Group6F->PushButton4) {
+  }
+  else if (aSender == Group6F->PushButton4) {
     myEditCurrentArgument = Group6F->LineEdit4;
-  } else if (aSender == Group6F->PushButton5) {
+  }
+  else if (aSender == Group6F->PushButton5) {
     myEditCurrentArgument = Group6F->LineEdit5;
-  } else if (aSender == Group6F->PushButton6) {
+  }
+  else if (aSender == Group6F->PushButton6) {
     myEditCurrentArgument = Group6F->LineEdit6;
   }
 
-  globalSelection(GEOM_FACE);
-
+  // enable push button and line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  aSender->setDown(true);
+
+  globalSelection(); // close local contexts, if any
+  localSelection(GEOM::GEOM_Object::_nil(), TopAbs_FACE); //Select Faces on All Shapes
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 }
 
 //=================================================================================
@@ -310,21 +419,20 @@ void BlocksGUI_BlockDlg::SetEditCurrentArgument()
 void BlocksGUI_BlockDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-
-  globalSelection(GEOM_FACE);
-
-  SelectionIntoArgument();
+  globalSelection(); // close local contexts, if any
+  localSelection(GEOM::GEOM_Object::_nil(), TopAbs_FACE); //Select Faces on All Shapes
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+  displayPreview();
 }
 
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BlocksGUI_BlockDlg::enterEvent (QEvent* e)
+void BlocksGUI_BlockDlg::enterEvent (QEvent*)
 {
-  if (!GroupConstructors->isEnabled())
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
@@ -343,17 +451,20 @@ GEOM::GEOM_IOperations_ptr BlocksGUI_BlockDlg::createOperation()
 //=================================================================================
 bool BlocksGUI_BlockDlg::isValid (QString&)
 {
+  bool ok = false;
   switch (getConstructorId()) {
-    case 0:
-      return !(myFace1->_is_nil() || myFace2->_is_nil());
-    case 1:
-      return !(myFace1->_is_nil() || myFace2->_is_nil() ||
-               myFace3->_is_nil() || myFace4->_is_nil() ||
-               myFace5->_is_nil() || myFace6->_is_nil());
-    default:
-      return false;
+  case 0:
+    ok = !(myFace1->_is_nil() || myFace2->_is_nil());
+    break;
+  case 1:
+    ok =  !(myFace1->_is_nil() || myFace2->_is_nil() ||
+            myFace3->_is_nil() || myFace4->_is_nil() ||
+            myFace5->_is_nil() || myFace6->_is_nil());
+    break;
+  default:
+    break;
   }
-  return false;
+  return ok;
 }
 
 //=================================================================================
@@ -367,22 +478,22 @@ bool BlocksGUI_BlockDlg::execute (ObjectList& objects)
   GEOM::GEOM_Object_var anObj;
 
   switch (getConstructorId()) {
-    case 0:
-      if (!CORBA::is_nil(myFace1) && !CORBA::is_nil(myFace2)) {
-        anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
-          MakeHexa2Faces(myFace1, myFace2);
-        res = true;
-      }
-      break;
-    case 1:
-      if (!CORBA::is_nil(myFace1) && !CORBA::is_nil(myFace2) &&
-          !CORBA::is_nil(myFace3) && !CORBA::is_nil(myFace4) &&
-          !CORBA::is_nil(myFace5) && !CORBA::is_nil(myFace6)) {
-        anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
-          MakeHexa(myFace1, myFace2, myFace3, myFace4, myFace5, myFace6);
-        res = true;
-      }
-      break;
+  case 0:
+    if (!CORBA::is_nil(myFace1) && !CORBA::is_nil(myFace2)) {
+      anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
+        MakeHexa2Faces(myFace1, myFace2);
+      res = true;
+    }
+    break;
+  case 1:
+    if (!CORBA::is_nil(myFace1) && !CORBA::is_nil(myFace2) &&
+        !CORBA::is_nil(myFace3) && !CORBA::is_nil(myFace4) &&
+        !CORBA::is_nil(myFace5) && !CORBA::is_nil(myFace6)) {
+      anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
+        MakeHexa(myFace1, myFace2, myFace3, myFace4, myFace5, myFace6);
+      res = true;
+    }
+    break;
   }
 
   if (!anObj->_is_nil())
@@ -390,3 +501,28 @@ bool BlocksGUI_BlockDlg::execute (ObjectList& objects)
 
   return res;
 }
+
+//=================================================================================
+// function : addSubshapesToStudy
+// purpose  : virtual method to add new SubObjects if local selection
+//=================================================================================
+void BlocksGUI_BlockDlg::addSubshapesToStudy()
+{
+  QMap<QString, GEOM::GEOM_Object_var> objMap;
+
+  switch (getConstructorId()) {
+  case 0:
+    objMap[Group2F->LineEdit1->text()] = myFace1;
+    objMap[Group2F->LineEdit2->text()] = myFace2;
+    break;
+  case 1:
+    objMap[Group6F->LineEdit1->text()] = myFace1;
+    objMap[Group6F->LineEdit2->text()] = myFace2;
+    objMap[Group6F->LineEdit3->text()] = myFace3;
+    objMap[Group6F->LineEdit4->text()] = myFace4;
+    objMap[Group6F->LineEdit5->text()] = myFace5;
+    objMap[Group6F->LineEdit6->text()] = myFace6;
+    break;
+  }
+  addSubshapesToFather(objMap);
+}
index 92801ac052d4561b1519c2b6588078d96ea2721c..23e372ba6e21301c507ee9a86f975b4ad12af952 100644 (file)
@@ -1,6 +1,7 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  CEA
+//  Copyright (C) 2003-2007  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 along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BlocksGUI_BlockDlg.h
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
 //
-//
-//  File   : BlocksGUI_BlockDlg.h
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-
-#ifndef DIALOGBOX_BLOCK_H
-#define DIALOGBOX_BLOCK_H
+#ifndef BLOCKSGUI_BLOCKDLG_H
+#define BLOCKSGUI_BLOCKDLG_H
 
-#include "GEOM_BlocksGUI.hxx"
-
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel_QTD.h"
-#include "DlgRef_6Sel_QTD.h"
+#include <GEOMBase_Skeleton.h>
 
+class DlgRef_2Sel;
+class DlgRef_6Sel;
 
 //=================================================================================
 // class    : BlocksGUI_BlockDlg
 // purpose  :
 //=================================================================================
-class GEOM_BLOCKSGUI_EXPORT BlocksGUI_BlockDlg : public GEOMBase_Skeleton
+class BlocksGUI_BlockDlg : public GEOMBase_Skeleton
 {
   Q_OBJECT
 
 public:
-  BlocksGUI_BlockDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
-                     bool modal = FALSE);
+  BlocksGUI_BlockDlg (GeometryGUI*, QWidget*);
   ~BlocksGUI_BlockDlg();
 
 protected:
   // redefined from GEOMBase_Helper
   virtual GEOM::GEOM_IOperations_ptr createOperation();
   virtual bool                       isValid (QString&);
-  virtual bool                       execute (ObjectList& objects);
+  virtual bool                       execute (ObjectList&);
+  virtual void                       addSubshapesToStudy();
 
 private:
-  void Init();
-  void enterEvent (QEvent* e);
+  void                               Init();
+  void                               enterEvent (QEvent*);
 
 private:
-  int                   myConstructorId;
+  int                                myConstructorId;
+
+  GEOM::GEOM_Object_var              myFace1, myFace2;
+  GEOM::GEOM_Object_var              myFace3, myFace4, myFace5, myFace6;
 
-  GEOM::GEOM_Object_var myFace1, myFace2;
-  GEOM::GEOM_Object_var myFace3, myFace4, myFace5, myFace6;
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
 
-  DlgRef_2Sel_QTD*      Group2F;
-  DlgRef_6Sel_QTD*      Group6F;
+  DlgRef_2Sel*                       Group2F;
+  DlgRef_6Sel*                       Group6F;
 
 private slots:
-  void ClickOnOk();
-  bool ClickOnApply();
-  void ActivateThisDialog();
-  void ConstructorsClicked (int constructorId);
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               ConstructorsClicked (int);
 
-  void SelectionIntoArgument();
-  void SetEditCurrentArgument();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // DIALOGBOX_BLOCK_H
+#endif // BLOCKSGUI_BLOCKDLG_H
index 802980698279688477ced74814802447948ac8df..8dcbdbbebcecabbca31809a59423381abcc8db42 100644 (file)
@@ -1,6 +1,7 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  CEA
+//  Copyright (C) 2003-2007  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 along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BlocksGUI_ExplodeDlg.cxx
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
 //
-//
-//  File   : BlocksGUI_ExplodeDlg.cxx
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-//  $Header$
-
 #include "BlocksGUI_ExplodeDlg.h"
 
-#include "DlgRef_SpinBox.h"
-
-#include "GEOM_Displayer.h"
-
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "OCCViewer_ViewModel.h"
-#include "SALOME_ListIteratorOfListIO.hxx"
-
-#include "utilities.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include <TColStd_IndexedMapOfInteger.hxx>
-
-#include <qmessagebox.h>
-#include <qtextedit.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
+#include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_ViewManager.h>
+#include <SUIT_MessageBox.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <OCCViewer_ViewModel.h>
+#include <SALOME_ListIteratorOfListIO.hxx>
 
 //=================================================================================
 // class    : BlocksGUI_ExplodeDlg()
 // purpose  : Constructs a BlocksGUI_ExplodeDlg which is a child of 'parent'.
 //=================================================================================
-BlocksGUI_ExplodeDlg::BlocksGUI_ExplodeDlg (GeometryGUI* theGeometryGUI, QWidget* parent, bool modal)
-     : GEOMBase_Skeleton(theGeometryGUI, parent, "ExplodeDlg", modal,
-                         WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BlocksGUI_ExplodeDlg::BlocksGUI_ExplodeDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
+  : GEOMBase_Skeleton( theGeometryGUI, parent )
 {
-  QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BLOCK_EXPLODE")));
-  QPixmap imageS (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BLOCK_EXPLODE" ) ) );
+  QPixmap imageS( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_BLOCK_EXPLODE_TITLE"));
+  setWindowTitle( tr( "GEOM_BLOCK_EXPLODE_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_BLOCK_EXPLODE"));
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_BLOCK_EXPLODE" ) );
 
-  RadioButton1->setPixmap(image1);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
+  mainFrame()->RadioButton1->setIcon( image1 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
 
   // Create first group
-  myGrp1 = new QGroupBox(1, Qt::Horizontal, tr("GEOM_ARGUMENTS"), this);
-
-  QGroupBox* aSelGrp = new QGroupBox(3, Qt::Horizontal, myGrp1);
-  aSelGrp->setFrameStyle(QFrame::NoFrame);
-  aSelGrp->setInsideMargin(0);
-
-  new QLabel(tr("GEOM_MAIN_OBJECT"), aSelGrp);
-  mySelBtn = new QPushButton(aSelGrp);
-  mySelBtn->setPixmap(imageS);
-  mySelName = new QLineEdit(aSelGrp);
-  mySelName->setReadOnly(true);
-
-  QGroupBox* aSpinGrp = new QGroupBox(2, Qt::Horizontal, myGrp1);
-  aSpinGrp->setFrameStyle(QFrame::NoFrame);
-  aSpinGrp->setInsideMargin(0);
-
-  new QLabel(tr("NB_FACES_MIN"), aSpinGrp);
-  mySpinBoxMin = new DlgRef_SpinBox(aSpinGrp);
-
-  new QLabel(tr("NB_FACES_MAX"), aSpinGrp);
-  mySpinBoxMax = new DlgRef_SpinBox(aSpinGrp);
-
-  QGroupBox* anInfoGrp = new QGroupBox(2, Qt::Horizontal, myGrp1);
-  anInfoGrp->setFrameStyle(QFrame::NoFrame);
-  anInfoGrp->setInsideMargin(0);
-
-  myBlocksNb = new QTextEdit(anInfoGrp);
-  myBlocksNb->setReadOnly(true);
-
-  QGroupBox* aCheckGrp = new QGroupBox(3, Qt::Horizontal, myGrp1);
-  aCheckGrp->setFrameStyle(QFrame::NoFrame);
-  aCheckGrp->setInsideMargin(0);
-
-  myCheckBtn = new QCheckBox(aCheckGrp, "CheckButton1");
-  myCheckBtn->setText(tr("GEOM_SUBSHAPE_SELECT"));
+  myGrp1 = new DlgRef_1Sel2Spin1View1Check( centralWidget() );
+  myGrp1->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
+  myGrp1->TextLabel1->setText( tr( "GEOM_MAIN_OBJECT" ) );
+  myGrp1->PushButton1->setIcon( imageS );
+  myGrp1->LineEdit1->setReadOnly( true );
+  myGrp1->TextLabel2->setText( tr( "NB_FACES_MIN" ) );
+  myGrp1->TextLabel3->setText( tr( "NB_FACES_MAX" ) );
+  myGrp1->CheckBox1->setText( tr( "GEOM_SUBSHAPE_SELECT" ) );
 
   // Add groups to layout
-  Layout1->addWidget(myGrp1, 1, 0);
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( myGrp1 );
   /***************************************************************/
 
-  setHelpFileName("explode_on_blocks_operation_page.html");
+  setHelpFileName( "explode_on_blocks_operation_page.html" );
 
   Init();
 }
@@ -128,57 +98,59 @@ BlocksGUI_ExplodeDlg::~BlocksGUI_ExplodeDlg()
 //=================================================================================
 void BlocksGUI_ExplodeDlg::Init()
 {
+  mainFrame()->GroupBoxName->hide();
+
   // Set range of spinboxes
-  double SpecificStep = 1.0;
-  mySpinBoxMin->RangeStepAndValidator(0.0, 999.0, SpecificStep, 3);
-  mySpinBoxMax->RangeStepAndValidator(0.0, 999.0, SpecificStep, 3);
+  int SpecificStep = 1;
+  initSpinBox( myGrp1->SpinBox1, 0, 999, SpecificStep );
+  initSpinBox( myGrp1->SpinBox2, 0, 999, SpecificStep );
 
-  if (SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType() 
-      != OCCViewer_Viewer::Type())
-    myCheckBtn->setEnabled(false);
+  if ( SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType() 
+       != OCCViewer_Viewer::Type() )
+    myGrp1->CheckBox1->setEnabled( false );
 
   // signals and slots connections
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
-  connect(mySelBtn, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect( myGrp1->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
 
-  connect(mySpinBoxMin, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(mySpinBoxMax, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+  connect( myGrp1->SpinBox1, SIGNAL( valueChanged( int ) ), this, SLOT( ValueChangedInSpinBox( int ) ) );
+  connect( myGrp1->SpinBox2, SIGNAL( valueChanged( int ) ), this, SLOT( ValueChangedInSpinBox( int ) ) );
 
-  connect(myCheckBtn, SIGNAL(stateChanged(int)), this, SLOT(SubShapeToggled()));
+  connect( myGrp1->CheckBox1, SIGNAL( stateChanged( int ) ), this, SLOT( SubShapeToggled() ) );
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   myConstructorId = -1;
-  ConstructorsClicked(0);
+  ConstructorsClicked( 0 );
 }
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void BlocksGUI_ExplodeDlg::ConstructorsClicked (int constructorId)
+void BlocksGUI_ExplodeDlg::ConstructorsClicked( int constructorId )
 {
-  if (myConstructorId == constructorId)
+  if ( myConstructorId == constructorId )
     return;
 
   myConstructorId = constructorId;
 
-  switch (constructorId) {
+  switch ( constructorId ) {
   case 0:
     myGrp1->show();
-    mySpinBoxMin->SetValue(6.0);
-    mySpinBoxMax->SetValue(6.0);
-    myCheckBtn->setChecked(FALSE);
+    myGrp1->SpinBox1->setValue( 6 );
+    myGrp1->SpinBox2->setValue( 6 );
+    myGrp1->CheckBox1->setChecked( false );
     break;
   default:
     break;
   }
 
   // init fields
-  myEditCurrentArgument = mySelName;
+  myEditCurrentArgument = myGrp1->LineEdit1;
   myObject = GEOM::GEOM_Object::_nil();
 
   activateSelection();
@@ -190,7 +162,7 @@ void BlocksGUI_ExplodeDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void BlocksGUI_ExplodeDlg::ClickOnOk()
 {
-  if (ClickOnApply())
+  if ( ClickOnApply() )
     ClickOnCancel();
 }
 
@@ -200,23 +172,22 @@ void BlocksGUI_ExplodeDlg::ClickOnOk()
 //=================================================================================
 bool BlocksGUI_ExplodeDlg::ClickOnApply()
 {
-  SUIT_Session::session()->activeApplication()->putInfo(tr(""));
+  SUIT_Session::session()->activeApplication()->putInfo( tr( "" ) );
 
   // Explode all sub shapes
-  if (isAllSubShapes()) {
+  if ( isAllSubShapes() ) {
     // More than 30 subshapes : ask confirmation
-    if (myNbBlocks > 30) {
-      const QString caption = tr("GEOM_CONFIRM");
-      const QString text = tr("GEOM_CONFIRM_INFO").arg(myNbBlocks);
-      const QString button0 = tr("GEOM_BUT_EXPLODE");
-      const QString button1 = tr("GEOM_BUT_CANCEL");
-
-      if (QMessageBox::warning(this, caption, text, button0, button1) != 0)
+    if ( myNbBlocks > 30 ) {
+      if ( SUIT_MessageBox::warning( this, 
+                                    tr( "GEOM_CONFIRM" ),
+                                    tr( "GEOM_CONFIRM_INFO" ).arg( myNbBlocks ),
+                                    tr( "GEOM_BUT_EXPLODE" ),
+                                    tr( "GEOM_BUT_CANCEL" ) ) != 0 )
         return false;  /* aborted */
     }
   }
 
-  if (!onAccept())
+  if ( !onAccept() )
     return false;
 
   activateSelection();
@@ -234,16 +205,19 @@ void BlocksGUI_ExplodeDlg::SelectionIntoArgument()
     return;
 
   myObject = GEOM::GEOM_Object::_nil();
-  mySelName->setText("");
+  myGrp1->LineEdit1->setText("");
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
 
-  if (IObjectCount() == 1) {
+  if (aSelList.Extent() == 1) {
     Standard_Boolean aResult = Standard_False;
-    GEOM::GEOM_Object_var anObj =
-      GEOMBase::ConvertIOinGEOMObject(firstIObject(), aResult);
+    GEOM::GEOM_Object_var anObj = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
 
-    if ( aResult && !anObj->_is_nil() && GEOMBase::IsShape( anObj ) ) {
+    if (aResult && !anObj->_is_nil() && GEOMBase::IsShape(anObj)) {
       myObject = anObj;
-      mySelName->setText(GEOMBase::GetName(anObj));
+      myGrp1->LineEdit1->setText(GEOMBase::GetName(anObj));
     }
   }
 
@@ -258,10 +232,10 @@ void BlocksGUI_ExplodeDlg::SetEditCurrentArgument()
 {
   QPushButton* aSender = (QPushButton*)sender();
 
-  if (mySelBtn == aSender) {
-    mySelName->setFocus();
-    myEditCurrentArgument = mySelName;
-    myCheckBtn->setChecked(FALSE);
+  if ( myGrp1->PushButton1 == aSender ) {
+    myGrp1->LineEdit1->setFocus();
+    myEditCurrentArgument = myGrp1->LineEdit1;
+    myGrp1->CheckBox1->setChecked( false );
   }
 
   activateSelection();
@@ -274,8 +248,8 @@ void BlocksGUI_ExplodeDlg::SetEditCurrentArgument()
 void BlocksGUI_ExplodeDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   activateSelection();
 }
@@ -284,9 +258,9 @@ void BlocksGUI_ExplodeDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BlocksGUI_ExplodeDlg::enterEvent (QEvent* e)
+void BlocksGUI_ExplodeDlg::enterEvent( QEvent* )
 {
-  if (!GroupConstructors->isEnabled())
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     this->ActivateThisDialog();
 }
 
@@ -294,9 +268,9 @@ void BlocksGUI_ExplodeDlg::enterEvent (QEvent* e)
 // function : ValueChangedInSpinBox()
 // purpose  :
 //=================================================================================
-void BlocksGUI_ExplodeDlg::ValueChangedInSpinBox (double newValue)
+void BlocksGUI_ExplodeDlg::ValueChangedInSpinBox()
 {
-  if (!isAllSubShapes())
+  if ( !isAllSubShapes() )
     activateSelection();
   else
     updateButtonState();
@@ -305,7 +279,7 @@ void BlocksGUI_ExplodeDlg::ValueChangedInSpinBox (double newValue)
 //=================================================================================
 // function : SubShapeToggled()
 // purpose  : Allow user selection of all or only selected sub shapes
-//          : Called when 'myCheckBtn' state change
+//          : Called when 'myGrp1->CheckBox1' state change
 //=================================================================================
 void BlocksGUI_ExplodeDlg::SubShapeToggled()
 {
@@ -319,20 +293,21 @@ void BlocksGUI_ExplodeDlg::SubShapeToggled()
 void BlocksGUI_ExplodeDlg::activateSelection()
 {
   clearTemporary();
-  erasePreview(true);
+  erasePreview( true );
 
-  if (isAllSubShapes()) { // Sub-shapes selection disabled
-    disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-              SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  if ( isAllSubShapes() ) { // Sub-shapes selection disabled
+    disconnect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+               SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
     globalSelection( GEOM_ALLSHAPES );
-    if (myObject->_is_nil()) {
+    if ( myObject->_is_nil() ) {
       SelectionIntoArgument();
     }
-    connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-           SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-  } else {
-    displayPreview(true, true, false);
-    globalSelection(GEOM_PREVIEW);
+    connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+            SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+  } 
+  else {
+    displayPreview( true, true, false );
+    globalSelection( GEOM_PREVIEW );
   }
 }
 
@@ -342,28 +317,30 @@ void BlocksGUI_ExplodeDlg::activateSelection()
 //=================================================================================
 void BlocksGUI_ExplodeDlg::updateButtonState()
 {
-  if (SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType() 
-      != OCCViewer_Viewer::Type() || myObject->_is_nil()) {
-    myCheckBtn->setChecked(FALSE);
-    myCheckBtn->setEnabled(FALSE);
-  } else {
-    myCheckBtn->setEnabled(TRUE);
+  if ( SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType() 
+       != OCCViewer_Viewer::Type() || myObject->_is_nil() ) {
+    myGrp1->CheckBox1->setChecked( false );
+    myGrp1->CheckBox1->setEnabled( false );
+  } 
+  else {
+    myGrp1->CheckBox1->setEnabled( true );
   }
 
   myNbBlocks = 0;
 
-  if (myObject->_is_nil()) {
-    myBlocksNb->setText("");
-  } else {
+  if ( myObject->_is_nil() ) {
+    myGrp1->TextBrowser1->setText( "" );
+  } 
+  else {
     bool isOnlyBlocks = GEOM::GEOM_IBlocksOperations::_narrow
-      (getOperation())->IsCompoundOfBlocks(myObject,
-                                           (int)mySpinBoxMin->GetValue(),
-                                           (int)mySpinBoxMax->GetValue(),
-                                           myNbBlocks);
-    if (isOnlyBlocks)
-      myBlocksNb->setText(tr("GEOM_NB_BLOCKS_NO_OTHERS").arg(myNbBlocks));
+      ( getOperation() )->IsCompoundOfBlocks( myObject,
+                                             myGrp1->SpinBox1->value(),
+                                             myGrp1->SpinBox2->value(),
+                                             myNbBlocks );
+    if ( isOnlyBlocks )
+      myGrp1->TextBrowser1->setText( tr( "GEOM_NB_BLOCKS_NO_OTHERS" ).arg( myNbBlocks ) );
     else
-      myBlocksNb->setText(tr("GEOM_NB_BLOCKS_SOME_OTHERS").arg(myNbBlocks));
+      myGrp1->TextBrowser1->setText( tr( "GEOM_NB_BLOCKS_SOME_OTHERS" ).arg( myNbBlocks ) );
   }
 }
 
@@ -373,7 +350,7 @@ void BlocksGUI_ExplodeDlg::updateButtonState()
 //=================================================================================
 bool BlocksGUI_ExplodeDlg::isAllSubShapes() const
 {
-  return !myCheckBtn->isChecked() || !myCheckBtn->isEnabled();
+  return !myGrp1->CheckBox1->isChecked() || !myGrp1->CheckBox1->isEnabled();
 }
 
 //=================================================================================
@@ -382,93 +359,122 @@ bool BlocksGUI_ExplodeDlg::isAllSubShapes() const
 //=================================================================================
 GEOM::GEOM_IOperations_ptr BlocksGUI_ExplodeDlg::createOperation()
 {
-  return getGeomEngine()->GetIBlocksOperations(getStudyId());
+  return getGeomEngine()->GetIBlocksOperations( getStudyId() );
 }
 
 //=================================================================================
 // function : isValid()
 // purpose  : Verify validity of input data
 //=================================================================================
-bool BlocksGUI_ExplodeDlg::isValid (QString&)
+bool BlocksGUI_ExplodeDlg::isValid (QString& msg)
 {
-  switch (getConstructorId()) {
+  bool okSP = true;
+  okSP = myGrp1->SpinBox1->isValid( msg, !IsPreview() ) && okSP;
+  okSP = myGrp1->SpinBox2->isValid( msg, !IsPreview() ) && okSP;
+
+  bool ok = false;
+  switch ( getConstructorId() ) {
   case 0:
-    if (IsPreview())
-      return !myObject->_is_nil();
-    else
-      return !myObject->_is_nil() && (isAllSubShapes() || IObjectCount());
+    if ( IsPreview() ) {
+      ok = !myObject->_is_nil();
+    }
+    else {
+      LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+      SALOME_ListIO aSelList;
+      aSelMgr->selectedObjects(aSelList);
+
+      ok = !myObject->_is_nil() && (isAllSubShapes() || aSelList.Extent());
+    }
+    break;
   default:
-    return false;
+    break;
   }
 
-  return false;
+  return ok && okSP;
 }
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool BlocksGUI_ExplodeDlg::execute (ObjectList& objects)
+bool BlocksGUI_ExplodeDlg::execute( ObjectList& objects )
 {
   GEOM::ListOfGO_var aList;
 
-  switch (getConstructorId()) {
-    case 0:
-      aList = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->ExplodeCompoundOfBlocks
-        (myObject,
-         (int)mySpinBoxMin->GetValue(),
-         (int)mySpinBoxMax->GetValue());
-      break;
+  switch ( getConstructorId() ) {
+  case 0:
+    aList = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() )->ExplodeCompoundOfBlocks
+      myObject,
+       myGrp1->SpinBox1->value(),
+       myGrp1->SpinBox2->value() );
+    break;
   }
-
-  if (!aList->length())
+  
+  if ( !aList->length() )
     return false;
 
-  if (IsPreview()) {
+  if ( IsPreview() ) {
     clearTemporary();
-
+    
     // Store objects. They will be put in study when "Apply" is pressed
-    for (int i = 0, n = aList->length(); i < n; i++) {
-      objects.push_back(GEOM::GEOM_Object::_duplicate(aList[i]));
-      myTmpObjs.push_back(GEOM::GEOM_Object::_duplicate(aList[i]));
+    for ( int i = 0, n = aList->length(); i < n; i++ ) {
+      objects.push_back( GEOM::GEOM_Object::_duplicate( aList[i] ) );
+      myTmpObjs.push_back( GEOM::GEOM_Object::_duplicate( aList[i] ) );
     }
 
-    return objects.size() ? true : false;
+    return objects.size() > 0;
   }
 
+  QStringList aParameters;
+  aParameters << myGrp1->SpinBox1->text();
+  aParameters << myGrp1->SpinBox2->text();
+
   // Throw away sub-shapes not selected by user if not in preview mode
   // and manual selection is active
-  if (!isAllSubShapes())
-  {
+  if ( !isAllSubShapes() ) {
     QMap<QString, char> selected;
 
+    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+    SALOME_ListIO aSelList;
+    aSelMgr->selectedObjects(aSelList);
+
     // Get names of selected objects
-    SALOME_ListIteratorOfListIO it (selectedIO());
-    for (; it.More(); it.Next()) {
-      selected.insert(it.Value()->getName(), 0);
+    SALOME_ListIteratorOfListIO it (aSelList);
+    for ( ; it.More(); it.Next() ) {
+      selected.insert( it.Value()->getName(), 0 );
     }
 
     // Iterate through result and select objects with names from selection
-    ObjectList toRemoveFromEnggine;
+    ObjectList toRemoveFromEngine;
     ObjectList::iterator anIter;
-    for (anIter = myTmpObjs.begin(); anIter != myTmpObjs.end(); ++anIter) {
-      CORBA::String_var objStr = myGeomGUI->getApp()->orb()->object_to_string(*anIter);
-      if (selected.contains(QString(objStr.in())))
-        objects.push_back(*anIter);
+    for ( anIter = myTmpObjs.begin(); anIter != myTmpObjs.end(); ++anIter ) {
+      CORBA::String_var objStr = myGeomGUI->getApp()->orb()->object_to_string( *anIter );
+      if ( selected.contains( QString( objStr.in() ) ) )
+      {
+       if ( !IsPreview() )
+         (*anIter)->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+        objects.push_back( *anIter );
+      }
       else
-        toRemoveFromEnggine.push_back(*anIter);
+        toRemoveFromEngine.push_back( *anIter );
     }
 
     // Remove from engine useless objects
-    ObjectList::iterator anIter2 = toRemoveFromEnggine.begin();
-    for (; anIter2 != toRemoveFromEnggine.end(); ++anIter2)
-      getGeomEngine()->RemoveObject(*anIter2);
+    ObjectList::iterator anIter2 = toRemoveFromEngine.begin();
+    for ( ; anIter2 != toRemoveFromEngine.end(); ++anIter2 )
+      getGeomEngine()->RemoveObject( *anIter2 );
 
     myTmpObjs.clear();
 
-  } else {
-    for (int i = 0, n = aList->length(); i < n; i++)
-      objects.push_back(GEOM::GEOM_Object::_duplicate(aList[i]));
+  }
+  else {
+    for ( int i = 0, n = aList->length(); i < n; i++ )
+    {
+      GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object::_duplicate( aList[i] );
+      if ( !IsPreview() )
+       anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+      objects.push_back( anObj._retn() );
+    }
   }
 
   return objects.size();
@@ -481,8 +487,8 @@ bool BlocksGUI_ExplodeDlg::execute (ObjectList& objects)
 void BlocksGUI_ExplodeDlg::clearTemporary()
 {
   ObjectList::iterator anIter;
-  for (anIter = myTmpObjs.begin(); anIter != myTmpObjs.end(); ++anIter)
-    getGeomEngine()->RemoveObject(*anIter);
+  for ( anIter = myTmpObjs.begin(); anIter != myTmpObjs.end(); ++anIter )
+    getGeomEngine()->RemoveObject( *anIter );
 
   myTmpObjs.clear();
 }
@@ -492,7 +498,7 @@ void BlocksGUI_ExplodeDlg::clearTemporary()
 // Purpose  : Get father object for object to be added in study
 //            ( called with addInStudy method )
 //================================================================
-GEOM::GEOM_Object_ptr BlocksGUI_ExplodeDlg::getFather (GEOM::GEOM_Object_ptr)
+GEOM::GEOM_Object_ptr BlocksGUI_ExplodeDlg::getFather( GEOM::GEOM_Object_ptr )
 {
   return myObject;
 }
@@ -501,7 +507,7 @@ GEOM::GEOM_Object_ptr BlocksGUI_ExplodeDlg::getFather (GEOM::GEOM_Object_ptr)
 // Function : getNewObjectName
 // Purpose  : Redefine this method to return proper name for a new object
 //================================================================
-const char* BlocksGUI_ExplodeDlg::getNewObjectName() const
+QString BlocksGUI_ExplodeDlg::getNewObjectName() const
 {
-  return "";
+  return QString::null;
 }
index 8e309ecfdbfd6a8c1535b54ad9988b6c9ba13d78..63b616a4d05558e84a6ee40dac862866d8a4d24f 100644 (file)
@@ -1,6 +1,7 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  CEA
+//  Copyright (C) 2003-2007  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 along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BlocksGUI_ExplodeDlg.h
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
 //
-//
-//  File   : BlocksGUI_ExplodeDlg.h
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-
-#ifndef DIALOGBOX_BLOCK_EXPLODE_H
-#define DIALOGBOX_BLOCK_EXPLODE_H
+#ifndef BLOCKSGUI_EXPLODEDLG_H
+#define BLOCKSGUI_EXPLODEDLG_H
 
-#include "GEOM_BlocksGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-
-class DlgRef_SpinBox;
-class QTextEdit;
-class QCheckBox;
+class DlgRef_1Sel2Spin1View1Check;
 
 //=================================================================================
 // class    : BlocksGUI_ExplodeDlg
 // purpose  :
 //=================================================================================
-class GEOM_BLOCKSGUI_EXPORT BlocksGUI_ExplodeDlg : public GEOMBase_Skeleton
+class BlocksGUI_ExplodeDlg : public GEOMBase_Skeleton
 {
   Q_OBJECT
 
 public:
-  BlocksGUI_ExplodeDlg (GeometryGUI*, QWidget* parent, bool modal = FALSE);
+  BlocksGUI_ExplodeDlg( GeometryGUI*, QWidget* );
   ~BlocksGUI_ExplodeDlg();
 
 protected:
   // redefined from GEOMBase_Helper
   virtual GEOM::GEOM_IOperations_ptr createOperation();
-  virtual bool                       isValid (QString& msg);
-  virtual bool                       execute (ObjectList& objects);
-  virtual GEOM::GEOM_Object_ptr      getFather(GEOM::GEOM_Object_ptr theObj);
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual GEOM::GEOM_Object_ptr      getFather( GEOM::GEOM_Object_ptr );
 
-  virtual const char*                getNewObjectName() const; 
+  virtual QString                    getNewObjectName() const; 
 
 private:
-  void Init();
-  void enterEvent (QEvent* e);
+  void                               Init();
+  void                               enterEvent( QEvent* );
 
-  void activateSelection();
+  void                               activateSelection();
 
-  void updateButtonState();
-  bool isAllSubShapes() const;
-  int  shapeType() const;
+  void                               updateButtonState();
+  bool                               isAllSubShapes() const;
+  int                                shapeType() const;
 
-  void clearTemporary();
+  void                               clearTemporary();
 
 private:
-  int                        myConstructorId;
-
-  CORBA::Long                myNbBlocks;
-  GEOM::GEOM_Object_var      myObject;
-
-  ObjectList                 myTmpObjs;
-
-  QFrame*                    myGrp1;
-
-  QPushButton*               mySelBtn;
-  QLineEdit*                 mySelName;
+  int                                myConstructorId;
 
-  DlgRef_SpinBox*            mySpinBoxMin;
-  DlgRef_SpinBox*            mySpinBoxMax;
+  CORBA::Long                        myNbBlocks;
+  GEOM::GEOM_Object_var              myObject;
 
-  QTextEdit*                 myBlocksNb;
+  ObjectList                         myTmpObjs;
 
-  QCheckBox*                 myCheckBtn;
+  DlgRef_1Sel2Spin1View1Check*       myGrp1;
 
 private slots:
-  void ClickOnOk();
-  bool ClickOnApply();
-  void ActivateThisDialog();
-  void ConstructorsClicked (int constructorId);
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               ConstructorsClicked( int );
 
-  void SelectionIntoArgument();
-  void SetEditCurrentArgument();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 
-  void SubShapeToggled();
+  void                               SubShapeToggled();
 
-  void ValueChangedInSpinBox (double newValue);
+  void                               ValueChangedInSpinBox();
 };
 
-#endif // DIALOGBOX_BLOCK_EXPLODE_H
+#endif // BLOCKSGUI_EXPLODEDLG_H
index 8cd43fedc37905c84a3c0a3690ac738fb78b7bf9..07801d8a1a4b88a31d410e83c70043939b821ccd 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BlocksGUI_PropagateDlg.cxx
+// Author : Vladimir KLYACHIN, Open CASCADE S.A.S. (vladimir.klyachin@opencascade.com)
 //
-//
-//  File   : BlocksGUI_PropagateDlg.cxx
-//  Author : VKN
-//  Module : GEOM
-//  $Header$
-
 #include "BlocksGUI_PropagateDlg.h"
-#include "GEOMImpl_Types.hxx"
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+#include <GEOMImpl_Types.hxx>
 
-#include <TColStd_MapOfInteger.hxx>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
-#include <qlabel.h>
-
-using namespace std;
+#include <TColStd_MapOfInteger.hxx>
 
 //=================================================================================
 // class    : BlocksGUI_PropagateDlg()
@@ -46,38 +44,35 @@ 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(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)
+BlocksGUI_PropagateDlg::BlocksGUI_PropagateDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
+  : GEOMBase_Skeleton( theGeometryGUI, parent )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PROPAGATE")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_PROPAGATE" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_PROPAGATE_TITLE"));
+  setWindowTitle( tr( "GEOM_PROPAGATE_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_PROPAGATE_TITLE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  QGroupBox* aMainGrp = new QGroupBox( 1, Qt::Horizontal, tr( "GEOM_SELECTED_SHAPE" ), this );
-  QGroupBox* aSelGrp = new QGroupBox(3, Qt::Horizontal, aMainGrp);
-  aSelGrp->setFrameStyle(QFrame::NoFrame);
-  aSelGrp->setInsideMargin(0);
-
-  new QLabel(tr("GEOM_OBJECT"), aSelGrp);
-  mySelBtn = new QPushButton(aSelGrp);
-  mySelBtn->setPixmap(image1);
-  mySelName = new QLineEdit(aSelGrp);
-  mySelName->setReadOnly(true);
-
-  Layout1->addWidget(aMainGrp, 1, 0);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_PROPAGATE_TITLE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  myGrp = new DlgRef_1Sel( centralWidget() );
+  myGrp->GroupBox1->setTitle( tr( "GEOM_SELECTED_SHAPE" ) );
+  myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) );
+  myGrp->PushButton1->setIcon( image1 );
+  myGrp->LineEdit1->setReadOnly( true );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( myGrp );
 
   /***************************************************************/
 
-  setHelpFileName("propagate_operation_page.html");
+  setHelpFileName( "propagate_operation_page.html" );
 
   Init();
 }
@@ -99,16 +94,17 @@ void BlocksGUI_PropagateDlg::Init()
   /* init variables */
 
   myObject = GEOM::GEOM_Object::_nil();
-  ResultName->setText( "" );
+  mainFrame()->ResultName->setText( "" );
+  mainFrame()->GroupBoxName->hide();
 
   //myGeomGUI->SetState( 0 );
 
   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
-  connect(mySelBtn, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(mySelName, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( myGrp->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( myGrp->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
   activateSelection();
 }
@@ -135,7 +131,7 @@ bool BlocksGUI_PropagateDlg::ClickOnApply()
 
   initName();
 
-  mySelName->setText("");
+  myGrp->LineEdit1->setText( "" );
   myObject = GEOM::GEOM_Object::_nil();
 
   activateSelection();
@@ -150,15 +146,19 @@ bool BlocksGUI_PropagateDlg::ClickOnApply()
 //=================================================================================
 void BlocksGUI_PropagateDlg::SelectionIntoArgument()
 {
-  mySelName->setText("");
+  myGrp->LineEdit1->setText( "" );
   myObject = GEOM::GEOM_Object::_nil();
 
-  if ( IObjectCount() == 1 ) {
-    Handle(SALOME_InteractiveObject) anIO = firstIObject();
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() == 1) {
+    Handle(SALOME_InteractiveObject) anIO = aSelList.First();
     Standard_Boolean aRes;
     myObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
     if ( aRes )
-      mySelName->setText( GEOMBase::GetName( myObject ) );
+      myGrp->LineEdit1->setText( GEOMBase::GetName( myObject ) );
   }
 }
 
@@ -169,8 +169,8 @@ void BlocksGUI_PropagateDlg::SelectionIntoArgument()
 void BlocksGUI_PropagateDlg::SetEditCurrentArgument()
 {
   const QObject* send = sender();
-  if ( send == mySelBtn )  {
-    mySelName->setFocus();
+  if ( send == myGrp->PushButton1 )  {
+    myGrp->LineEdit1->setFocus();
   }
   activateSelection();
 }
@@ -183,7 +183,7 @@ void BlocksGUI_PropagateDlg::SetEditCurrentArgument()
 void BlocksGUI_PropagateDlg::LineEditReturnPressed()
 {
   const QObject* send = sender();
-  if( send == mySelName ) {
+  if ( send == myGrp->LineEdit1 ) {
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
 }
@@ -197,7 +197,7 @@ void BlocksGUI_PropagateDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
 
-  mySelName->setText("");
+  myGrp->LineEdit1->setText( "" );
   myObject = GEOM::GEOM_Object::_nil();
 
   //myGeomGUI->SetState( 0 );
@@ -209,23 +209,12 @@ void BlocksGUI_PropagateDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  : Mouse enter onto the dialog to activate it
 //=================================================================================
-void BlocksGUI_PropagateDlg::enterEvent(QEvent* e)
+void BlocksGUI_PropagateDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
-
-//=================================================================================
-// function : closeEvent()
-// purpose  :
-//=================================================================================
-void BlocksGUI_PropagateDlg::closeEvent(QCloseEvent* e)
-{
-  //myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : createOperation
 // purpose  :
@@ -239,7 +228,7 @@ GEOM::GEOM_IOperations_ptr BlocksGUI_PropagateDlg::createOperation()
 // function : isValid
 // purpose  :
 //=================================================================================
-bool BlocksGUI_PropagateDlg::isValid( QString& msg )
+bool BlocksGUI_PropagateDlg::isValid( QString& )
 {
   return !myObject->_is_nil() ;
 }
@@ -250,19 +239,17 @@ bool BlocksGUI_PropagateDlg::isValid( QString& msg )
 //=================================================================================
 bool BlocksGUI_PropagateDlg::execute( ObjectList& objects )
 {
-
   GEOM::ListOfGO_var aList = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() )->Propagate( myObject );
-  ResultName->setText( "" );
+  mainFrame()->ResultName->setText( "" );
 
   if ( !aList->length() )
     return false;
 
-  for ( int i = 0, n = aList->length(); i < n; i++ )
-  {
-    objects.push_back(aList[i]._retn());
+  for ( int i = 0, n = aList->length(); i < n; i++ ) {
+    objects.push_back( aList[i]._retn() );
   }
 
-  return objects.size() ? true : false;
+  return objects.size() > 0;
 }
 
 //=================================================================================
@@ -275,11 +262,11 @@ void BlocksGUI_PropagateDlg::activateSelection()
   aMap.Add( GEOM_SOLID );
   aMap.Add( GEOM_COMPOUND );
   globalSelection( aMap );
-  if (myObject->_is_nil()) {
+  if ( myObject->_is_nil() ) {
     SelectionIntoArgument();
   }
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 }
 
 //================================================================
@@ -287,7 +274,7 @@ void BlocksGUI_PropagateDlg::activateSelection()
 // Purpose  : Get father object for object to be added in study
 //            ( called with addInStudy method )
 //================================================================
-GEOM::GEOM_Object_ptr BlocksGUI_PropagateDlg::getFather (GEOM::GEOM_Object_ptr)
+GEOM::GEOM_Object_ptr BlocksGUI_PropagateDlg::getFather( GEOM::GEOM_Object_ptr )
 {
   return myObject;
 }
index e6236d6323db257262dab655f49b29b6d1b816b3..a4eaf5a832a522abbbdb83fc9ded38cfd53abe81 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BlocksGUI_PropagateDlg.h
+// Author : Vladimir KLYACHIN, Open CASCADE S.A.S. (vladimir.klyachin@opencascade.com)
 //
-//
-//  File   : BlocksGUI_PropagateDlg.h
-//  Author : VKN
-//  Module : GEOM
-
-#ifndef DIALOGBOX_BlocksGUI_PropagateDlg_H
-#define DIALOGBOX_BlocksGUI_PropagateDlg_H
-
-#include "GEOM_BlocksGUI.hxx"
+#ifndef BLOCKSGUI_PROPAGATEDLG_H
+#define BLOCKSGUI_PROPAGATEDLG_H
 
-#include "GEOMBase_Skeleton.h"
+#include <GEOMBase_Skeleton.h>
 
+class DlgRef_1Sel;
 
 //=================================================================================
 // class    : BlocksGUI_PropagateDlg
 // purpose  :
 //=================================================================================
-class GEOM_BLOCKSGUI_EXPORT BlocksGUI_PropagateDlg : public GEOMBase_Skeleton
+class BlocksGUI_PropagateDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BlocksGUI_PropagateDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                          const char* name = "", bool modal = FALSE, WFlags fl = 0);
-    ~BlocksGUI_PropagateDlg();
+  BlocksGUI_PropagateDlg( GeometryGUI*, QWidget* = 0 );
+  ~BlocksGUI_PropagateDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual GEOM::GEOM_Object_ptr getFather(GEOM::GEOM_Object_ptr theObj);
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual GEOM::GEOM_Object_ptr      getFather( GEOM::GEOM_Object_ptr );
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
 
-    void ActivateThisDialog();
+  void                               ActivateThisDialog();
 
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    void closeEvent(QCloseEvent* e);
-    void activateSelection();
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  void                               activateSelection();
 
 private:
-    GEOM::GEOM_Object_var      myObject;
-    QPushButton*               mySelBtn;
-    QLineEdit*                 mySelName;
+  GEOM::GEOM_Object_var              myObject;
+  DlgRef_1Sel*                       myGrp;
 };
 
-#endif // DIALOGBOX_BlocksGUI_PropagateDlg_H
+#endif // BLOCKSGUI_PROPAGATEDLG_H
index 06c2136d70708a9ba4e8de637fab13962a2417ed..930af1c45ea49c74b1673e64a5225411ae6fbd8e 100644 (file)
@@ -1,6 +1,7 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  CEA
+//  Copyright (C) 2003-2007  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 along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BlocksGUI_QuadFaceDlg.cxx
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
 //
-//
-//  File   : BlocksGUI_QuadFaceDlg.cxx
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-//  $Header$
-
 #include "BlocksGUI_QuadFaceDlg.h"
-#include "GEOMImpl_Types.hxx"
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+
+// QT Includes
 #include <qlabel.h>
 
+// OCCT Includes
+#include <TopAbs.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+
+#include <GEOMImpl_Types.hxx>
+
 //=================================================================================
 // class    : BlocksGUI_QuadFaceDlg()
 // purpose  : Constructs a BlocksGUI_QuadFaceDlg which is a child of 'parent'.
 //=================================================================================
-BlocksGUI_QuadFaceDlg::BlocksGUI_QuadFaceDlg (GeometryGUI* theGeometryGUI, QWidget* parent, bool modal)
-     : GEOMBase_Skeleton(theGeometryGUI, parent, "QuadFaceDlg", modal,
-                         WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BlocksGUI_QuadFaceDlg::BlocksGUI_QuadFaceDlg (GeometryGUI* theGeometryGUI, QWidget* parent)
+  : GEOMBase_Skeleton(theGeometryGUI, parent),
+    myInitial(true)
 {
   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")));
+  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"));
+  setWindowTitle(tr("GEOM_QUAD_FACE_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_QUAD_FACE"));
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_QUAD_FACE"));
 
-  RadioButton1->setPixmap(image1);
-  RadioButton2->setPixmap(image2);
-  RadioButton3->setPixmap(image3);
+  mainFrame()->RadioButton1->setIcon(image1);
+  mainFrame()->RadioButton2->setIcon(image2);
+  mainFrame()->RadioButton3->setIcon(image3);
 
   // Create first group
-  myGrp1 = new QGroupBox(1, Qt::Horizontal, tr("GEOM_ARGUMENTS"), this);
-
-  QGroupBox* aSelGrp1 = new QGroupBox(3, Qt::Horizontal, myGrp1);
-  aSelGrp1->setFrameStyle(QFrame::NoFrame);
-  aSelGrp1->setInsideMargin(0);
+  myGrp1 = new QGroupBox(tr("GEOM_ARGUMENTS"), centralWidget());
 
-  createSelWg(tr("VERTEX_1"), imageS, aSelGrp1, Vertex1);
-  createSelWg(tr("VERTEX_2"), imageS, aSelGrp1, Vertex2);
-  createSelWg(tr("VERTEX_3"), imageS, aSelGrp1, Vertex3);
-  createSelWg(tr("VERTEX_4"), imageS, aSelGrp1, Vertex4);
+  createSelWg(tr("VERTEX_1"), imageS, myGrp1, Vertex1);
+  createSelWg(tr("VERTEX_2"), imageS, myGrp1, Vertex2);
+  createSelWg(tr("VERTEX_3"), imageS, myGrp1, Vertex3);
+  createSelWg(tr("VERTEX_4"), imageS, myGrp1, Vertex4);
 
   // Create second group
-  myGrp2 = new QGroupBox(1, Qt::Horizontal, tr("GEOM_ARGUMENTS"), this);
+  myGrp2 = new QGroupBox(tr("GEOM_ARGUMENTS"), centralWidget());
 
-  QGroupBox* aSelGrp2 = new QGroupBox(3, Qt::Horizontal, myGrp2);
-  aSelGrp2->setFrameStyle(QFrame::NoFrame);
-  aSelGrp2->setInsideMargin(0);
-
-  createSelWg(tr("EDGE_1"), imageS, aSelGrp2, Edge12);
-  createSelWg(tr("EDGE_2"), imageS, aSelGrp2, Edge22);
+  createSelWg(tr("EDGE_1"), imageS, myGrp2, Edge12);
+  createSelWg(tr("EDGE_2"), imageS, myGrp2, Edge22);
 
   // Create fird group
-  myGrp3 = new QGroupBox(1, Qt::Horizontal, tr("GEOM_ARGUMENTS"), this);
-
-  QGroupBox* aSelGrp3 = new QGroupBox(3, Qt::Horizontal, myGrp3);
-  aSelGrp3->setFrameStyle(QFrame::NoFrame);
-  aSelGrp3->setInsideMargin(0);
+  myGrp3 = new QGroupBox(tr("GEOM_ARGUMENTS"), centralWidget());
 
-  createSelWg(tr("EDGE_1"), imageS, aSelGrp3, Edge14);
-  createSelWg(tr("EDGE_2"), imageS, aSelGrp3, Edge24);
-  createSelWg(tr("EDGE_3"), imageS, aSelGrp3, Edge34);
-  createSelWg(tr("EDGE_4"), imageS, aSelGrp3, Edge44);
-
-  (new QLabel(myGrp3))->setSizePolicy(
-    QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+  createSelWg(tr("EDGE_1"), imageS, myGrp3, Edge14);
+  createSelWg(tr("EDGE_2"), imageS, myGrp3, Edge24);
+  createSelWg(tr("EDGE_3"), imageS, myGrp3, Edge34);
+  createSelWg(tr("EDGE_4"), imageS, myGrp3, Edge44);
 
   // Add groups to layout
-  Layout1->addWidget(myGrp1, 2, 0);
-  Layout1->addWidget(myGrp2, 2, 0);
-  Layout1->addWidget(myGrp3, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(myGrp1);
+  layout->addWidget(myGrp2);
+  layout->addWidget(myGrp3);
   /***************************************************************/
 
   setHelpFileName("build_by_blocks_page.html#quad_face_anchor");
@@ -121,16 +117,14 @@ BlocksGUI_QuadFaceDlg::~BlocksGUI_QuadFaceDlg()
 void BlocksGUI_QuadFaceDlg::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(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
 
   QMap<int, QPushButton*>::iterator anIterBtn;
   for (anIterBtn = mySelBtn.begin(); anIterBtn != mySelBtn.end(); ++anIterBtn)
-    connect(anIterBtn.data(), SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+    connect(anIterBtn.value(), SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
 
   // init controls and fields
   initName(tr("GEOM_QUAD_FACE"));
@@ -150,39 +144,44 @@ void BlocksGUI_QuadFaceDlg::ConstructorsClicked (int constructorId)
 
   myConstructorId = constructorId;
 
+  // init fields
+  myShape1 = myShape2 = GEOM::GEOM_Object::_nil();
+  myShape3 = myShape4 = myShape1;
+
+  // clear line edits
+  QMap<int, QLineEdit*>::iterator anIterLE;
+  for (anIterLE = mySelName.begin(); anIterLE != mySelName.end(); ++anIterLE)
+    anIterLE.value()->setText("");
+
   switch (constructorId) {
   case 0:
     myGrp2->hide();
     myGrp3->hide();
     myGrp1->show();
-    myEditCurrentArgument = mySelName[Vertex1];
+    mySelBtn[Vertex1]->click();
     break;
   case 1:
     myGrp1->hide();
     myGrp3->hide();
     myGrp2->show();
-    myEditCurrentArgument = mySelName[Edge12];
+    mySelBtn[Edge12]->click();
     break;
   case 2:
     myGrp1->hide();
     myGrp2->hide();
     myGrp3->show();
-    myEditCurrentArgument = mySelName[Edge14];
+    mySelBtn[Edge14]->click();
     break;
   default:
     break;
   }
 
-  // clear line edits
-  QMap<int, QLineEdit*>::iterator anIterLE;
-  for (anIterLE = mySelName.begin(); anIterLE != mySelName.end(); ++anIterLE)
-    anIterLE.data()->setText("");
-
-  // init fields
-  myShape1 = myShape2 = GEOM::GEOM_Object::_nil();
-  myShape3 = myShape4 = myShape1;
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
 
-  activateSelection();
+  // on dialog initialization we init the first field with a selected object (if any)
+  SelectionIntoArgument();
 }
 
 //=================================================================================
@@ -210,48 +209,136 @@ bool BlocksGUI_QuadFaceDlg::ClickOnApply()
 
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection has changed
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void BlocksGUI_QuadFaceDlg::SelectionIntoArgument()
 {
   erasePreview();
-  myEditCurrentArgument->setText("");
 
   // Get index of current selection focus
   int aCurrFocus = -1;
   QMap<int, QLineEdit*>::iterator anIter;
   for (anIter = mySelName.begin(); anIter != mySelName.end(); ++anIter) {
-    if (myEditCurrentArgument == anIter.data()) {
+    if (myEditCurrentArgument == anIter.value()) {
       aCurrFocus = anIter.key();
       break;
     }
   }
 
-  GEOM::GEOM_Object_var anObj;
-  Standard_Boolean aResult = Standard_False;
-  if (IObjectCount() == 1) {
-    anObj = GEOMBase::ConvertIOinGEOMObject(firstIObject(), aResult);
-    if (aResult) {
-      if (anObj->_is_nil()) {
-        aResult = Standard_False;
-      } else {
-        mySelName[aCurrFocus]->setText(GEOMBase::GetName(anObj));
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  TopAbs_ShapeEnum aType = TopAbs_EDGE;
+  if (aCurrFocus == Vertex1 || aCurrFocus == Vertex2 ||
+      aCurrFocus == Vertex3 || aCurrFocus == Vertex4)
+    aType = TopAbs_VERTEX;
+
+  QString aName;
+  GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object::_nil();
+
+  if (aSelList.Extent() == 1) {
+    Standard_Boolean aResult = Standard_False;
+    anObj = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+    if (aResult && !anObj->_is_nil()) {
+      aName = GEOMBase::GetName(anObj);
+
+      // Get Selected object if selected subshape
+      TopoDS_Shape aShape;
+      if (GEOMBase::GetShape(anObj, aShape, TopAbs_SHAPE) && !aShape.IsNull())
+      {
+        TColStd_IndexedMapOfInteger aMap;
+        aSelMgr->GetIndexes(aSelList.First(), aMap);
+        if (aMap.Extent() == 1) // Local Selection
+        {
+          int anIndex = aMap(1);
+          if (aType == TopAbs_VERTEX)
+            aName += QString(":vertex_%1").arg(anIndex);
+          else
+            aName += QString(":edge_%1").arg(anIndex);
+
+          //Find SubShape Object in Father
+          GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(anObj, aName);
+
+          if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+            GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
+            anObj = aShapesOp->GetSubShape(anObj, anIndex);
+          }
+          else
+            anObj = aFindedObject; // get Object from study
+        }
+        else // Global Selection
+        {
+          if (aShape.ShapeType() != aType) {
+            anObj = GEOM::GEOM_Object::_nil();
+            aName = "";
+          }
+        }
       }
-    } else {
-      anObj = GEOM::GEOM_Object::_nil();
     }
   }
 
-  if (aCurrFocus == Vertex1 || aCurrFocus == Edge12 || aCurrFocus == Edge14) {
+  myEditCurrentArgument->setText(aName);
+
+  switch (aCurrFocus) {
+    // four vertices
+  case Vertex1:
     myShape1 = anObj;
-  } else if (aCurrFocus == Vertex2 || aCurrFocus == Edge22 || aCurrFocus == Edge24) {
+    if (!myShape1->_is_nil() && myShape2->_is_nil())
+      mySelBtn[Vertex2]->click();
+    break;
+  case Vertex2:
     myShape2 = anObj;
-  } else if (aCurrFocus == Vertex3 || aCurrFocus == Edge34) {
+    if (!myShape2->_is_nil() && myShape3->_is_nil())
+      mySelBtn[Vertex3]->click();
+    break;
+  case Vertex3:
     myShape3 = anObj;
-  } else if (aCurrFocus == Vertex4 || aCurrFocus == Edge44) {
+    if (!myShape3->_is_nil() && myShape4->_is_nil())
+      mySelBtn[Vertex4]->click();
+    break;
+  case Vertex4:
     myShape4 = anObj;
-  } else {
-    return;
+    if (!myShape4->_is_nil() && myShape1->_is_nil())
+      mySelBtn[Vertex1]->click();
+    break;
+
+    // two edges
+  case Edge12:
+    myShape1 = anObj;
+    if (!myShape1->_is_nil() && myShape2->_is_nil())
+      mySelBtn[Edge22]->click();
+    break;
+  case Edge22:
+    myShape2 = anObj;
+    if (!myShape2->_is_nil() && myShape1->_is_nil())
+      mySelBtn[Edge12]->click();
+    break;
+
+    // four edges
+  case Edge14:
+    myShape1 = anObj;
+    if (!myShape1->_is_nil() && myShape2->_is_nil())
+      mySelBtn[Edge24]->click();
+    break;
+  case Edge24:
+    myShape2 = anObj;
+    if (!myShape2->_is_nil() && myShape3->_is_nil())
+      mySelBtn[Edge34]->click();
+    break;
+  case Edge34:
+    myShape3 = anObj;
+    if (!myShape3->_is_nil() && myShape4->_is_nil())
+      mySelBtn[Edge44]->click();
+    break;
+  case Edge44:
+    myShape4 = anObj;
+    if (!myShape4->_is_nil() && myShape1->_is_nil())
+      mySelBtn[Edge14]->click();
+    break;
+
+  default:
+    break;
   }
 
   displayPreview();
@@ -265,14 +352,65 @@ void BlocksGUI_QuadFaceDlg::SetEditCurrentArgument()
 {
   QPushButton* aSender = (QPushButton*)sender();
 
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  if (myInitial)
+    myInitial = false;
+  else
+    myGeomGUI->getApp()->selectionMgr()->clearSelected();
+
+  // disable all
+  switch (myConstructorId) {
+  case 0:
+    mySelBtn[Vertex1]->setDown(false);
+    mySelBtn[Vertex2]->setDown(false);
+    mySelBtn[Vertex3]->setDown(false);
+    mySelBtn[Vertex4]->setDown(false);
+
+    mySelName[Vertex1]->setEnabled(false);
+    mySelName[Vertex2]->setEnabled(false);
+    mySelName[Vertex3]->setEnabled(false);
+    mySelName[Vertex4]->setEnabled(false);
+    break;
+  case 1:
+    mySelBtn[Edge12]->setDown(false);
+    mySelBtn[Edge22]->setDown(false);
+
+    mySelName[Edge12]->setEnabled(false);
+    mySelName[Edge22]->setEnabled(false);
+    break;
+  case 2:
+    mySelBtn[Edge14]->setDown(false);
+    mySelBtn[Edge24]->setDown(false);
+    mySelBtn[Edge34]->setDown(false);
+    mySelBtn[Edge44]->setDown(false);
+
+    mySelName[Edge14]->setEnabled(false);
+    mySelName[Edge24]->setEnabled(false);
+    mySelName[Edge34]->setEnabled(false);
+    mySelName[Edge44]->setEnabled(false);
+    break;
+  default:
+    break;
+  }
+
+  // set line edit as current argument
   QMap<int, QPushButton*>::iterator anIter;
   for (anIter = mySelBtn.begin(); anIter != mySelBtn.end(); ++anIter) {
-    if (anIter.data() == aSender) {
-      mySelName[anIter.key()]->setFocus();
+    if (anIter.value() == aSender) {
       myEditCurrentArgument = mySelName[anIter.key()];
+      break;
     }
   }
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
+  myEditCurrentArgument->setFocus();
+
+  // enable push button
+  // after setFocus(), because it will be setDown(false) when loses focus
+  aSender->setDown(true);
+
   activateSelection();
 }
 
@@ -283,10 +421,9 @@ void BlocksGUI_QuadFaceDlg::SetEditCurrentArgument()
 void BlocksGUI_QuadFaceDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-
   activateSelection();
+
+  // ??
   displayPreview();
 }
 
@@ -294,22 +431,12 @@ void BlocksGUI_QuadFaceDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BlocksGUI_QuadFaceDlg::enterEvent (QEvent* e)
+void BlocksGUI_QuadFaceDlg::enterEvent (QEvent*)
 {
-  if (!GroupConstructors->isEnabled())
-    this->ActivateThisDialog();
+  if (!mainFrame()->GroupConstructors->isEnabled())
+    ActivateThisDialog();
 }
 
-//=================================================================================
-// function : DeactivateActiveDialog()
-// purpose  :
-//=================================================================================
-//void BlocksGUI_QuadFaceDlg::DeactivateActiveDialog()
-//{
-//  // disconnect selection
-//  GEOMBase_Skeleton::DeactivateActiveDialog();
-//}
-
 //=================================================================================
 // function : createSelWg()
 // purpose  :
@@ -319,11 +446,24 @@ void BlocksGUI_QuadFaceDlg::createSelWg (const QString& theLbl,
                                          QWidget*       theParent,
                                          const int      theId)
 {
-  new QLabel(theLbl, theParent);
+  QLabel* lab = new QLabel(theLbl, theParent);
   mySelBtn[theId] = new QPushButton(theParent);
-  mySelBtn[theId]->setPixmap(thePix);
+  mySelBtn[theId]->setIcon(thePix);
+  mySelBtn[theId]->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
   mySelName[theId] = new QLineEdit(theParent);
   mySelName[theId]->setReadOnly(true);
+  QGridLayout* l = 0;
+  if (!theParent->layout()) {
+    l = new QGridLayout(theParent);
+    l->setMargin(9); l->setSpacing(6);
+  }
+  else {
+    l = qobject_cast<QGridLayout*>(theParent->layout());
+  }
+  int row = l->rowCount();
+  l->addWidget(lab,              row, 0);
+  l->addWidget(mySelBtn[theId],  row, 1);
+  l->addWidget(mySelName[theId], row, 2);
 }
 
 //=================================================================================
@@ -332,18 +472,20 @@ void BlocksGUI_QuadFaceDlg::createSelWg (const QString& theLbl,
 //=================================================================================
 void BlocksGUI_QuadFaceDlg::activateSelection()
 {
+  globalSelection(); // close local contexts, if any
   if (myEditCurrentArgument == mySelName[Vertex1] ||
       myEditCurrentArgument == mySelName[Vertex2] ||
       myEditCurrentArgument == mySelName[Vertex3] ||
-      myEditCurrentArgument == mySelName[Vertex4]) {
-
-    globalSelection(GEOM_POINT);
-
-  } else {
-    globalSelection(GEOM_EDGE);
+      myEditCurrentArgument == mySelName[Vertex4])
+  {
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX); //Select Vertices on All Shapes
   }
-
-  SelectionIntoArgument();
+  else
+  {
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE); //Select Edges on All Shapes
+  }
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 }
 
 //=================================================================================
@@ -361,19 +503,23 @@ GEOM::GEOM_IOperations_ptr BlocksGUI_QuadFaceDlg::createOperation()
 //=================================================================================
 bool BlocksGUI_QuadFaceDlg::isValid (QString&)
 {
+  bool ok = false;
   switch (getConstructorId()) {
-    case 0:
-      return (!myShape1->_is_nil() && !myShape2->_is_nil() &&
-              !myShape3->_is_nil() && !myShape4->_is_nil());
-    case 1:
-      return (!myShape1->_is_nil() && !myShape2->_is_nil());
-    case 2:
-      return (!myShape1->_is_nil() && !myShape2->_is_nil() &&
-              !myShape3->_is_nil() && !myShape4->_is_nil());
-    default:
-      return false;
+  case 0:
+    ok = (!myShape1->_is_nil() && !myShape2->_is_nil() &&
+          !myShape3->_is_nil() && !myShape4->_is_nil());
+    break;
+  case 1:
+    ok = (!myShape1->_is_nil() && !myShape2->_is_nil());
+    break;
+  case 2:
+    ok = (!myShape1->_is_nil() && !myShape2->_is_nil() &&
+          !myShape3->_is_nil() && !myShape4->_is_nil());
+    break;
+  default:
+    break;
   }
-  return false;
+  return ok;
 }
 
 //=================================================================================
@@ -387,23 +533,23 @@ bool BlocksGUI_QuadFaceDlg::execute (ObjectList& objects)
   GEOM::GEOM_Object_var anObj;
 
   switch (getConstructorId()) {
-    case 0:
-      anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->MakeQuad4Vertices
-        (myShape1, myShape2, myShape3, myShape4);
-      res = true;
-      break;
-    case 1:
-      anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->MakeQuad2Edges
-        (myShape1, myShape2);
-      res = true;
-      break;
-    case 2:
-      anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->MakeQuad
-        (myShape1, myShape2, myShape3, myShape4);
-      res = true;
-      break;
-    default:
-      break;
+  case 0:
+    anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
+      MakeQuad4Vertices(myShape1, myShape2, myShape3, myShape4);
+    res = true;
+    break;
+  case 1:
+    anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
+      MakeQuad2Edges(myShape1, myShape2);
+    res = true;
+    break;
+  case 2:
+    anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
+      MakeQuad(myShape1, myShape2, myShape3, myShape4);
+    res = true;
+    break;
+  default:
+    break;
   }
 
   if (!anObj->_is_nil())
@@ -411,3 +557,32 @@ bool BlocksGUI_QuadFaceDlg::execute (ObjectList& objects)
 
   return res;
 }
+
+//=================================================================================
+// function : addSubshapeToStudy
+// purpose  : virtual method to add new SubObjects if local selection
+//=================================================================================
+void BlocksGUI_QuadFaceDlg::addSubshapesToStudy()
+{
+  QMap<QString, GEOM::GEOM_Object_var> objMap;
+
+  switch (getConstructorId()) {
+  case 0:
+    objMap[mySelName[Vertex1]->text()] = myShape1;
+    objMap[mySelName[Vertex2]->text()] = myShape2;
+    objMap[mySelName[Vertex3]->text()] = myShape3;
+    objMap[mySelName[Vertex4]->text()] = myShape4;
+    break;
+  case 1:
+    objMap[mySelName[Edge12]->text()] = myShape1;
+    objMap[mySelName[Edge22]->text()] = myShape2;
+    break;
+  case 2:
+    objMap[mySelName[Edge14]->text()] = myShape1;
+    objMap[mySelName[Edge24]->text()] = myShape2;
+    objMap[mySelName[Edge34]->text()] = myShape3;
+    objMap[mySelName[Edge44]->text()] = myShape4;
+    break;
+  }
+  addSubshapesToFather(objMap);
+}
index be706bab3903202db8add0e65e7d95d5857e3d83..1d55983f3c914b4085d12b29452e5a23416979b9 100644 (file)
@@ -1,6 +1,7 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  CEA
+//  Copyright (C) 2003-2007  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 along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BlocksGUI_QuadFaceDlg.h
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
 //
-//
-//  File   : BlocksGUI_QuadFaceDlg.h
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
+#ifndef BLOCKSGUI_QUADFACEDLG_H
+#define BLOCKSGUI_QUADFACEDLG_H
 
-#ifndef DIALOGBOX_QUAD_FACE_H
-#define DIALOGBOX_QUAD_FACE_H
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOM_BlocksGUI.hxx"
+#include <QMap>
 
-#include "GEOMBase_Skeleton.h"
+class QGroupBox;
+class QPushButton;
+class QLineEdit;
 
 //=================================================================================
 // class    : BlocksGUI_QuadFaceDlg
 // purpose  :
 //=================================================================================
-class GEOM_BLOCKSGUI_EXPORT BlocksGUI_QuadFaceDlg : public GEOMBase_Skeleton
+class BlocksGUI_QuadFaceDlg : public GEOMBase_Skeleton
 {
   Q_OBJECT
 
   enum { Vertex1, Vertex2, Vertex3, Vertex4,
-        Edge12, Edge22,
-        Edge14, Edge24, Edge34, Edge44 };
+         Edge12, Edge22,
+         Edge14, Edge24, Edge34, Edge44 };
 
 public:
-  BlocksGUI_QuadFaceDlg (GeometryGUI*, QWidget* parent, bool modal = FALSE);
+  BlocksGUI_QuadFaceDlg (GeometryGUI*, QWidget*);
   ~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&);
+  virtual bool                       execute (ObjectList&);
+  virtual void                       addSubshapesToStudy();
 
 private:
-  void Init();
-  void enterEvent (QEvent* e);
+  void                               Init();
+  void                               enterEvent (QEvent*);
 
-  void createSelWg (const QString&, QPixmap&, QWidget*, const int);
-  void activateSelection();
+  void                               createSelWg (const QString&, QPixmap&,
+                                                  QWidget*, const int);
+  void                               activateSelection();
 
 private:
-  int                     myConstructorId;
+  int                                myConstructorId;
+
+  GEOM::GEOM_Object_var              myShape1;
+  GEOM::GEOM_Object_var              myShape2;
+  GEOM::GEOM_Object_var              myShape3;
+  GEOM::GEOM_Object_var              myShape4;
 
-  GEOM::GEOM_Object_var   myShape1;
-  GEOM::GEOM_Object_var   myShape2;
-  GEOM::GEOM_Object_var   myShape3;
-  GEOM::GEOM_Object_var   myShape4;
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
 
-  QFrame*                 myGrp1;
-  QFrame*                 myGrp2;
-  QFrame*                 myGrp3;
+  QGroupBox*                         myGrp1;
+  QGroupBox*                         myGrp2;
+  QGroupBox*                         myGrp3;
 
-  QMap<int, QPushButton*> mySelBtn;
-  QMap<int, QLineEdit*>   mySelName;
+  QMap<int, QPushButton*>            mySelBtn;
+  QMap<int, QLineEdit*>              mySelName;
 
 private slots:
-  void ClickOnOk();
-  bool ClickOnApply();
-  void ActivateThisDialog();
-  void ConstructorsClicked( int constructorId );
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               ConstructorsClicked (int);
 
-  void SelectionIntoArgument();
-  void SetEditCurrentArgument();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // DIALOGBOX_QUAD_FACE_H
+#endif // BLOCKSGUI_QUADFACEDLG_H
index 9e5da6754f5bc731e473a896364c8a51901eb74b..9e5e91a97b83ad142dc1b246f531ec9fc583e7fa 100644 (file)
@@ -1,6 +1,7 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  CEA
+//  Copyright (C) 2003-2007  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 along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BlocksGUI_TrsfDlg.cxx
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
 //
-//
-//  File   : BlocksGUI_TrsfDlg.cxx
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-//  $Header$
-
 #include "BlocksGUI_TrsfDlg.h"
 
-#include "DlgRef_SpinBox.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "OCCViewer_ViewModel.h"
+#include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_ViewManager.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <OCCViewer_ViewModel.h>
 
+// OCCT Includes
 #include <TColStd_IndexedMapOfInteger.hxx>
 
-#include <qlabel.h>
-
 //=================================================================================
 // class    : BlocksGUI_TrsfDlg()
 // purpose  : Constructs a BlocksGUI_TrsfDlg which is a child of 'parent'.
 //=================================================================================
-BlocksGUI_TrsfDlg::BlocksGUI_TrsfDlg (GeometryGUI* theGeometryGUI, QWidget* parent, bool modal)
-     : GEOMBase_Skeleton(theGeometryGUI, parent, "TrsfDlg", modal,
-                         WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BlocksGUI_TrsfDlg::BlocksGUI_TrsfDlg (GeometryGUI* theGeometryGUI, QWidget* parent)
+  : GEOMBase_Skeleton(theGeometryGUI, parent),
+    myInitial(true)
 {
   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"));
+  setWindowTitle(tr("GEOM_BLOCK_MULTITRSF_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_BLOCK_MULTITRSF"));
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_BLOCK_MULTITRSF"));
 
-  RadioButton1->setPixmap(image1);
-  RadioButton2->setPixmap(image2);
-  RadioButton3->close(TRUE);
+  mainFrame()->RadioButton1->setIcon(image1);
+  mainFrame()->RadioButton2->setIcon(image2);
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
 
   // Create first group
-  myGrp1 = new QGroupBox(1, Qt::Horizontal, tr("GEOM_BLOCK_MULTITRSF_SIMPLE"), this);
-
-  QGroupBox* aSelGrp1 = new QGroupBox(3, Qt::Horizontal, myGrp1);
-  aSelGrp1->setFrameStyle(QFrame::NoFrame);
-  aSelGrp1->setInsideMargin(0);
-
-  createSelWg(tr("GEOM_MAIN_OBJECT"), imageS, aSelGrp1, MainObj1);
-  createSelWg(tr("FACE_1"), imageS, aSelGrp1, Face1);
-  createSelWg(tr("FACE_2"), imageS, aSelGrp1, Face2);
-
-  QGroupBox* aSpinGrp1 = new QGroupBox(1, Qt::Vertical, myGrp1);
-  aSpinGrp1->setFrameStyle(QFrame::NoFrame);
-  aSpinGrp1->setInsideMargin(0);
+  myGrp1 = new QGroupBox(tr("GEOM_BLOCK_MULTITRSF_SIMPLE"), centralWidget());
 
-  new QLabel(tr("GEOM_NB_TIMES"), aSpinGrp1);
-  mySpinBox[SpinBox1] = new DlgRef_SpinBox(aSpinGrp1);
+  createSelWg(tr("GEOM_MAIN_OBJECT"), imageS, myGrp1, MainObj1);
+  createSelWg(tr("FACE_1"),           imageS, myGrp1, Face1);
+  createSelWg(tr("FACE_2"),           imageS, myGrp1, Face2);
+  createSpinWg(tr("GEOM_NB_TIMES"),           myGrp1, SpinBox1);
 
   // Create second group
-  myGrp2 = new QGroupBox(1, Qt::Horizontal, tr("GEOM_BLOCK_MULTITRSF_DOUBLE"), this);
-
-  // U trsf
-  QGroupBox* aSelGrp2U = new QGroupBox(3, Qt::Horizontal, myGrp2);
-  aSelGrp2U->setFrameStyle(QFrame::NoFrame);
-  aSelGrp2U->setInsideMargin(0);
-
-  createSelWg(tr("GEOM_MAIN_OBJECT"), imageS, aSelGrp2U, MainObj2);
-  createSelWg(tr("FACE_1U"), imageS, aSelGrp2U, Face1U);
-  createSelWg(tr("FACE_2U"), imageS, aSelGrp2U, Face2U);
-
-  QGroupBox* aSpinGrp2U = new QGroupBox(1, Qt::Vertical, myGrp2);
-  aSpinGrp2U->setFrameStyle(QFrame::NoFrame);
-  aSpinGrp2U->setInsideMargin(0);
-
-  new QLabel(tr("GEOM_NB_TIMES_U"), aSpinGrp2U);
-  mySpinBox[SpinBox2U] = new DlgRef_SpinBox(aSpinGrp2U);
-
-  // V trsf
-  QGroupBox* aSelGrp2V = new QGroupBox(3, Qt::Horizontal, myGrp2);
-  aSelGrp2V->setFrameStyle(QFrame::NoFrame);
-  aSelGrp2V->setInsideMargin(0);
-
-  createSelWg(tr("FACE_1V"), imageS, aSelGrp2V, Face1V);
-  createSelWg(tr("FACE_2V"), imageS, aSelGrp2V, Face2V);
+  myGrp2 = new QGroupBox(tr("GEOM_BLOCK_MULTITRSF_DOUBLE"), centralWidget());
 
-  QGroupBox* aSpinGrp2V = new QGroupBox(1, Qt::Vertical, myGrp2);
-  aSpinGrp2V->setFrameStyle(QFrame::NoFrame);
-  aSpinGrp2V->setInsideMargin(0);
-
-  new QLabel(tr("GEOM_NB_TIMES_V"), aSpinGrp2V);
-  mySpinBox[SpinBox2V] = new DlgRef_SpinBox(aSpinGrp2V);
-
-  (new QLabel(myGrp2))->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+  createSelWg(tr("GEOM_MAIN_OBJECT"), imageS, myGrp2, MainObj2);
+  createSelWg(tr("FACE_1U"),          imageS, myGrp2, Face1U);
+  createSelWg(tr("FACE_2U"),          imageS, myGrp2, Face2U);
+  createSpinWg(tr("GEOM_NB_TIMES_U"),         myGrp2, SpinBox2U);
+  createSelWg(tr("FACE_1V"),          imageS, myGrp2, Face1V);
+  createSelWg(tr("FACE_2V"),          imageS, myGrp2, Face2V);
+  createSpinWg(tr("GEOM_NB_TIMES_V"),         myGrp2, SpinBox2V);
 
   // Add groups to layout
-  Layout1->addWidget( myGrp1, 2, 0 );
-  Layout1->addWidget( myGrp2, 2, 0 );
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(myGrp1);
+  layout->addWidget(myGrp2);
   /***************************************************************/
 
   setHelpFileName("multi_transformation_operation_page.html");
@@ -141,27 +112,25 @@ void BlocksGUI_TrsfDlg::Init()
 {
   // Set range of spinboxes
   double SpecificStep = 1.0;
-  QMap<int, DlgRef_SpinBox*>::iterator anIter;
+  QMap<int, SalomeApp_DoubleSpinBox*>::iterator anIter;
   for (anIter = mySpinBox.begin(); anIter != mySpinBox.end(); ++anIter) {
     //anIter.data()->RangeStepAndValidator(1.0, 999.999, SpecificStep, 3);
-    anIter.data()->RangeStepAndValidator(1.0, MAX_NUMBER, SpecificStep, 3);
+    initSpinBox(anIter.value(), 1.0, 999, SpecificStep, 3);
   }
 
   // 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(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
 
   QMap<int, QPushButton*>::iterator anIterBtn;
   for (anIterBtn = mySelBtn.begin(); anIterBtn != mySelBtn.end(); ++anIterBtn)
-    connect(anIterBtn.data(), SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+    connect(anIterBtn.value(), SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
 
-  QMap<int, DlgRef_SpinBox*>::iterator anIterSpin;
+  QMap<int, SalomeApp_DoubleSpinBox*>::iterator anIterSpin;
   for (anIterSpin = mySpinBox.begin(); anIterSpin != mySpinBox.end(); ++anIterSpin)
-    connect(anIterSpin.data(), SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+    connect(anIterSpin.value(), SIGNAL(valueChanged(int)), this, SLOT(ValueChangedInSpinBox(int)));
 
   // init controls and fields
   initName(tr("GEOM_BLOCK_MULTITRSF"));
@@ -181,41 +150,44 @@ void BlocksGUI_TrsfDlg::ConstructorsClicked (int constructorId)
 
   myConstructorId = constructorId;
 
+  // init fields
+  myShape = GEOM::GEOM_Object::_nil();
+  myFaces[Face1] = myFaces[Face2] = -1;
+  myFaces[Face1U] = myFaces[Face2U] = -1;
+  myFaces[Face1V] = myFaces[Face2V] = -1;
+
+  // clear line edits
+  QMap<int, QLineEdit*>::iterator anIterLE;
+  for (anIterLE = mySelName.begin(); anIterLE != mySelName.end(); ++anIterLE)
+    anIterLE.value()->setText("");
+
   switch (constructorId) {
   case 0:
     myGrp2->hide();
     myGrp1->show();
-    mySpinBox[SpinBox1]->SetValue(2.0);
-    myEditCurrentArgument = mySelName[MainObj1];
-    myFaces[Face1] = -1;
-    myFaces[Face2] = -1;
+    mySpinBox[SpinBox1]->setValue(2);
+    mySpinBox[SpinBox1]->setDecimals(0);
+    mySelBtn[MainObj1]->click();
     break;
   case 1:
     myGrp1->hide();
     myGrp2->show();
-    mySpinBox[SpinBox2U]->SetValue(2.0);
-    mySpinBox[SpinBox2V]->SetValue(2.0);
-    myEditCurrentArgument = mySelName[MainObj2];
-    myFaces[Face1U] = -1;
-    myFaces[Face2U] = -1;
-    myFaces[Face1V] = -1;
-    myFaces[Face2V] = -1;
+    mySpinBox[SpinBox2U]->setValue(2);
+    mySpinBox[SpinBox2U]->setDecimals(0);
+    mySpinBox[SpinBox2V]->setValue(2);
+    mySpinBox[SpinBox2V]->setDecimals(0);
+    mySelBtn[MainObj2]->click();
     break;
   default:
     break;
   }
 
-  // clear line edits
-  QMap<int, QLineEdit*>::iterator anIterLE;
-  for (anIterLE = mySelName.begin(); anIterLE != mySelName.end(); ++anIterLE)
-    anIterLE.data()->setText("");
-
-  // init fields
-  myShape = GEOM::GEOM_Object::_nil();
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
 
-  activateSelection();
-//  enableWidgets();
-//  displayPreview();
+  // on dialog initialization we init the first field with a selected object (if any)
+  SelectionIntoArgument();
 }
 
 //=================================================================================
@@ -243,7 +215,7 @@ bool BlocksGUI_TrsfDlg::ClickOnApply()
 
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection has changed
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void BlocksGUI_TrsfDlg::SelectionIntoArgument()
 {
@@ -254,55 +226,97 @@ void BlocksGUI_TrsfDlg::SelectionIntoArgument()
   int aCurrFocus = -1;
   QMap<int, QLineEdit*>::iterator anIter;
   for (anIter = mySelName.begin(); anIter != mySelName.end(); ++anIter) {
-    if (myEditCurrentArgument == anIter.data()) {
+    if (myEditCurrentArgument == anIter.value()) {
       aCurrFocus = anIter.key();
       break;
     }
   }
 
-  // If selection of main object is activated
-  if (aCurrFocus == MainObj1 || aCurrFocus == MainObj2) {
-    if (IObjectCount() == 1) {
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  QString aName;
+  GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object::_nil();
+
+  if (aCurrFocus == MainObj1 || aCurrFocus == MainObj2)
+  {
+    // If selection of main object is activated
+    if (aSelList.Extent() == 1) {
       Standard_Boolean aResult = Standard_False;
-      GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject(firstIObject(), aResult);
-
-      if (aResult && !anObj->_is_nil() && GEOMBase::IsShape( anObj ) ) {
-        myShape = anObj;
-        mySelName[aCurrFocus]->setText(GEOMBase::GetName(anObj));
-        enableWidgets();
-        return;
+      anObj = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+
+      if (aResult && !anObj->_is_nil() && GEOMBase::IsShape(anObj)) {
+        aName = GEOMBase::GetName(anObj);
       }
     }
-
-    myShape = GEOM::GEOM_Object::_nil();
+    myEditCurrentArgument->setText(aName);
+    myShape = anObj;
     enableWidgets();
   }
-  // If face selection is activated
   else if (aCurrFocus == Face1  || aCurrFocus == Face2  ||
            aCurrFocus == Face1U || aCurrFocus == Face2U ||
            aCurrFocus == Face1V || aCurrFocus == Face2V) {
-    if (IObjectCount() == 1) {
+    // If face selection is activated
+    int anIndex = -1;
+    if (aSelList.Extent() == 1) {
       Standard_Boolean aResult = Standard_False;
-      GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject(firstIObject(), aResult);
-
-      if ( aResult && !anObj->_is_nil() && GEOMBase::IsShape( anObj ) ) {
+      anObj = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+      if (aResult && !anObj->_is_nil() && GEOMBase::IsShape(anObj)) {
+        aName = GEOMBase::GetName(anObj);
         TColStd_IndexedMapOfInteger anIndexes;
-       ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->GetIndexes( firstIObject(), anIndexes );
+        aSelMgr->GetIndexes(aSelList.First(), anIndexes);
 
         if (anIndexes.Extent() == 1) {
-          int anIndex = anIndexes(1);
-          QString aFaceName = QString(GEOMBase::GetName(anObj)) + ":%1";
-          myEditCurrentArgument->setText(aFaceName.arg(anIndex));
-          myFaces[aCurrFocus] = anIndex;
-          displayPreview();
-          return;
+          anIndex = anIndexes(1);
+          aName += QString(":face_%1").arg(anIndex);
         }
       }
     }
+    myEditCurrentArgument->setText(aName);
+    myFaces[aCurrFocus] = anIndex;
+    displayPreview();
+  }
+
+  switch (aCurrFocus) {
+    // 1D
+  case MainObj1:
+    if (!myShape->_is_nil() && myFaces[Face1] == -1)
+      mySelBtn[Face1]->click();
+    break;
+  case Face1:
+    if (myFaces[Face1] != -1 && myFaces[Face2] == -1)
+      mySelBtn[Face2]->click();
+    break;
+  case Face2:
+    if (myFaces[Face2] != -1 && myShape->_is_nil())
+      mySelBtn[MainObj1]->click();
+    break;
+
+    // 2D
+  case MainObj2:
+    if (!myShape->_is_nil() && myFaces[Face1U] == -1)
+      mySelBtn[Face1U]->click();
+    break;
+  case Face1U:
+    if (myFaces[Face1U] != -1 && myFaces[Face2U] == -1)
+      mySelBtn[Face2U]->click();
+    break;
+  case Face2U:
+    if (myFaces[Face2U] != -1 && myFaces[Face1V] == -1)
+      mySelBtn[Face1V]->click();
+    break;
+  case Face1V:
+    if (myFaces[Face1V] != -1 && myFaces[Face2V] == -1)
+      mySelBtn[Face2V]->click();
+    break;
+  case Face2V:
+    if (myFaces[Face2V] != -1 && myShape->_is_nil())
+      mySelBtn[MainObj1]->click();
+    break;
 
-    myFaces[aCurrFocus] = -1;
+  default:
+    break;
   }
 }
 
@@ -314,15 +328,58 @@ void BlocksGUI_TrsfDlg::SetEditCurrentArgument()
 {
   QPushButton* aSender = (QPushButton*)sender();
 
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  if (myInitial)
+    myInitial = false;
+  else
+    myGeomGUI->getApp()->selectionMgr()->clearSelected();
+
+  // disable all
+  switch (myConstructorId) {
+  case 0:
+    mySelBtn[MainObj1]->setDown(false);
+    mySelBtn[Face1]->setDown(false);
+    mySelBtn[Face2]->setDown(false);
+
+    mySelName[MainObj1]->setEnabled(false);
+    mySelName[Face1]->setEnabled(false);
+    mySelName[Face2]->setEnabled(false);
+    break;
+  case 1:
+    mySelBtn[MainObj2]->setDown(false);
+    mySelBtn[Face1U]->setDown(false);
+    mySelBtn[Face2U]->setDown(false);
+    mySelBtn[Face1V]->setDown(false);
+    mySelBtn[Face2V]->setDown(false);
+
+    mySelName[MainObj2]->setEnabled(false);
+    mySelName[Face1U]->setEnabled(false);
+    mySelName[Face2U]->setEnabled(false);
+    mySelName[Face1V]->setEnabled(false);
+    mySelName[Face2V]->setEnabled(false);
+    break;
+  default:
+    break;
+  }
+
+  // set line edit as current argument
   QMap<int, QPushButton*>::iterator anIter;
   for (anIter = mySelBtn.begin(); anIter != mySelBtn.end(); ++anIter) {
-    if (anIter.data() == aSender) {
-      mySelName[anIter.key()]->setFocus();
+    if (anIter.value() == aSender) {
       myEditCurrentArgument = mySelName[anIter.key()];
       break;
     }
   }
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
+  myEditCurrentArgument->setFocus();
+
+  // enable push button
+  // after setFocus(), because it will be setDown(false) when loses focus
+  aSender->setDown(true);
+
   activateSelection();
 }
 
@@ -333,10 +390,9 @@ void BlocksGUI_TrsfDlg::SetEditCurrentArgument()
 void BlocksGUI_TrsfDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-
   activateSelection();
+
+  // ??
   displayPreview();
 }
 
@@ -344,17 +400,17 @@ void BlocksGUI_TrsfDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BlocksGUI_TrsfDlg::enterEvent (QEvent* e)
+void BlocksGUI_TrsfDlg::enterEvent (QEvent*)
 {
-  if (!GroupConstructors->isEnabled())
-    this->ActivateThisDialog();
+  if (!mainFrame()->GroupConstructors->isEnabled())
+    ActivateThisDialog();
 }
 
 //=================================================================================
 // function : ValueChangedInSpinBox()
 // purpose  :
 //=================================================================================
-void BlocksGUI_TrsfDlg::ValueChangedInSpinBox (double newValue)
+void BlocksGUI_TrsfDlg::ValueChangedInSpinBox(int)
 {
   displayPreview();
 }
@@ -368,11 +424,47 @@ void BlocksGUI_TrsfDlg::createSelWg (const QString& theLbl,
                                      QWidget*       theParent,
                                      const int      theId)
 {
-  new QLabel(theLbl, theParent);
+  QLabel* lab = new QLabel(theLbl, theParent);
   mySelBtn[theId] = new QPushButton(theParent);
-  mySelBtn[theId]->setPixmap(thePix);
+  mySelBtn[theId]->setIcon(thePix);
+  mySelBtn[theId]->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
   mySelName[theId] = new QLineEdit(theParent);
   mySelName[theId]->setReadOnly(true);
+  QGridLayout* l = 0;
+  if (!theParent->layout()) {
+    l = new QGridLayout(theParent);
+    l->setMargin(9); l->setSpacing(6);
+  }
+  else {
+    l = qobject_cast<QGridLayout*>(theParent->layout());
+  }
+  int row = l->rowCount();
+  l->addWidget(lab,              row, 0);
+  l->addWidget(mySelBtn[theId],  row, 1);
+  l->addWidget(mySelName[theId], row, 2);
+}
+
+//=================================================================================
+// function : createSpinWg()
+// purpose  :
+//=================================================================================
+void BlocksGUI_TrsfDlg::createSpinWg (const QString& theLbl,
+                                      QWidget*       theParent,
+                                      const int      theId)
+{
+  QLabel* lab = new QLabel(theLbl, theParent);
+  mySpinBox[theId] = new SalomeApp_DoubleSpinBox(theParent);
+  QGridLayout* l = 0;
+  if (!theParent->layout()) {
+    l = new QGridLayout(theParent);
+    l->setMargin(9); l->setSpacing(6);
+  }
+  else {
+    l = qobject_cast<QGridLayout*>(theParent->layout());
+  }
+  int row = l->rowCount();
+  l->addWidget(lab,              row, 0);
+  l->addWidget(mySpinBox[theId], row, 2);
 }
 
 //=================================================================================
@@ -381,26 +473,22 @@ void BlocksGUI_TrsfDlg::createSelWg (const QString& theLbl,
 //=================================================================================
 void BlocksGUI_TrsfDlg::activateSelection()
 {
+  globalSelection(GEOM_ALLSHAPES);
   if (!myShape->_is_nil() &&
-      (myEditCurrentArgument == mySelName[ Face1  ] ||
-       myEditCurrentArgument == mySelName[ Face2  ] ||
-       myEditCurrentArgument == mySelName[ Face1U ] ||
-       myEditCurrentArgument == mySelName[ Face2U ] ||
-       myEditCurrentArgument == mySelName[ Face1V ] ||
-       myEditCurrentArgument == mySelName[ Face2V ])) {
-
+      (myEditCurrentArgument == mySelName[Face1 ] ||
+       myEditCurrentArgument == mySelName[Face2 ] ||
+       myEditCurrentArgument == mySelName[Face1U] ||
+       myEditCurrentArgument == mySelName[Face2U] ||
+       myEditCurrentArgument == mySelName[Face1V] ||
+       myEditCurrentArgument == mySelName[Face2V]))
+  {
     // Local selection is available only in the OCC Viewer
-    if (SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType() 
-       == OCCViewer_Viewer::Type()) {
+    if (getDesktop()->activeWindow()->getViewManager()->getType() == OCCViewer_Viewer::Type()) {
       localSelection(myShape, TopAbs_FACE);
-    } else {
-      return;
     }
-  } else {
-    globalSelection( GEOM_ALLSHAPES );
   }
-
-  SelectionIntoArgument();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 }
 
 //=================================================================================
@@ -414,26 +502,27 @@ void BlocksGUI_TrsfDlg::enableWidgets()
   bool toEnable = !myShape->_is_nil();
 
   if (anId == 0) {
-    mySelName[Face1]->setEnabled(toEnable);
-    mySelName[Face2]->setEnabled(toEnable);
-    mySelBtn[Face1]->setEnabled(toEnable);
-    mySelBtn[Face2]->setEnabled(toEnable);
+    //mySelName[Face1]->setEnabled(toEnable);
+    //mySelName[Face2]->setEnabled(toEnable);
+    //mySelBtn[Face1]->setEnabled(toEnable);
+    //mySelBtn[Face2]->setEnabled(toEnable);
 
-    if (!toEnable) {
+    if (!toEnable)  {
       mySelName[Face1]->setText("");
       mySelName[Face2]->setText("");
       myFaces[Face1] = -1;
       myFaces[Face2] = -1;
     }
-  } else if (anId == 1) {
-    mySelName[Face1U]->setEnabled(toEnable);
-    mySelName[Face2U]->setEnabled(toEnable);
-    mySelName[Face1V]->setEnabled(toEnable);
-    mySelName[Face2V]->setEnabled(toEnable);
-    mySelBtn[Face1U]->setEnabled(toEnable);
-    mySelBtn[Face2U]->setEnabled(toEnable);
-    mySelBtn[Face1V]->setEnabled(toEnable);
-    mySelBtn[Face2V]->setEnabled(toEnable);
+  }
+  else if (anId == 1) {
+    //mySelName[Face1U]->setEnabled(toEnable);
+    //mySelName[Face2U]->setEnabled(toEnable);
+    //mySelName[Face1V]->setEnabled(toEnable);
+    //mySelName[Face2V]->setEnabled(toEnable);
+    //mySelBtn[Face1U]->setEnabled(toEnable);
+    //mySelBtn[Face2U]->setEnabled(toEnable);
+    //mySelBtn[Face1V]->setEnabled(toEnable);
+    //mySelBtn[Face2V]->setEnabled(toEnable);
 
     if (!toEnable) {
       mySelName[Face1U]->setText("");
@@ -458,20 +547,26 @@ GEOM::GEOM_IOperations_ptr BlocksGUI_TrsfDlg::createOperation()
 }
 
 //=================================================================================
-// function : ClickOnApply()
+// function : isValid
 // purpose  : Verify validity of input data
 //=================================================================================
-bool BlocksGUI_TrsfDlg::isValid (QString&)
+bool BlocksGUI_TrsfDlg::isValid (QString& msg)
 {
+  bool ok = false, okSP = true;
   switch (getConstructorId()) {
-    case 0:
-      return !myShape->_is_nil() && myFaces[Face1] > 0;
-    case 1:
-      return !myShape->_is_nil() && myFaces[Face1U] > 0 && myFaces[Face1V] > 0;
-    default:
-      return false;
+  case 0:
+    ok = !myShape->_is_nil() && myFaces[Face1] > 0;
+    okSP = mySpinBox[SpinBox1]->isValid( msg, !IsPreview() );
+    break;
+  case 1:
+    ok = !myShape->_is_nil() && myFaces[Face1U] > 0 && myFaces[Face1V] > 0;
+    okSP = mySpinBox[SpinBox2U]->isValid( msg, !IsPreview() ) && okSP;
+    okSP = mySpinBox[SpinBox2V]->isValid( msg, !IsPreview() ) && okSP;
+    break;
+  default:
+    break;
   }
-  return false;
+  return ok && okSP;
 }
 
 //=================================================================================
@@ -485,25 +580,40 @@ bool BlocksGUI_TrsfDlg::execute (ObjectList& objects)
   GEOM::GEOM_Object_var anObj;
 
   switch (getConstructorId()) {
-    case 0:
-      anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->MakeMultiTransformation1D
-        (myShape,
-         myFaces[Face1],
-         myFaces[Face2],
-         (int)mySpinBox[SpinBox1]->GetValue());
-      res = true;
-      break;
-    case 1:
-      anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->MakeMultiTransformation2D
-        (myShape,
-         myFaces[Face1U],
-         myFaces[Face2U],
-         (int)mySpinBox[SpinBox2U]->GetValue(),
-         myFaces[Face1V],
-         myFaces[Face2V],
-         (int)mySpinBox[SpinBox2V]->GetValue());
-      res = true;
-      break;
+  case 0:
+    anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
+      MakeMultiTransformation1D(myShape,
+                                myFaces[Face1], myFaces[Face2],
+                                mySpinBox[SpinBox1]->value());
+    if (!anObj->_is_nil() && !IsPreview())
+    {
+      QStringList aParameters;
+      aParameters << "" << "";
+      aParameters << mySpinBox[SpinBox1]->text();
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    }
+    res = true;
+    break;
+  case 1:
+    anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
+      MakeMultiTransformation2D (myShape,
+                                 myFaces[Face1U], myFaces[Face2U],
+                                 mySpinBox[SpinBox2U]->value(),
+                                 myFaces[Face1V], myFaces[Face2V],
+                                 mySpinBox[SpinBox2V]->value());
+    if (!anObj->_is_nil() && !IsPreview())
+    {
+      QStringList aParameters;
+      aParameters << "" << "";
+      aParameters << mySpinBox[SpinBox2U]->text();
+      aParameters << "" << "";
+      aParameters << mySpinBox[SpinBox2V]->text();
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    }
+    res = true;
+    break;
+  default:
+    break;
   }
 
   if (!anObj->_is_nil())
index 7508c8e4844108df3f59072c36600c96f7d34798..a0f823f143975d15f490bd4ad229e0122b2dc32a 100644 (file)
@@ -1,6 +1,7 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  CEA
+//  Copyright (C) 2003-2007  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 along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BlocksGUI_TrsfDlg.h
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
 //
-//
-//  File   : BlocksGUI_TrsfDlg.h
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-
-#ifndef DIALOGBOX_BLOCK_MULTITRSF_H
-#define DIALOGBOX_BLOCK_MULTITRSF_H
+#ifndef BLOCKSGUI_TRSFDLG_H
+#define BLOCKSGUI_TRSFDLG_H
 
-#include "GEOM_BlocksGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
+#include <QMap>
 
-class DlgRef_SpinBox;
+class SalomeApp_DoubleSpinBox;
+class QGroupBox;
+class QPushButton;
+class QLineEdit;
 
 //=================================================================================
 // class    : BlocksGUI_TrsfDlg
 // purpose  :
 //=================================================================================
-class GEOM_BLOCKSGUI_EXPORT BlocksGUI_TrsfDlg : public GEOMBase_Skeleton
+class BlocksGUI_TrsfDlg : public GEOMBase_Skeleton
 {
   Q_OBJECT
 
@@ -45,46 +47,50 @@ class GEOM_BLOCKSGUI_EXPORT BlocksGUI_TrsfDlg : public GEOMBase_Skeleton
   enum { SpinBox1, SpinBox2U, SpinBox2V };
 
 public:
-  BlocksGUI_TrsfDlg (GeometryGUI*, QWidget* parent, bool modal = FALSE);
+  BlocksGUI_TrsfDlg (GeometryGUI*, QWidget*);
   ~BlocksGUI_TrsfDlg();
 
 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&);
+  virtual bool                       execute (ObjectList&);
 
 private:
-  void Init();
-  void enterEvent (QEvent* e);
+  void                               Init();
+  void                               enterEvent(QEvent*);
 
-  void createSelWg (const QString&, QPixmap&, QWidget*, const int);
-  void activateSelection();
-  void enableWidgets();
+  void                               createSelWg (const QString&, QPixmap&, QWidget*, const int);
+  void                               createSpinWg (const QString&, QWidget*, const int);
+  void                               activateSelection();
+  void                               enableWidgets();
 
 private:
-  int                        myConstructorId;
+  int                                myConstructorId;
+
+  GEOM::GEOM_Object_var              myShape;
+  QMap<int, int>                     myFaces;
 
-  GEOM::GEOM_Object_var      myShape;
-  QMap<int, int>             myFaces;
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
 
-  QFrame*                    myGrp1;
-  QFrame*                    myGrp2;
+  QGroupBox*                         myGrp1;
+  QGroupBox*                         myGrp2;
 
-  QMap<int, QPushButton*>    mySelBtn;
-  QMap<int, QLineEdit*>      mySelName;
-  QMap<int, DlgRef_SpinBox*> mySpinBox;
+  QMap<int, QPushButton*>            mySelBtn;
+  QMap<int, QLineEdit*>              mySelName;
+  QMap<int, SalomeApp_DoubleSpinBox*> mySpinBox;
 
 private slots:
-  void ClickOnOk();
-  bool ClickOnApply();
-  void ActivateThisDialog();
-  void ConstructorsClicked (int constructorId);
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               ConstructorsClicked (int);
 
-  void SelectionIntoArgument();
-  void SetEditCurrentArgument();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 
-  void ValueChangedInSpinBox (double newValue);
+  void                               ValueChangedInSpinBox (int);
 };
 
-#endif // DIALOGBOX_BLOCK_MULTITRSF_H
+#endif // BLOCKSGUI_TRSFDLG_H
diff --git a/src/BlocksGUI/GEOM_BlocksGUI.hxx b/src/BlocksGUI/GEOM_BlocksGUI.hxx
deleted file mode 100755 (executable)
index 83f6cbc..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-//  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_BlocksGUI.hxx
-//  Author : Alexander A. BORODIN
-//  Module : GEOM
-
-#ifndef _GEOM_BlocksGUI_HXX_
-#define _GEOM_BlocksGUI_HXX_
-
-#ifdef WNT
- #if defined BLOCKSGUI_EXPORTS
-  #if defined WIN32
-   #define GEOM_BLOCKSGUI_EXPORT __declspec( dllexport )
-  #else
-   #define GEOM_BLOCKSGUI_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define GEOM_BLOCKSGUI_EXPORT __declspec( dllimport )
-  #else
-   #define GEOM_BLOCKSGUI_EXPORT
-  #endif
- #endif
-#else
- #define GEOM_BLOCKSGUI_EXPORT
-#endif
-
-#endif
index 0c1f704702ba2dfa8d8938d209e42151e3cda2ce..7ad9706cc3fe5441ffecae40788b965768888615 100644 (file)
@@ -1,86 +1,88 @@
-#  GEOM BUILDGUI : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  CEA
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it 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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM BUILDGUI : 
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : BlockGUI
 #
-#  File   : Makefile.in
-#  Author : Julia DOROVSKIKH (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header$
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-# header files 
+# Headers files
+salomeinclude_HEADERS =                        \
+       BlocksGUI.h                     \
+       BlocksGUI_QuadFaceDlg.h         \
+       BlocksGUI_BlockDlg.h            \
+       BlocksGUI_ExplodeDlg.h          \
+       BlocksGUI_PropagateDlg.h        \
+       BlocksGUI_TrsfDlg.h
 
 # Libraries targets
 lib_LTLIBRARIES = libBlocksGUI.la 
 
 # Sources files
-dist_libBlocksGUI_la_SOURCES = \
-       BlocksGUI.cxx \
-       BlocksGUI_QuadFaceDlg.cxx \
-       BlocksGUI_BlockDlg.cxx \
-       BlocksGUI_ExplodeDlg.cxx \
-       BlocksGUI_PropagateDlg.cxx \
+dist_libBlocksGUI_la_SOURCES =         \
+       BlocksGUI.cxx                   \
+       BlocksGUI_QuadFaceDlg.cxx       \
+       BlocksGUI_BlockDlg.cxx          \
+       BlocksGUI_ExplodeDlg.cxx        \
+       BlocksGUI_PropagateDlg.cxx      \
        BlocksGUI_TrsfDlg.cxx
 
-MOC_FILES = \
-       BlocksGUI_QuadFaceDlg_moc.cxx \
-       BlocksGUI_BlockDlg_moc.cxx \
-       BlocksGUI_ExplodeDlg_moc.cxx \
-       BlocksGUI_PropagateDlg_moc.cxx \
+MOC_FILES =                            \
+       BlocksGUI_QuadFaceDlg_moc.cxx   \
+       BlocksGUI_BlockDlg_moc.cxx      \
+       BlocksGUI_ExplodeDlg_moc.cxx    \
+       BlocksGUI_PropagateDlg_moc.cxx  \
        BlocksGUI_TrsfDlg_moc.cxx
 
-nodist_libBlocksGUI_la_SOURCES= \
+nodist_libBlocksGUI_la_SOURCES =       \
        $(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
-
-#LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libBlocksGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../DlgRef \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(srcdir)/../GEOMFiltersSelection \
-       -I$(top_builddir)/idl \
+libBlocksGUI_la_CPPFLAGS =                     \
+       $(QT_INCLUDES)                          \
+       $(VTK_INCLUDES)                         \
+       $(CAS_CPPFLAGS)                         \
+       $(PYTHON_INCLUDES)                      \
+       $(BOOST_CPPFLAGS)                       \
+       $(KERNEL_CXXFLAGS)                      \
+       $(GUI_CXXFLAGS)                         \
+       $(CORBA_CXXFLAGS)                       \
+       $(CORBA_INCLUDES)                       \
+       -I$(srcdir)/../GEOMGUI                  \
+       -I$(srcdir)/../DlgRef                   \
+       -I$(srcdir)/../GEOMBase                 \
+       -I$(srcdir)/../OBJECT                   \
+       -I$(srcdir)/../GEOMClient               \
+       -I$(srcdir)/../GEOMImpl                 \
+       -I$(srcdir)/../GEOMFiltersSelection     \
+       -I$(top_builddir)/src/DlgRef            \
+       -I$(top_builddir)/idl                   \
        -I$(top_builddir)/salome_adm/unix
 
-libBlocksGUI_la_LDFLAGS  = \
-       ../GEOMFiltersSelection/libGEOMFiltersSelection.la \
-       ../DlgRef/libDlgRef.la \
-       ../GEOMBase/libGEOMBase.la \
-       ../GEOMGUI/libGEOM.la \
+libBlocksGUI_la_LDFLAGS  =                                     \
+       ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \
+       ../DlgRef/libDlgRef.la                                  \
+       ../GEOMBase/libGEOMBase.la                              \
+       ../GEOMGUI/libGEOM.la                                   \
        $(QT_MT_LIBS)
index 34ddff642428a62704e19d7cc437db18ba01dd46..4284340e353dedf3dd6a0ea8fd778a49b5ed8f39 100644 (file)
@@ -1,46 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BooleanGUI.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : BooleanGUI.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
-
 #include "BooleanGUI.h"
-
-#include "SUIT_Desktop.h"
 #include "BooleanGUI_Dialog.h"
 
-#include "GeometryGUI.h"
-
-using namespace std;
+#include <GeometryGUI.h>
+#include <SUIT_Desktop.h>
 
 //=======================================================================
 // function : BooleanGUI()
 // purpose  : Constructor
 //=======================================================================
-BooleanGUI::BooleanGUI( GeometryGUI* parent ) : GEOMGUI( parent )
+BooleanGUI::BooleanGUI( GeometryGUI* parent ) 
+  : GEOMGUI( parent )
 {
 }
 
@@ -57,7 +51,7 @@ BooleanGUI::~BooleanGUI()
 // function : OnGUIEvent()
 // purpose  : 
 //=======================================================================
-bool BooleanGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
+bool BooleanGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 {
   getGeometryGUI()->EmitSignalDeactivateDialog();
 
@@ -73,7 +67,7 @@ bool BooleanGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
   else
     return false;
 
-  QDialog* aDlg = new BooleanGUI_Dialog( anOperation, getGeometryGUI(), parent, "");
+  QDialog* aDlg = new BooleanGUI_Dialog( anOperation, getGeometryGUI(), parent );
   aDlg->show();
 
   return true;
@@ -84,7 +78,9 @@ bool BooleanGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
 //=====================================================================================
 extern "C"
 {
-GEOM_BOOLEANGUI_EXPORT
+#ifdef WIN32
+  __declspec( dllexport )
+#endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
     return new BooleanGUI( parent );
index 32d8f57e01c9661565e4f464cba88c88b2e50839..d4868c3585fbb8fe54f24495c9a6ba8ec18d21d2 100644 (file)
@@ -1,66 +1,46 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BooleanGUI.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : BooleanGUI.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
 #ifndef BOOLEANGUI_H
 #define BOOLEANGUI_H
 
-#include "GEOMGUI.h"
-
-#ifdef WNT
- #if defined BOOLEANGUI_EXPORTS
-  #if defined WIN32
-   #define GEOM_BOOLEANGUI_EXPORT __declspec( dllexport )
-  #else
-   #define GEOM_BOOLEANGUI_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define GEOM_BOOLEANGUI_EXPORT __declspec( dllimport )
-  #else
-   #define GEOM_BOOLEANGUI_EXPORT
-  #endif
- #endif
-#else
- #define GEOM_BOOLEANGUI_EXPORT
-#endif
+#include <GEOMGUI.h>
 
 //=================================================================================
 // class    : BooleanGUI
 // purpose  :
 //=================================================================================
-class GEOM_BOOLEANGUI_EXPORT BooleanGUI : public GEOMGUI
+class BooleanGUI : public GEOMGUI
 {
 public:
   enum BooleanOperation { COMMON = 1, CUT = 2, FUSE = 3, SECTION = 4 };
 
-  BooleanGUI( GeometryGUI* parent );
+  BooleanGUI( GeometryGUI* );
   ~BooleanGUI();
 
-  bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent);
+  bool OnGUIEvent( int, SUIT_Desktop* );
 };
 
-#endif
+#endif // BOOLEANGUI_H
diff --git a/src/BooleanGUI/BooleanGUI.pro b/src/BooleanGUI/BooleanGUI.pro
new file mode 100644 (file)
index 0000000..8e4baf4
--- /dev/null
@@ -0,0 +1,61 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = BuildGUI
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+INCLUDEPATH += $${QT_INCLUDES} $${VTK_INCLUDES} $${CAS_CPPFLAGS} $${PYTHON_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} $${CORBA_INCLUDES} ../GEOMGUI ../DlgRef ../GEOMBase ../OBJECT ../GEOMClient ../GEOMImpl ../GEOMFiltersSelection $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lGEOMBase
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += BOOLEANGUI_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+SOURCES  = BooleanGUI.cxx
+SOURCES += BooleanGUI_Dialog.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index 39826043a23424f004dcdc5446a2f802130d15a6..85e1f19902c4a0b7eb08b2f5041040dd25bd91ad 100644 (file)
@@ -1,42 +1,39 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BooleanGUI_Dialog.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : BooleanGUI_Dialog.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
-#include "BooleanGUI_Dialog.h"
 #include "BooleanGUI.h"
-#include "DlgRef_2Sel_QTD.h"
-
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include "BooleanGUI_Dialog.h"
 
-#include <qlabel.h>
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-using namespace std;
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : BooleanGUI_Dialog()
@@ -45,76 +42,77 @@ using namespace std;
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-BooleanGUI_Dialog::BooleanGUI_Dialogconst int theOperation, GeometryGUI* theGeometryGUI,
-                                      QWidget* parent, const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, fl),
-   myOperation( theOperation )
+BooleanGUI_Dialog::BooleanGUI_Dialog (const int theOperation, GeometryGUI* theGeometryGUI,
+                                      QWidget* parent, bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myOperation(theOperation)
 {
   QPixmap image0;
   QString aTitle, aCaption;
-  switch ( myOperation )
-  {
-    case BooleanGUI::COMMON:
-      image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_COMMON")));
-      aTitle = tr("GEOM_COMMON");
-      aCaption = tr("GEOM_COMMON_TITLE");
-      setHelpFileName("common_operation_page.html");
-      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_operation_page.html");
-      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_operation_page.html");
-      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_opeartion_page.html");
-      break;
+  switch (myOperation) {
+  case BooleanGUI::COMMON:
+    image0 = QPixmap(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_COMMON")));
+    aTitle = tr("GEOM_COMMON");
+    aCaption = tr("GEOM_COMMON_TITLE");
+    setHelpFileName("common_operation_page.html");
+    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_operation_page.html");
+    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_operation_page.html");
+    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_opeartion_page.html");
+    break;
   }
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption( aCaption );
+  setWindowTitle(aCaption);
 
   /***************************************************************/
-  GroupConstructors->setTitle( aTitle );
-  RadioButton1->setPixmap( image0 );
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle(aTitle);
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
+
+  myGroup = new DlgRef_2Sel(centralWidget());
 
-  myGroup = new DlgRef_2Sel_QTD(this, "GroupCommon");
   myGroup->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
-  if ( myOperation != BooleanGUI::CUT )
-  {
-       myGroup->TextLabel1->setText(tr("GEOM_OBJECT_I").arg("1"));
-       myGroup->TextLabel2->setText(tr("GEOM_OBJECT_I").arg("2"));
+  if (myOperation != BooleanGUI::CUT) {
+    myGroup->TextLabel1->setText(tr("GEOM_OBJECT_I").arg(1));
+    myGroup->TextLabel2->setText(tr("GEOM_OBJECT_I").arg(2));
   }
-  else
-  {
-       myGroup->TextLabel1->setText(tr("GEOM_MAIN_OBJECT"));
-       myGroup->TextLabel2->setText(tr("GEOM_TOOL_OBJECT"));
+  else {
+    myGroup->TextLabel1->setText(tr("GEOM_MAIN_OBJECT"));
+    myGroup->TextLabel2->setText(tr("GEOM_TOOL_OBJECT"));
   }
-  
-  myGroup->PushButton1->setPixmap(image1);
-  myGroup->PushButton2->setPixmap(image1);
-  myGroup->LineEdit1->setReadOnly( true );
-  myGroup->LineEdit2->setReadOnly( true );
 
-  Layout1->addWidget(myGroup, 2, 0);
+  myGroup->PushButton1->setIcon(image1);
+  myGroup->PushButton2->setIcon(image1);
+  myGroup->LineEdit1->setReadOnly(true);
+  myGroup->LineEdit2->setReadOnly(true);
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(myGroup);
   /***************************************************************/
 
-  /* Initialisation */
+  // Initialisation
   Init();
 }
 
-
 //=================================================================================
 // function : ~BooleanGUI_Dialog()
 // purpose  : Destroys the object and frees any allocated resources
@@ -123,19 +121,24 @@ BooleanGUI_Dialog::~BooleanGUI_Dialog()
 {
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void BooleanGUI_Dialog::Init()
 {
-  /* init variables */
+  mainFrame()->GroupBoxPublish->show();
+
+  // init variables
   myEditCurrentArgument = myGroup->LineEdit1;
 
-   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  myGroup->LineEdit1->setText("");
+  myGroup->LineEdit2->setText("");
+  myObject1 = myObject2 = GEOM::GEOM_Object::_nil();
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
 
   connect(myGroup->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
   connect(myGroup->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
@@ -143,24 +146,22 @@ void BooleanGUI_Dialog::Init()
   connect(myGroup->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(myGroup->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
+           SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 
-  initName( GroupConstructors->title() );
+  initName(mainFrame()->GroupConstructors->title());
 
-  setTabOrder (RadioButton1, ResultName );
-  setTabOrder (ResultName, myGroup->PushButton1);
-  setTabOrder (myGroup->PushButton1, myGroup->PushButton2);
-  setTabOrder (myGroup->PushButton2, buttonOk);
-  setTabOrder (buttonOk, buttonApply);
-  setTabOrder (buttonApply, buttonCancel);
-  setTabOrder (buttonCancel, buttonHelp);
+  setTabOrder(mainFrame()->GroupConstructors, mainFrame()->GroupBoxName);
+  setTabOrder(mainFrame()->GroupBoxName, mainFrame()->GroupMedium);
+  setTabOrder(mainFrame()->GroupMedium, mainFrame()->GroupButtons);
 
-  RadioButton1->setFocus();
+  mainFrame()->RadioButton1->setFocus();
 
-  globalSelection( GEOM_ALLSHAPES );
-}
+  globalSelection(GEOM_ALLSHAPES);
 
+  myGroup->PushButton1->click();
+  SelectionIntoArgument();
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -168,52 +169,69 @@ void BooleanGUI_Dialog::Init()
 //=================================================================================
 void BooleanGUI_Dialog::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool BooleanGUI_Dialog::ClickOnApply()
 {
-  if ( !onAccept() )
-    return false;  
+  if (!onAccept())
+    return false;
 
   initName();
+  // activate selection and connect selection manager
+  myGroup->PushButton1->click();
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection has changed
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void BooleanGUI_Dialog::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText( "" );
+  myEditCurrentArgument->setText("");
 
-  if ( IObjectCount() != 1 )
-  {
-    if      ( myEditCurrentArgument == myGroup->LineEdit1 )   myObject1 = GEOM::GEOM_Object::_nil();
-    else if ( myEditCurrentArgument == myGroup->LineEdit2 )   myObject2 = GEOM::GEOM_Object::_nil();
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
+    if      (myEditCurrentArgument == myGroup->LineEdit1) myObject1 = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == myGroup->LineEdit2) myObject2 = GEOM::GEOM_Object::_nil();
     return;
   }
 
   // nbSel == 1
   Standard_Boolean aRes = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
-  if ( !CORBA::is_nil( aSelectedObject ) && aRes && GEOMBase::IsShape( aSelectedObject ) )
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aRes);
+  if (!CORBA::is_nil(aSelectedObject) && aRes && GEOMBase::IsShape(aSelectedObject))
   {
-    myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
-    if      ( myEditCurrentArgument == myGroup->LineEdit1 )   myObject1 = aSelectedObject;
-    else if ( myEditCurrentArgument == myGroup->LineEdit2 )   myObject2 = aSelectedObject;
+    myEditCurrentArgument->setText(GEOMBase::GetName(aSelectedObject));
+
+    // clear selection
+    disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+    myGeomGUI->getApp()->selectionMgr()->clearSelected();
+    connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+            this, SLOT(SelectionIntoArgument()));
+
+    if (myEditCurrentArgument == myGroup->LineEdit1) {
+      myObject1 = aSelectedObject;
+      if (myObject2->_is_nil())
+        myGroup->PushButton2->click();
+    }
+    else if (myEditCurrentArgument == myGroup->LineEdit2) {
+      myObject2 = aSelectedObject;
+      if (myObject1->_is_nil())
+        myGroup->PushButton1->click();
+    }
   }
 }
 
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -222,14 +240,26 @@ void BooleanGUI_Dialog::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
 
-  if      ( send == myGroup->PushButton1 ) myEditCurrentArgument = myGroup->LineEdit1;
-  else if ( send == myGroup->PushButton2 ) myEditCurrentArgument = myGroup->LineEdit2;
+  if (send == myGroup->PushButton1) {
+    myEditCurrentArgument = myGroup->LineEdit1;
+
+    myGroup->PushButton2->setDown(false);
+    myGroup->LineEdit2->setEnabled(false);
+  }
+  else if (send == myGroup->PushButton2) {
+    myEditCurrentArgument = myGroup->LineEdit2;
+
+    myGroup->PushButton1->setDown(false);
+    myGroup->LineEdit1->setEnabled(false);
+  }
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
 }
 
-
 //=================================================================================
 // function : LineEditReturnPressed()
 // purpose  :
@@ -237,14 +267,12 @@ void BooleanGUI_Dialog::SetEditCurrentArgument()
 void BooleanGUI_Dialog::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if ( send == myGroup->LineEdit1 || send == myGroup->LineEdit2 )
-  {
+  if (send == myGroup->LineEdit1 || send == myGroup->LineEdit2) {
     myEditCurrentArgument = send;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
 }
 
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -252,19 +280,19 @@ void BooleanGUI_Dialog::LineEditReturnPressed()
 void BooleanGUI_Dialog::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  globalSelection( GEOM_ALLSHAPES );
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-}
 
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+  displayPreview();
+}
 
 //=================================================================================
 // function : enterEvent()
 // purpose  : when mouse enter onto the QWidget
 //=================================================================================
-void BooleanGUI_Dialog::enterEvent(QEvent * e)
+void BooleanGUI_Dialog::enterEvent (QEvent*)
 {
-  if ( !GroupConstructors->isEnabled() )
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
@@ -274,35 +302,51 @@ void BooleanGUI_Dialog::enterEvent(QEvent * e)
 //=================================================================================
 GEOM::GEOM_IOperations_ptr BooleanGUI_Dialog::createOperation()
 {
-  return getGeomEngine()->GetIBooleanOperations( getStudyId() );
+  return getGeomEngine()->GetIBooleanOperations(getStudyId());
 }
 
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool BooleanGUI_Dialog::isValid( QString& msg )
+bool BooleanGUI_Dialog::isValid (QString&)
 {
-  Handle(SALOME_InteractiveObject) IO = firstIObject();
-  Standard_Boolean testResult;
-  GEOM::GEOM_Object_var anObject = GEOMBase::ConvertIOinGEOMObject( IO, testResult );
-  if ( !testResult || anObject->_is_nil() )
-    return false;
+  //Handle(SALOME_InteractiveObject) IO = firstIObject();
+  //Standard_Boolean testResult;
+  //GEOM::GEOM_Object_var anObject = GEOMBase::ConvertIOinGEOMObject(IO, testResult);
+  //if (!testResult || anObject->_is_nil())
+  //  return false;
 
-  return !CORBA::is_nil( myObject1 ) && !CORBA::is_nil( myObject2 );
+  return !CORBA::is_nil(myObject1) && !CORBA::is_nil(myObject2);
 }
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool BooleanGUI_Dialog::execute( ObjectList& objects )
+bool BooleanGUI_Dialog::execute (ObjectList& objects)
 {
   GEOM::GEOM_Object_var anObj;
-  anObj = GEOM::GEOM_IBooleanOperations::_narrow( getOperation() )->MakeBoolean( myObject1, myObject2, myOperation );
-  if ( !anObj->_is_nil() )
-    objects.push_back( anObj._retn() );
+
+  anObj = GEOM::GEOM_IBooleanOperations::_narrow(getOperation())->
+    MakeBoolean(myObject1, myObject2, myOperation);
+  if (!anObj->_is_nil())
+    objects.push_back(anObj._retn());
 
   return true;
 }
+
+//=================================================================================
+// function : restoreSubShapes
+// purpose  :
+//=================================================================================
+void BooleanGUI_Dialog::restoreSubShapes (SALOMEDS::Study_ptr   theStudy,
+                                          SALOMEDS::SObject_ptr theSObject)
+{
+  if (mainFrame()->CheckBoxRestoreSS->isChecked()) {
+    // empty list of arguments means that all arguments should be restored
+    getGeomEngine()->RestoreSubShapesSO(theStudy, theSObject, GEOM::ListOfGO(),
+                                         /*theFindMethod=*/GEOM::FSM_GetInPlace, // ? GEOM::FSM_GetSame
+                                         /*theInheritFirstArg=*/myOperation == BooleanGUI::CUT); // ? false
+  }
+}
index e42fd2be241e4d639237eecd985ab312b38dc9e0..c9ac5a5c2728ea7016b735a55354d4a6a8b8b8db 100644 (file)
@@ -1,76 +1,74 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BooleanGUI_Dialog.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef BooleanGUI_Dialog_H
-#define BooleanGUI_Dialog_H
-
-#include "BooleanGUI.h" //for wnt defines
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BooleanGUI_Dialog.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef BOOLEANGUI_DIALOG_H
+#define BOOLEANGUI_DIALOG_H
 
-#include "GEOMBase_Skeleton.h"
+#include <GEOMBase_Skeleton.h>
 
-class DlgRef_2Sel_QTD;
+class DlgRef_2Sel;
 
 //=================================================================================
 // class    : BooleanGUI_Dialog
 // purpose  :
 //=================================================================================
-class GEOM_BOOLEANGUI_EXPORT BooleanGUI_Dialog : public GEOMBase_Skeleton
+class BooleanGUI_Dialog : public GEOMBase_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BooleanGUI_Dialog( const int theOperation, GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                      const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~BooleanGUI_Dialog();
-
+  BooleanGUI_Dialog( const int, GeometryGUI*, QWidget* = 0,
+                    bool = false, Qt::WindowFlags = 0 );
+  ~BooleanGUI_Dialog();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr );
 
 private:
-    int myOperation;
-         
-    void Init();
-    void enterEvent(QEvent * e);
-
-    GEOM::GEOM_Object_var myObject1;
-    GEOM::GEOM_Object_var myObject2;
-
-    DlgRef_2Sel_QTD* myGroup;
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  
+private:
+  int                                myOperation;
+  
+  GEOM::GEOM_Object_var              myObject1;
+  GEOM::GEOM_Object_var              myObject2;
+  
+  DlgRef_2Sel*                       myGroup;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void SetEditCurrentArgument();
-    void SelectionIntoArgument();
-    void LineEditReturnPressed();
-    void ActivateThisDialog();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               SetEditCurrentArgument();
+  void                               SelectionIntoArgument();
+  void                               LineEditReturnPressed();
+  void                               ActivateThisDialog();
 };
 
-#endif // BooleanGUI_Dialog_H
+#endif // BOOLEANGUI_DIALOG_H
index fd149c69cb7a7fa5bf27d1da30e3dcda8ca2a862..fbea5743738238f8b187ef5a0848f30d4d060800 100644 (file)
@@ -1,75 +1,75 @@
-#  GEOM BOOLEANGUI : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM BOOLEANGUI : 
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : BooleanGUI
 #
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
+salomeinclude_HEADERS =                \
+       BooleanGUI.h            \
+       BooleanGUI_Dialog.h
 
 # Libraries targets
 lib_LTLIBRARIES = libBooleanGUI.la 
 
 # Sources files
-dist_libBooleanGUI_la_SOURCES = \
-       BooleanGUI.cxx \
+dist_libBooleanGUI_la_SOURCES =        \
+       BooleanGUI.h            \
+       BooleanGUI_Dialog.h     \
+                               \
+       BooleanGUI.cxx          \
        BooleanGUI_Dialog.cxx
 
-MOC_FILES = \
+MOC_FILES =                            \
        BooleanGUI_Dialog_moc.cxx
 
-nodist_libBooleanGUI_la_SOURCES= \
+nodist_libBooleanGUI_la_SOURCES =      \
        $(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
-
-#LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libBooleanGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../DlgRef \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(srcdir)/../GEOMFiltersSelection \
-       -I$(top_builddir)/idl \
+libBooleanGUI_la_CPPFLAGS =                    \
+       $(QT_INCLUDES)                          \
+       $(VTK_INCLUDES)                         \
+       $(CAS_CPPFLAGS)                         \
+       $(PYTHON_INCLUDES)                      \
+       $(BOOST_CPPFLAGS)                       \
+       $(KERNEL_CXXFLAGS)                      \
+       $(GUI_CXXFLAGS)                         \
+       $(CORBA_CXXFLAGS)                       \
+       $(CORBA_INCLUDES)                       \
+       -I$(srcdir)/../GEOMGUI                  \
+       -I$(srcdir)/../DlgRef                   \
+       -I$(srcdir)/../GEOMBase                 \
+       -I$(srcdir)/../OBJECT                   \
+       -I$(srcdir)/../GEOMClient               \
+       -I$(srcdir)/../GEOMImpl                 \
+       -I$(srcdir)/../GEOMFiltersSelection     \
+       -I$(top_builddir)/src/DlgRef            \
+       -I$(top_builddir)/idl                   \
        -I$(top_builddir)/salome_adm/unix
 
-libBooleanGUI_la_LDFLAGS  = \
+libBooleanGUI_la_LDFLAGS  =            \
        ../GEOMBase/libGEOMBase.la
index a9d44381764f1b9bf3b9e5658bdd94c81f4ae129..643cbf11af03422f56f94c78a93651122ae122f0 100644 (file)
@@ -1,37 +1,32 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BooleanGUI.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : BooleanGUI.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "BuildGUI.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-
-#include "SalomeApp_Application.h"
+#include <SUIT_Desktop.h>
+#include <SalomeApp_Application.h>
 
 #include "BuildGUI_EdgeDlg.h"       // Method EDGE
 #include "BuildGUI_WireDlg.h"       // Method WIRE
 #include "BuildGUI_SolidDlg.h"      // Method SOLID
 #include "BuildGUI_CompoundDlg.h"   // Method COMPOUND
 
-#include "GeometryGUI.h"
+#include <GeometryGUI.h>
 
 //=======================================================================
 // function : BuildGUI()
 // purpose  : Constructor
 //=======================================================================
 BuildGUI::BuildGUI( GeometryGUI* parent )
-: GEOMGUI( parent )
+  : GEOMGUI( parent )
 {
 }
 
@@ -68,24 +63,25 @@ bool BuildGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 {
   getGeometryGUI()->EmitSignalDeactivateDialog();
 
-  QDialog* aDlg = NULL;
-
-  switch ( theCommandID )
-  {
-    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;
+  QDialog* aDlg = 0;
 
-    default: 
-      getGeometryGUI()->getApp()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); 
-      break;
+  switch ( theCommandID ) {
+  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: 
+    getGeometryGUI()->getApp()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); 
+    break;
   }
-
-  if ( aDlg != NULL )
+  
+  if ( aDlg ) {
+    aDlg->updateGeometry();
+    aDlg->resize( aDlg->minimumSizeHint() );
     aDlg->show();
+  }
 
   return true;
 }
@@ -95,7 +91,9 @@ bool BuildGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 //=====================================================================================
 extern "C"
 {
- GEOM_BUILDGUI_EXPORT
+#ifdef WIN32
+  __declspec( dllexport )
+#endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
     return new BuildGUI( parent );
index 60e57a347ae9f3a960fb513c9909ebd364311193..1ae6aed71297b4223b6773d5e683bff4805e2243 100644 (file)
@@ -1,48 +1,44 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BuildGUI.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : BuildGUI.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
 #ifndef BUILDGUI_H
 #define BUILDGUI_H
 
-#include "GEOM_BuildGUI.hxx"
-
-#include "GEOMGUI.h"
+#include <GEOMGUI.h>
 
 //=================================================================================
 // class    : BuildGUI
 // purpose  :
 //=================================================================================
-class GEOM_BUILDGUI_EXPORT BuildGUI : public GEOMGUI
+class BuildGUI : public GEOMGUI
 {
 public :
-  BuildGUI( GeometryGUI* parent );
+  BuildGUI( GeometryGUI* );
   ~BuildGUI();
 
-  bool OnGUIEvent( int theCommandID, SUIT_Desktop* parent );
+  bool OnGUIEvent( int, SUIT_Desktop* );
 };
 
-#endif
+#endif // BUILDGUI_H
diff --git a/src/BuildGUI/BuildGUI.pro b/src/BuildGUI/BuildGUI.pro
new file mode 100644 (file)
index 0000000..4e3ff52
--- /dev/null
@@ -0,0 +1,66 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = BuildGUI
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+INCLUDEPATH += $${QT_INCLUDES} $${VTK_INCLUDES} $${CAS_CPPFLAGS} $${PYTHON_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} $${CORBA_INCLUDES} ../GEOMGUI ../DlgRef ../GEOMBase ../OBJECT ../GEOMClient ../GEOMImpl ../GEOMFiltersSelection $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lGEOMFiltersSelection -lGEOMBase
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += BUILDGUI_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+SOURCES  = BuildGUI.cxx
+SOURCES += BuildGUI_EdgeDlg.cxx
+SOURCES += BuildGUI_WireDlg.cxx
+SOURCES += BuildGUI_FaceDlg.cxx
+SOURCES += BuildGUI_ShellDlg.cxx
+SOURCES += BuildGUI_SolidDlg.cxx
+SOURCES += BuildGUI_CompoundDlg.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index 4ea4ca69650137b7f65533e40deb865920884a00..66ec085ebf631c6e8489a96137d6d6ee3063d259 100644 (file)
@@ -1,39 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+//  GEOM GEOMGUI : GUI for Geometry component
+// File   : BuildGUI_CompoundDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : BuildGUI_CompoundDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "BuildGUI_CompoundDlg.h"
-#include "GEOMImpl_Types.hxx"
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include <qlabel.h>
+#include <GEOMImpl_Types.hxx>
+
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : BuildGUI_CompoundDlg()
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-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)
+BuildGUI_CompoundDlg::BuildGUI_CompoundDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
+  : GEOMBase_Skeleton( theGeometryGUI, parent )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_COMPOUND")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BUILD_COMPOUND" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_COMPOUND_TITLE"));
+  setWindowTitle( tr( "GEOM_COMPOUND_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_COMPOUND"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupShapes = new DlgRef_1Sel_QTD(this, "GroupShapes");
-  GroupShapes->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
-  GroupShapes->TextLabel1->setText(tr("GEOM_OBJECTS"));
-  GroupShapes->PushButton1->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_COMPOUND" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupShapes = new DlgRef_1Sel( centralWidget() );
+
+  GroupShapes->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
+  GroupShapes->TextLabel1->setText( tr( "GEOM_OBJECTS" ) );
+  GroupShapes->PushButton1->setIcon( image1 );
   GroupShapes->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget(GroupShapes, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupShapes );
   /***************************************************************/
 
   setHelpFileName("create_compound_page.html");
@@ -96,12 +100,14 @@ void BuildGUI_CompoundDlg::Init()
   
   myOkShapes = false;
 
+  mainFrame()->GroupBoxPublish->show();
+
   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-  connect(GroupShapes->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));  
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+  connect( GroupShapes->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( ( (SalomeApp_Application*)(SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 
+          SIGNAL(currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   globalSelection( GEOM_ALLSHAPES );
 
@@ -143,14 +149,18 @@ void BuildGUI_CompoundDlg::SelectionIntoArgument()
   myEditCurrentArgument->setText( "" );
   QString aString = ""; /* name of selection */
 
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
   myOkShapes = false;
-  int nbSel = GEOMBase::GetNameOfSelectedIObjects( selectedIO(), aString, true );
+  int nbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aString, true);
   if ( nbSel == 0 ) 
     return;
   if ( nbSel != 1 )
     aString = QString( "%1_objects").arg( nbSel );
   
-  GEOMBase::ConvertListOfIOInListOfGO( selectedIO(), myShapes, true );
+  GEOMBase::ConvertListOfIOInListOfGO(aSelList, myShapes, true);
   myEditCurrentArgument->setText( aString );
   myOkShapes = true;
 }
@@ -163,7 +173,7 @@ void BuildGUI_CompoundDlg::SelectionIntoArgument()
 void BuildGUI_CompoundDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  if (send != GroupShapes->PushButton1)
+  if ( send != GroupShapes->PushButton1 )
     return;
   
   myEditCurrentArgument = GroupShapes->LineEdit1;
@@ -181,8 +191,8 @@ void BuildGUI_CompoundDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
   globalSelection( GEOM_ALLSHAPES );
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 }
 
 
@@ -192,7 +202,7 @@ void BuildGUI_CompoundDlg::ActivateThisDialog()
 //=================================================================================
 void BuildGUI_CompoundDlg::enterEvent(QEvent* e)
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog(); 
 }
 
@@ -229,3 +239,18 @@ bool BuildGUI_CompoundDlg::execute( ObjectList& objects )
 
   return true;
 }
+
+//=================================================================================
+// function : restoreSubShapes
+// purpose  :
+//=================================================================================
+void BuildGUI_CompoundDlg::restoreSubShapes( SALOMEDS::Study_ptr   theStudy,
+                                             SALOMEDS::SObject_ptr theSObject )
+{
+  if ( mainFrame()->CheckBoxRestoreSS->isChecked() ) {
+    // empty list of arguments means that all arguments should be restored
+    getGeomEngine()->RestoreSubShapesSO( theStudy, theSObject, GEOM::ListOfGO(),
+                                        /*theFindMethod=*/GEOM::FSM_GetSame, // ? GEOM::FSM_GetInPlace
+                                        /*theInheritFirstArg=*/false );
+  }
+}
index 31182622c2d74fb2e1de4115601113a91e1d366a..4aa6de2109d7f5102ca52c76fd97e374bbae7b57 100644 (file)
@@ -1,72 +1,70 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : GEOMBase_CompoundDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_COMPOUND_H
-#define DIALOGBOX_COMPOUND_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BuildGUI_CompoundDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef BUILDGUI_COMPOUNDDLG_H
+#define BUILDGUI_COMPOUNDDLG_H
 
-#include "GEOM_BuildGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_QTD.h"
+class DlgRef_1Sel;
 
 //=================================================================================
 // class    : BuildGUI_CompoundDlg
 // purpose  :
 //=================================================================================
-class GEOM_BUILDGUI_EXPORT BuildGUI_CompoundDlg : public GEOMBase_Skeleton
+class BuildGUI_CompoundDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BuildGUI_CompoundDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                        const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~BuildGUI_CompoundDlg();
+  BuildGUI_CompoundDlg( GeometryGUI*, QWidget* = 0 );
+  ~BuildGUI_CompoundDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& msg );
-    virtual bool execute( ObjectList& objects );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr );
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-
-    GEOM::ListOfGO myShapes;
-    bool           myOkShapes;
-
-    DlgRef_1Sel_QTD* GroupShapes;
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  
+private:
+  GEOM::ListOfGO                     myShapes;
+  bool                               myOkShapes;
+  
+  DlgRef_1Sel*                       GroupShapes;
     
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // DIALOGBOX_COMPOUND_H
+#endif // BUILDGUI_COMPOUNDDLG_H
index 6403242ce9d5177c7d356531f0e2d3a668037c87..1548635f45a908cce1bbbedd783e08615589f554 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BuildGUI_EdgeDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : BuildGUI_EdgeDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "BuildGUI_EdgeDlg.h"
 
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <Precision.hxx>
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include "utilities.h"
-#include "GEOMImpl_Types.hxx"
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-
-#include <qlabel.h>
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : BuildGUI_EdgeDlg()
-// purpose  : Constructs a BuildGUI_EdgeDlg which is a child of 'parent', with the 
+// purpose  : Constructs a BuildGUI_EdgeDlg which is 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.
 //=================================================================================
-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)
+BuildGUI_EdgeDlg::BuildGUI_EdgeDlg (GeometryGUI* theGeometryGUI, QWidget* parent)
+  : GEOMBase_Skeleton(theGeometryGUI, parent)
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_EDGE")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BUILD_EDGE")));
+  QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_EDGE_TITLE"));
+  setWindowTitle(tr("GEOM_EDGE_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_EDGE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_EDGE"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_2Sel(centralWidget());
 
-  GroupPoints = new DlgRef_2Sel_QTD(this, "GroupPoints");
   GroupPoints->GroupBox1->setTitle(tr("GEOM_POINTS"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_POINT_I").arg("1"));
-  GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg("2"));
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->PushButton2->setPixmap(image1);
-  
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
-
-  Layout1->addWidget(GroupPoints, 2, 0);
+  GroupPoints->TextLabel1->setText(tr("GEOM_POINT_I").arg(1));
+  GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg(2));
+  GroupPoints->PushButton1->setIcon(image1);
+  GroupPoints->PushButton2->setIcon(image1);
+
+  GroupPoints->LineEdit1->setReadOnly(true);
+  GroupPoints->LineEdit2->setReadOnly(true);
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
   /***************************************************************/
 
   setHelpFileName("create_edge_page.html");
 
-  /* Initialisations */
+  // Initialisation
   Init();
 }
 
-
 //=================================================================================
 // function : ~BuildGUI_EdgeDlg()
 // purpose  : Destroys the object and frees any allocated resources
 //=================================================================================
 BuildGUI_EdgeDlg::~BuildGUI_EdgeDlg()
 {
-    // no need to delete child widgets, Qt does it all for us
+  // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void BuildGUI_EdgeDlg::Init()
 {
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
+  // init variables
+  GroupPoints->LineEdit1->setReadOnly(true);
+  GroupPoints->LineEdit2->setReadOnly(true);
 
+  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit2->setText("");
+  myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
   myOkPoint1 = myOkPoint2 = false;
 
-  globalSelection( GEOM_POINT );
-
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
 
   connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
 
   connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
   connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
 
-  initName( tr( "GEOM_EDGE") );
-}
+  initName(tr("GEOM_EDGE"));
 
+  GroupPoints->PushButton1->click();
+  SelectionIntoArgument();
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -131,102 +127,123 @@ void BuildGUI_EdgeDlg::Init()
 //=================================================================================
 void BuildGUI_EdgeDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool BuildGUI_EdgeDlg::ClickOnApply()
 {
-  if ( !onAccept() )
+  if (!onAccept())
     return false;
 
   initName();
+  // activate selection and connect selection manager
+  GroupPoints->PushButton1->click();
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed or other case
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void BuildGUI_EdgeDlg::SelectionIntoArgument()
 {
   erasePreview();
   myEditCurrentArgument->setText("");
-  
-  if(IObjectCount() != 1) {
-    if(myEditCurrentArgument == GroupPoints->LineEdit1)
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
+    if (myEditCurrentArgument == GroupPoints->LineEdit1)
       myOkPoint1 = false;
-    else if(myEditCurrentArgument == GroupPoints->LineEdit2)
+    else if (myEditCurrentArgument == GroupPoints->LineEdit2)
       myOkPoint2 = false;
     return;
   }
-  
+
   // nbSel == 1
   Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
-  
-  if(!testResult)
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+  if (!testResult || aSelectedObject->_is_nil())
     return;
 
-  if(myEditCurrentArgument == GroupPoints->LineEdit1) {
+  myEditCurrentArgument->setText(GEOMBase::GetName(aSelectedObject));
+
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
     myPoint1 = aSelectedObject;
     myOkPoint1 = true;
+    if (!myOkPoint2)
+      GroupPoints->PushButton2->click();
   }
-  else if(myEditCurrentArgument == GroupPoints->LineEdit2) {
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
     myPoint2 = aSelectedObject;
     myOkPoint2 = true;
+    if (!myOkPoint1)
+      GroupPoints->PushButton1->click();
   }
-  
-  myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
-  
-  displayPreview();
-}
-
 
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose  :
-//=================================================================================
-void BuildGUI_EdgeDlg::LineEditReturnPressed()
-{
-  QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1 || send == GroupPoints->LineEdit2)
-    {
-      myEditCurrentArgument = send;
-      GEOMBase_Skeleton::LineEditReturnPressed();
-    }
+  displayPreview();
 }
 
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
 //=================================================================================
 void BuildGUI_EdgeDlg::SetEditCurrentArgument()
 {
-  
   QPushButton* send = (QPushButton*)sender();
-  globalSelection();
+  //globalSelection();//??
 
-  if(send == GroupPoints->PushButton1) {
+  if (send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
-    globalSelection( GEOM_POINT );
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
   }
-  else if(send == GroupPoints->PushButton2) {
+  else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
-    globalSelection( GEOM_POINT );
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
   }
-  
+
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  globalSelection(GEOM_POINT);
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
 }
 
+//=================================================================================
+// function : LineEditReturnPressed()
+// purpose  :
+//=================================================================================
+void BuildGUI_EdgeDlg::LineEditReturnPressed()
+{
+  QLineEdit* send = (QLineEdit*)sender();
+  if (send == GroupPoints->LineEdit1 || send == GroupPoints->LineEdit2) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
+}
 
 //=================================================================================
 // function : ActivateThisDialog()
@@ -235,20 +252,20 @@ void BuildGUI_EdgeDlg::SetEditCurrentArgument()
 void BuildGUI_EdgeDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-  globalSelection( GEOM_POINT );
+
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
   displayPreview();
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BuildGUI_EdgeDlg::enterEvent(QEvent* e)
+void BuildGUI_EdgeDlg::enterEvent (QEvent*)
 {
-  if ( !GroupConstructors->isEnabled() )
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
@@ -258,14 +275,14 @@ void BuildGUI_EdgeDlg::enterEvent(QEvent* e)
 //=================================================================================
 GEOM::GEOM_IOperations_ptr BuildGUI_EdgeDlg::createOperation()
 {
-  return getGeomEngine()->GetIShapesOperations( getStudyId() );
+  return getGeomEngine()->GetIShapesOperations(getStudyId());
 }
 
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool BuildGUI_EdgeDlg::isValid( QString& )
+bool BuildGUI_EdgeDlg::isValid (QString&)
 {
   return myOkPoint1 && myOkPoint2;
 }
@@ -274,14 +291,14 @@ bool BuildGUI_EdgeDlg::isValid( QString& )
 // function : execute
 // purpose  :
 //=================================================================================
-bool BuildGUI_EdgeDlg::execute( ObjectList& objects )
+bool BuildGUI_EdgeDlg::execute (ObjectList& objects)
 {
   GEOM::GEOM_Object_var anObj;
 
-  anObj = GEOM::GEOM_IShapesOperations::_narrow( getOperation() )->MakeEdge( myPoint1, myPoint2 );
+  anObj = GEOM::GEOM_IShapesOperations::_narrow(getOperation())->MakeEdge(myPoint1, myPoint2);
 
-  if ( !anObj->_is_nil() )
-    objects.push_back( anObj._retn() );
+  if (!anObj->_is_nil())
+    objects.push_back(anObj._retn());
 
   return true;
 }
index 3a7b7b2b50e0e9ccb1c5cc2f89312dff6d67bb8c..17dda7703fad453129613f3121df8f189d819b2b 100644 (file)
@@ -1,74 +1,71 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BuildGUI_EdgeDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_EDGE_H
-#define DIALOGBOX_EDGE_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BuildGUI_EdgeDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef BUILDGUI_EDGEDLG_H
+#define BUILDGUI_EDGEDLG_H
 
-#include "GEOM_BuildGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel_QTD.h"
+class DlgRef_2Sel;
 
 //=================================================================================
 // class    : BuildGUI_EdgeDlg
 // purpose  :
 //=================================================================================
-class GEOM_BUILDGUI_EXPORT BuildGUI_EdgeDlg : public GEOMBase_Skeleton
+class BuildGUI_EdgeDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BuildGUI_EdgeDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                    const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~BuildGUI_EdgeDlg();
+  BuildGUI_EdgeDlg( GeometryGUI*, QWidget* = 0 );
+  ~BuildGUI_EdgeDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& msg );
-    virtual bool execute( ObjectList& objects );    
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );    
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    
-    GEOM::GEOM_Object_var myPoint1, myPoint2;   /* Points containing the edge */ 
-    bool myOkPoint1;   /* true when myPoint is defined */    
-    bool myOkPoint2;
-    
-    DlgRef_2Sel_QTD* GroupPoints;
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  
+private:
+  GEOM::GEOM_Object_var              myPoint1, myPoint2;   /* Points containing the edge */ 
+  bool                               myOkPoint1;   /* true when myPoint is defined */    
+  bool                               myOkPoint2;
+  
+  DlgRef_2Sel*                       GroupPoints;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // DIALOGBOX_EDGE_H
+#endif // BUILDGUI_EDGEDLG_H
index a008a721f30411cdcf15e6d70909e72a26f740e9..e1adb30c60e155ada891e93b7b09a65c77973890 100644 (file)
@@ -1,44 +1,41 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BuildGUI_FaceDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : BuildGUI_FaceDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "BuildGUI_FaceDlg.h"
-#include "GEOMImpl_Types.hxx"
-#include "TColStd_MapOfInteger.hxx"
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <GEOMImpl_Types.hxx>
+#include <TColStd_MapOfInteger.hxx>
 
-//Qt includes
-#include <qcheckbox.h>
-#include <qlabel.h>
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-using namespace std;
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : BuildGUI_FaceDlg()
@@ -47,29 +44,32 @@ 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(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)
+BuildGUI_FaceDlg::BuildGUI_FaceDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
+  : GEOMBase_Skeleton( theGeometryGUI, parent )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_FACE")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BUILD_FACE" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_FACE_TITLE"));
+  setWindowTitle( tr( "GEOM_FACE_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_FACE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupWire = new DlgRef_1Sel1Check_QTD(this, "GroupWire");
-  GroupWire->GroupBox1->setTitle(tr("GEOM_FACE_FFW"));
-  GroupWire->TextLabel1->setText(tr("GEOM_OBJECTS"));
-  GroupWire->CheckButton1->setText(tr("GEOM_FACE_OPT"));
-  GroupWire->PushButton1->setPixmap(image1);
-
-  Layout1->addWidget(GroupWire, 2, 0);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_FACE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupWire = new DlgRef_1Sel1Check( centralWidget() );
+
+  GroupWire->GroupBox1->setTitle( tr( "GEOM_FACE_FFW" ) );
+  GroupWire->TextLabel1->setText( tr( "GEOM_OBJECTS" ) );
+  GroupWire->CheckButton1->setText( tr( "GEOM_FACE_OPT" ) );
+  GroupWire->PushButton1->setIcon( image1 );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupWire );
   /***************************************************************/
 
   setHelpFileName("create_face_page.html");
@@ -99,7 +99,7 @@ void BuildGUI_FaceDlg::Init()
   myEditCurrentArgument = GroupWire->LineEdit1;
   GroupWire->LineEdit1->setReadOnly( true );
 
-  GroupWire->CheckButton1->setChecked(TRUE);
+  GroupWire->CheckButton1->setChecked( true );
 
   TColStd_MapOfInteger aMap;
   aMap.Add( GEOM_EDGE );
@@ -107,14 +107,14 @@ void BuildGUI_FaceDlg::Init()
   globalSelection( aMap );
 
   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-  connect(GroupWire->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupWire->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));  
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-
-  initName(tr("GEOM_FACE"));
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+  connect( GroupWire->LineEdit1,   SIGNAL( returnPressed()), this, SLOT( LineEditReturnPressed() ) );
+  connect( GroupWire->PushButton1, SIGNAL( clicked() ),      this, SLOT( SetEditCurrentArgument() ) );
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+
+  initName( tr( "GEOM_FACE" ) );
 }
 
 
@@ -149,24 +149,25 @@ bool BuildGUI_FaceDlg::ClickOnApply()
 //=================================================================================
 void BuildGUI_FaceDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   QString aName;
   
-  int aNbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aName);
-  
-  if(aNbSel < 1)
-    {
-      myWires.length(0);
-      return;
-    }
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  int aNbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aName);
   
-  GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), myWires);
-  if (!myWires.length())
+  if ( aNbSel < 1) {
+    myWires.length(0);
     return;
-  if(aNbSel != 1)
-    aName = tr("%1_objects").arg(aNbSel);
+  }
   
-  myEditCurrentArgument->setText( aName );
+  GEOMBase::ConvertListOfIOInListOfGO(aSelList, myWires);
+  if ( !myWires.length() )
+    return;
+  if ( aNbSel != 1 )
+    aName = tr( "%1_objects" ).arg( aNbSel );
   
   myEditCurrentArgument->setText( aName );
 }
@@ -179,7 +180,7 @@ void BuildGUI_FaceDlg::SelectionIntoArgument()
 void BuildGUI_FaceDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  if (send != GroupWire->PushButton1)
+  if ( send != GroupWire->PushButton1 )
     return;
   
   TColStd_MapOfInteger aMap;
@@ -201,8 +202,8 @@ void BuildGUI_FaceDlg::SetEditCurrentArgument()
 void BuildGUI_FaceDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
   TColStd_MapOfInteger aMap;
   aMap.Add( GEOM_EDGE );
   aMap.Add( GEOM_WIRE );
@@ -214,9 +215,9 @@ void BuildGUI_FaceDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BuildGUI_FaceDlg::enterEvent(QEvent* e)
+void BuildGUI_FaceDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog(); 
 }
 
@@ -235,7 +236,7 @@ GEOM::GEOM_IOperations_ptr BuildGUI_FaceDlg::createOperation()
 //=================================================================================
 bool BuildGUI_FaceDlg::isValid( QString& )
 {
-  return (myWires.length() != 0);
+  return ( myWires.length() != 0 );
 }
 
 //=================================================================================
index 734cbc2f3548d5c00b7ffba9026349fbd503f94b..12bd7d7131331de07e11ad38f0b30657956f6faa 100644 (file)
@@ -1,71 +1,68 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BuildGUI_FaceDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_FACE_H
-#define DIALOGBOX_FACE_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BuildGUI_FaceDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef BUILDGUI_FACEDLG_H
+#define BUILDGUI_FACEDLG_H
 
-#include "GEOM_BuildGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel1Check_QTD.h"
+class DlgRef_1Sel1Check;
 
 //=================================================================================
 // class    : BuildGUI_FaceDlg
 // purpose  :
 //=================================================================================
-class GEOM_BUILDGUI_EXPORT BuildGUI_FaceDlg : public GEOMBase_Skeleton
+class BuildGUI_FaceDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BuildGUI_FaceDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                    const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~BuildGUI_FaceDlg();
+  BuildGUI_FaceDlg( GeometryGUI*, QWidget* = 0 );
+  ~BuildGUI_FaceDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& msg );
-    virtual bool execute( ObjectList& objects );    
-
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );    
+  
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    
-    GEOM::ListOfGO myWires;
-    
-    DlgRef_1Sel1Check_QTD* GroupWire;
+  GEOM::ListOfGO                     myWires;
+  
+  DlgRef_1Sel1Check*                 GroupWire;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // DIALOGBOX_FACE_H
+#endif // BUILDGUI_FACEDLG_H
index 99c99f03f15232cde5d4c5740e7deed1da42b9c9..bd1cb125ad7ac40e01989bb0e3ca8adf735114db 100644 (file)
@@ -1,41 +1,42 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BuildGUI_ShellDlg.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : BuildGUI_ShellDlg.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "BuildGUI_ShellDlg.h"
-#include "GEOMImpl_Types.hxx"
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <GEOMImpl_Types.hxx>
 
-#include "TColStd_MapOfInteger.hxx"
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
-#include <qlabel.h>
+#include <TColStd_MapOfInteger.hxx>
 
 //=================================================================================
 // class    : BuildGUI_ShellDlg()
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-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)
+BuildGUI_ShellDlg::BuildGUI_ShellDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
+  : GEOMBase_Skeleton( theGeometryGUI, parent )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BUILD_SHELL")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BUILD_SHELL" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_SHELL_TITLE"));
+  setWindowTitle( tr( "GEOM_SHELL_TITLE" ) );
     
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_SHELL"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupShell = new DlgRef_1Sel_QTD(this, "GroupShell");
-  GroupShell->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
-  GroupShell->TextLabel1->setText(tr("GEOM_OBJECTS"));
-  GroupShell->PushButton1->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_SHELL" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupShell = new DlgRef_1Sel( centralWidget() );
+
+  GroupShell->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
+  GroupShell->TextLabel1->setText( tr( "GEOM_OBJECTS" ) );
+  GroupShell->PushButton1->setIcon( image1 );
   GroupShell->LineEdit1->setReadOnly( true );
   
-  Layout1->addWidget(GroupShell, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupShell );
   /***************************************************************/
 
   setHelpFileName("create_shell_page.html");
@@ -99,20 +103,25 @@ void BuildGUI_ShellDlg::Init()
   myOkFacesAndShells = false;
   
   TColStd_MapOfInteger aMap;
-  aMap.Add(GEOM_SHELL);
-  aMap.Add(GEOM_FACE);
-  globalSelection( aMap );
+  aMap.Add( GEOM_SHELL );
+  aMap.Add( GEOM_FACE );
+  aMap.Add( GEOM_COMPOUNDFILTER );
+  
+  QList<int> aSubShapes;
+  aSubShapes.append( GEOM_FACE );
+  globalSelection( aMap, aSubShapes );
+  
 
   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
-  connect(GroupShell->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect( GroupShell->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
-  initName(tr("GEOM_SHELL"));
+  initName( tr( "GEOM_SHELL" ) );
 }
 
 
@@ -150,14 +159,18 @@ void BuildGUI_ShellDlg::SelectionIntoArgument()
   myEditCurrentArgument->setText( "" );
   QString aString;
 
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
   myOkFacesAndShells = false;
-  int nbSel = GEOMBase::GetNameOfSelectedIObjects( selectedIO(), aString, true );
+  int nbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aString, true);
   if ( nbSel == 0 )
     return;
   if ( nbSel != 1 )
     aString = QString( "%1_objects ").arg( nbSel );
 
-  GEOMBase::ConvertListOfIOInListOfGO( selectedIO(),  myFacesAndShells, true );
+  GEOMBase::ConvertListOfIOInListOfGO(aSelList, myFacesAndShells, true);
   if ( !myFacesAndShells.length() )
     return;
 
@@ -173,13 +186,18 @@ void BuildGUI_ShellDlg::SelectionIntoArgument()
 void BuildGUI_ShellDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  if (send != GroupShell->PushButton1)
+  if ( send != GroupShell->PushButton1 )
     return;
 
   TColStd_MapOfInteger aMap;
-  aMap.Add(GEOM_SHELL);
-  aMap.Add(GEOM_FACE);
-  globalSelection( aMap );
+  aMap.Add( GEOM_SHELL );
+  aMap.Add( GEOM_FACE );
+  aMap.Add( GEOM_COMPOUNDFILTER );
+
+  QList<int> aSubShapes;
+  aSubShapes.append( GEOM_FACE );
+  globalSelection( aMap, aSubShapes );
+  
   myEditCurrentArgument = GroupShell->LineEdit1;
 
   myEditCurrentArgument->setFocus();
@@ -194,12 +212,16 @@ void BuildGUI_ShellDlg::SetEditCurrentArgument()
 void BuildGUI_ShellDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
   TColStd_MapOfInteger aMap;
-  aMap.Add(GEOM_SHELL);
-  aMap.Add(GEOM_FACE);
-  globalSelection( aMap );
+  aMap.Add( GEOM_SHELL );
+  aMap.Add( GEOM_FACE );
+  aMap.Add( GEOM_COMPOUNDFILTER );
+  
+  QList<int> aSubShapes;
+  aSubShapes.append( GEOM_FACE );
+  globalSelection( aMap, aSubShapes );
 }
 
 
@@ -207,9 +229,9 @@ void BuildGUI_ShellDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BuildGUI_ShellDlg::enterEvent(QEvent* e)
+void BuildGUI_ShellDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
index 8c113246836714b95445a32a74ef6e26d8394716..d611afe2422f41c5be1b0a006d0bd384840bbc2c 100644 (file)
@@ -1,72 +1,69 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BuildGUI_ShellDlg.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
-#ifndef DIALOGBOX_SHELL_H
-#define DIALOGBOX_SHELL_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BuildGUI_ShellDlg.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
+//
+#ifndef BUILDGUI_SHELLDLG_H
+#define BUILDGUI_SHELLDLG_H
 
-#include "GEOM_BuildGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_QTD.h"
+class DlgRef_1Sel;
 
 //=================================================================================
 // class    : BuildGUI_ShellDlg
 // purpose  :
 //=================================================================================
-class GEOM_BUILDGUI_EXPORT BuildGUI_ShellDlg : public GEOMBase_Skeleton
+class BuildGUI_ShellDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BuildGUI_ShellDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                     const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~BuildGUI_ShellDlg();
+  BuildGUI_ShellDlg( GeometryGUI*, QWidget* = 0 );
+  ~BuildGUI_ShellDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& msg );
-    virtual bool execute( ObjectList& objects );    
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );    
 
 private:
-    void Init();
-    void enterEvent(QEvent * e);
-
-    GEOM::ListOfGO myFacesAndShells;
-    bool myOkFacesAndShells;          /* to check when arguments is defined */
+  void                               Init();
+  void                               enterEvent( QEvent* );
 
-    DlgRef_1Sel_QTD* GroupShell;
+private:
+  GEOM::ListOfGO                     myFacesAndShells;
+  bool                               myOkFacesAndShells;/* to check when arguments is defined */
+  
+  DlgRef_1Sel*                       GroupShell;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void SetEditCurrentArgument();
-    void SelectionIntoArgument();
-    void ActivateThisDialog();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               SetEditCurrentArgument();
+  void                               SelectionIntoArgument();
+  void                               ActivateThisDialog();
 };
 
-#endif // DIALOGBOX_SHELL_H
+#endif // BUILDGUI_SHELLDLG_H
index 0d0bcb0751b152861da4ae4fe27915602d3fff66..05b62c1a21a92dfefe78eb5ce80fc4f9d0c15688 100644 (file)
@@ -1,41 +1,41 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BuildGUI_SolidDlg.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : BuildGUI_SolidDlg.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "BuildGUI_SolidDlg.h"
-#include "GEOMImpl_Types.hxx"
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-//Qt includes
-#include <qcheckbox.h>
-#include <qlabel.h>
+#include <GEOMImpl_Types.hxx>
+
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : BuildGUI_SolidDlg()
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-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)
+BuildGUI_SolidDlg::BuildGUI_SolidDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
+  : GEOMBase_Skeleton( theGeometryGUI, parent )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BUILD_SOLID")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BUILD_SOLID" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_SOLID_TITLE"));
+  setWindowTitle( tr( "GEOM_SOLID_TITLE" ) );
     
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_SOLID"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupSolid = new DlgRef_1Sel1Check_QTD(this, "GroupSolid");
-  GroupSolid->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
-  GroupSolid->TextLabel1->setText(tr("GEOM_OBJECTS"));
-  GroupSolid->CheckButton1->setText(tr("GEOM_CREATE_SINGLE_SOLID"));
-  GroupSolid->PushButton1->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_SOLID" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupSolid = new DlgRef_1Sel1Check( centralWidget() );
+
+  GroupSolid->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
+  GroupSolid->TextLabel1->setText( tr( "GEOM_OBJECTS" ) );
+  GroupSolid->CheckButton1->setText( tr( "GEOM_CREATE_SINGLE_SOLID" ) );
+  GroupSolid->PushButton1->setIcon( image1 );
   GroupSolid->LineEdit1->setReadOnly( true );
   
-  Layout1->addWidget(GroupSolid, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupSolid );
   /***************************************************************/
 
   setHelpFileName("create_solid_page.html");
@@ -83,7 +86,7 @@ BuildGUI_SolidDlg::BuildGUI_SolidDlg(GeometryGUI* theGeometryGUI, QWidget* paren
 //=================================================================================
 BuildGUI_SolidDlg::~BuildGUI_SolidDlg()
 {
-    // no need to delete child widgets, Qt does it all for us
+  // no need to delete child widgets, Qt does it all for us
 }
 
 
@@ -103,16 +106,16 @@ void BuildGUI_SolidDlg::Init()
   globalSelection( GEOM_SHELL );
 
   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
-  connect(GroupSolid->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupSolid->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(EnableNameField(bool)));
+  connect( GroupSolid->PushButton1,  SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupSolid->CheckButton1, SIGNAL( toggled( bool ) ), this, SLOT( EnableNameField( bool ) ) );
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
-  initName(tr("GEOM_SOLID"));
+  initName( tr( "GEOM_SOLID" ) );
 }
 
 
@@ -132,6 +135,17 @@ void BuildGUI_SolidDlg::ClickOnOk()
 //=================================================================================
 bool BuildGUI_SolidDlg::ClickOnApply()
 {
+  for ( int i = 0, n = myShells.length(); i< n; i++ ) {
+    if ( !isClosed(i)) {
+      QString aName = GEOMBase::GetName( myShells[i] );
+      SUIT_MessageBox::warning( (QWidget*)SUIT_Session::session()->activeApplication()->desktop(),
+                                 QObject::tr("WRN_WARNING"),
+                                 QObject::tr("WRN_SHAPE_UNCLOSED").arg(aName) ,
+                                 QObject::tr("BUT_OK") );
+       return false;
+    }
+  }
+
   if ( !onAccept() )
     return false;
 
@@ -146,21 +160,25 @@ bool BuildGUI_SolidDlg::ClickOnApply()
 //=================================================================================
 void BuildGUI_SolidDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   QString aString = "";
   
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
   myOkShells = false;
-  int nbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aString);
-  if (nbSel == 0) 
+  int nbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aString);
+  if ( nbSel == 0 )
     return;
-  if(nbSel != 1)
-    aString = tr("%1_objects").arg(nbSel);
+  if ( nbSel != 1 )
+    aString = tr( "%1_objects" ).arg( nbSel );
   
-  GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), myShells);
-  if (!myShells.length()) 
+  GEOMBase::ConvertListOfIOInListOfGO(aSelList, myShells);
+  if ( !myShells.length() )
     return;
   
-  myEditCurrentArgument->setText(aString);
+  myEditCurrentArgument->setText( aString );
   myOkShells = true;
 }
 
@@ -171,7 +189,7 @@ void BuildGUI_SolidDlg::SelectionIntoArgument()
 void BuildGUI_SolidDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  if(send != GroupSolid->PushButton1)
+  if ( send != GroupSolid->PushButton1 )
     return;
   
   globalSelection( GEOM_SHELL );
@@ -189,8 +207,8 @@ void BuildGUI_SolidDlg::SetEditCurrentArgument()
 void BuildGUI_SolidDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
   globalSelection( GEOM_SHELL );
 }
 
@@ -199,9 +217,9 @@ void BuildGUI_SolidDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BuildGUI_SolidDlg::enterEvent(QEvent* e)
+void BuildGUI_SolidDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
@@ -210,9 +228,9 @@ void BuildGUI_SolidDlg::enterEvent(QEvent* e)
 // function :  EnableNameField()
 // purpose  :
 //=================================================================================
-void  BuildGUI_SolidDlg::EnableNameField(bool toEnable)
+void  BuildGUI_SolidDlg::EnableNameField( bool toEnable )
 {
-  this->GroupBoxName->setEnabled(toEnable); 
+  mainFrame()->GroupBoxName->setEnabled( toEnable ); 
 }
 
 //=================================================================================
@@ -233,6 +251,42 @@ bool BuildGUI_SolidDlg::isValid( QString& )
   return myOkShells;
 }
 
+//=================================================================================
+// function : isClosed
+// purpose  : Check the object 'i' in myShells list is closed or unclosed
+//=================================================================================
+bool BuildGUI_SolidDlg::isClosed(int i)
+{
+  GEOM::GEOM_Object_var aShape = myShells[i];
+  GEOM::GEOM_IKindOfShape::shape_kind aKind;
+  GEOM::ListOfLong_var anInts;
+  GEOM::ListOfDouble_var aDbls;
+
+  if (aShape->_is_nil()) {
+    MESSAGE ("Shape is NULL!!!");
+    return false;
+  }
+
+  GEOM::GEOM_IMeasureOperations_ptr anOp = myGeomGUI->GetGeomGen()->GetIMeasureOperations( getStudyId() );
+
+  //  GEOM::GEOM_IMeasureOperations_var anOp = GEOM::GEOM_IMeasureOperations::_narrow( getOperation() );
+
+  // Detect kind of shape and parameters
+  aKind = anOp->KindOfShape(aShape, anInts, aDbls);
+
+  if ( !anOp->IsDone() ) {
+    MESSAGE ("KindOfShape Operation is NOT DONE!!!");
+    return false;
+  }
+  
+  if ( anInts[0] == 1 )
+    return true;
+  else if ( anInts[0] == 2 )
+    return false;
+  return false;
+}
+
 //=================================================================================
 // function : execute
 // purpose  :
@@ -241,18 +295,15 @@ bool BuildGUI_SolidDlg::execute( ObjectList& objects )
 {
   bool toCreateSingleSolid = GroupSolid->CheckButton1->isChecked();
   
-  if ( toCreateSingleSolid )
-  {
+  if ( toCreateSingleSolid ) {
     GEOM::GEOM_Object_var anObj = GEOM::GEOM_IShapesOperations::_narrow(
       getOperation() )->MakeSolidShells( myShells );
 
     if ( !anObj->_is_nil() )
       objects.push_back( anObj._retn() );
   }
-  else
-  {
-    for ( int i = 0, n = myShells.length(); i< n; i++ )
-    {
+  else {
+    for ( int i = 0, n = myShells.length(); i< n; i++ ) {
       GEOM::GEOM_Object_var anObj = GEOM::GEOM_IShapesOperations::_narrow(
         getOperation() )->MakeSolidShell( myShells[ i ] );
 
index 41982f4a2287efb07aa378289bc3b5dee5cdeac8..3236ad4aaf52f82cada89a29afce55640c111c9d 100644 (file)
@@ -1,74 +1,72 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BuildGUI_SolidDlg.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
-#ifndef DIALOGBOX_SOLID_H
-#define DIALOGBOX_SOLID_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BuildGUI_SolidDlg.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
+//
+#ifndef BUILDGUI_SOLIDDLG_H
+#define BUILDGUI_SOLIDDLG_H
 
-#include "GEOM_BuildGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel1Check_QTD.h"
+class DlgRef_1Sel1Check;
 
 //=================================================================================
 // class    : BuildGUI_SolidDlg
 // purpose  :
 //=================================================================================
-class GEOM_BUILDGUI_EXPORT BuildGUI_SolidDlg : public GEOMBase_Skeleton
+class BuildGUI_SolidDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BuildGUI_SolidDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                     const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~BuildGUI_SolidDlg();
+  BuildGUI_SolidDlg( GeometryGUI*, QWidget* = 0 );
+  ~BuildGUI_SolidDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& msg );
-    virtual bool execute( ObjectList& objects );    
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );    
 
 private:
-    void Init();
-    void enterEvent(QEvent * e);
+  void                               Init();
+  bool                               isClosed(int i);
+  void                               enterEvent( QEvent* );
 
-    GEOM::ListOfGO myShells;
-    bool myOkShells;          /* to check when arguments is defined and
-                                 all shells are closed */
+private:
+  GEOM::ListOfGO                     myShells;
+  bool                               myOkShells; /* to check when arguments is defined and
+                                                   all shells are closed */
 
-    DlgRef_1Sel1Check_QTD* GroupSolid;
+  DlgRef_1Sel1Check*                GroupSolid;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void SetEditCurrentArgument();
-    void SelectionIntoArgument();
-    void ActivateThisDialog();
-    void EnableNameField(bool toEnable);
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               SetEditCurrentArgument();
+  void                               SelectionIntoArgument();
+  void                               ActivateThisDialog();
+  void                               EnableNameField( bool );
 };
 
-#endif // DIALOGBOX_SOLID_H
+#endif // BUILDGUI_SOLIDDLG_H
index 6bf55259c92fd6c61c35ce7ea5df0c155178b421..05326e4570afe7636deac44857b85612b2399508 100644 (file)
@@ -1,41 +1,42 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BuildGUI_WireDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : BuildGUI_WireDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "BuildGUI_WireDlg.h"
-#include "GEOMImpl_Types.hxx"
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <GEOMImpl_Types.hxx>
+
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include "TColStd_MapOfInteger.hxx"
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
-#include <qlabel.h>
+#include <TColStd_MapOfInteger.hxx>
 
 //=================================================================================
 // class    : BuildGUI_WireDlg()
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-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)
+BuildGUI_WireDlg::BuildGUI_WireDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
+  : GEOMBase_Skeleton( theGeometryGUI, parent )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_WIRE")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BUILD_WIRE" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_WIRE_TITLE"));
+  setWindowTitle( tr( "GEOM_WIRE_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_WIRE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel_QTD(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_WIRE_CONNECT"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS"));
-  GroupPoints->PushButton1->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_WIRE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_1Sel( centralWidget() );
+
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_WIRE_CONNECT" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_OBJECTS" ) );
+  GroupPoints->PushButton1->setIcon( image1 );
   GroupPoints->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget(GroupPoints, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
   /***************************************************************/
 
-  setHelpFileName("create_wire_page.html");
+  setHelpFileName( "create_wire_page.html" );
 
   /* Initialisations */
   Init();
@@ -99,18 +103,18 @@ void BuildGUI_WireDlg::Init()
   myOkEdgesAndWires = false;
   
   TColStd_MapOfInteger aMap;
-  aMap.Add(GEOM_WIRE);
-  aMap.Add(GEOM_EDGE);
+  aMap.Add( GEOM_WIRE );
+  aMap.Add( GEOM_EDGE );
   globalSelection( aMap );
 
   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+  connect( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
   
-  initName(tr("GEOM_WIRE"));
+  initName( tr( "GEOM_WIRE" ) );
 }
 
 
@@ -145,22 +149,26 @@ bool BuildGUI_WireDlg::ClickOnApply()
 //=================================================================================
 void BuildGUI_WireDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   QString aString = ""; /* name of selection */
 
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
   myOkEdgesAndWires = false;
-  int nbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aString);
+  int nbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aString);
 
-  if(nbSel == 0)
+  if ( nbSel == 0 )
     return;
-  if(nbSel != 1)
-    aString = tr("%1_objects").arg(nbSel);
+  if ( nbSel != 1 )
+    aString = tr( "%1_objects" ).arg( nbSel );
 
-  GEOMBase::ConvertListOfIOInListOfGO(selectedIO(),  myEdgesAndWires);
-  if (!myEdgesAndWires.length())
+  GEOMBase::ConvertListOfIOInListOfGO(aSelList,  myEdgesAndWires);
+  if ( !myEdgesAndWires.length() )
     return;
 
-  myEditCurrentArgument->setText(aString);
+  myEditCurrentArgument->setText( aString );
   myOkEdgesAndWires = true;
 }
 
@@ -172,12 +180,12 @@ void BuildGUI_WireDlg::SelectionIntoArgument()
 void BuildGUI_WireDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  if (send != GroupPoints->PushButton1)
+  if ( send != GroupPoints->PushButton1 )
     return;
 
   TColStd_MapOfInteger aMap;
-  aMap.Add(GEOM_WIRE);
-  aMap.Add(GEOM_EDGE);
+  aMap.Add( GEOM_WIRE );
+  aMap.Add( GEOM_EDGE );
   globalSelection( aMap );
   myEditCurrentArgument = GroupPoints->LineEdit1;
 
@@ -193,11 +201,11 @@ void BuildGUI_WireDlg::SetEditCurrentArgument()
 void BuildGUI_WireDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
   TColStd_MapOfInteger aMap;
-  aMap.Add(GEOM_WIRE);
-  aMap.Add(GEOM_EDGE);
+  aMap.Add( GEOM_WIRE );
+  aMap.Add( GEOM_EDGE );
   globalSelection( aMap );
 }
 
@@ -206,9 +214,9 @@ void BuildGUI_WireDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void BuildGUI_WireDlg::enterEvent(QEvent* e)
+void BuildGUI_WireDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
index ecfcc2c1481d0c046db610f4433217433eb8b8ed..616df02464d5c0049f7a0ed635df5698b1b2ca8c 100644 (file)
@@ -1,72 +1,69 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : BuildGUI_WireDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_WIRE_H
-#define DIALOGBOX_WIRE_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : BuildGUI_WireDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef BUILDGUI_WIREDLG_H
+#define BUILDGUI_WIREDLG_H
 
-#include "GEOM_BuildGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_QTD.h"
+class DlgRef_1Sel;
 
 //=================================================================================
 // class    : BuildGUI_WireDlg
 // purpose  :
 //=================================================================================
-class GEOM_BUILDGUI_EXPORT BuildGUI_WireDlg : public GEOMBase_Skeleton
+class BuildGUI_WireDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    BuildGUI_WireDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                    const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~BuildGUI_WireDlg();
+  BuildGUI_WireDlg( GeometryGUI*, QWidget* = 0 );
+  ~BuildGUI_WireDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& msg );
-    virtual bool execute( ObjectList& objects );    
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );    
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-
-    GEOM::ListOfGO myEdgesAndWires;
-    bool myOkEdgesAndWires;   /* to check when arguments is defined */
+  void                               Init();
+  void                               enterEvent( QEvent* );
 
-    DlgRef_1Sel_QTD* GroupPoints;
+private:
+  GEOM::ListOfGO                     myEdgesAndWires;
+  bool                               myOkEdgesAndWires;   /* to check when arguments is defined */
+  
+  DlgRef_1Sel*                       GroupPoints;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // DIALOGBOX_WIRE_H
+#endif // BUILDGUI_WIREDLG_H
diff --git a/src/BuildGUI/GEOM_BuildGUI.hxx b/src/BuildGUI/GEOM_BuildGUI.hxx
deleted file mode 100755 (executable)
index 7a36f85..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-//  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_BuildGUI.hxx
-//  Author : Alexander A. BORODIN
-//  Module : GEOM
-
-#ifndef _GEOM_BuildGUI_HXX_
-#define _GEOM_BuildGUI_HXX_
-
-#ifdef WNT
- #if defined BUILDGUI_EXPORTS
-  #if defined WIN32
-   #define GEOM_BUILDGUI_EXPORT __declspec( dllexport )
-  #else
-   #define GEOM_BUILDGUI_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define GEOM_BUILDGUI_EXPORT __declspec( dllimport )
-  #else
-   #define GEOM_BUILDGUI_EXPORT
-  #endif
- #endif
-#else
- #define GEOM_BUILDGUI_EXPORT
-#endif
-
-#endif
index 59820f17bb7ff21350fa8d000cb3401d9fda5908..d4f2af5489314bb57b24e7cf09e7aad04ed7e22c 100644 (file)
@@ -1,87 +1,88 @@
-#  GEOM BUILDGUI : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM BUILDGUI : 
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : BuildGUI
 #
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =                \
+       BuildGUI.h              \
+       BuildGUI_EdgeDlg.h      \
+       BuildGUI_WireDlg.h      \
+       BuildGUI_FaceDlg.h      \
+       BuildGUI_ShellDlg.h     \
+       BuildGUI_SolidDlg.h     \
+       BuildGUI_CompoundDlg.h
 
 # Libraries targets
 lib_LTLIBRARIES = libBuildGUI.la 
 
 # Sources files
-dist_libBuildGUI_la_SOURCES = \
-       BuildGUI.cxx \
-       BuildGUI_EdgeDlg.cxx \
-       BuildGUI_WireDlg.cxx \
-       BuildGUI_FaceDlg.cxx \
-       BuildGUI_ShellDlg.cxx \
-       BuildGUI_SolidDlg.cxx \
+dist_libBuildGUI_la_SOURCES =  \
+       BuildGUI.cxx            \
+       BuildGUI_EdgeDlg.cxx    \
+       BuildGUI_WireDlg.cxx    \
+       BuildGUI_FaceDlg.cxx    \
+       BuildGUI_ShellDlg.cxx   \
+       BuildGUI_SolidDlg.cxx   \
        BuildGUI_CompoundDlg.cxx
 
-MOC_FILES = \
-       BuildGUI_EdgeDlg_moc.cxx \
-       BuildGUI_WireDlg_moc.cxx \
-       BuildGUI_FaceDlg_moc.cxx \
-       BuildGUI_ShellDlg_moc.cxx \
-       BuildGUI_SolidDlg_moc.cxx \
+MOC_FILES =                            \
+       BuildGUI_EdgeDlg_moc.cxx        \
+       BuildGUI_WireDlg_moc.cxx        \
+       BuildGUI_FaceDlg_moc.cxx        \
+       BuildGUI_ShellDlg_moc.cxx       \
+       BuildGUI_SolidDlg_moc.cxx       \
        BuildGUI_CompoundDlg_moc.cxx
 
-nodist_libBuildGUI_la_SOURCES= \
+nodist_libBuildGUI_la_SOURCES =                \
        $(MOC_FILES)
 
-# LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
-
-# LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libBuildGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../DlgRef \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(srcdir)/../GEOMFiltersSelection \
-       -I$(top_builddir)/idl \
+libBuildGUI_la_CPPFLAGS =                      \
+       $(QT_INCLUDES)                          \
+       $(VTK_INCLUDES)                         \
+       $(CAS_CPPFLAGS)                         \
+       $(PYTHON_INCLUDES)                      \
+       $(BOOST_CPPFLAGS)                       \
+       $(KERNEL_CXXFLAGS)                      \
+       $(GUI_CXXFLAGS)                         \
+       $(CORBA_CXXFLAGS)                       \
+       $(CORBA_INCLUDES)                       \
+       -I$(srcdir)/../GEOMGUI                  \
+       -I$(srcdir)/../DlgRef                   \
+       -I$(srcdir)/../GEOMBase                 \
+       -I$(srcdir)/../OBJECT                   \
+       -I$(srcdir)/../GEOMClient               \
+       -I$(srcdir)/../GEOMImpl                 \
+       -I$(srcdir)/../GEOMFiltersSelection     \
+       -I$(top_builddir)/idl                   \
+       -I$(top_builddir)/src/DlgRef            \
        -I$(top_builddir)/salome_adm/unix
 
-libBuildGUI_la_LDFLAGS  = \
-       ../GEOMFiltersSelection/libGEOMFiltersSelection.la \
+libBuildGUI_la_LDFLAGS =                                       \
+       ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \
        ../GEOMBase/libGEOMBase.la
index 6e4b906467b80127d979a3ab1f43d974f24f1e59..6b62fe2fefc2955ef1ddef99b9065b32a8936603 100644 (file)
@@ -1,44 +1,41 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : DisplayGUI.cxx
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
-//  File   : DisplayGUI.cxx
-//  Author : Vadim SANDLER
-//  Module : GEOM
-//  $Header$
-
 #include "DisplayGUI.h"
-#include "GeometryGUI.h"
-#include "GEOM_Displayer.h"
+#include <GeometryGUI.h>
+#include <GEOM_Displayer.h>
+#include <GEOM_AISShape.hxx>
 
 #include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
 #include <SUIT_ViewWindow.h>
 #include <SUIT_OverrideCursor.h>
 
 #include <OCCViewer_ViewManager.h>
 #include <OCCViewer_ViewModel.h>
-#include <OCCViewer_ViewWindow.h>
 
+#include <SALOME_ListIO.hxx>
 #include <SALOME_ListIteratorOfListIO.hxx>
 
 #include <SVTK_ViewWindow.h>
@@ -56,8 +53,7 @@
 
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
 
-#include <qmenubar.h>
-
+#include <QAction>
 
 //=======================================================================
 // function : DisplayGUI::DisplayGUI()
@@ -94,7 +90,7 @@ bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
     {
       InvertDisplayMode();
       int newMode = GetDisplayMode();
-      getGeometryGUI()->action( 211 )->setMenuText
+      getGeometryGUI()->action( 211 )->setText
         ( newMode == 1 ? tr( "GEOM_MEN_WIREFRAME" ) : tr("GEOM_MEN_SHADING") );
       getGeometryGUI()->menuMgr()->update();
       break;
@@ -476,7 +472,9 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow
 //=====================================================================================
 extern "C"
 {
- GEOM_DISPLAYGUI_EXPORT
+#ifdef WIN32
+  __declspec( dllexport )
+#endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
     return new DisplayGUI( parent );
index 9e31f223c91686a9df8331ce7c60c4d12dc36c0f..d9e089e2ab16bc8fee358a551a1f5a15bcbe3f97 100644 (file)
@@ -1,60 +1,48 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : DisplayGUI.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : DisplayGUI.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
 #ifndef DISPLAYGUI_H
 #define DISPLAYGUI_H
 
 #include "GEOMGUI.h"
-#include "GEOMBase.h"
-
-#ifdef WNT
-# if defined DISPLAYGUI_EXPORTS
-#  define GEOM_DISPLAYGUI_EXPORT __declspec( dllexport )
-# else
-#  define GEOM_DISPLAYGUI_EXPORT __declspec( dllimport )
-# endif
-#else
-# define GEOM_DISPLAYGUI_EXPORT
-#endif
 
 //=================================================================================
-// class    : GEOMBase_Display
+// class    : DisplayGUI
 // purpose  :
 //=================================================================================
-//class QAD_ViewFrame;
+
 class SUIT_ViewWindow;
-class GEOM_DISPLAYGUI_EXPORT DisplayGUI : public GEOMGUI
+
+class DisplayGUI : public GEOMGUI
 {
 public:
-  DisplayGUI( GeometryGUI* parent );
+  DisplayGUI( GeometryGUI* );
   ~DisplayGUI();
 
   // Dispatch menu command
-  bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent);
+  bool OnGUIEvent( int, SUIT_Desktop* );
 
   // Display all GEOM objects
   void DisplayAll();
@@ -69,16 +57,16 @@ public:
 
   // DISPLAY MODE methods : 0 - wireframe, 1 - shading
   // Set display mode for the viewer (current viewer if <viewWindow> - 0 )
-  void SetDisplayMode( const int mode, SUIT_ViewWindow* viewWindow = 0 );
+  void SetDisplayMode( const int, SUIT_ViewWindow* = 0 );
   // Get display mode of the viewer (current viewer if <viewWindow> - 0 )
-  int  GetDisplayMode( SUIT_ViewWindow* viewWindow = 0 );
+  int  GetDisplayMode( SUIT_ViewWindow* = 0 );
   // Invert display mode ( shadin <-> wireframe ) for the viewer 
   // (current viewer if <viewWindow> = 0 )
-  void InvertDisplayMode( SUIT_ViewWindow* viewWindow = 0 );
+  void InvertDisplayMode( SUIT_ViewWindow* = 0 );
 
   // Set display mode for selected objects in the viewer given
   // (current viewer if <viewWindow> = 0 )
-  void ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindo = 0 );
+  void ChangeDisplayMode( const int, SUIT_ViewWindow* = 0 );
 };
 
-#endif
+#endif // DISPLAYGUI_H
diff --git a/src/DisplayGUI/DisplayGUI.pro b/src/DisplayGUI/DisplayGUI.pro
new file mode 100644 (file)
index 0000000..c4ab18b
--- /dev/null
@@ -0,0 +1,68 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = DisplayGUI
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+GUI_LDFLAGS = -L$$(GUI_ROOT_DIR)/lib/salome
+
+VTK_LIBS = -L$$(VTKHOME)/lib/vtk -L$$(VTKHOME)/lib/vtk/python -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets   -lGL -L/usr/X11R6/lib -lGLU -L/usr/X11R6/lib -lX11 -lXt
+
+QT_MT_LIBS = -L$$(QTDIR)/lib -lQtCore -lQtXml -lQtGui -lQtOpenGL
+
+INCLUDEPATH += $${QT_INCLUDES} $${VTK_INCLUDES} $${CAS_CPPFLAGS} $${PYTHON_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} $${CORBA_INCLUDES} ../OBJECT ../GEOMBase ../GEOMClient ../GEOMImpl ../GEOMGUI $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lGEOM -lGEOMToolsGUI $${GUI_LDFLAGS} -lsuit -lSVTK -lSOCC -lSalomePrs -lSalomeApp $${VTK_LIBS} $${QT_MT_LIBS}
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += DISPLAYGUI_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+HEADERS = DisplayGUI.h
+
+SOURCES = DisplayGUI.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index 9f4f6a3bce517343ab62c2a6cb17b8980c3197a6..434048fe171e06c3298e1071648f4403f4f079ac 100644 (file)
@@ -1,70 +1,64 @@
-#  GEOM DISPLAYGUI : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM DISPLAYGUI : 
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : DisplayGUI
 #
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS = \
+salomeinclude_HEADERS =        \
        DisplayGUI.h
 
 # Libraries targets
 lib_LTLIBRARIES = libDisplayGUI.la
 
-dist_libDisplayGUI_la_SOURCES = DisplayGUI.cxx
-
-#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
-
-#LIB_SERVER_IDL = 
+dist_libDisplayGUI_la_SOURCES = \
+       DisplayGUI.h            \
+       DisplayGUI.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libDisplayGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(srcdir)/../GEOMClient \
-       -I$(top_builddir)/idl \
+libDisplayGUI_la_CPPFLAGS =            \
+       $(QT_INCLUDES)                  \
+       $(VTK_INCLUDES)                 \
+       $(CAS_CPPFLAGS)                 \
+       $(PYTHON_INCLUDES)              \
+       $(BOOST_CPPFLAGS)               \
+       $(KERNEL_CXXFLAGS)              \
+       $(GUI_CXXFLAGS)                 \
+       $(CORBA_CXXFLAGS)               \
+       $(CORBA_INCLUDES)               \
+       -I$(srcdir)/../GEOMGUI          \
+       -I$(srcdir)/../OBJECT           \
+       -I$(srcdir)/../GEOMImpl         \
+       -I$(srcdir)/../GEOMClient       \
+       -I$(top_builddir)/idl           \
        -I$(top_builddir)/salome_adm/unix
 
-libDisplayGUI_la_LDFLAGS = \
-       ../GEOMGUI/libGEOM.la \
-       ../GEOMToolsGUI/libGEOMToolsGUI.la \
-       $(GUI_LDFLAGS) -lsuit -lSVTK -lSOCC -lSalomePrs -lSalomeApp \
-       $(VTK_LIBS) \
+libDisplayGUI_la_LDFLAGS =             \
+       ../GEOMGUI/libGEOM.la           \
+       $(GUI_LDFLAGS) -lsuit -lSVTK    \
+       -lSOCC -lSalomePrs -lSalomeApp  \
+       $(VTK_LIBS)                     \
        $(QT_MT_LIBS)
diff --git a/src/DlgRef/DlgRef.cxx b/src/DlgRef/DlgRef.cxx
new file mode 100644 (file)
index 0000000..c22828f
--- /dev/null
@@ -0,0 +1,790 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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   : DlgRef.cxx
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
+//
+#include "DlgRef.h"
+
+//////////////////////////////////////////
+// DlgRef_1List1Spin1Btn
+//////////////////////////////////////////
+
+DlgRef_1List1Spin1Btn::DlgRef_1List1Spin1Btn( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1List1Spin1Btn::~DlgRef_1List1Spin1Btn()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel1Check1List
+//////////////////////////////////////////
+
+DlgRef_1Sel1Check1List::DlgRef_1Sel1Check1List( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel1Check1List::~DlgRef_1Sel1Check1List()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel1Check1Sel
+//////////////////////////////////////////
+
+DlgRef_1Sel1Check1Sel::DlgRef_1Sel1Check1Sel( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel1Check1Sel::~DlgRef_1Sel1Check1Sel()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel1Check
+//////////////////////////////////////////
+
+DlgRef_1Sel1Check::DlgRef_1Sel1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel1Check::~DlgRef_1Sel1Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel1List1Check3Btn
+//////////////////////////////////////////
+
+DlgRef_1Sel1List1Check3Btn::DlgRef_1Sel1List1Check3Btn( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel1List1Check3Btn::~DlgRef_1Sel1List1Check3Btn()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel1Spin1Check
+//////////////////////////////////////////
+
+DlgRef_1Sel1Spin1Check::DlgRef_1Sel1Spin1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel1Spin1Check::~DlgRef_1Sel1Spin1Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel1Spin
+//////////////////////////////////////////
+
+DlgRef_1Sel1Spin::DlgRef_1Sel1Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel1Spin::~DlgRef_1Sel1Spin()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel2Spin1View1Check
+//////////////////////////////////////////
+
+DlgRef_1Sel2Spin1View1Check::DlgRef_1Sel2Spin1View1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel2Spin1View1Check::~DlgRef_1Sel2Spin1View1Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel2Spin
+//////////////////////////////////////////
+
+DlgRef_1Sel2Spin::DlgRef_1Sel2Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel2Spin::~DlgRef_1Sel2Spin()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel3Check
+//////////////////////////////////////////
+
+DlgRef_1Sel3Check::DlgRef_1Sel3Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel3Check::~DlgRef_1Sel3Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel3Spin
+//////////////////////////////////////////
+
+DlgRef_1Sel3Spin::DlgRef_1Sel3Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel3Spin::~DlgRef_1Sel3Spin()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel3Spin1Check
+//////////////////////////////////////////
+
+DlgRef_1Sel3Spin1Check::DlgRef_1Sel3Spin1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel3Spin1Check::~DlgRef_1Sel3Spin1Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel4Spin
+//////////////////////////////////////////
+
+DlgRef_1Sel4Spin::DlgRef_1Sel4Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel4Spin::~DlgRef_1Sel4Spin()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel5Spin1Check
+//////////////////////////////////////////
+
+DlgRef_1Sel5Spin1Check::DlgRef_1Sel5Spin1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel5Spin1Check::~DlgRef_1Sel5Spin1Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel5Spin
+//////////////////////////////////////////
+
+DlgRef_1Sel5Spin::DlgRef_1Sel5Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel5Spin::~DlgRef_1Sel5Spin()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Spin
+//////////////////////////////////////////
+
+DlgRef_1Spin::DlgRef_1Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Spin::~DlgRef_1Spin()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1Sel
+//////////////////////////////////////////
+
+DlgRef_1Sel::DlgRef_1Sel( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel::~DlgRef_1Sel()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_1SelExt
+//////////////////////////////////////////
+
+DlgRef_1SelExt::DlgRef_1SelExt( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1SelExt::~DlgRef_1SelExt()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_2Sel1List1Check
+//////////////////////////////////////////
+
+DlgRef_2Sel1List1Check::DlgRef_2Sel1List1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2Sel1List1Check::~DlgRef_2Sel1List1Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_2Sel1List
+//////////////////////////////////////////
+
+DlgRef_2Sel1List::DlgRef_2Sel1List( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2Sel1List::~DlgRef_2Sel1List()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_2Sel1Spin2Check
+//////////////////////////////////////////
+
+DlgRef_2Sel1Spin2Check::DlgRef_2Sel1Spin2Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2Sel1Spin2Check::~DlgRef_2Sel1Spin2Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_2Sel1Spin
+//////////////////////////////////////////
+
+DlgRef_2Sel1Spin::DlgRef_2Sel1Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2Sel1Spin::~DlgRef_2Sel1Spin()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_2Sel2List
+//////////////////////////////////////////
+
+DlgRef_2Sel2List::DlgRef_2Sel2List( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2Sel2List::~DlgRef_2Sel2List()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_2Sel2Spin1Check
+//////////////////////////////////////////
+
+DlgRef_2Sel2Spin1Check::DlgRef_2Sel2Spin1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2Sel2Spin1Check::~DlgRef_2Sel2Spin1Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_2Sel2Spin
+//////////////////////////////////////////
+
+DlgRef_2Sel2Spin::DlgRef_2Sel2Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2Sel2Spin::~DlgRef_2Sel2Spin()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_2Sel3Spin2Rb
+//////////////////////////////////////////
+
+DlgRef_2Sel3Spin2Rb::DlgRef_2Sel3Spin2Rb( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2Sel3Spin2Rb::~DlgRef_2Sel3Spin2Rb()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_2Sel3Spin
+//////////////////////////////////////////
+
+DlgRef_2Sel3Spin::DlgRef_2Sel3Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2Sel3Spin::~DlgRef_2Sel3Spin()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_2Sel4Spin1Check
+//////////////////////////////////////////
+
+DlgRef_2Sel4Spin1Check::DlgRef_2Sel4Spin1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2Sel4Spin1Check::~DlgRef_2Sel4Spin1Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_2Sel
+//////////////////////////////////////////
+
+DlgRef_2Sel::DlgRef_2Sel( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2Sel::~DlgRef_2Sel()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_2SelExt
+//////////////////////////////////////////
+
+DlgRef_2SelExt::DlgRef_2SelExt( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2SelExt::~DlgRef_2SelExt()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_2Spin
+//////////////////////////////////////////
+
+DlgRef_2Spin::DlgRef_2Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2Spin::~DlgRef_2Spin()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_3Check
+//////////////////////////////////////////
+
+DlgRef_3Check::DlgRef_3Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_3Check::~DlgRef_3Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_3Radio
+//////////////////////////////////////////
+
+DlgRef_3Radio::DlgRef_3Radio( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_3Radio::~DlgRef_3Radio()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_3Radio1Sel1Spin
+//////////////////////////////////////////
+
+DlgRef_3Radio1Sel1Spin::DlgRef_3Radio1Sel1Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_3Radio1Sel1Spin::~DlgRef_3Radio1Sel1Spin()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_3Sel1Check
+//////////////////////////////////////////
+
+DlgRef_3Sel1Check::DlgRef_3Sel1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_3Sel1Check::~DlgRef_3Sel1Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_3Sel1Spin
+//////////////////////////////////////////
+
+DlgRef_3Sel1Spin::DlgRef_3Sel1Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_3Sel1Spin::~DlgRef_3Sel1Spin()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_3Sel3Spin1Check
+//////////////////////////////////////////
+
+DlgRef_3Sel3Spin1Check::DlgRef_3Sel3Spin1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_3Sel3Spin1Check::~DlgRef_3Sel3Spin1Check()
+{
+}
+
+void DlgRef_3Sel3Spin1Check::ShowRows( int fromRow, int toRow, bool toShow )
+{
+  const int maxRows = 7;
+  
+  if ( toRow >= fromRow && fromRow >= 0 && toRow <= maxRows ) {
+    int c = gridLayout1->count();
+    for ( int i = 0; i < c; i++ ) {
+      QWidget* w = gridLayout1->itemAt( i )->widget();
+      int row, col, rowspan, colspan;
+      gridLayout1->getItemPosition( i, &row, &col, &rowspan, &colspan );
+      if ( w && row >= fromRow && row <= toRow )
+       w->setVisible( toShow );
+    }
+  }
+}
+
+//////////////////////////////////////////
+// DlgRef_3Sel3Spin2Check
+//////////////////////////////////////////
+
+DlgRef_3Sel3Spin2Check::DlgRef_3Sel3Spin2Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_3Sel3Spin2Check::~DlgRef_3Sel3Spin2Check()
+{
+}
+
+void DlgRef_3Sel3Spin2Check::ShowRows( int fromRow, int toRow, bool toShow )
+{
+  const int maxRows = 8;
+  
+  if ( toRow >= fromRow && fromRow >= 0 && toRow <= maxRows ) {
+    int c = gridLayout1->count();
+    for ( int i = 0; i < c; i++ ) {
+      QWidget* w = gridLayout1->itemAt( i )->widget();
+      int row, col, rowspan, colspan;
+      gridLayout1->getItemPosition( i, &row, &col, &rowspan, &colspan );
+      if ( w && row >= fromRow && row <= toRow )
+       w->setVisible( toShow );
+    }
+  }
+}
+
+//////////////////////////////////////////
+// DlgRef_3Sel4Spin2Check
+//////////////////////////////////////////
+
+DlgRef_3Sel4Spin2Check::DlgRef_3Sel4Spin2Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_3Sel4Spin2Check::~DlgRef_3Sel4Spin2Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_3Sel
+//////////////////////////////////////////
+
+DlgRef_3Sel::DlgRef_3Sel( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_3Sel::~DlgRef_3Sel()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_3Spin1Check
+//////////////////////////////////////////
+
+DlgRef_3Spin1Check::DlgRef_3Spin1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_3Spin1Check::~DlgRef_3Spin1Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_3Spin
+//////////////////////////////////////////
+
+DlgRef_3Spin::DlgRef_3Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_3Spin::~DlgRef_3Spin()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_4Sel1List1Check
+//////////////////////////////////////////
+
+DlgRef_4Sel1List1Check::DlgRef_4Sel1List1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_4Sel1List1Check::~DlgRef_4Sel1List1Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_4Sel1List
+//////////////////////////////////////////
+
+DlgRef_4Sel1List::DlgRef_4Sel1List( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_4Sel1List::~DlgRef_4Sel1List()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_4Sel1Spin2Check
+//////////////////////////////////////////
+
+DlgRef_4Sel1Spin2Check::DlgRef_4Sel1Spin2Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_4Sel1Spin2Check::~DlgRef_4Sel1Spin2Check()
+{
+}
+
+void DlgRef_4Sel1Spin2Check::ShowRows( int fromRow, int toRow, bool toShow )
+{
+  const int maxRows = 6;
+  
+  if ( toRow >= fromRow && fromRow >= 0 && toRow <= maxRows ) {
+    int c = gridLayout1->count();
+    for ( int i = 0; i < c; i++ ) {
+      QWidget* w = gridLayout1->itemAt( i )->widget();
+      int row, col, rowspan, colspan;
+      gridLayout1->getItemPosition( i, &row, &col, &rowspan, &colspan );
+      if ( w && row >= fromRow && row <= toRow )
+       w->setVisible( toShow );
+    }
+  }
+}
+
+//////////////////////////////////////////
+// DlgRef_4Sel1Spin3Check
+//////////////////////////////////////////
+
+DlgRef_4Sel1Spin3Check::DlgRef_4Sel1Spin3Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_4Sel1Spin3Check::~DlgRef_4Sel1Spin3Check()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_6Sel
+//////////////////////////////////////////
+
+DlgRef_6Sel::DlgRef_6Sel( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_6Sel::~DlgRef_6Sel()
+{
+}
+
+//////////////////////////////////////////
+// DlgRef_Skeleton
+//////////////////////////////////////////
+
+DlgRef_Skeleton::DlgRef_Skeleton( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_Skeleton::~DlgRef_Skeleton()
+{
+}
+
+//////////////////////////////////////////
+// Utility functions
+//////////////////////////////////////////
+
+QString DlgRef::PrintDoubleValue( double theValue, int thePrecision )
+{
+  const double prec = 1e-12;
+  
+  if ( abs(theValue) < thePrecision)
+    return "0";
+
+  QString aRes;
+  aRes.setNum( theValue, 'g', thePrecision );
+
+  if ( prec > 0 ) {
+    int p = 0;
+    while ( p < thePrecision ) {
+      aRes.setNum( theValue, 'g', p++ );
+      double v = aRes.toDouble();
+      double err = qAbs( theValue - v );
+      if ( err > 0 && err <= prec )
+       break;
+    }
+  }
+
+  // remove trailing zeroes
+  QString delim( "." );
+
+  int idx = aRes.lastIndexOf( delim );
+  if ( idx == -1 )
+    return aRes;
+
+  QString iPart = aRes.left( idx );
+  QString fPart = aRes.mid( idx + 1 );
+
+  while ( !fPart.isEmpty() && fPart.at( fPart.length() - 1 ) == '0' )
+    fPart.remove( fPart.length() - 1, 1 );
+
+  aRes = iPart;
+  if ( !fPart.isEmpty() )
+    aRes += delim + fPart;
+
+  return aRes;
+}
diff --git a/src/DlgRef/DlgRef.h b/src/DlgRef/DlgRef.h
new file mode 100644 (file)
index 0000000..d786fe8
--- /dev/null
@@ -0,0 +1,823 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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   : DlgRef.h
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
+//
+#ifndef GEOM_DLGREF_H
+#define GEOM_DLGREF_H
+
+#if defined WIN32
+#  if defined DLGREF_EXPORTS
+#    define DLGREF_EXPORT __declspec( dllexport )
+#  else
+#    define DLGREF_EXPORT __declspec( dllimport )
+#  endif
+#else
+#  define DLGREF_EXPORT
+#endif
+
+//////////////////////////////////////////
+// DlgRef_1List1Spin1Btn
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1List1Spin1Btn_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1List1Spin1Btn : public QWidget, 
+                                           public Ui::DlgRef_1List1Spin1Btn_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1List1Spin1Btn( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1List1Spin1Btn();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel1Check1List
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel1Check1List_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel1Check1List : public QWidget, 
+                                            public Ui::DlgRef_1Sel1Check1List_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel1Check1List( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel1Check1List();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel1Check1Sel
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel1Check1Sel_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel1Check1Sel : public QWidget, 
+                                           public Ui::DlgRef_1Sel1Check1Sel_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel1Check1Sel( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel1Check1Sel();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel1Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel1Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel1Check : public QWidget, 
+                                       public Ui::DlgRef_1Sel1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel1Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel1List1Check3Btn
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel1List1Check3Btn_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel1List1Check3Btn : public QWidget, 
+                                                public Ui::DlgRef_1Sel1List1Check3Btn_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel1List1Check3Btn( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel1List1Check3Btn();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel1Spin1Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel1Spin1Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel1Spin1Check : public QWidget, 
+                                            public Ui::DlgRef_1Sel1Spin1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel1Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel1Spin1Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel1Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel1Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel1Spin : public QWidget, 
+                                      public Ui::DlgRef_1Sel1Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel1Spin();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel2Spin1View1Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel2Spin1View1Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel2Spin1View1Check : public QWidget, 
+                                                  public Ui::DlgRef_1Sel2Spin1View1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel2Spin1View1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel2Spin1View1Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel2Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel2Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel2Spin : public QWidget, 
+                                       public Ui::DlgRef_1Sel2Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel2Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel2Spin();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel3Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel3Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel3Check : public QWidget, 
+                                        public Ui::DlgRef_1Sel3Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel3Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel3Check();
+};
+
+
+
+//////////////////////////////////////////
+// DlgRef_1Sel3Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel3Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel3Spin : public QWidget, 
+                                       public Ui::DlgRef_1Sel3Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel3Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel3Spin();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel3Spin1Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel3Spin1Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel3Spin1Check : public QWidget, 
+                                             public Ui::DlgRef_1Sel3Spin1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel3Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel3Spin1Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel4Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel4Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel4Spin : public QWidget, 
+                                       public Ui::DlgRef_1Sel4Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel4Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel4Spin();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel5Spin1Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel5Spin1Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel5Spin1Check : public QWidget, 
+                                             public Ui::DlgRef_1Sel5Spin1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel5Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel5Spin1Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel5Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel5Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel5Spin : public QWidget, 
+                                       public Ui::DlgRef_1Sel5Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel5Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel5Spin();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Spin : public QWidget, 
+                                   public Ui::DlgRef_1Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Spin();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel : public QWidget, 
+                                   public Ui::DlgRef_1Sel_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel();
+};
+
+//////////////////////////////////////////
+// DlgRef_1SelExt
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1SelExt_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1SelExt : public QWidget, 
+                                     public Ui::DlgRef_1SelExt_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1SelExt( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1SelExt();
+};
+
+//////////////////////////////////////////
+// DlgRef_2Sel1List1Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_2Sel1List1Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_2Sel1List1Check : public QWidget, 
+                                             public Ui::DlgRef_2Sel1List1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_2Sel1List1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_2Sel1List1Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_2Sel1List
+//////////////////////////////////////////
+
+#include "ui_DlgRef_2Sel1List_QTD.h"
+
+class DLGREF_EXPORT DlgRef_2Sel1List : public QWidget, 
+                                       public Ui::DlgRef_2Sel1List_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_2Sel1List( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_2Sel1List();
+};
+
+//////////////////////////////////////////
+// DlgRef_2Sel1Spin2Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_2Sel1Spin2Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_2Sel1Spin2Check : public QWidget, 
+                                             public Ui::DlgRef_2Sel1Spin2Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_2Sel1Spin2Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_2Sel1Spin2Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_2Sel1Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_2Sel1Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_2Sel1Spin : public QWidget, 
+                                       public Ui::DlgRef_2Sel1Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_2Sel1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_2Sel1Spin();
+};
+
+//////////////////////////////////////////
+// DlgRef_2Sel2List
+//////////////////////////////////////////
+
+#include "ui_DlgRef_2Sel2List_QTD.h"
+
+class DLGREF_EXPORT DlgRef_2Sel2List : public QWidget, 
+                                       public Ui::DlgRef_2Sel2List_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_2Sel2List( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_2Sel2List();
+};
+
+//////////////////////////////////////////
+// DlgRef_2Sel2Spin1Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_2Sel2Spin1Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_2Sel2Spin1Check : public QWidget, 
+                                             public Ui::DlgRef_2Sel2Spin1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_2Sel2Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_2Sel2Spin1Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_2Sel2Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_2Sel2Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_2Sel2Spin : public QWidget, 
+                                       public Ui::DlgRef_2Sel2Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_2Sel2Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_2Sel2Spin();
+};
+
+//////////////////////////////////////////
+// DlgRef_2Sel3Spin2Rb
+//////////////////////////////////////////
+
+#include "ui_DlgRef_2Sel3Spin2Rb_QTD.h"
+
+class DLGREF_EXPORT DlgRef_2Sel3Spin2Rb : public QWidget, 
+                                          public Ui::DlgRef_2Sel3Spin2Rb_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_2Sel3Spin2Rb( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_2Sel3Spin2Rb();
+};
+
+//////////////////////////////////////////
+// DlgRef_2Sel3Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_2Sel3Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_2Sel3Spin : public QWidget, 
+                                       public Ui::DlgRef_2Sel3Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_2Sel3Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_2Sel3Spin();
+};
+
+//////////////////////////////////////////
+// DlgRef_2Sel4Spin1Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_2Sel4Spin1Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_2Sel4Spin1Check : public QWidget, 
+                                             public Ui::DlgRef_2Sel4Spin1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_2Sel4Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_2Sel4Spin1Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_2Sel
+//////////////////////////////////////////
+
+#include "ui_DlgRef_2Sel_QTD.h"
+
+class DLGREF_EXPORT DlgRef_2Sel : public QWidget, 
+                                  public Ui::DlgRef_2Sel_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_2Sel( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_2Sel();
+};
+
+//////////////////////////////////////////
+// DlgRef_2SelExt
+//////////////////////////////////////////
+
+#include "ui_DlgRef_2SelExt_QTD.h"
+
+class DLGREF_EXPORT DlgRef_2SelExt : public QWidget, 
+                                     public Ui::DlgRef_2SelExt_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_2SelExt( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_2SelExt();
+};
+
+//////////////////////////////////////////
+// DlgRef_2Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_2Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_2Spin : public QWidget, 
+                                   public Ui::DlgRef_2Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_2Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_2Spin();
+};
+
+//////////////////////////////////////////
+// DlgRef_3Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_3Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_3Check : public QWidget, 
+                                    public Ui::DlgRef_3Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_3Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_3Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel3Radio
+//////////////////////////////////////////
+
+#include "ui_DlgRef_3Radio_QTD.h"
+
+class DLGREF_EXPORT DlgRef_3Radio : public QWidget, 
+                                    public Ui::DlgRef_3Radio_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_3Radio( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_3Radio();
+};
+
+//////////////////////////////////////////
+// DlgRef_1Sel3Radio1Sel1Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_3Radio1Sel1Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_3Radio1Sel1Spin : public QWidget, 
+                                             public Ui::DlgRef_3Radio1Sel1Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_3Radio1Sel1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_3Radio1Sel1Spin();
+};
+
+//////////////////////////////////////////
+// DlgRef_3Sel1Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_3Sel1Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_3Sel1Check : public QWidget, 
+                                        public Ui::DlgRef_3Sel1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_3Sel1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_3Sel1Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_3Sel1Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_3Sel1Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_3Sel1Spin : public QWidget, 
+                                       public Ui::DlgRef_3Sel1Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_3Sel1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_3Sel1Spin();
+};
+
+//////////////////////////////////////////
+// DlgRef_3Sel3Spin1Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_3Sel3Spin1Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_3Sel3Spin1Check : public QWidget, 
+                                             public Ui::DlgRef_3Sel3Spin1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_3Sel3Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_3Sel3Spin1Check();
+
+  void ShowRows( int, int, bool = true );
+};
+
+//////////////////////////////////////////
+// DlgRef_3Sel3Spin2Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_3Sel3Spin2Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_3Sel3Spin2Check : public QWidget, 
+                                             public Ui::DlgRef_3Sel3Spin2Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_3Sel3Spin2Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_3Sel3Spin2Check();
+
+  void ShowRows( int, int, bool = true );
+};
+
+//////////////////////////////////////////
+// DlgRef_3Sel4Spin2Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_3Sel4Spin2Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_3Sel4Spin2Check : public QWidget, 
+                                             public Ui::DlgRef_3Sel4Spin2Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_3Sel4Spin2Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_3Sel4Spin2Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_3Sel
+//////////////////////////////////////////
+
+#include "ui_DlgRef_3Sel_QTD.h"
+
+class DLGREF_EXPORT DlgRef_3Sel : public QWidget, 
+                                  public Ui::DlgRef_3Sel_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_3Sel( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_3Sel();
+};
+
+//////////////////////////////////////////
+// DlgRef_3Spin1Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_3Spin1Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_3Spin1Check : public QWidget, 
+                                         public Ui::DlgRef_3Spin1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_3Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_3Spin1Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_3Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_3Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_3Spin : public QWidget, 
+                                   public Ui::DlgRef_3Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_3Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_3Spin();
+};
+
+//////////////////////////////////////////
+// DlgRef_4Sel1List1Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_4Sel1List1Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_4Sel1List1Check : public QWidget, 
+                                             public Ui::DlgRef_4Sel1List1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_4Sel1List1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_4Sel1List1Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_4Sel1List
+//////////////////////////////////////////
+
+#include "ui_DlgRef_4Sel1List_QTD.h"
+
+class DLGREF_EXPORT DlgRef_4Sel1List : public QWidget, 
+                                       public Ui::DlgRef_4Sel1List_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_4Sel1List( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_4Sel1List();
+};
+
+//////////////////////////////////////////
+// DlgRef_4Sel1Spin2Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_4Sel1Spin2Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_4Sel1Spin2Check : public QWidget, 
+                                             public Ui::DlgRef_4Sel1Spin2Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_4Sel1Spin2Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_4Sel1Spin2Check();
+
+  void ShowRows( int, int, bool = true );
+};
+
+//////////////////////////////////////////
+// DlgRef_4Sel1Spin2Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_4Sel1Spin3Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_4Sel1Spin3Check : public QWidget, 
+                                             public Ui::DlgRef_4Sel1Spin3Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_4Sel1Spin3Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_4Sel1Spin3Check();
+};
+
+//////////////////////////////////////////
+// DlgRef_6Sel
+//////////////////////////////////////////
+
+#include "ui_DlgRef_6Sel_QTD.h"
+
+class DLGREF_EXPORT DlgRef_6Sel : public QWidget, 
+                                  public Ui::DlgRef_6Sel_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_6Sel( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_6Sel();
+};
+
+//////////////////////////////////////////
+// DlgRef_Skeleton
+//////////////////////////////////////////
+
+#include "ui_DlgRef_Skeleton_QTD.h"
+
+class DLGREF_EXPORT DlgRef_Skeleton : public QWidget, 
+                                      public Ui::DlgRef_Skeleton_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_Skeleton( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_Skeleton();
+};
+
+//////////////////////////////////////////
+// Utility functions
+//////////////////////////////////////////
+
+namespace DlgRef
+{
+  DLGREF_EXPORT QString PrintDoubleValue( double, int = 16 );
+};
+
+#endif // GEOM_DLGREF_H
diff --git a/src/DlgRef/DlgRef.pro b/src/DlgRef/DlgRef.pro
new file mode 100644 (file)
index 0000000..1abf890
--- /dev/null
@@ -0,0 +1,136 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = DlgRef
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+GUI_LDFLAGS = -L$$(GUI_ROOT_DIR)/lib/salome
+
+STDLIB = -lstdc++
+
+QT_MT_LIBS = -L$$(QTDIR)/lib -lQtCore -lQtXml -lQtGui -lQtOpenGL
+
+INCLUDEPATH += $${QT_INCLUDES} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS}
+
+LIBS += $${GUI_LDFLAGS} -lqtx $${STDLIB} $${QT_MT_LIBS}
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += DLGREF_EXPORTS
+
+HEADERS  = DlgRef_Skeleton_QTD.h
+HEADERS += DlgRef_1Sel_QTD.h
+HEADERS += DlgRef_2Sel_QTD.h
+HEADERS += DlgRef_3Sel_QTD.h
+HEADERS += DlgRef_1Sel1Check_QTD.h
+HEADERS += DlgRef_1Sel3Check_QTD.h
+HEADERS += DlgRef_1Sel1Check1List_QTD.h
+HEADERS += DlgRef_1Sel1Spin_QTD.h
+HEADERS += DlgRef_1Sel2Spin_QTD.h
+HEADERS += DlgRef_1Sel3Spin_QTD.h
+HEADERS += DlgRef_1Sel4Spin_QTD.h
+HEADERS += DlgRef_1Sel5Spin_QTD.h
+HEADERS += DlgRef_2Sel1Spin_QTD.h
+HEADERS += DlgRef_2Sel2Spin_QTD.h
+HEADERS += DlgRef_2Sel3Spin_QTD.h
+HEADERS += DlgRef_1Sel1Spin1Check_QTD.h
+HEADERS += DlgRef_1Sel3Spin1Check_QTD.h
+HEADERS += DlgRef_2Sel1Spin2Check_QTD.h
+HEADERS += DlgRef_2Sel2Spin1Check_QTD.h
+HEADERS += DlgRef_2Sel4Spin1Check_QTD.h
+HEADERS += DlgRef_3Sel4Spin2Check_QTD.h
+HEADERS += DlgRef_4Sel1List_QTD.h
+HEADERS += DlgRef_2Sel1List_QTD.h
+HEADERS += DlgRef_1List1Spin1Btn_QTD.h
+HEADERS += DlgRef_4Sel1List1Check_QTD.h
+HEADERS += DlgRef_1Spin_QTD.h
+HEADERS += DlgRef_2Spin_QTD.h
+HEADERS += DlgRef_3Spin_QTD.h
+HEADERS += DlgRef_3Spin1Check_QTD.h
+HEADERS += DlgRef_3Sel3Spin1Check_QTD.h
+HEADERS += DlgRef_4Sel1Spin2Check_QTD.h
+HEADERS += DlgRef_4Sel1Spin3Check_QTD.h
+HEADERS += DlgRef_SpinBox.h
+HEADERS += DlgRef_1Sel1Spin.h
+HEADERS += DlgRef_1Sel2Spin.h
+HEADERS += DlgRef_1Sel3Spin.h
+HEADERS += DlgRef_1Sel4Spin.h
+HEADERS += DlgRef_1Sel5Spin.h
+HEADERS += DlgRef_2Sel1Spin.h
+HEADERS += DlgRef_2Sel2Spin.h
+HEADERS += DlgRef_2Sel3Spin.h
+HEADERS += DlgRef_1Sel1Spin1Check.h
+HEADERS += DlgRef_1Sel3Spin1Check.h
+HEADERS += DlgRef_2Sel1Spin2Check.h
+HEADERS += DlgRef_2Sel2Spin1Check.h
+HEADERS += DlgRef_2Sel4Spin1Check.h
+HEADERS += DlgRef_3Sel4Spin2Check.h
+HEADERS += DlgRef_3Sel3Spin1Check.h
+HEADERS += DlgRef_1Spin.h
+HEADERS += DlgRef_2Spin.h
+HEADERS += DlgRef_3Spin.h
+HEADERS += DlgRef_3Spin1Check.h
+HEADERS += DlgRef_3Sel1Spin.h
+HEADERS += DlgRef_1Sel_Ext.h
+HEADERS += DlgRef_3Check_QTD.h
+HEADERS += DlgRef_6Sel_QTD.h
+HEADERS += DlgRef_4Sel1Spin2Check.h
+HEADERS += DlgRef_3Sel1Check_QTD.h
+HEADERS += GEOM_DlgRef.hxx
+
+SOURCES  = DlgRef_SpinBox.cxx
+SOURCES += DlgRef_1Sel1Spin.cxx
+SOURCES += DlgRef_1Sel2Spin.cxx
+SOURCES += DlgRef_1Sel3Spin.cxx
+SOURCES += DlgRef_1Sel4Spin.cxx
+SOURCES += DlgRef_1Sel5Spin.cxx
+SOURCES += DlgRef_2Sel1Spin.cxx
+SOURCES += DlgRef_2Sel2Spin.cxx
+SOURCES += DlgRef_2Sel3Spin.cxx
+SOURCES += DlgRef_1Sel1Spin1Check.cxx
+SOURCES += DlgRef_1Sel3Spin1Check.cxx
+SOURCES += DlgRef_2Sel1Spin2Check.cxx
+SOURCES += DlgRef_2Sel2Spin1Check.cxx
+SOURCES += DlgRef_2Sel4Spin1Check.cxx
+SOURCES += DlgRef_3Sel4Spin2Check.cxx
+SOURCES += DlgRef_3Sel3Spin1Check.cxx
+SOURCES += DlgRef_1Spin.cxx
+SOURCES += DlgRef_2Spin.cxx
+SOURCES += DlgRef_3Spin.cxx
+SOURCES += DlgRef_3Spin1Check.cxx
+SOURCES += DlgRef_3Sel1Spin.cxx
+SOURCES += DlgRef_4Sel1Spin2Check.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
diff --git a/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.cxx b/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.cxx
deleted file mode 100644 (file)
index 0159516..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_1List1Spin1Btn_QTD.ui'
-**
-** Created: Wed Mar 17 11:29:24 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_1List1Spin1Btn_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qheader.h>
-#include <qlabel.h>
-#include <qlistview.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_1List1Spin1Btn_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_1List1Spin1Btn_QTD::DlgRef_1List1Spin1Btn_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_1List1Spin1Btn_QTD" );
-    resize( 204, 148 ); 
-    setCaption( trUtf8( "DlgRef_3Sel4Spin2Check_QTD" ) );
-    DlgRef_1List1Spin1Btn_QTDLayout = new QGridLayout( this, 1, 1, 11, 6, "DlgRef_1List1Spin1Btn_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-    QSpacerItem* spacer = new QSpacerItem( 0, 23, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    GroupBox1Layout->addItem( spacer, 3, 1 );
-
-    ListView1 = new QListView( GroupBox1, "ListView1" );
-
-    GroupBox1Layout->addMultiCellWidget( ListView1, 0, 3, 0, 0 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    GroupBox1Layout->addWidget( TextLabel1, 0, 1 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-
-    GroupBox1Layout->addWidget( SpinBox1, 1, 1 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setText( trUtf8( "" ) );
-
-    GroupBox1Layout->addWidget( PushButton1, 2, 1 );
-
-    DlgRef_1List1Spin1Btn_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1List1Spin1Btn_QTD::~DlgRef_1List1Spin1Btn_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h b/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h
deleted file mode 100644 (file)
index a14fe62..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_1List1Spin1Btn_QTD.ui'
-**
-** Created: Wed Mar 17 11:29:24 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_1LIST1SPIN1BTN_QTD_H
-#define DLGREF_1LIST1SPIN1BTN_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QListView;
-class QListViewItem;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_1List1Spin1Btn_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1List1Spin1Btn_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1List1Spin1Btn_QTD();
-
-    QGroupBox* GroupBox1;
-    QListView* ListView1;
-    QLabel* TextLabel1;
-    QSpinBox* SpinBox1;
-    QPushButton* PushButton1;
-
-
-protected:
-    QGridLayout* DlgRef_1List1Spin1Btn_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-};
-
-#endif // DLGREF_1LIST1SPIN1BTN_QTD_H
diff --git a/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.ui b/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.ui
new file mode 100644 (file)
index 0000000..7194945
--- /dev/null
@@ -0,0 +1,87 @@
+<ui version="4.0" >
+ <class>DlgRef_1List1Spin1Btn_QTD</class>
+ <widget class="QWidget" name="DlgRef_1List1Spin1Btn_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>213</width>
+    <height>116</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item rowspan="4" row="0" column="0" >
+       <widget class="QTreeWidget" name="ListView1" />
+      </item>
+      <item row="3" column="1" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>16</width>
+          <height>120</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QSpinBox" name="SpinBox1" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>ListView1</tabstop>
+  <tabstop>SpinBox1</tabstop>
+  <tabstop>PushButton1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel1Check1List_QTD.cxx b/src/DlgRef/DlgRef_1Sel1Check1List_QTD.cxx
deleted file mode 100644 (file)
index 05e896b..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_1Sel1Check1List_QTD.ui'
-**
-** Created: lun oct 27 16:18:55 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_1Sel1Check1List_QTD.h"
-
-#include <qvariant.h>
-#include <qcombobox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_1Sel1Check1List_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_1Sel1Check1List_QTD::DlgRef_1Sel1Check1List_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_1Sel1Check1List_QTD" );
-    resize( 129, 104 ); 
-    setCaption( trUtf8( "DlgRef_1Sel1Check1List_QTD" ) );
-    DlgRef_1Sel1Check1List_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_1Sel1Check1List_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-    QSpacerItem* spacer = new QSpacerItem( 0, 166, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 2 );
-
-    CheckButton1 = new QRadioButton( GroupBox1, "CheckButton1" );
-    CheckButton1->setText( trUtf8( "" ) );
-
-    Layout1->addMultiCellWidget( CheckButton1, 2, 2, 0, 2 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addMultiCellWidget( TextLabel2, 1, 1, 0, 1 );
-
-    ComboBox1 = new QComboBox( FALSE, GroupBox1, "ComboBox1" );
-    ComboBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, ComboBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( ComboBox1, 1, 2 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_1Sel1Check1List_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel1Check1List_QTD::~DlgRef_1Sel1Check1List_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h b/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h
deleted file mode 100644 (file)
index 834d71a..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_1Sel1Check1List_QTD.ui'
-**
-** Created: lun oct 27 16:18:55 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_1SEL1CHECK1LIST_QTD_H
-#define DLGREF_1SEL1CHECK1LIST_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QComboBox;
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QRadioButton;
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel1Check1List_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel1Check1List_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel1Check1List_QTD();
-
-    QGroupBox* GroupBox1;
-    QRadioButton* CheckButton1;
-    QLabel* TextLabel2;
-    QComboBox* ComboBox1;
-    QLineEdit* LineEdit1;
-    QLabel* TextLabel1;
-    QPushButton* PushButton1;
-
-
-protected:
-    QGridLayout* DlgRef_1Sel1Check1List_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // DLGREF_1SEL1CHECK1LIST_QTD_H
diff --git a/src/DlgRef/DlgRef_1Sel1Check1List_QTD.ui b/src/DlgRef/DlgRef_1Sel1Check1List_QTD.ui
new file mode 100644 (file)
index 0000000..67e158a
--- /dev/null
@@ -0,0 +1,122 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel1Check1List_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel1Check1List_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>94</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="QComboBox" name="ComboBox1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>7</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>ComboBox1</tabstop>
+  <tabstop>CheckButton1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel1Check1Sel_QTD.ui b/src/DlgRef/DlgRef_1Sel1Check1Sel_QTD.ui
new file mode 100644 (file)
index 0000000..a8b9443
--- /dev/null
@@ -0,0 +1,148 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel1Check1Sel_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel1Check1Sel_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>99</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>5</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>5</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="3" column="0" colspan="3" >
+       <widget class="QWidget" native="1" name="Box" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="1" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>CheckButton1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel1Check_QTD.cxx b/src/DlgRef/DlgRef_1Sel1Check_QTD.cxx
deleted file mode 100644 (file)
index 7c86f65..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_1Sel1Check_QTD.ui'
-**
-** Created: Thu May 20 11:55:05 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_1Sel1Check_QTD.h"
-
-#include <qvariant.h>
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_1Sel1Check_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_1Sel1Check_QTD::DlgRef_1Sel1Check_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_1Sel1Check_QTD" );
-    resize( 382, 219 ); 
-    setCaption( trUtf8( "DlgRef_1Sel1Check_QTD" ) );
-    DlgRef_1Sel1Check_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_1Sel1Check_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout3->addWidget( TextLabel1, 0, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout3->addWidget( PushButton1, 0, 1 );
-
-    CheckButton1 = new QCheckBox( GroupBox1, "CheckButton1" );
-    CheckButton1->setText( trUtf8( "" ) );
-
-    Layout3->addMultiCellWidget( CheckButton1, 1, 1, 0, 2 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout3->addItem( spacer, 2, 2 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout3->addWidget( LineEdit1, 0, 2 );
-
-    GroupBox1Layout->addLayout( Layout3, 0, 0 );
-
-    DlgRef_1Sel1Check_QTDLayout->addWidget( GroupBox1, 0, 0 );
-
-    // tab order
-    setTabOrder( PushButton1, LineEdit1 );
-    setTabOrder( LineEdit1, CheckButton1 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel1Check_QTD::~DlgRef_1Sel1Check_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_1Sel1Check_QTD.h b/src/DlgRef/DlgRef_1Sel1Check_QTD.h
deleted file mode 100644 (file)
index ace1e26..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_1Sel1Check_QTD.ui'
-**
-** Created: Thu May 20 11:55:05 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_1SEL1CHECK_QTD_H
-#define DLGREF_1SEL1CHECK_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QCheckBox;
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel1Check_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel1Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel1Check_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel1;
-    QPushButton* PushButton1;
-    QCheckBox* CheckButton1;
-    QLineEdit* LineEdit1;
-
-
-protected:
-    QGridLayout* DlgRef_1Sel1Check_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout3;
-};
-
-#endif // DLGREF_1SEL1CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_1Sel1Check_QTD.ui b/src/DlgRef/DlgRef_1Sel1Check_QTD.ui
new file mode 100644 (file)
index 0000000..ca24f20
--- /dev/null
@@ -0,0 +1,91 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel1Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel1Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>155</width>
+    <height>64</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>CheckButton1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui b/src/DlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui
new file mode 100644 (file)
index 0000000..366d2d6
--- /dev/null
@@ -0,0 +1,140 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel1List1Check3Btn_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel1List1Check3Btn_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>180</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item rowspan="3" row="2" column="0" colspan="3" >
+       <widget class="QListWidget" name="ListView1" />
+      </item>
+      <item row="2" column="3" >
+       <widget class="QPushButton" name="PushButton3" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="3" >
+       <widget class="QPushButton" name="PushButton4" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="3" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>20</width>
+          <height>21</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>CheckButton1</tabstop>
+  <tabstop>ListView1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>PushButton3</tabstop>
+  <tabstop>PushButton4</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel1Spin.cxx b/src/DlgRef/DlgRef_1Sel1Spin.cxx
deleted file mode 100644 (file)
index 1788e18..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Sel1Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_1Sel1Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_1Sel1Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_1Sel1Spin::DlgRef_1Sel1Spin(QWidget* parent,  const char* name, WFlags fl)
-  :DlgRef_1Sel1Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout2->addWidget(SpinBox_DX, 0, 1);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel1Spin::~DlgRef_1Sel1Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_1Sel1Spin.h b/src/DlgRef/DlgRef_1Sel1Spin.h
deleted file mode 100644 (file)
index 3202db5..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Sel1Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_1SEL1SPIN_H
-#define DLGREF_1SEL1SPIN_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_1Sel1Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin : public DlgRef_1Sel1Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel1Spin( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel1Spin();
-
-    DlgRef_SpinBox* SpinBox_DX;
-
-};
-
-#endif // DLGREF_1SEL1SPIN_H
diff --git a/src/DlgRef/DlgRef_1Sel1Spin1Check.cxx b/src/DlgRef/DlgRef_1Sel1Spin1Check.cxx
deleted file mode 100644 (file)
index cfca35f..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Sel1Spin1Check.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_1Sel1Spin1Check.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_1Sel1Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_1Sel1Spin1Check::DlgRef_1Sel1Spin1Check(QWidget* parent, const char* name, WFlags fl)
-  :DlgRef_1Sel1Spin1Check_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout2->addWidget(SpinBox_DX, 0, 1);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel1Spin1Check::~DlgRef_1Sel1Spin1Check()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_1Sel1Spin1Check.h b/src/DlgRef/DlgRef_1Sel1Spin1Check.h
deleted file mode 100644 (file)
index 0e30376..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Sel1Spin1Check.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_1SEL1SPIN1CHECK_H
-#define DLGREF_1SEL1SPIN1CHECK_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_1Sel1Spin1Check_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin1Check : public DlgRef_1Sel1Spin1Check_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel1Spin1Check(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~DlgRef_1Sel1Spin1Check();
-
-    DlgRef_SpinBox* SpinBox_DX;
-
-};
-
-#endif // DLGREF_1SEL1SPIN1CHECK_H
diff --git a/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.cxx b/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.cxx
deleted file mode 100644 (file)
index 57014bf..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_1Sel1Spin1Check_QTD.ui'
-**
-** Created: Mon May 24 15:59:03 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_1Sel1Spin1Check_QTD.h"
-
-#include <qvariant.h>
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_1Sel1Spin1Check_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_1Sel1Spin1Check_QTD::DlgRef_1Sel1Spin1Check_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_1Sel1Spin1Check_QTD" );
-    resize( 163, 109 ); 
-    setCaption( trUtf8( "DlgRef_1Sel1Spin1Check_QTD" ) );
-    DlgRef_1Sel1Spin1Check_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_1Sel1Spin1Check_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout8 = new QGridLayout( 0, 1, 1, 0, 6, "Layout8"); 
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox1, 0, 1 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout2->addWidget( TextLabel2, 0, 0 );
-
-    Layout8->addMultiCellLayout( Layout2, 1, 1, 0, 2 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout8->addWidget( TextLabel1, 0, 0 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout8->addWidget( LineEdit1, 0, 2 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout8->addWidget( PushButton1, 0, 1 );
-
-    CheckButton1 = new QCheckBox( GroupBox1, "CheckButton1" );
-    CheckButton1->setText( trUtf8( "" ) );
-
-    Layout8->addMultiCellWidget( CheckButton1, 2, 2, 0, 2 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout8->addItem( spacer, 3, 2 );
-
-    GroupBox1Layout->addLayout( Layout8, 0, 0 );
-
-    DlgRef_1Sel1Spin1Check_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel1Spin1Check_QTD::~DlgRef_1Sel1Spin1Check_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.h b/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.h
deleted file mode 100644 (file)
index 1dd195d..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_1Sel1Spin1Check_QTD.ui'
-**
-** Created: Mon May 24 15:59:03 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_1SEL1SPIN1CHECK_QTD_H
-#define DLGREF_1SEL1SPIN1CHECK_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QCheckBox;
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin1Check_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel1Spin1Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel1Spin1Check_QTD();
-
-    QGroupBox* GroupBox1;
-    QSpinBox* SpinBox1;
-    QLabel* TextLabel2;
-    QLabel* TextLabel1;
-    QLineEdit* LineEdit1;
-    QPushButton* PushButton1;
-    QCheckBox* CheckButton1;
-
-
-protected:
-    QGridLayout* DlgRef_1Sel1Spin1Check_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout8;
-    QGridLayout* Layout2;
-};
-
-#endif // DLGREF_1SEL1SPIN1CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.ui b/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.ui
new file mode 100644 (file)
index 0000000..ab8c89f
--- /dev/null
@@ -0,0 +1,138 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel1Spin1Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel1Spin1Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>89</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>CheckButton1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel1Spin_QTD.cxx b/src/DlgRef/DlgRef_1Sel1Spin_QTD.cxx
deleted file mode 100644 (file)
index 7167033..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_1Sel1Spin_QTD.ui'
-**
-** Created: mar sep 23 16:05:08 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_1Sel1Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_1Sel1Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_1Sel1Spin_QTD::DlgRef_1Sel1Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_1Sel1Spin_QTD" );
-    resize( 129, 87 ); 
-    setCaption( trUtf8( "DlgRef_1Sel1Spin_QTD" ) );
-    DlgRef_1Sel1Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_1Sel1Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout2->addWidget( TextLabel2, 0, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox1, 0, 1 );
-
-    Layout1->addMultiCellLayout( Layout2, 1, 1, 0, 2 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 2, 2 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_1Sel1Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel1Spin_QTD::~DlgRef_1Sel1Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_1Sel1Spin_QTD.h b/src/DlgRef/DlgRef_1Sel1Spin_QTD.h
deleted file mode 100644 (file)
index f00c396..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_1Sel1Spin_QTD.ui'
-**
-** Created: mar sep 23 16:05:08 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_1SEL1SPIN_QTD_H
-#define DLGREF_1SEL1SPIN_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel1Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel1Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel1Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QPushButton* PushButton1;
-    QLabel* TextLabel1;
-    QLineEdit* LineEdit1;
-    QLabel* TextLabel2;
-    QSpinBox* SpinBox1;
-
-
-protected:
-    QGridLayout* DlgRef_1Sel1Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QGridLayout* Layout2;
-};
-
-#endif // DLGREF_1SEL1SPIN_QTD_H
diff --git a/src/DlgRef/DlgRef_1Sel1Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel1Spin_QTD.ui
new file mode 100644 (file)
index 0000000..06d9d7c
--- /dev/null
@@ -0,0 +1,130 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel1Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel1Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>70</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel2Spin.cxx b/src/DlgRef/DlgRef_1Sel2Spin.cxx
deleted file mode 100644 (file)
index 17b68a9..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Sel2Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_1Sel2Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_1Sel2Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_1Sel2Spin::DlgRef_1Sel2Spin(QWidget* parent,  const char* name, WFlags fl)
-  :DlgRef_1Sel2Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout2->addWidget(SpinBox_DX, 0, 1);
-
-  SpinBox_DY = new DlgRef_SpinBox( GroupBox1, "SpinBox_DY");
-  Layout2->addWidget(SpinBox_DY, 1, 1);
-
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel2Spin::~DlgRef_1Sel2Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_1Sel2Spin.h b/src/DlgRef/DlgRef_1Sel2Spin.h
deleted file mode 100644 (file)
index c7e8054..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Sel2Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_1SEL2SPIN_H
-#define DLGREF_1SEL2SPIN_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_1Sel2Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel2Spin : public DlgRef_1Sel2Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel2Spin(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~DlgRef_1Sel2Spin();
-
-    DlgRef_SpinBox* SpinBox_DX;
-    DlgRef_SpinBox* SpinBox_DY;
-
-};
-
-#endif // DLGREF_1SEL2SPIN_H
diff --git a/src/DlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui b/src/DlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui
new file mode 100644 (file)
index 0000000..675626f
--- /dev/null
@@ -0,0 +1,146 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel2Spin1View1Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel2Spin1View1Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>176</width>
+    <height>220</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="3" column="0" colspan="3" >
+       <widget class="QTextBrowser" name="TextBrowser1" />
+      </item>
+      <item row="2" column="2" >
+       <widget class="SalomeApp_IntSpinBox" name="SpinBox2" />
+      </item>
+      <item row="1" column="2" >
+       <widget class="SalomeApp_IntSpinBox" name="SpinBox1" />
+      </item>
+      <item row="4" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckBox1" >
+        <property name="text" >
+         <string>Check</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_IntSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header location="global" >SalomeApp_IntSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>SpinBox1</tabstop>
+  <tabstop>SpinBox2</tabstop>
+  <tabstop>TextBrowser1</tabstop>
+  <tabstop>CheckBox1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel2Spin_QTD.cxx b/src/DlgRef/DlgRef_1Sel2Spin_QTD.cxx
deleted file mode 100644 (file)
index ea98f71..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_1Sel2Spin_QTD.ui'
-**
-** Created: jeu oct 2 11:08:05 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_1Sel2Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_1Sel2Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_1Sel2Spin_QTD::DlgRef_1Sel2Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_1Sel2Spin_QTD" );
-    resize( 129, 115 ); 
-    setCaption( trUtf8( "DlgRef_1Sel2Spin_QTD" ) );
-    DlgRef_1Sel2Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_1Sel2Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout2->addWidget( TextLabel3, 1, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox1, 0, 1 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout2->addWidget( TextLabel2, 0, 0 );
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox2, 1, 1 );
-
-    Layout1->addMultiCellLayout( Layout2, 1, 1, 0, 2 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 30, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 2, 2 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_1Sel2Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel2Spin_QTD::~DlgRef_1Sel2Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_1Sel2Spin_QTD.h b/src/DlgRef/DlgRef_1Sel2Spin_QTD.h
deleted file mode 100644 (file)
index b85a76a..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_1Sel2Spin_QTD.ui'
-**
-** Created: jeu oct 2 11:08:05 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_1SEL2SPIN_QTD_H
-#define DLGREF_1SEL2SPIN_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel2Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel2Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel2Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel3;
-    QSpinBox* SpinBox1;
-    QLabel* TextLabel2;
-    QSpinBox* SpinBox2;
-    QLineEdit* LineEdit1;
-    QPushButton* PushButton1;
-    QLabel* TextLabel1;
-
-
-protected:
-    QGridLayout* DlgRef_1Sel2Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QGridLayout* Layout2;
-};
-
-#endif // DLGREF_1SEL2SPIN_QTD_H
diff --git a/src/DlgRef/DlgRef_1Sel2Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel2Spin_QTD.ui
new file mode 100644 (file)
index 0000000..432160b
--- /dev/null
@@ -0,0 +1,150 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel2Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel2Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>95</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" />
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel3Check_QTD.cxx b/src/DlgRef/DlgRef_1Sel3Check_QTD.cxx
deleted file mode 100644 (file)
index db0cb79..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_1Sel3Check_QTD.ui'
-**
-** Created: Thu May 20 10:15:08 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_1Sel3Check_QTD.h"
-
-#include <qvariant.h>
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_1Sel3Check_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_1Sel3Check_QTD::DlgRef_1Sel3Check_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_1Sel3Check_QTD" );
-    resize( 163, 116 ); 
-    setCaption( trUtf8( "DlgRef_1Sel3Check_QTD" ) );
-    DlgRef_1Sel3Check_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_1Sel3Check_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout6 = new QGridLayout( 0, 1, 1, 0, 6, "Layout6"); 
-    QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout6->addItem( spacer, 4, 2 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout6->addWidget( LineEdit1, 0, 2 );
-
-    CheckButton2 = new QCheckBox( GroupBox1, "CheckButton2" );
-    CheckButton2->setText( trUtf8( "" ) );
-
-    Layout6->addMultiCellWidget( CheckButton2, 2, 2, 0, 2 );
-
-    CheckButton1 = new QCheckBox( GroupBox1, "CheckButton1" );
-    CheckButton1->setText( trUtf8( "" ) );
-
-    Layout6->addMultiCellWidget( CheckButton1, 1, 1, 0, 2 );
-
-    CheckButton3 = new QCheckBox( GroupBox1, "CheckButton3" );
-    CheckButton3->setText( trUtf8( "" ) );
-
-    Layout6->addMultiCellWidget( CheckButton3, 3, 3, 0, 2 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout6->addWidget( PushButton1, 0, 1 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout6->addWidget( TextLabel1, 0, 0 );
-
-    GroupBox1Layout->addLayout( Layout6, 0, 0 );
-
-    DlgRef_1Sel3Check_QTDLayout->addWidget( GroupBox1, 0, 0 );
-
-    // tab order
-    setTabOrder( PushButton1, LineEdit1 );
-    setTabOrder( LineEdit1, CheckButton1 );
-    setTabOrder( CheckButton1, CheckButton2 );
-    setTabOrder( CheckButton2, CheckButton3 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel3Check_QTD::~DlgRef_1Sel3Check_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_1Sel3Check_QTD.h b/src/DlgRef/DlgRef_1Sel3Check_QTD.h
deleted file mode 100644 (file)
index 83e38df..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_1Sel3Check_QTD.ui'
-**
-** Created: Thu May 20 10:15:07 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_1SEL3CHECK_QTD_H
-#define DLGREF_1SEL3CHECK_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QCheckBox;
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel3Check_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel3Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel3Check_QTD();
-
-    QGroupBox* GroupBox1;
-    QLineEdit* LineEdit1;
-    QCheckBox* CheckButton2;
-    QCheckBox* CheckButton1;
-    QCheckBox* CheckButton3;
-    QPushButton* PushButton1;
-    QLabel* TextLabel1;
-
-
-protected:
-    QGridLayout* DlgRef_1Sel3Check_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout6;
-};
-
-#endif // DLGREF_1SEL3CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_1Sel3Check_QTD.ui b/src/DlgRef/DlgRef_1Sel3Check_QTD.ui
new file mode 100644 (file)
index 0000000..bcc2e30
--- /dev/null
@@ -0,0 +1,107 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel3Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel3Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>155</width>
+    <height>114</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton3" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton2" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>CheckButton1</tabstop>
+  <tabstop>CheckButton2</tabstop>
+  <tabstop>CheckButton3</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel3Spin.cxx b/src/DlgRef/DlgRef_1Sel3Spin.cxx
deleted file mode 100644 (file)
index a356d2f..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Sel3Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_1Sel3Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_1Sel3Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_1Sel3Spin::DlgRef_1Sel3Spin(QWidget* parent,  const char* name, WFlags fl)
-  :DlgRef_1Sel3Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox3->close(TRUE);
-
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout2->addWidget(SpinBox_DX, 0, 1);
-
-  SpinBox_DY = new DlgRef_SpinBox( GroupBox1, "SpinBox_DY");
-  Layout2->addWidget(SpinBox_DY, 1, 1);
-
-  SpinBox_DZ = new DlgRef_SpinBox( GroupBox1, "SpinBox_DZ");
-  Layout2->addWidget(SpinBox_DZ, 2, 1);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel3Spin::~DlgRef_1Sel3Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_1Sel3Spin.h b/src/DlgRef/DlgRef_1Sel3Spin.h
deleted file mode 100644 (file)
index f307a28..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Sel3Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_1SEL3SPIN_H
-#define DLGREF_1SEL3SPIN_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_1Sel3Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel3Spin : public DlgRef_1Sel3Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel3Spin(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~DlgRef_1Sel3Spin();
-
-    DlgRef_SpinBox* SpinBox_DX;
-    DlgRef_SpinBox* SpinBox_DY;
-    DlgRef_SpinBox* SpinBox_DZ;
-
-};
-
-#endif // DLGREF_1SEL3SPIN_H
diff --git a/src/DlgRef/DlgRef_1Sel3Spin1Check_QTD.ui b/src/DlgRef/DlgRef_1Sel3Spin1Check_QTD.ui
new file mode 100644 (file)
index 0000000..37a9f4a
--- /dev/null
@@ -0,0 +1,177 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel3Spin1Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel3Spin1Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>120</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" />
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ" />
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="4" column="0" colspan="2" >
+       <widget class="QCheckBox" name="CheckButton1" >
+         <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>  
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+  <tabstop>SpinBox_DZ</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel3Spin_QTD.cxx b/src/DlgRef/DlgRef_1Sel3Spin_QTD.cxx
deleted file mode 100644 (file)
index e0356a6..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_1Sel3Spin_QTD.ui'
-**
-** Created: ven oct 24 15:55:11 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_1Sel3Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_1Sel3Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_1Sel3Spin_QTD::DlgRef_1Sel3Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_1Sel3Spin_QTD" );
-    resize( 129, 143 ); 
-    setCaption( trUtf8( "DlgRef_1Sel3Spin_QTD" ) );
-    DlgRef_1Sel3Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_1Sel3Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 150, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 2, 2 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox2, 1, 1 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout2->addWidget( TextLabel3, 1, 0 );
-
-    SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
-    SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox3, 2, 1 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox1, 0, 1 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout2->addWidget( TextLabel4, 2, 0 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout2->addWidget( TextLabel2, 0, 0 );
-
-    Layout1->addMultiCellLayout( Layout2, 1, 1, 0, 2 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_1Sel3Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel3Spin_QTD::~DlgRef_1Sel3Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_1Sel3Spin_QTD.h b/src/DlgRef/DlgRef_1Sel3Spin_QTD.h
deleted file mode 100644 (file)
index 61b0d21..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_1Sel3Spin_QTD.ui'
-**
-** Created: ven oct 24 15:55:10 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_1SEL3SPIN_QTD_H
-#define DLGREF_1SEL3SPIN_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel3Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel3Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel3Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel1;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit1;
-    QSpinBox* SpinBox2;
-    QLabel* TextLabel3;
-    QSpinBox* SpinBox3;
-    QSpinBox* SpinBox1;
-    QLabel* TextLabel4;
-    QLabel* TextLabel2;
-
-
-protected:
-    QGridLayout* DlgRef_1Sel3Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QGridLayout* Layout2;
-};
-
-#endif // DLGREF_1SEL3SPIN_QTD_H
diff --git a/src/DlgRef/DlgRef_1Sel3Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel3Spin_QTD.ui
new file mode 100644 (file)
index 0000000..6ec567c
--- /dev/null
@@ -0,0 +1,170 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel3Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel3Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>120</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" />
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ" />
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+  <tabstop>SpinBox_DZ</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel4Spin.cxx b/src/DlgRef/DlgRef_1Sel4Spin.cxx
deleted file mode 100644 (file)
index 66af2fe..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Sel4Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_1Sel4Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_1Sel4Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_1Sel4Spin::DlgRef_1Sel4Spin(QWidget* parent,  const char* name, WFlags fl)
-  :DlgRef_1Sel4Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox3->close(TRUE);
-  SpinBox4->close(TRUE);
-
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout3->addWidget(SpinBox_DX, 0, 2);
-
-  SpinBox_DY = new DlgRef_SpinBox( GroupBox1, "SpinBox_DY");
-  Layout3->addWidget(SpinBox_DY, 0, 4);
-
-  SpinBox_DZ = new DlgRef_SpinBox( GroupBox1, "SpinBox_DZ");
-  Layout3->addWidget(SpinBox_DZ, 0, 6);
-
-  SpinBox_S = new DlgRef_SpinBox( GroupBox1, "SpinBox_S");
-  Layout4->addWidget(SpinBox_S, 0, 1);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel4Spin::~DlgRef_1Sel4Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_1Sel4Spin.h b/src/DlgRef/DlgRef_1Sel4Spin.h
deleted file mode 100644 (file)
index 4dcfeb3..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Sel4Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_1SEL4SPIN_H
-#define DLGREF_1SEL4SPIN_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_1Sel4Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel4Spin : public DlgRef_1Sel4Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel4Spin( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel4Spin();
-
-    DlgRef_SpinBox* SpinBox_DX;
-    DlgRef_SpinBox* SpinBox_DY;
-    DlgRef_SpinBox* SpinBox_DZ;
-
-    DlgRef_SpinBox* SpinBox_S;
-
-};
-
-#endif // DLGREF_1SEL4SPIN_H
diff --git a/src/DlgRef/DlgRef_1Sel4Spin_QTD.cxx b/src/DlgRef/DlgRef_1Sel4Spin_QTD.cxx
deleted file mode 100644 (file)
index f245c62..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_1Sel4Spin_QTD.ui'
-**
-** Created: mar sep 23 16:05:09 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_1Sel4Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_1Sel4Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_1Sel4Spin_QTD::DlgRef_1Sel4Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_1Sel4Spin_QTD" );
-    resize( 284, 119 ); 
-    setCaption( trUtf8( "DlgRef_1Sel4Spin_QTD" ) );
-    DlgRef_1Sel4Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_1Sel4Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-
-    TextLabel5 = new QLabel( GroupBox1, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-    TextLabel5->setText( trUtf8( "TL5" ) );
-
-    Layout3->addWidget( TextLabel5, 0, 5 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout3->addWidget( TextLabel3, 0, 1 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout3->addWidget( TextLabel4, 0, 3 );
-
-    SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
-    SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout3->addWidget( SpinBox3, 0, 6 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout3->addWidget( SpinBox1, 0, 2 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout3->addWidget( TextLabel2, 0, 0 );
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout3->addWidget( SpinBox2, 0, 4 );
-
-    Layout1->addLayout( Layout3, 1, 0 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 0 );
-
-    Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); 
-
-    TextLabel6 = new QLabel( GroupBox1, "TextLabel6" );
-    TextLabel6->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel6->sizePolicy().hasHeightForWidth() ) );
-    TextLabel6->setText( trUtf8( "TL6" ) );
-
-    Layout4->addWidget( TextLabel6, 0, 0 );
-
-    SpinBox4 = new QSpinBox( GroupBox1, "SpinBox4" );
-
-    Layout4->addWidget( SpinBox4, 0, 1 );
-
-    Layout1->addLayout( Layout4, 2, 0 );
-
-    Layout2 = new QHBoxLayout( 0, 0, 6, "Layout2"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-    Layout2->addWidget( TextLabel1 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-    Layout2->addWidget( PushButton1 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-    Layout2->addWidget( LineEdit1 );
-
-    Layout1->addLayout( Layout2, 0, 0 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_1Sel4Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel4Spin_QTD::~DlgRef_1Sel4Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_1Sel4Spin_QTD.h b/src/DlgRef/DlgRef_1Sel4Spin_QTD.h
deleted file mode 100644 (file)
index a865d41..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_1Sel4Spin_QTD.ui'
-**
-** Created: mar sep 23 16:05:09 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_1SEL4SPIN_QTD_H
-#define DLGREF_1SEL4SPIN_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel4Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel4Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel4Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel5;
-    QLabel* TextLabel3;
-    QLabel* TextLabel4;
-    QSpinBox* SpinBox3;
-    QSpinBox* SpinBox1;
-    QLabel* TextLabel2;
-    QSpinBox* SpinBox2;
-    QLabel* TextLabel6;
-    QSpinBox* SpinBox4;
-    QLabel* TextLabel1;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit1;
-
-
-protected:
-    QGridLayout* DlgRef_1Sel4Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QGridLayout* Layout3;
-    QGridLayout* Layout4;
-    QHBoxLayout* Layout2;
-};
-
-#endif // DLGREF_1SEL4SPIN_QTD_H
diff --git a/src/DlgRef/DlgRef_1Sel4Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel4Spin_QTD.ui
new file mode 100644 (file)
index 0000000..5bb4e29
--- /dev/null
@@ -0,0 +1,214 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel4Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel4Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>271</width>
+    <height>117</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel6" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL6</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QtxDoubleSpinBox" name="SpinBox_S" />
+      </item>
+      <item row="1" column="0" colspan="3" >
+       <widget class="QGroupBox" name="groupBox" >
+        <property name="title" >
+         <string/>
+        </property>
+        <layout class="QHBoxLayout" >
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <property name="leftMargin" >
+          <number>9</number>
+         </property>
+         <property name="topMargin" >
+          <number>9</number>
+         </property>
+         <property name="rightMargin" >
+          <number>9</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>9</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="TextLabel3" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text" >
+            <string>TL3</string>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QtxDoubleSpinBox" name="SpinBox_DX" />
+         </item>
+         <item>
+          <widget class="QLabel" name="TextLabel4" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text" >
+            <string>TL4</string>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QtxDoubleSpinBox" name="SpinBox_DY" />
+         </item>
+         <item>
+          <widget class="QLabel" name="TextLabel5" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text" >
+            <string>TL5</string>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QtxDoubleSpinBox" name="SpinBox_DZ" />
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>QtxDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >QtxDoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+  <tabstop>SpinBox_DZ</tabstop>
+  <tabstop>SpinBox_S</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel5Spin.cxx b/src/DlgRef/DlgRef_1Sel5Spin.cxx
deleted file mode 100644 (file)
index 1820c25..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Sel5Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_1Sel5Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_1Sel5Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_1Sel5Spin::DlgRef_1Sel5Spin(QWidget* parent,  const char* name, WFlags fl)
-  :DlgRef_1Sel5Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox3->close(TRUE);
-  SpinBox4->close(TRUE);
-  SpinBox5->close(TRUE);
-
-  SpinBox_1 = new DlgRef_SpinBox(GroupBox1, "SpinBox_1");
-  Layout2->addWidget(SpinBox_1, 0, 1);
-
-  SpinBox_2 = new DlgRef_SpinBox(GroupBox1, "SpinBox_2");
-  Layout2->addWidget(SpinBox_2, 0, 3);
-
-  SpinBox_3 = new DlgRef_SpinBox(GroupBox1, "SpinBox_3");
-  Layout2->addWidget(SpinBox_3, 2, 1);
-
-  SpinBox_4 = new DlgRef_SpinBox(GroupBox1, "SpinBox_4");
-  Layout2->addWidget(SpinBox_4, 1, 1);
-
-  SpinBox_5 = new DlgRef_SpinBox(GroupBox1, "SpinBox_5");
-  Layout2->addWidget(SpinBox_5, 1, 3);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel5Spin::~DlgRef_1Sel5Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_1Sel5Spin.h b/src/DlgRef/DlgRef_1Sel5Spin.h
deleted file mode 100644 (file)
index e1bbefb..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Sel5Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_1SEL5SPIN_H
-#define DLGREF_1SEL5SPIN_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_1Sel5Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel5Spin : public DlgRef_1Sel5Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel5Spin( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel5Spin();
-
-    DlgRef_SpinBox* SpinBox_1;
-    DlgRef_SpinBox* SpinBox_2;
-    DlgRef_SpinBox* SpinBox_3;
-    DlgRef_SpinBox* SpinBox_4;
-    DlgRef_SpinBox* SpinBox_5;
-
-};
-
-#endif // DLGREF_1SEL5SPIN_H
diff --git a/src/DlgRef/DlgRef_1Sel5Spin1Check.cxx b/src/DlgRef/DlgRef_1Sel5Spin1Check.cxx
deleted file mode 100644 (file)
index d683e97..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Sel5Spin1Check.cxx
-//  Author : Vladimir TURIN
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_1Sel5Spin1Check.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_1Sel5Spin1Check which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_1Sel5Spin1Check::DlgRef_1Sel5Spin1Check(QWidget* parent,  const char* name, WFlags fl)
-  :DlgRef_1Sel5Spin1Check_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox3->close(TRUE);
-  SpinBox4->close(TRUE);
-  SpinBox5->close(TRUE);
-
-  SpinBox_1 = new DlgRef_SpinBox(GroupBox1, "SpinBox_1");
-  Layout2->addWidget(SpinBox_1, 0, 1);
-
-  SpinBox_2 = new DlgRef_SpinBox(GroupBox1, "SpinBox_2");
-  Layout2->addWidget(SpinBox_2, 0, 3);
-
-  SpinBox_3 = new DlgRef_SpinBox(GroupBox1, "SpinBox_3");
-  Layout2->addWidget(SpinBox_3, 2, 1);
-
-  SpinBox_4 = new DlgRef_SpinBox(GroupBox1, "SpinBox_4");
-  Layout2->addWidget(SpinBox_4, 1, 1);
-
-  SpinBox_5 = new DlgRef_SpinBox(GroupBox1, "SpinBox_5");
-  Layout2->addWidget(SpinBox_5, 1, 3);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel5Spin1Check::~DlgRef_1Sel5Spin1Check()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_1Sel5Spin1Check.h b/src/DlgRef/DlgRef_1Sel5Spin1Check.h
deleted file mode 100644 (file)
index 271839c..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Sel5Spin1Check.h
-//  Author : Vladimir TURIN
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_1SEL5SPIN_H
-#define DLGREF_1SEL5SPIN_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_1Sel5Spin1Check_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel5Spin1Check : public DlgRef_1Sel5Spin1Check_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel5Spin1Check( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel5Spin1Check();
-
-    DlgRef_SpinBox* SpinBox_1;
-    DlgRef_SpinBox* SpinBox_2;
-    DlgRef_SpinBox* SpinBox_3;
-    DlgRef_SpinBox* SpinBox_4;
-    DlgRef_SpinBox* SpinBox_5;
-
-};
-
-#endif // DLGREF_1SEL5SPIN_H
diff --git a/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.cxx b/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.cxx
deleted file mode 100644 (file)
index 2785759..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_1Sel5Spin1Check_QTD.ui'
-**
-** Created: Fri Feb 1 14:04:55 2008
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#include "DlgRef_1Sel5Spin1Check_QTD.h"
-
-#include <qvariant.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qspinbox.h>
-#include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/*
- *  Constructs a DlgRef_1Sel5Spin1Check_QTD as a child of 'parent', with the
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_1Sel5Spin1Check_QTD::DlgRef_1Sel5Spin1Check_QTD( QWidget* parent, const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_1Sel5Spin1Check_QTD" );
-    DlgRef_1Sel5Spin1Check_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_1Sel5Spin1Check_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox2, 0, 3 );
-
-    SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
-    SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox3, 2, 1 );
-
-    TextLabel5 = new QLabel( GroupBox1, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( TextLabel5, 1, 0 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( TextLabel3, 0, 2 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( TextLabel4, 2, 0 );
-
-    SpinBox4 = new QSpinBox( GroupBox1, "SpinBox4" );
-    SpinBox4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox4->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox4, 1, 1 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox1, 0, 1 );
-
-    TextLabel6 = new QLabel( GroupBox1, "TextLabel6" );
-    TextLabel6->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel6->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( TextLabel6, 1, 2 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( TextLabel2, 0, 0 );
-
-    SpinBox5 = new QSpinBox( GroupBox1, "SpinBox5" );
-    SpinBox5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox5->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox5, 1, 3 );
-
-    CheckBox1 = new QCheckBox( GroupBox1, "CheckBox1" );
-
-    Layout2->addMultiCellWidget( CheckBox1, 2, 2, 2, 3 );
-
-    Layout1->addMultiCellLayout( Layout2, 1, 1, 0, 2 );
-    Spacer6 = new QSpacerItem( 0, 120, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( Spacer6, 2, 2 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_1Sel5Spin1Check_QTDLayout->addWidget( GroupBox1, 0, 0 );
-    languageChange();
-    resize( QSize(162, 143).expandedTo(minimumSizeHint()) );
-    clearWState( WState_Polished );
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel5Spin1Check_QTD::~DlgRef_1Sel5Spin1Check_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_1Sel5Spin1Check_QTD::languageChange()
-{
-    setCaption( tr( "DlgRef_1Sel5Spin1Check_QTD" ) );
-    GroupBox1->setTitle( QString::null );
-    TextLabel1->setText( tr( "TL1" ) );
-    PushButton1->setText( QString::null );
-    TextLabel5->setText( tr( "TL5" ) );
-    TextLabel3->setText( tr( "TL3" ) );
-    TextLabel4->setText( tr( "TL4" ) );
-    TextLabel6->setText( tr( "TL6" ) );
-    TextLabel2->setText( tr( "TL2" ) );
-    CheckBox1->setText( QString::null );
-}
-
diff --git a/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.h b/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.h
deleted file mode 100644 (file)
index 0f7fbc8..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_1Sel5Spin1Check_QTD.ui'
-**
-** Created: Fri Feb 1 14:04:51 2008
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#ifndef DLGREF_1SEL5SPIN1CHECK_QTD_H
-#define DLGREF_1SEL5SPIN1CHECK_QTD_H
-
-#include <qvariant.h>
-#include <qwidget.h>
-
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QSpacerItem;
-class QGroupBox;
-class QLabel;
-class QPushButton;
-class QSpinBox;
-class QCheckBox;
-class QLineEdit;
-
-class DlgRef_1Sel5Spin1Check_QTD : public QWidget
-{
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel5Spin1Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel5Spin1Check_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel1;
-    QPushButton* PushButton1;
-    QSpinBox* SpinBox2;
-    QSpinBox* SpinBox3;
-    QLabel* TextLabel5;
-    QLabel* TextLabel3;
-    QLabel* TextLabel4;
-    QSpinBox* SpinBox4;
-    QSpinBox* SpinBox1;
-    QLabel* TextLabel6;
-    QLabel* TextLabel2;
-    QSpinBox* SpinBox5;
-    QCheckBox* CheckBox1;
-    QLineEdit* LineEdit1;
-
-protected:
-    QGridLayout* DlgRef_1Sel5Spin1Check_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QSpacerItem* Spacer6;
-    QGridLayout* Layout2;
-
-protected slots:
-    virtual void languageChange();
-
-};
-
-#endif // DLGREF_1SEL5SPIN1CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.ui b/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.ui
new file mode 100644 (file)
index 0000000..3c50b20
--- /dev/null
@@ -0,0 +1,196 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel5Spin1Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel5Spin1Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>165</width>
+    <height>125</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="0" colspan="3" >
+       <layout class="QGridLayout" >
+        <item row="0" column="0" >
+         <widget class="QLabel" name="TextLabel2" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>TL2</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" >
+         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox1" />
+        </item>
+        <item row="0" column="2" >
+         <widget class="QLabel" name="TextLabel3" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>TL3</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="3" >
+         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox2" />
+        </item>
+        <item row="1" column="0" >
+         <widget class="QLabel" name="TextLabel5" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>TL5</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1" >
+         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox4" />
+        </item>
+        <item row="1" column="2" >
+         <widget class="QLabel" name="TextLabel6" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>TL6</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="3" >
+         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox5" />
+        </item>
+        <item row="2" column="0" >
+         <widget class="QLabel" name="TextLabel4" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>TL4</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1" >
+         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox3" />
+        </item>
+        <item row="2" column="2" colspan="2" >
+         <widget class="QCheckBox" name="CheckBox1" >
+          <property name="text" >
+           <string/>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>SpinBox1</tabstop>
+  <tabstop>SpinBox2</tabstop>
+  <tabstop>SpinBox4</tabstop>
+  <tabstop>SpinBox5</tabstop>
+  <tabstop>SpinBox3</tabstop>
+  <tabstop>CheckBox1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel5Spin_QTD.cxx b/src/DlgRef/DlgRef_1Sel5Spin_QTD.cxx
deleted file mode 100644 (file)
index 3fd23ef..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_1Sel5Spin_QTD.ui'
-**
-** Created: mar nov 18 11:19:14 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_1Sel5Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_1Sel5Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_1Sel5Spin_QTD::DlgRef_1Sel5Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_1Sel5Spin_QTD" );
-    resize( 162, 143 ); 
-    setCaption( trUtf8( "DlgRef_1Sel5Spin_QTD" ) );
-    DlgRef_1Sel5Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_1Sel5Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox2, 0, 3 );
-
-    SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
-    SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox3, 2, 1 );
-
-    TextLabel5 = new QLabel( GroupBox1, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-    TextLabel5->setText( trUtf8( "TL5" ) );
-
-    Layout2->addWidget( TextLabel5, 1, 0 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout2->addWidget( TextLabel3, 0, 2 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout2->addWidget( TextLabel4, 2, 0 );
-
-    SpinBox4 = new QSpinBox( GroupBox1, "SpinBox4" );
-    SpinBox4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox4->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox4, 1, 1 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox1, 0, 1 );
-
-    TextLabel6 = new QLabel( GroupBox1, "TextLabel6" );
-    TextLabel6->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel6->sizePolicy().hasHeightForWidth() ) );
-    TextLabel6->setText( trUtf8( "TL6" ) );
-
-    Layout2->addWidget( TextLabel6, 1, 2 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout2->addWidget( TextLabel2, 0, 0 );
-
-    SpinBox5 = new QSpinBox( GroupBox1, "SpinBox5" );
-    SpinBox5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox5->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox5, 1, 3 );
-
-    Layout1->addMultiCellLayout( Layout2, 1, 1, 0, 2 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 120, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 2, 2 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_1Sel5Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel5Spin_QTD::~DlgRef_1Sel5Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_1Sel5Spin_QTD.h b/src/DlgRef/DlgRef_1Sel5Spin_QTD.h
deleted file mode 100644 (file)
index d5375b1..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_1Sel5Spin_QTD.ui'
-**
-** Created: mar nov 18 11:19:13 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_1SEL5SPIN_QTD_H
-#define DLGREF_1SEL5SPIN_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel5Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel5Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel5Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel1;
-    QPushButton* PushButton1;
-    QSpinBox* SpinBox2;
-    QSpinBox* SpinBox3;
-    QLabel* TextLabel5;
-    QLabel* TextLabel3;
-    QLabel* TextLabel4;
-    QSpinBox* SpinBox4;
-    QSpinBox* SpinBox1;
-    QLabel* TextLabel6;
-    QLabel* TextLabel2;
-    QSpinBox* SpinBox5;
-    QLineEdit* LineEdit1;
-
-
-protected:
-    QGridLayout* DlgRef_1Sel5Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QGridLayout* Layout2;
-};
-
-#endif // DLGREF_1SEL5SPIN_QTD_H
diff --git a/src/DlgRef/DlgRef_1Sel5Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel5Spin_QTD.ui
new file mode 100644 (file)
index 0000000..eb2fd77
--- /dev/null
@@ -0,0 +1,232 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel5Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel5Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>174</width>
+    <height>123</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="1" column="0" colspan="3" >
+       <layout class="QGridLayout" >
+        <property name="leftMargin" >
+         <number>0</number>
+        </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>6</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>6</number>
+        </property>
+        <item row="2" column="0" >
+         <widget class="QLabel" name="TextLabel4" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>TL4</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2" >
+         <widget class="QLabel" name="TextLabel3" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>TL3</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="3" >
+         <widget class="QtxDoubleSpinBox" name="SpinBox5" />
+        </item>
+        <item row="0" column="0" >
+         <widget class="QLabel" name="TextLabel2" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>TL2</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" >
+         <widget class="QtxDoubleSpinBox" name="SpinBox1" />
+        </item>
+        <item row="1" column="2" >
+         <widget class="QLabel" name="TextLabel6" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>TL6</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="3" >
+         <widget class="QtxDoubleSpinBox" name="SpinBox2" />
+        </item>
+        <item row="2" column="1" >
+         <widget class="QtxDoubleSpinBox" name="SpinBox3" />
+        </item>
+        <item row="1" column="1" >
+         <widget class="QtxDoubleSpinBox" name="SpinBox4" />
+        </item>
+        <item row="1" column="0" >
+         <widget class="QLabel" name="TextLabel5" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string>TL5</string>
+          </property>
+          <property name="wordWrap" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>QtxDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >QtxDoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>SpinBox1</tabstop>
+  <tabstop>SpinBox2</tabstop>
+  <tabstop>SpinBox4</tabstop>
+  <tabstop>SpinBox5</tabstop>
+  <tabstop>SpinBox3</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1SelExt_QTD.ui b/src/DlgRef/DlgRef_1SelExt_QTD.ui
new file mode 100644 (file)
index 0000000..6b285a1
--- /dev/null
@@ -0,0 +1,94 @@
+<ui version="4.0" >
+ <class>DlgRef_1SelExt_QTD</class>
+ <widget class="QWidget" name="DlgRef_1SelExt_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>155</width>
+    <height>51</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>7</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="1" column="0" colspan="3" >
+       <widget class="QWidget" native="1" name="Box" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Sel_Ext.h b/src/DlgRef/DlgRef_1Sel_Ext.h
deleted file mode 100644 (file)
index ff29a62..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_1Sel_QTD.ui'
-**
-** Created: lun sep 22 17:38:05 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DlgRef_1Sel_Ext_H
-#define DlgRef_1Sel_Ext_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_1Sel_QTD.h"
-
-class QGridLayout;
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel_Ext : public DlgRef_1Sel_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel_Ext( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 )
-       : DlgRef_1Sel_QTD( parent, name, fl ) {};
-    ~DlgRef_1Sel_Ext() {};
-
-    QGridLayout* getGroupBoxLayout() { return GroupBox1Layout; }
-};
-
-#endif // DlgRef_1Sel_Ext_H
diff --git a/src/DlgRef/DlgRef_1Sel_QTD.cxx b/src/DlgRef/DlgRef_1Sel_QTD.cxx
deleted file mode 100644 (file)
index 0c2220e..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_1Sel_QTD.ui'
-**
-** Created: lun sep 22 17:38:06 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_1Sel_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_1Sel_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_1Sel_QTD::DlgRef_1Sel_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_1Sel_QTD" );
-    resize( 129, 57 ); 
-    setCaption( trUtf8( "DlgRef_1Sel_QTD" ) );
-    DlgRef_1Sel_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_1Sel_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupBox1->sizePolicy().hasHeightForWidth() ) );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 1, 2 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_1Sel_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Sel_QTD::~DlgRef_1Sel_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_1Sel_QTD.h b/src/DlgRef/DlgRef_1Sel_QTD.h
deleted file mode 100644 (file)
index 4fce284..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_1Sel_QTD.ui'
-**
-** Created: lun sep 22 17:38:05 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_1SEL_QTD_H
-#define DLGREF_1SEL_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-
-class GEOM_DLGREF_EXPORT DlgRef_1Sel_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Sel_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Sel_QTD();
-
-    QGroupBox* GroupBox1;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit1;
-    QLabel* TextLabel1;
-
-
-protected:
-    QGridLayout* DlgRef_1Sel_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // DLGREF_1SEL_QTD_H
diff --git a/src/DlgRef/DlgRef_1Sel_QTD.ui b/src/DlgRef/DlgRef_1Sel_QTD.ui
new file mode 100644 (file)
index 0000000..ffcb8aa
--- /dev/null
@@ -0,0 +1,91 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>155</width>
+    <height>45</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>7</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_1Spin.cxx b/src/DlgRef/DlgRef_1Spin.cxx
deleted file mode 100644 (file)
index 00244bc..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_1Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_1Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_1Spin::DlgRef_1Spin(QWidget* parent, const char* name, WFlags fl)
-  :DlgRef_1Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout1->addWidget(SpinBox_DX, 0, 1);
-
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Spin::~DlgRef_1Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_1Spin.h b/src/DlgRef/DlgRef_1Spin.h
deleted file mode 100644 (file)
index 8acaa26..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_1Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_1SPIN_H
-#define DLGREF_1SPIN_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_1Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_1Spin : public DlgRef_1Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Spin(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~DlgRef_1Spin();
-
-    DlgRef_SpinBox* SpinBox_DX;
-
-};
-
-#endif // DLGREF_1SPIN_H
diff --git a/src/DlgRef/DlgRef_1Spin_QTD.cxx b/src/DlgRef/DlgRef_1Spin_QTD.cxx
deleted file mode 100644 (file)
index a028f91..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_1Spin_QTD.ui'
-**
-** Created: jeu sep 25 12:22:29 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_1Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_1Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_1Spin_QTD::DlgRef_1Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_1Spin_QTD" );
-    resize( 124, 55 ); 
-    setCaption( trUtf8( "DlgRef_1Spin_QTD" ) );
-    DlgRef_1Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_1Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-    QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 1 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox1, 0, 1 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_1Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_1Spin_QTD::~DlgRef_1Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_1Spin_QTD.h b/src/DlgRef/DlgRef_1Spin_QTD.h
deleted file mode 100644 (file)
index 25177e9..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_1Spin_QTD.ui'
-**
-** Created: jeu sep 25 12:22:29 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_1SPIN_QTD_H
-#define DLGREF_1SPIN_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_1Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_1Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_1Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QSpinBox* SpinBox1;
-    QLabel* TextLabel1;
-
-
-protected:
-    QGridLayout* DlgRef_1Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // DLGREF_1SPIN_QTD_H
diff --git a/src/DlgRef/DlgRef_1Spin_QTD.ui b/src/DlgRef/DlgRef_1Spin_QTD.ui
new file mode 100644 (file)
index 0000000..1ede440
--- /dev/null
@@ -0,0 +1,93 @@
+<ui version="4.0" >
+ <class>DlgRef_1Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>99</width>
+    <height>41</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_2Sel1List1Check_QTD.cxx b/src/DlgRef/DlgRef_2Sel1List1Check_QTD.cxx
deleted file mode 100644 (file)
index b469af6..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_4Sel1List_QTD.ui'
-**
-** Created: lun oct 31 17:21:04 2006
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_2Sel1List1Check_QTD.h"
-
-#include <qvariant.h>
-#include <qcombobox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qradiobutton.h>
-
-/* 
- *  Constructs a DlgRef_2Sel1List_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_2Sel1List1Check_QTD::DlgRef_2Sel1List1Check_QTD( QWidget* parent,
-                                                       const char* name,
-                                                       WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_2Sel1List1Check_QTD" );
-    resize( 129, 175 ); 
-    setCaption( trUtf8( "DlgRef_2Sel1List1Check_QTD" ) );
-    DlgRef_2Sel1List1Check_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_2Sel1List1Check_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-    
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-   
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-    
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 );
-    
-    ComboBox1 = new QComboBox( FALSE, GroupBox1, "ComboBox1" );
-    ComboBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, ComboBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( ComboBox1, 2, 2 );
-   
-    radioButton4 = new QRadioButton( GroupBox1, "radioButton4" );
-    GroupBox1Layout->addMultiCellWidget( radioButton4, 3, 3, 0, 1 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-    
-    DlgRef_2Sel1List1Check_QTDLayout->addWidget( GroupBox1, 0, 0 );
-
-    QSpacerItem* spacer = new QSpacerItem( 0, 80, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 5, 2 );
-
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel1List1Check_QTD::~DlgRef_2Sel1List1Check_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_2Sel1List1Check_QTD.h b/src/DlgRef/DlgRef_2Sel1List1Check_QTD.h
deleted file mode 100644 (file)
index 8b636a8..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_2Sel1List_QTD.ui'
-**
-** Created: lun oct 31 17:21:03 2006
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_2SEL1LIST_QTD_H
-#define DLGREF_2SEL1LIST_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QComboBox;
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QRadioButton;
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel1List1Check_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel1List1Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_2Sel1List1Check_QTD();
-
-    QGroupBox* GroupBox1;
-    QLineEdit* LineEdit2;
-    QPushButton* PushButton1;
-    QPushButton* PushButton2;
-    QLabel* TextLabel1;
-    QLineEdit* LineEdit1;
-    QLabel* TextLabel2;
-    QComboBox* ComboBox1;
-    QLabel* TextLabel3;
-    QRadioButton* radioButton4;
-
-
-protected:
-    QGridLayout* DlgRef_2Sel1List1Check_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // DLGREF_2SEL1LIST1CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_2Sel1List1Check_QTD.ui b/src/DlgRef/DlgRef_2Sel1List1Check_QTD.ui
new file mode 100644 (file)
index 0000000..4633930
--- /dev/null
@@ -0,0 +1,153 @@
+<ui version="4.0" >
+ <class>DlgRef_2Sel1List1Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_2Sel1List1Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>211</width>
+    <height>121</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QComboBox" name="ComboBox1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>ComboBox1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_2Sel1List_QTD.cxx b/src/DlgRef/DlgRef_2Sel1List_QTD.cxx
deleted file mode 100644 (file)
index ec428c3..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_4Sel1List_QTD.ui'
-**
-** Created: lun oct 31 17:21:04 2006
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_2Sel1List_QTD.h"
-
-#include <qvariant.h>
-#include <qcombobox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_2Sel1List_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_2Sel1List_QTD::DlgRef_2Sel1List_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_2Sel1List_QTD" );
-    resize( 129, 175 ); 
-    setCaption( trUtf8( "DlgRef_2Sel1List_QTD" ) );
-    DlgRef_2Sel1List_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_2Sel1List_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-    
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-   
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-    
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 );
-    
-    ComboBox1 = new QComboBox( FALSE, GroupBox1, "ComboBox1" );
-    ComboBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, ComboBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( ComboBox1, 2, 2 );
-   
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-    
-    DlgRef_2Sel1List_QTDLayout->addWidget( GroupBox1, 0, 0 );
-
-    QSpacerItem* spacer = new QSpacerItem( 0, 80, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 5, 2 );
-
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel1List_QTD::~DlgRef_2Sel1List_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_2Sel1List_QTD.h b/src/DlgRef/DlgRef_2Sel1List_QTD.h
deleted file mode 100644 (file)
index a566579..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_2Sel1List_QTD.ui'
-**
-** Created: lun oct 31 17:21:03 2006
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_2SEL1LIST_QTD_H
-#define DLGREF_2SEL1LIST_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QComboBox;
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel1List_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel1List_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_2Sel1List_QTD();
-
-    QGroupBox* GroupBox1;
-    QLineEdit* LineEdit2;
-    QPushButton* PushButton1;
-    QPushButton* PushButton2;
-    QLabel* TextLabel1;
-    QLineEdit* LineEdit1;
-    QLabel* TextLabel2;
-    QComboBox* ComboBox1;
-    QLabel* TextLabel3;
-
-
-protected:
-    QGridLayout* DlgRef_2Sel1List_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // DLGREF_2SEL1LIST_QTD_H
diff --git a/src/DlgRef/DlgRef_2Sel1List_QTD.ui b/src/DlgRef/DlgRef_2Sel1List_QTD.ui
new file mode 100644 (file)
index 0000000..53ba9da
--- /dev/null
@@ -0,0 +1,152 @@
+<ui version="4.0" >
+ <class>DlgRef_2Sel1List_QTD</class>
+ <widget class="QWidget" name="DlgRef_2Sel1List_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>100</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QComboBox" name="ComboBox1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>7</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>ComboBox1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_2Sel1Spin.cxx b/src/DlgRef/DlgRef_2Sel1Spin.cxx
deleted file mode 100644 (file)
index 141e744..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_2Sel1Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_2Sel1Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-#include <qpushbutton.h>
-
-/* 
- *  Constructs a DlgRef_2Sel1Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_2Sel1Spin::DlgRef_2Sel1Spin(QWidget* parent,  const char* name, WFlags fl)
-  :DlgRef_2Sel1Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout2->addWidget(SpinBox_DX, 0, 1);
-
-  // PAL 6532
-  PushButton1->setAutoDefault( false );
-  PushButton2->setAutoDefault( false );
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel1Spin::~DlgRef_2Sel1Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_2Sel1Spin.h b/src/DlgRef/DlgRef_2Sel1Spin.h
deleted file mode 100644 (file)
index 8e40168..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_2Sel1Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_2SEL1SPIN_H
-#define DLGREF_2SEL1SPIN_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_2Sel1Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin : public DlgRef_2Sel1Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel1Spin( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_2Sel1Spin();
-
-    DlgRef_SpinBox* SpinBox_DX;
-
-};
-
-#endif // DLGREF_2SEL1SPIN_H
diff --git a/src/DlgRef/DlgRef_2Sel1Spin2Check.cxx b/src/DlgRef/DlgRef_2Sel1Spin2Check.cxx
deleted file mode 100644 (file)
index 0184c15..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_2Sel1Spin2Check.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_2Sel1Spin2Check.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_2Sel1Spin2Check which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_2Sel1Spin2Check::DlgRef_2Sel1Spin2Check(QWidget* parent, const char* name, WFlags fl)
-  :DlgRef_2Sel1Spin2Check_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout1->addWidget(SpinBox_DX, 2, 2);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel1Spin2Check::~DlgRef_2Sel1Spin2Check()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_2Sel1Spin2Check.h b/src/DlgRef/DlgRef_2Sel1Spin2Check.h
deleted file mode 100644 (file)
index 227dcee..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_2Sel1Spin2Check.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_2SEL1SPIN2CHECK_H
-#define DLGREF_2SEL1SPIN2CHECK_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_2Sel1Spin2Check_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin2Check : public DlgRef_2Sel1Spin2Check_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel1Spin2Check(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~DlgRef_2Sel1Spin2Check();
-
-    DlgRef_SpinBox* SpinBox_DX;
-
-};
-
-#endif // DLGREF_2SEL1SPIN2CHECK_H
diff --git a/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.cxx b/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.cxx
deleted file mode 100644 (file)
index 35fd8b3..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_2Sel1Spin2Check_QTD.ui'
-**
-** Created: Fri Aug 13 15:32:26 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_2Sel1Spin2Check_QTD.h"
-
-#include <qvariant.h>
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_2Sel1Spin2Check_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_2Sel1Spin2Check_QTD::DlgRef_2Sel1Spin2Check_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_2Sel1Spin2Check_QTD" );
-    resize( 256, 139 ); 
-    setCaption( trUtf8( "DlgRef_2Sel1Spin2Check_QTD" ) );
-    DlgRef_2Sel1Spin2Check_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_2Sel1Spin2Check_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addWidget( TextLabel3, 2, 0 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 316, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 4, 2 );
-
-    CheckButton2 = new QCheckBox( GroupBox1, "CheckButton2" );
-    CheckButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( CheckButton2, 2, 3 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addMultiCellWidget( LineEdit2, 1, 1, 2, 3 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addMultiCellWidget( LineEdit1, 0, 0, 2, 3 );
-
-    CheckButton1 = new QCheckBox( GroupBox1, "CheckButton1" );
-    CheckButton1->setText( trUtf8( "" ) );
-
-    Layout1->addMultiCellWidget( CheckButton1, 3, 3, 0, 3 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox1, 2, 2 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_2Sel1Spin2Check_QTDLayout->addWidget( GroupBox1, 0, 0 );
-
-    // tab order
-    setTabOrder( PushButton1, LineEdit1 );
-    setTabOrder( LineEdit1, PushButton2 );
-    setTabOrder( PushButton2, LineEdit2 );
-    setTabOrder( LineEdit2, SpinBox1 );
-    setTabOrder( SpinBox1, CheckButton2 );
-    setTabOrder( CheckButton2, CheckButton1 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel1Spin2Check_QTD::~DlgRef_2Sel1Spin2Check_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.h b/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.h
deleted file mode 100644 (file)
index 617fd44..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_2Sel1Spin2Check_QTD.ui'
-**
-** Created: Fri Aug 13 15:32:26 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_2SEL1SPIN2CHECK_QTD_H
-#define DLGREF_2SEL1SPIN2CHECK_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QCheckBox;
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin2Check_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel1Spin2Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_2Sel1Spin2Check_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel2;
-    QPushButton* PushButton1;
-    QLabel* TextLabel3;
-    QLabel* TextLabel1;
-    QCheckBox* CheckButton2;
-    QLineEdit* LineEdit2;
-    QPushButton* PushButton2;
-    QLineEdit* LineEdit1;
-    QCheckBox* CheckButton1;
-    QSpinBox* SpinBox1;
-
-
-protected:
-    QGridLayout* DlgRef_2Sel1Spin2Check_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // DLGREF_2SEL1SPIN2CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.ui b/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.ui
new file mode 100644 (file)
index 0000000..5bb1b8e
--- /dev/null
@@ -0,0 +1,193 @@
+<ui version="4.0" >
+ <class>DlgRef_2Sel1Spin2Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_2Sel1Spin2Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>170</width>
+    <height>118</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="3" >
+       <widget class="QCheckBox" name="CheckButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="3" column="0" colspan="4" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>CheckButton2</tabstop>
+  <tabstop>CheckButton1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_2Sel1Spin_QTD.cxx b/src/DlgRef/DlgRef_2Sel1Spin_QTD.cxx
deleted file mode 100644 (file)
index 0e649c9..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_2Sel1Spin_QTD.ui'
-**
-** Created: Tue Jun 1 16:15:00 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_2Sel1Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_2Sel1Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_2Sel1Spin_QTD::DlgRef_2Sel1Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_2Sel1Spin_QTD" );
-    resize( 163, 122 ); 
-    setCaption( trUtf8( "DlgRef_2Sel1Spin_QTD" ) );
-    DlgRef_2Sel1Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_2Sel1Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setFrameShape( QLabel::NoFrame );
-    TextLabel2->setFrameShadow( QLabel::Plain );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox1, 0, 1 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout2->addWidget( TextLabel3, 0, 0 );
-
-    Layout1->addMultiCellLayout( Layout2, 2, 2, 0, 2 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 2 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_2Sel1Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-
-    // tab order
-    setTabOrder( PushButton1, LineEdit1 );
-    setTabOrder( LineEdit1, PushButton2 );
-    setTabOrder( PushButton2, LineEdit2 );
-    setTabOrder( LineEdit2, SpinBox1 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel1Spin_QTD::~DlgRef_2Sel1Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_2Sel1Spin_QTD.h b/src/DlgRef/DlgRef_2Sel1Spin_QTD.h
deleted file mode 100644 (file)
index d35c360..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_2Sel1Spin_QTD.ui'
-**
-** Created: Tue Jun 1 16:14:59 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_2SEL1SPIN_QTD_H
-#define DLGREF_2SEL1SPIN_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel1Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel1Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_2Sel1Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QLineEdit* LineEdit1;
-    QPushButton* PushButton2;
-    QLabel* TextLabel1;
-    QLineEdit* LineEdit2;
-    QPushButton* PushButton1;
-    QLabel* TextLabel2;
-    QSpinBox* SpinBox1;
-    QLabel* TextLabel3;
-
-
-protected:
-    QGridLayout* DlgRef_2Sel1Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QGridLayout* Layout2;
-};
-
-#endif // DLGREF_2SEL1SPIN_QTD_H
diff --git a/src/DlgRef/DlgRef_2Sel1Spin_QTD.ui b/src/DlgRef/DlgRef_2Sel1Spin_QTD.ui
new file mode 100644 (file)
index 0000000..76fc2d4
--- /dev/null
@@ -0,0 +1,169 @@
+<ui version="4.0" >
+ <class>DlgRef_2Sel1Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_2Sel1Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>99</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="frameShape" >
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="frameShadow" >
+         <enum>QFrame::Plain</enum>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_2Sel2List_QTD.ui b/src/DlgRef/DlgRef_2Sel2List_QTD.ui
new file mode 100644 (file)
index 0000000..b54bca5
--- /dev/null
@@ -0,0 +1,166 @@
+<ui version="4.0" >
+ <class>DlgRef_2Sel2List_QTD</class>
+ <widget class="QWidget" name="DlgRef_2Sel2List_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>128</width>
+    <height>144</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QComboBox" name="ComboBox1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="QComboBox" name="ComboBox2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>ComboBox1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_2Sel2Spin.cxx b/src/DlgRef/DlgRef_2Sel2Spin.cxx
deleted file mode 100644 (file)
index 58341f3..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_2Sel2Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_2Sel2Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_2Sel1Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_2Sel2Spin::DlgRef_2Sel2Spin(QWidget* parent,  const char* name, WFlags fl)
-  :DlgRef_2Sel2Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout2->addWidget(SpinBox_DX, 0, 1);
-  SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
-  Layout2->addWidget(SpinBox_DY, 1, 1);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel2Spin::~DlgRef_2Sel2Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_2Sel2Spin.h b/src/DlgRef/DlgRef_2Sel2Spin.h
deleted file mode 100644 (file)
index ed09840..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_2Sel2Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_2SEL2SPIN_H
-#define DLGREF_2SEL2SPIN_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_2Sel2Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin : public DlgRef_2Sel2Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel2Spin(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~DlgRef_2Sel2Spin();
-
-    DlgRef_SpinBox* SpinBox_DX;
-    DlgRef_SpinBox* SpinBox_DY;
-
-};
-
-#endif // DLGREF_2SEL2SPIN_H
diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Check.cxx b/src/DlgRef/DlgRef_2Sel2Spin1Check.cxx
deleted file mode 100644 (file)
index e352f7d..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_2Sel1Spin1Check.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_2Sel2Spin1Check.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-#include <qpushbutton.h>
-
-/* 
- *  Constructs a DlgRef_2Sel1Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_2Sel2Spin1Check::DlgRef_2Sel2Spin1Check(QWidget* parent, const char* name, WFlags fl)
-  :DlgRef_2Sel2Spin1Check_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
-  Layout2->addWidget(SpinBox_DX, 0, 1);
-  Layout2->addWidget(SpinBox_DY, 1, 1);
-
-  // PAL 6532
-  PushButton1->setAutoDefault( false );
-  PushButton2->setAutoDefault( false );
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel2Spin1Check::~DlgRef_2Sel2Spin1Check()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Check.h b/src/DlgRef/DlgRef_2Sel2Spin1Check.h
deleted file mode 100644 (file)
index b15de56..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_2Sel1Spin1Check.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_2SEL2SPIN1CHECK_H
-#define DLGREF_2SEL2SPIN1CHECK_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_2Sel2Spin1Check_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin1Check : public DlgRef_2Sel2Spin1Check_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel2Spin1Check(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~DlgRef_2Sel2Spin1Check();
-
-    DlgRef_SpinBox* SpinBox_DX;
-    DlgRef_SpinBox* SpinBox_DY;
-
-};
-
-#endif // DLGREF_2SEL2SPIN1CHECK_H
diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.cxx b/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.cxx
deleted file mode 100644 (file)
index b2d22bf..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_2Sel2Spin1Check_QTD.ui'
-**
-** Created: Tue Jun 1 16:29:28 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_2Sel2Spin1Check_QTD.h"
-
-#include <qvariant.h>
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_2Sel2Spin1Check_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_2Sel2Spin1Check_QTD::DlgRef_2Sel2Spin1Check_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_2Sel2Spin1Check_QTD" );
-    resize( 163, 170 ); 
-    setCaption( trUtf8( "DlgRef_2Sel2Spin1Check_QTD" ) );
-    DlgRef_2Sel2Spin1Check_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_2Sel2Spin1Check_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox1, 0, 1 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout2->addWidget( TextLabel3, 0, 0 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout2->addWidget( TextLabel4, 1, 0 );
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox2, 1, 1 );
-
-    Layout1->addMultiCellLayout( Layout2, 2, 2, 0, 2 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 4, 2 );
-
-    CheckButton1 = new QCheckBox( GroupBox1, "CheckButton1" );
-    CheckButton1->setText( trUtf8( "" ) );
-
-    Layout1->addMultiCellWidget( CheckButton1, 3, 3, 0, 2 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_2Sel2Spin1Check_QTDLayout->addWidget( GroupBox1, 0, 0 );
-
-    // tab order
-    setTabOrder( PushButton1, LineEdit1 );
-    setTabOrder( LineEdit1, PushButton2 );
-    setTabOrder( PushButton2, LineEdit2 );
-    setTabOrder( LineEdit2, SpinBox1 );
-    setTabOrder( SpinBox1, SpinBox2 );
-    setTabOrder( SpinBox2, CheckButton1 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel2Spin1Check_QTD::~DlgRef_2Sel2Spin1Check_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.h b/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.h
deleted file mode 100644 (file)
index c3d7030..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_2Sel2Spin1Check_QTD.ui'
-**
-** Created: Tue Jun 1 16:29:28 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_2SEL2SPIN1CHECK_QTD_H
-#define DLGREF_2SEL2SPIN1CHECK_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QCheckBox;
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin1Check_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel2Spin1Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_2Sel2Spin1Check_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel2;
-    QLabel* TextLabel1;
-    QSpinBox* SpinBox1;
-    QLabel* TextLabel3;
-    QLabel* TextLabel4;
-    QSpinBox* SpinBox2;
-    QLineEdit* LineEdit1;
-    QCheckBox* CheckButton1;
-    QLineEdit* LineEdit2;
-    QPushButton* PushButton2;
-    QPushButton* PushButton1;
-
-
-protected:
-    QGridLayout* DlgRef_2Sel2Spin1Check_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QGridLayout* Layout2;
-};
-
-#endif // DLGREF_2SEL2SPIN1CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.ui b/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.ui
new file mode 100644 (file)
index 0000000..07800a5
--- /dev/null
@@ -0,0 +1,192 @@
+<ui version="4.0" >
+ <class>DlgRef_2Sel2Spin1Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_2Sel2Spin1Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>143</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="4" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" />
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+  <tabstop>CheckButton1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_2Sel2Spin_QTD.cxx b/src/DlgRef/DlgRef_2Sel2Spin_QTD.cxx
deleted file mode 100644 (file)
index faf1f66..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_2Sel2Spin_QTD.ui'
-**
-** Created: jeu sep 25 12:10:29 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_2Sel2Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_2Sel2Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_2Sel2Spin_QTD::DlgRef_2Sel2Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_2Sel2Spin_QTD" );
-    resize( 129, 145 ); 
-    setCaption( trUtf8( "DlgRef_2Sel2Spin_QTD" ) );
-    DlgRef_2Sel2Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_2Sel2Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox2, 1, 1 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout2->addWidget( TextLabel4, 1, 0 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout2->addWidget( TextLabel3, 0, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox1, 0, 1 );
-
-    Layout1->addMultiCellLayout( Layout2, 2, 2, 0, 2 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 2 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_2Sel2Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel2Spin_QTD::~DlgRef_2Sel2Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_2Sel2Spin_QTD.h b/src/DlgRef/DlgRef_2Sel2Spin_QTD.h
deleted file mode 100644 (file)
index bc51575..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_2Sel2Spin_QTD.ui'
-**
-** Created: jeu sep 25 12:10:29 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_2SEL2SPIN_QTD_H
-#define DLGREF_2SEL2SPIN_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel2Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel2Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_2Sel2Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QLineEdit* LineEdit1;
-    QSpinBox* SpinBox2;
-    QLabel* TextLabel4;
-    QLabel* TextLabel3;
-    QSpinBox* SpinBox1;
-    QPushButton* PushButton2;
-    QLabel* TextLabel2;
-    QLabel* TextLabel1;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit2;
-
-
-protected:
-    QGridLayout* DlgRef_2Sel2Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QGridLayout* Layout2;
-};
-
-#endif // DLGREF_2SEL2SPIN_QTD_H
diff --git a/src/DlgRef/DlgRef_2Sel2Spin_QTD.ui b/src/DlgRef/DlgRef_2Sel2Spin_QTD.ui
new file mode 100644 (file)
index 0000000..f9df917
--- /dev/null
@@ -0,0 +1,184 @@
+<ui version="4.0" >
+ <class>DlgRef_2Sel2Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_2Sel2Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>124</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="3" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" />
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_2Sel3Spin.cxx b/src/DlgRef/DlgRef_2Sel3Spin.cxx
deleted file mode 100644 (file)
index 8006c50..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_2Sel3Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_2Sel3Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_2Sel1Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_2Sel3Spin::DlgRef_2Sel3Spin(QWidget* parent,  const char* name, WFlags fl)
-  :DlgRef_2Sel3Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox3->close(TRUE);
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout2->addWidget(SpinBox_DX, 0, 1);
-  SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
-  Layout2->addWidget(SpinBox_DY, 1, 1);
-  SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ");
-  Layout2->addWidget(SpinBox_DZ, 2, 1);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel3Spin::~DlgRef_2Sel3Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_2Sel3Spin.h b/src/DlgRef/DlgRef_2Sel3Spin.h
deleted file mode 100644 (file)
index 53b857b..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_2Sel3Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_2SEL3SPIN_H
-#define DLGREF_2SEL3SPIN_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_2Sel3Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel3Spin : public DlgRef_2Sel3Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel3Spin(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~DlgRef_2Sel3Spin();
-
-    DlgRef_SpinBox* SpinBox_DX;
-    DlgRef_SpinBox* SpinBox_DY;
-    DlgRef_SpinBox* SpinBox_DZ;
-
-};
-
-#endif // DLGREF_2SEL3SPIN_H
diff --git a/src/DlgRef/DlgRef_2Sel3Spin2Rb.cxx b/src/DlgRef/DlgRef_2Sel3Spin2Rb.cxx
deleted file mode 100755 (executable)
index a17d55e..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//  File   : DlgRef_2Sel2Spin.cxx\r
-//  Author : Dmitry MATVEITCHEV\r
-//  Module : GEOM\r
-//  $Header: \r
-\r
-#include "DlgRef_2Sel3Spin2Rb.h"\r
-#include <iostream.h>\r
-\r
-#include <qlayout.h>\r
-#include <qspinbox.h>\r
-#include <qgroupbox.h>\r
-#include <qradiobutton.h>\r
-\r
-/* \r
- *  Constructs a DlgRef_2Sel3Spin2Rb which is a child of 'parent', with the \r
- *  name 'name' and widget flags set to 'f' \r
- */\r
-DlgRef_2Sel3Spin2Rb::DlgRef_2Sel3Spin2Rb(QWidget* parent,  const char* name, WFlags fl)\r
-  :DlgRef_2Sel3Spin2Rb_QTD(parent, name, fl)\r
-{\r
-  SpinBox1->close(TRUE);\r
-  SpinBox2->close(TRUE);\r
-  SpinBox3->close(TRUE);\r
-  RadioButton1->setChecked(true);\r
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");\r
-  Layout2->addMultiCellWidget(SpinBox_DX, 0, 0, 2, 4);\r
-  SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");\r
-  Layout2->addWidget(SpinBox_DY, 1, 2);\r
-  SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ");\r
-  Layout2->addWidget(SpinBox_DZ, 1, 4);\r
-  SpinBox_DY->setEnabled(false);\r
-  SpinBox_DZ->setEnabled(false);\r
-}\r
-\r
-/*  \r
- *  Destroys the object and frees any allocated resources\r
- */\r
-DlgRef_2Sel3Spin2Rb::~DlgRef_2Sel3Spin2Rb()\r
-{\r
-    // no need to delete child widgets, Qt does it all for us\r
-}\r
diff --git a/src/DlgRef/DlgRef_2Sel3Spin2Rb.h b/src/DlgRef/DlgRef_2Sel3Spin2Rb.h
deleted file mode 100755 (executable)
index e651662..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//  File   : DlgRef_2Sel3Spin2Rb.h\r
-//  Author : Dmitry MATVEITCHEV\r
-//  Module : GEOM\r
-//  $Header: \r
-\r
-#ifndef DLGREF_2SEL3SPIN2RB_H\r
-#define DLGREF_2SEL3SPIN2RB_H\r
-\r
-#include "DlgRef_2Sel3Spin2Rb_QTD.h"\r
-#include "DlgRef_SpinBox.h"\r
-//#if defined WNT \r
-//#include <SALOME_WNT.hxx>\r
-//#else\r
-//#define SALOME_WNT_EXPORT\r
-//#endif\r
-#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS\r
-#define DLGREF_WNT_EXPORT __declspec( dllexport )\r
-#else\r
-#define DLGREF_WNT_EXPORT\r
-#endif\r
-class DLGREF_WNT_EXPORT DlgRef_2Sel3Spin2Rb : public DlgRef_2Sel3Spin2Rb_QTD\r
-{ \r
-    Q_OBJECT\r
-\r
-public:\r
-    DlgRef_2Sel3Spin2Rb(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);\r
-    ~DlgRef_2Sel3Spin2Rb();\r
-\r
-    DlgRef_SpinBox* SpinBox_DX;\r
-    DlgRef_SpinBox* SpinBox_DY;\r
-    DlgRef_SpinBox* SpinBox_DZ;\r
-};\r
-\r
-#endif // DLGREF_2SEL3SPIN2RB_H\r
diff --git a/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.cxx b/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.cxx
deleted file mode 100755 (executable)
index bcbd3d6..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_2Sel3Spin2Rb_QTD.ui'
-**
-** Created: Tue Oct 9 15:16:54 2007
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#include "DlgRef_2Sel3Spin2Rb_QTD.h"
-
-#include <qvariant.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/*
- *  Constructs a DlgRef_2Sel3Spin2Rb_QTD as a child of 'parent', with the
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_2Sel3Spin2Rb_QTD::DlgRef_2Sel3Spin2Rb_QTD( QWidget* parent, const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_2Sel3Spin2Rb_QTD" );
-    DlgRef_2Sel3Spin2Rb_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_2Sel3Spin2Rb_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    TextLabel5 = new QLabel( GroupBox1, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( TextLabel5, 1, 3 );
-
-    RadioButton2 = new QRadioButton( GroupBox1, "RadioButton2" );
-
-    Layout2->addWidget( RadioButton2, 1, 0 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( TextLabel3, 0, 1 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addMultiCellWidget( SpinBox1, 0, 0, 2, 4 );
-
-    RadioButton1 = new QRadioButton( GroupBox1, "RadioButton1" );
-
-    Layout2->addWidget( RadioButton1, 0, 0 );
-
-    SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
-    SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox3, 1, 4 );
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox2, 1, 2 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( TextLabel4, 1, 1 );
-
-    Layout1->addMultiCellLayout( Layout2, 2, 2, 0, 2 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-    Spacer5 = new QSpacerItem( 0, 207, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( Spacer5, 3, 2 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_2Sel3Spin2Rb_QTDLayout->addWidget( GroupBox1, 0, 0 );
-    resize( QSize(439, 340).expandedTo(minimumSizeHint()) );
-    clearWState( WState_Polished );
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel3Spin2Rb_QTD::~DlgRef_2Sel3Spin2Rb_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.h b/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.h
deleted file mode 100755 (executable)
index 89f145a..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_2Sel3Spin2Rb_QTD.ui'
-**
-** Created: Tue Oct 9 15:16:54 2007
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#ifndef DLGREF_2SEL3SPIN2RB_QTD_H
-#define DLGREF_2SEL3SPIN2RB_QTD_H
-
-#include <qvariant.h>
-#include <qwidget.h>
-
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QSpacerItem;
-class QGroupBox;
-class QPushButton;
-class QLineEdit;
-class QLabel;
-class QRadioButton;
-class QSpinBox;
-
-class DlgRef_2Sel3Spin2Rb_QTD : public QWidget
-{
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel3Spin2Rb_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_2Sel3Spin2Rb_QTD();
-
-    QGroupBox* GroupBox1;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit1;
-    QLabel* TextLabel2;
-    QLabel* TextLabel5;
-    QRadioButton* RadioButton2;
-    QLabel* TextLabel3;
-    QSpinBox* SpinBox1;
-    QRadioButton* RadioButton1;
-    QSpinBox* SpinBox3;
-    QSpinBox* SpinBox2;
-    QLabel* TextLabel4;
-    QPushButton* PushButton2;
-    QLineEdit* LineEdit2;
-    QLabel* TextLabel1;
-
-protected:
-    QGridLayout* DlgRef_2Sel3Spin2Rb_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QSpacerItem* Spacer5;
-    QGridLayout* Layout2;
-
-};
-
-#endif // DLGREF_2SEL3SPIN2RB_QTD_H
diff --git a/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.ui b/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.ui
new file mode 100644 (file)
index 0000000..050f8ba
--- /dev/null
@@ -0,0 +1,211 @@
+<ui version="4.0" >
+ <class>DlgRef_2Sel3Spin2Rb_QTD</class>
+ <widget class="QWidget" name="DlgRef_2Sel3Spin2Rb_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>211</width>
+    <height>128</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>DlgRef_2Sel3Spin2Rb_QTD</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" colspan="3" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" colspan="3" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QRadioButton" name="RadioButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="3" column="0" >
+       <widget class="QRadioButton" name="RadioButton2" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="3" >
+       <widget class="QLabel" name="TextLabel5" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL5</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="4" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>RadioButton1</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>RadioButton2</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+  <tabstop>SpinBox_DZ</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_2Sel3Spin_QTD.cxx b/src/DlgRef/DlgRef_2Sel3Spin_QTD.cxx
deleted file mode 100644 (file)
index a479051..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_2Sel3Spin_QTD.ui'
-**
-** Created: jeu sep 25 16:18:43 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_2Sel3Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_2Sel3Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_2Sel3Spin_QTD::DlgRef_2Sel3Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_2Sel3Spin_QTD" );
-    resize( 129, 173 ); 
-    setCaption( trUtf8( "DlgRef_2Sel3Spin_QTD" ) );
-    DlgRef_2Sel3Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_2Sel3Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout2->addWidget( TextLabel3, 0, 0 );
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox2, 1, 1 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout2->addWidget( TextLabel4, 1, 0 );
-
-    TextLabel5 = new QLabel( GroupBox1, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-    TextLabel5->setText( trUtf8( "TL4" ) );
-
-    Layout2->addWidget( TextLabel5, 2, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox1, 0, 1 );
-
-    SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
-    SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox3, 2, 1 );
-
-    Layout1->addMultiCellLayout( Layout2, 2, 2, 0, 2 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 2 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_2Sel3Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel3Spin_QTD::~DlgRef_2Sel3Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_2Sel3Spin_QTD.h b/src/DlgRef/DlgRef_2Sel3Spin_QTD.h
deleted file mode 100644 (file)
index 8b49e9f..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_2Sel3Spin_QTD.ui'
-**
-** Created: jeu sep 25 16:18:43 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_2SEL3SPIN_QTD_H
-#define DLGREF_2SEL3SPIN_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel3Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel3Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_2Sel3Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QLineEdit* LineEdit1;
-    QLabel* TextLabel1;
-    QLabel* TextLabel2;
-    QLabel* TextLabel3;
-    QSpinBox* SpinBox2;
-    QLabel* TextLabel4;
-    QLabel* TextLabel5;
-    QSpinBox* SpinBox1;
-    QSpinBox* SpinBox3;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit2;
-    QPushButton* PushButton2;
-
-
-protected:
-    QGridLayout* DlgRef_2Sel3Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QGridLayout* Layout2;
-};
-
-#endif // DLGREF_2SEL3SPIN_QTD_H
diff --git a/src/DlgRef/DlgRef_2Sel3Spin_QTD.ui b/src/DlgRef/DlgRef_2Sel3Spin_QTD.ui
new file mode 100644 (file)
index 0000000..b3f27fb
--- /dev/null
@@ -0,0 +1,204 @@
+<ui version="4.0" >
+ <class>DlgRef_2Sel3Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_2Sel3Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>149</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="TextLabel5" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL5</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="4" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ" />
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+  <tabstop>SpinBox_DZ</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_2Sel4Spin1Check.cxx b/src/DlgRef/DlgRef_2Sel4Spin1Check.cxx
deleted file mode 100644 (file)
index bfb387e..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_2Sel4Spin1Check.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_2Sel4Spin1Check.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-#include <qpushbutton.h>
-
-/* 
- *  Constructs a DlgRef_2Sel1Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_2Sel4Spin1Check::DlgRef_2Sel4Spin1Check(QWidget* parent, const char* name, WFlags fl)
-  :DlgRef_2Sel4Spin1Check_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox3->close(TRUE);
-  SpinBox4->close(TRUE);
-  SpinBox_DX1 = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX1");
-  SpinBox_DY1 = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY1");
-  SpinBox_DX2 = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX2");
-  SpinBox_DY2 = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY2");
-  Layout2->addWidget(SpinBox_DX1, 0, 1);
-  Layout2->addWidget(SpinBox_DY1, 1, 1);
-  Layout3->addWidget(SpinBox_DX2, 0, 1);
-  Layout3->addWidget(SpinBox_DY2, 1, 1);
-
-  // PAL 6532
-  PushButton1->setAutoDefault( false );
-  PushButton2->setAutoDefault( false );
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel4Spin1Check::~DlgRef_2Sel4Spin1Check()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_2Sel4Spin1Check.h b/src/DlgRef/DlgRef_2Sel4Spin1Check.h
deleted file mode 100644 (file)
index 1d5e0c4..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_2Sel4Spin1Check.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_2SEL4SPIN1CHECK_H
-#define DLGREF_2SEL4SPIN1CHECK_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_2Sel4Spin1Check_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel4Spin1Check : public DlgRef_2Sel4Spin1Check_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel4Spin1Check(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~DlgRef_2Sel4Spin1Check();
-
-    DlgRef_SpinBox* SpinBox_DX1;
-    DlgRef_SpinBox* SpinBox_DY1;
-    DlgRef_SpinBox* SpinBox_DX2;
-    DlgRef_SpinBox* SpinBox_DY2;
-
-};
-
-#endif // DLGREF_2SEL4SPIN1CHECK_H
diff --git a/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.cxx b/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.cxx
deleted file mode 100644 (file)
index 3dd3f2e..0000000
+++ /dev/null
@@ -1,177 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_2Sel4Spin1Check_QTD.ui'
-**
-** Created: Tue Jun 1 12:38:04 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_2Sel4Spin1Check_QTD.h"
-
-#include <qvariant.h>
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_2Sel4Spin1Check_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_2Sel4Spin1Check_QTD::DlgRef_2Sel4Spin1Check_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_2Sel4Spin1Check_QTD" );
-    resize( 262, 230 ); 
-    setCaption( trUtf8( "DlgRef_2Sel4Spin1Check_QTD" ) );
-    DlgRef_2Sel4Spin1Check_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_2Sel4Spin1Check_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout5 = new QGridLayout( 0, 1, 1, 0, 6, "Layout5"); 
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout5->addWidget( PushButton1, 0, 1 );
-
-    CheckButton1 = new QCheckBox( GroupBox1, "CheckButton1" );
-    CheckButton1->setText( trUtf8( "" ) );
-
-    Layout5->addMultiCellWidget( CheckButton1, 3, 3, 0, 3 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout2->addWidget( TextLabel3, 0, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox1, 0, 1 );
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox2, 1, 1 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout2->addWidget( TextLabel4, 1, 0 );
-
-    Layout5->addMultiCellLayout( Layout2, 2, 2, 0, 2 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout5->addWidget( LineEdit2, 1, 2 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout5->addWidget( TextLabel1, 0, 0 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout5->addWidget( LineEdit1, 0, 2 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout5->addItem( spacer, 5, 3 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout5->addWidget( PushButton2, 1, 1 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout5->addWidget( TextLabel2, 1, 0 );
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-
-    SpinBox4 = new QSpinBox( GroupBox1, "SpinBox4" );
-    SpinBox4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox4->sizePolicy().hasHeightForWidth() ) );
-
-    Layout3->addWidget( SpinBox4, 1, 1 );
-
-    TextLabel5 = new QLabel( GroupBox1, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-    TextLabel5->setText( trUtf8( "TL5" ) );
-
-    Layout3->addWidget( TextLabel5, 0, 0 );
-
-    SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
-    SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout3->addWidget( SpinBox3, 0, 1 );
-
-    TextLabel6 = new QLabel( GroupBox1, "TextLabel6" );
-    TextLabel6->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel6->sizePolicy().hasHeightForWidth() ) );
-    TextLabel6->setText( trUtf8( "TL6" ) );
-
-    Layout3->addWidget( TextLabel6, 1, 0 );
-
-    Layout5->addMultiCellLayout( Layout3, 4, 4, 0, 2 );
-
-    GroupBox1Layout->addLayout( Layout5, 0, 0 );
-
-    DlgRef_2Sel4Spin1Check_QTDLayout->addWidget( GroupBox1, 0, 0 );
-
-    // tab order
-    setTabOrder( PushButton1, LineEdit1 );
-    setTabOrder( LineEdit1, PushButton2 );
-    setTabOrder( PushButton2, LineEdit2 );
-    setTabOrder( LineEdit2, SpinBox1 );
-    setTabOrder( SpinBox1, SpinBox2 );
-    setTabOrder( SpinBox2, CheckButton1 );
-    setTabOrder( CheckButton1, SpinBox3 );
-    setTabOrder( SpinBox3, SpinBox4 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel4Spin1Check_QTD::~DlgRef_2Sel4Spin1Check_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.h b/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.h
deleted file mode 100644 (file)
index 7f49d2b..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_2Sel4Spin1Check_QTD.ui'
-**
-** Created: Tue Jun 1 12:38:04 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_2SEL4SPIN1CHECK_QTD_H
-#define DLGREF_2SEL4SPIN1CHECK_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QCheckBox;
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel4Spin1Check_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel4Spin1Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_2Sel4Spin1Check_QTD();
-
-    QGroupBox* GroupBox1;
-    QPushButton* PushButton1;
-    QCheckBox* CheckButton1;
-    QLabel* TextLabel3;
-    QSpinBox* SpinBox1;
-    QSpinBox* SpinBox2;
-    QLabel* TextLabel4;
-    QLineEdit* LineEdit2;
-    QLabel* TextLabel1;
-    QLineEdit* LineEdit1;
-    QPushButton* PushButton2;
-    QLabel* TextLabel2;
-    QSpinBox* SpinBox4;
-    QLabel* TextLabel5;
-    QSpinBox* SpinBox3;
-    QLabel* TextLabel6;
-
-
-protected:
-    QGridLayout* DlgRef_2Sel4Spin1Check_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout5;
-    QGridLayout* Layout2;
-    QGridLayout* Layout3;
-};
-
-#endif // DLGREF_2SEL4SPIN1CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.ui b/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.ui
new file mode 100644 (file)
index 0000000..27e0b7e
--- /dev/null
@@ -0,0 +1,232 @@
+<ui version="4.0" >
+ <class>DlgRef_2Sel4Spin1Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_2Sel4Spin1Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>197</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="4" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY2" />
+      </item>
+      <item row="5" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX2" />
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY1" />
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX1" />
+      </item>
+      <item row="6" column="0" >
+       <widget class="QLabel" name="TextLabel6" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL6</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="TextLabel5" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL5</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>SpinBox_DX1</tabstop>
+  <tabstop>SpinBox_DY1</tabstop>
+  <tabstop>CheckButton1</tabstop>
+  <tabstop>SpinBox_DX2</tabstop>
+  <tabstop>SpinBox_DY2</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_2SelExt_QTD.ui b/src/DlgRef/DlgRef_2SelExt_QTD.ui
new file mode 100644 (file)
index 0000000..a5ab1a4
--- /dev/null
@@ -0,0 +1,132 @@
+<ui version="4.0" >
+ <class>DlgRef_2SelExt_QTD</class>
+ <widget class="QWidget" name="DlgRef_2SelExt_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>155</width>
+    <height>80</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>7</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="0" colspan="3" >
+       <widget class="QWidget" native="1" name="Box" />
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_2Sel_QTD.cxx b/src/DlgRef/DlgRef_2Sel_QTD.cxx
deleted file mode 100644 (file)
index 7e305f6..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_2Sel_QTD.ui'
-**
-** Created: mar sep 23 16:05:09 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_2Sel_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_2Sel_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_2Sel_QTD::DlgRef_2Sel_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_2Sel_QTD" );
-    resize( 129, 87 ); 
-    setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
-    setCaption( trUtf8( "DlgRef_2Sel_QTD" ) );
-    DlgRef_2Sel_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_2Sel_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 2, 2 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_2Sel_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Sel_QTD::~DlgRef_2Sel_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_2Sel_QTD.h b/src/DlgRef/DlgRef_2Sel_QTD.h
deleted file mode 100644 (file)
index c28d7e9..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_2Sel_QTD.ui'
-**
-** Created: mar sep 23 16:05:09 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_2SEL_QTD_H
-#define DLGREF_2SEL_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-
-class GEOM_DLGREF_EXPORT DlgRef_2Sel_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Sel_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_2Sel_QTD();
-
-    QGroupBox* GroupBox1;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit2;
-    QPushButton* PushButton2;
-    QLabel* TextLabel1;
-    QLabel* TextLabel2;
-    QLineEdit* LineEdit1;
-
-
-protected:
-    QGridLayout* DlgRef_2Sel_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // DLGREF_2SEL_QTD_H
diff --git a/src/DlgRef/DlgRef_2Sel_QTD.ui b/src/DlgRef/DlgRef_2Sel_QTD.ui
new file mode 100644 (file)
index 0000000..753d958
--- /dev/null
@@ -0,0 +1,129 @@
+<ui version="4.0" >
+ <class>DlgRef_2Sel_QTD</class>
+ <widget class="QWidget" name="DlgRef_2Sel_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>74</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>7</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_2Spin.cxx b/src/DlgRef/DlgRef_2Spin.cxx
deleted file mode 100644 (file)
index 437ed0b..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_2Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_2Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_2Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_2Spin::DlgRef_2Spin(QWidget* parent, const char* name, WFlags fl)
-  :DlgRef_2Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout1->addWidget(SpinBox_DX, 0, 1);
-
-  SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
-  Layout1->addWidget(SpinBox_DY, 1, 1);
-
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Spin::~DlgRef_2Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_2Spin.h b/src/DlgRef/DlgRef_2Spin.h
deleted file mode 100644 (file)
index a69052c..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_2Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_2SPIN_H
-#define DLGREF_2SPIN_H
-
-#include "DlgRef_2Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-#include "GEOM_DlgRef.hxx"
-
-class GEOM_DLGREF_EXPORT DlgRef_2Spin : public DlgRef_2Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Spin(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~DlgRef_2Spin();
-
-    DlgRef_SpinBox* SpinBox_DX;
-    DlgRef_SpinBox* SpinBox_DY;
-
-};
-
-#endif // DLGREF_2SPIN_H
diff --git a/src/DlgRef/DlgRef_2Spin_QTD.cxx b/src/DlgRef/DlgRef_2Spin_QTD.cxx
deleted file mode 100644 (file)
index fab9c4f..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_2Spin_QTD.ui'
-**
-** Created: jeu sep 25 12:10:30 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_2Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_2Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_2Spin_QTD::DlgRef_2Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_2Spin_QTD" );
-    resize( 124, 83 ); 
-    setCaption( trUtf8( "DlgRef_2Spin_QTD" ) );
-    DlgRef_2Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_2Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox2, 1, 1 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 1 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox1, 0, 1 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_2Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_2Spin_QTD::~DlgRef_2Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_2Spin_QTD.h b/src/DlgRef/DlgRef_2Spin_QTD.h
deleted file mode 100644 (file)
index b820d4b..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_2Spin_QTD.ui'
-**
-** Created: jeu sep 25 12:10:30 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_2SPIN_QTD_H
-#define DLGREF_2SPIN_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_2Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_2Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_2Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QSpinBox* SpinBox2;
-    QSpinBox* SpinBox1;
-    QLabel* TextLabel1;
-    QLabel* TextLabel2;
-
-
-protected:
-    QGridLayout* DlgRef_2Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // DLGREF_2SPIN_QTD_H
diff --git a/src/DlgRef/DlgRef_2Spin_QTD.ui b/src/DlgRef/DlgRef_2Spin_QTD.ui
new file mode 100644 (file)
index 0000000..466bf52
--- /dev/null
@@ -0,0 +1,112 @@
+<ui version="4.0" >
+ <class>DlgRef_2Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_2Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>100</width>
+    <height>66</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_3Check_QTD.cxx b/src/DlgRef/DlgRef_3Check_QTD.cxx
deleted file mode 100644 (file)
index 9640159..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_3Check_QTD.ui'
-**
-** Created: Tue Aug 24 11:27:47 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_3Check_QTD.h"
-
-#include <qvariant.h>
-#include <qbuttongroup.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_3Check_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_3Check_QTD::DlgRef_3Check_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_3Check_QTD" );
-    resize( 135, 108 ); 
-    setCaption( trUtf8( "DlgRef_3Check_QTD" ) );
-    DlgRef_3Check_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_3Check_QTDLayout"); 
-
-    GroupBox1 = new QButtonGroup( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    RadioButton3 = new QRadioButton( GroupBox1, "RadioButton3" );
-    RadioButton3->setText( trUtf8( "RadioButton3" ) );
-
-    Layout1->addWidget( RadioButton3, 2, 0 );
-
-    RadioButton1 = new QRadioButton( GroupBox1, "RadioButton1" );
-    RadioButton1->setText( trUtf8( "RadioButton1" ) );
-
-    Layout1->addWidget( RadioButton1, 0, 0 );
-
-    RadioButton2 = new QRadioButton( GroupBox1, "RadioButton2" );
-    RadioButton2->setText( trUtf8( "RadioButton2" ) );
-
-    Layout1->addWidget( RadioButton2, 1, 0 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 91, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 0 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_3Check_QTDLayout->addWidget( GroupBox1, 0, 0 );
-
-    // tab order
-    setTabOrder( RadioButton1, RadioButton2 );
-    setTabOrder( RadioButton2, RadioButton3 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_3Check_QTD::~DlgRef_3Check_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_3Check_QTD.h b/src/DlgRef/DlgRef_3Check_QTD.h
deleted file mode 100644 (file)
index 976bf89..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_3Check_QTD.ui'
-**
-** Created: Tue Aug 24 11:27:47 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_3CHECK_QTD_H
-#define DLGREF_3CHECK_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QButtonGroup;
-class QRadioButton;
-
-class GEOM_DLGREF_EXPORT DlgRef_3Check_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_3Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_3Check_QTD();
-
-    QButtonGroup* GroupBox1;
-    QRadioButton* RadioButton3;
-    QRadioButton* RadioButton1;
-    QRadioButton* RadioButton2;
-
-
-protected:
-    QGridLayout* DlgRef_3Check_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // DLGREF_3CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_3Check_QTD.ui b/src/DlgRef/DlgRef_3Check_QTD.ui
new file mode 100644 (file)
index 0000000..aa9a707
--- /dev/null
@@ -0,0 +1,69 @@
+<ui version="4.0" >
+ <class>DlgRef_3Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_3Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>118</width>
+    <height>88</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="1" column="0" >
+       <widget class="QRadioButton" name="RadioButton2" >
+        <property name="text" >
+         <string>RadioButton2</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QRadioButton" name="RadioButton1" >
+        <property name="text" >
+         <string>RadioButton1</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QRadioButton" name="RadioButton3" >
+        <property name="text" >
+         <string>RadioButton3</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>RadioButton1</tabstop>
+  <tabstop>RadioButton2</tabstop>
+  <tabstop>RadioButton3</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui b/src/DlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui
new file mode 100644 (file)
index 0000000..74e1d6b
--- /dev/null
@@ -0,0 +1,150 @@
+<ui version="4.0" >
+ <class>DlgRef_3Radio1Sel1Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_3Radio1Sel1Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>357</width>
+    <height>131</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize" >
+      <size>
+       <width>357</width>
+       <height>131</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" name="gridLayout" >
+      <item row="0" column="0" colspan="3" >
+       <layout class="QHBoxLayout" name="horizontalLayout" >
+        <item>
+         <widget class="QRadioButton" name="RadioButton1" >
+          <property name="text" >
+           <string>RadioButton1</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="RadioButton2" >
+          <property name="text" >
+           <string>RadioButton2</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="RadioButton3" >
+          <property name="text" >
+           <string>RadioButton3</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="3" column="2" >
+       <spacer name="verticalSpacer" >
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>256</width>
+          <height>19</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_3Radio_QTD.ui b/src/DlgRef/DlgRef_3Radio_QTD.ui
new file mode 100644 (file)
index 0000000..e55899e
--- /dev/null
@@ -0,0 +1,75 @@
+<ui version="4.0" >
+ <class>DlgRef_3Radio_QTD</class>
+ <widget class="QWidget" name="DlgRef_3Radio_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>335</width>
+    <height>44</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QHBoxLayout" >
+      <item>
+       <widget class="QRadioButton" name="RadioButton1" >
+        <property name="text" >
+         <string>RadioButton1</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="RadioButton2" >
+        <property name="text" >
+         <string>RadioButton2</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="RadioButton3" >
+        <property name="text" >
+         <string>RadioButton3</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>RadioButton1</tabstop>
+  <tabstop>RadioButton2</tabstop>
+  <tabstop>RadioButton3</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_3Sel1Check_QTD.cxx b/src/DlgRef/DlgRef_3Sel1Check_QTD.cxx
deleted file mode 100644 (file)
index e30a066..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_3Sel1Check_QTD.ui'
-**
-** Created: Mon Oct 29 18:14:59 2007
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#include "DlgRef_3Sel1Check_QTD.h"
-
-#include <qvariant.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qcheckbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/*
- *  Constructs a DlgRef_3Sel1Check_QTD as a child of 'parent', with the
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_3Sel1Check_QTD::DlgRef_3Sel1Check_QTD( QWidget* parent, const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_3Sel1Check_QTD" );
-    setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
-    DlgRef_3Sel1Check_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_3Sel1Check_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, GroupBox1->sizePolicy().hasHeightForWidth() ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-
-    GroupBox1Layout->addWidget( PushButton1, 0, 1 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    GroupBox1Layout->addMultiCellWidget( LineEdit1, 0, 0, 2, 3 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-
-    GroupBox1Layout->addWidget( TextLabel1, 0, 0 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-
-    GroupBox1Layout->addWidget( PushButton2, 1, 1 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    GroupBox1Layout->addMultiCellWidget( LineEdit2, 1, 1, 2, 3 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-
-    GroupBox1Layout->addWidget( TextLabel2, 1, 0 );
-
-    PushButton3 = new QPushButton( GroupBox1, "PushButton3" );
-    PushButton3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton3->sizePolicy().hasHeightForWidth() ) );
-
-    GroupBox1Layout->addWidget( PushButton3, 2, 1 );
-
-    LineEdit3 = new QLineEdit( GroupBox1, "LineEdit3" );
-
-    GroupBox1Layout->addMultiCellWidget( LineEdit3, 2, 2, 2, 3 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-
-    GroupBox1Layout->addWidget( TextLabel3, 2, 0 );
-    Spacer3 = new QSpacerItem( 16, 721, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    GroupBox1Layout->addItem( Spacer3, 4, 3 );
-
-    CheckButton1 = new QCheckBox( GroupBox1, "CheckButton1" );
-
-    GroupBox1Layout->addMultiCellWidget( CheckButton1, 3, 3, 0, 2 );
-
-    DlgRef_3Sel1Check_QTDLayout->addWidget( GroupBox1, 0, 0 );
-    languageChange();
-    resize( QSize(403, 441).expandedTo(minimumSizeHint()) );
-    clearWState( WState_Polished );
-
-    // tab order
-    setTabOrder( PushButton1, LineEdit1 );
-    setTabOrder( LineEdit1, PushButton2 );
-    setTabOrder( PushButton2, LineEdit2 );
-    setTabOrder( LineEdit2, PushButton3 );
-    setTabOrder( PushButton3, LineEdit3 );
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_3Sel1Check_QTD::~DlgRef_3Sel1Check_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_3Sel1Check_QTD::languageChange()
-{
-    setCaption( tr( "DlgRef_3Sel3Spin1Check_QTD" ) );
-    GroupBox1->setTitle( QString::null );
-    PushButton1->setText( QString::null );
-    TextLabel1->setText( tr( "TL1" ) );
-    PushButton2->setText( QString::null );
-    TextLabel2->setText( tr( "TL2" ) );
-    PushButton3->setText( QString::null );
-    TextLabel3->setText( tr( "TL3" ) );
-    CheckButton1->setText( tr( "CheckButton1" ) );
-}
-
diff --git a/src/DlgRef/DlgRef_3Sel1Check_QTD.h b/src/DlgRef/DlgRef_3Sel1Check_QTD.h
deleted file mode 100644 (file)
index 52a73f9..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_3Sel1Check_QTD.ui'
-**
-** Created: Mon Oct 29 18:14:59 2007
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#ifndef DLGREF_3SEL1CHECK_QTD_H
-#define DLGREF_3SEL1CHECK_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QSpacerItem;
-class QGroupBox;
-class QPushButton;
-class QLineEdit;
-class QLabel;
-class QCheckBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_3Sel1Check_QTD : public QWidget
-{
-    Q_OBJECT
-
-public:
-    DlgRef_3Sel1Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_3Sel1Check_QTD();
-
-    QGroupBox* GroupBox1;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit1;
-    QLabel* TextLabel1;
-    QPushButton* PushButton2;
-    QLineEdit* LineEdit2;
-    QLabel* TextLabel2;
-    QPushButton* PushButton3;
-    QLineEdit* LineEdit3;
-    QLabel* TextLabel3;
-    QCheckBox* CheckButton1;
-
-protected:
-    QGridLayout* DlgRef_3Sel1Check_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QSpacerItem* Spacer3;
-
-protected slots:
-    virtual void languageChange();
-
-};
-
-#endif // DLGREF_3SEL1CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_3Sel1Check_QTD.ui b/src/DlgRef/DlgRef_3Sel1Check_QTD.ui
new file mode 100644 (file)
index 0000000..91d9258
--- /dev/null
@@ -0,0 +1,182 @@
+<ui version="4.0" >
+ <class>DlgRef_3Sel1Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_3Sel1Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>126</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>5</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>5</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="3" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="QLineEdit" name="LineEdit3" />
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="PushButton3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>PushButton3</tabstop>
+  <tabstop>LineEdit3</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_3Sel1Spin.cxx b/src/DlgRef/DlgRef_3Sel1Spin.cxx
deleted file mode 100644 (file)
index d9e7176..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-// File:       DlgRef_3Sel1Spin.cxx
-// Created:    Thu May 13 12:19:31 2004
-// Author:     Alexander SLADKOV
-//             <asv@yandex.nnov.opencascade.com>
-
-
-#include "DlgRef_3Sel1Spin.h"
-
-//=================================================================================
-// class    : DlgRef_3Sel1Spin
-// purpose  : 
-//=================================================================================
-DlgRef_3Sel1Spin::DlgRef_3Sel1Spin( QWidget* parent, const char* name, WFlags fl )
-  :DlgRef_3Sel_QTD( parent, name, fl )
-{
-  Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-  TextLabel4 = new QLabel( (QWidget*)GroupBox1, "TextLabel4" );
-  TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-  Layout2->addWidget( TextLabel4, 0, 0 );
-
-  SpinBox_DX = new DlgRef_SpinBox( (QWidget*)GroupBox1, "SpinBox_DX" );
-  Layout2->addWidget( SpinBox_DX, 0, 1 );
-
-  Layout1->addMultiCellLayout( Layout2, 3, 3, 0, 2 );    
-  QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-  Layout1->addItem( spacer, 4, 2 );
-}
-
-DlgRef_3Sel1Spin::~DlgRef_3Sel1Spin()
-{
-}
diff --git a/src/DlgRef/DlgRef_3Sel1Spin.h b/src/DlgRef/DlgRef_3Sel1Spin.h
deleted file mode 100644 (file)
index 60a7798..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_3Sel1Spin.h
-//  Author : Alexander SLADKOV
-//  Module : GEOM
-//  $Header$
-
-#ifndef DlgRef_3SEL_1SPIN_H
-#define DlgRef_3SEL_1SPIN_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_3Sel_QTD.h"
-#include "DlgRef_SpinBox.h"
-#include <qlayout.h>
-#include <qlabel.h>
-
-//=================================================================================
-// class    : DlgRef_3Sel1Spin
-// purpose  : extension of a DlgRef_3Sel_QTD class, 1 additional spin box is added
-//=================================================================================
-class GEOM_DLGREF_EXPORT DlgRef_3Sel1Spin : public DlgRef_3Sel_QTD
-{
-  Q_OBJECT
-
-  public:
-    DlgRef_3Sel1Spin( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_3Sel1Spin();
-
-    QLabel* TextLabel4;
-    DlgRef_SpinBox* SpinBox_DX;
-
-  protected:
-    QGridLayout* Layout2;
-};
-
-#endif // DlgRef_3SEL_1SPIN_H
diff --git a/src/DlgRef/DlgRef_3Sel1Spin_QTD.ui b/src/DlgRef/DlgRef_3Sel1Spin_QTD.ui
new file mode 100644 (file)
index 0000000..d1f2f04
--- /dev/null
@@ -0,0 +1,210 @@
+<ui version="4.0" >
+ <class>DlgRef_3Sel1Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_3Sel1Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>128</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="QLineEdit" name="LineEdit3" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="PushButton3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>      
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>PushButton3</tabstop>
+  <tabstop>LineEdit3</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check.cxx b/src/DlgRef/DlgRef_3Sel3Spin1Check.cxx
deleted file mode 100644 (file)
index dd1a8b2..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_3Sel3Spin1Check.cxx
-//  Author : Michael Zorin
-//  Module : GEOM
-//  $Header: 
-
-#include <DlgRef_3Sel3Spin1Check.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qgroupbox.h>
-
-
-/* 
- *  Constructs a DlgRef_3Sel3Spin1Check which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_3Sel3Spin1Check::DlgRef_3Sel3Spin1Check(QWidget* parent,  const char* name, WFlags fl)
-  :DlgRef_3Sel3Spin1Check_QTD(parent, name, fl)
-{
-  SpinBox_1->close(TRUE);
-  SpinBox_2->close(TRUE);
-  SpinBox_3->close(TRUE);
-  SpinBox1 = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  SpinBox2 = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
-  SpinBox3 = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ");
-  Layout1->addWidget(SpinBox1, 3, 2);
-  Layout1->addWidget(SpinBox2, 4, 2);
-  Layout1->addWidget(SpinBox3, 5, 2);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_3Sel3Spin1Check::~DlgRef_3Sel3Spin1Check()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
-void DlgRef_3Sel3Spin1Check:: ShowRows(int fromRow, int toRow, bool toShow)
-{
-  typedef void (QWidget::* ShowFun)(); 
-  ShowFun pShowFun;    
-
-  if (toShow)
-       pShowFun = &QWidget::show;
-  else
-        pShowFun = &QWidget::hide;
-
-  if (fromRow >= 0 && toRow>=0 && toRow >= fromRow)
-    {
-      if ( fromRow == 0)
-       {
-         (TextLabel1->*pShowFun)();
-         (PushButton1->*pShowFun)();
-         (LineEdit1->*pShowFun)();
-       }
-      if ( fromRow <= 1 && 1 <= toRow)
-       {
-         (TextLabel2->*pShowFun)();
-         (PushButton2->*pShowFun)();
-         (LineEdit2->*pShowFun)(); 
-       }
-      if ( fromRow <= 2 && 2 <= toRow)
-       {
-         (TextLabel3->*pShowFun)();
-         (PushButton3->*pShowFun)();
-         (LineEdit3->*pShowFun)(); 
-       }
-      if ( fromRow <= 3 && 3 <= toRow)
-       {
-         (TextLabel4->*pShowFun)();
-         (SpinBox1->*pShowFun)();
-       }
-      if ( fromRow <= 4 && 4 <= toRow)
-       {
-         (TextLabel5->*pShowFun)();
-         (SpinBox2->*pShowFun)();
-       }
-      if ( fromRow <= 5 && 5 <= toRow)
-       {
-         (TextLabel6->*pShowFun)();
-         (SpinBox3->*pShowFun)();
-       }
-      if ( fromRow <= 6 && 6 <= toRow)
-       (CheckBox1->*pShowFun)();
-    }
-}
diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check.h b/src/DlgRef/DlgRef_3Sel3Spin1Check.h
deleted file mode 100644 (file)
index d1731cf..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_3Sel3Spin1Check.h
-//  Author : Michael ZORIN
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_3SEL3SPIN1CHECK_H
-#define DLGREF_3SEL3SPIN1CHECK_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_3Sel3Spin1Check_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_3Sel3Spin1Check : public DlgRef_3Sel3Spin1Check_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_3Sel3Spin1Check( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_3Sel3Spin1Check();
-
-    DlgRef_SpinBox* SpinBox1;
-    DlgRef_SpinBox* SpinBox2;  
-    DlgRef_SpinBox* SpinBox3;
-
-    void ShowRows(int fromRow, int toRow, bool toShow = true);
-
-};
-
-#endif // DLGREF_3SEL3SPIN1CHECK_H
diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.cxx b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.cxx
deleted file mode 100644 (file)
index 9c9ca51..0000000
+++ /dev/null
@@ -1,177 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_3Sel3Spin1Check_QTD.ui'
-**
-** Created: Mon Apr 19 16:36:48 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_3Sel3Spin1Check_QTD.h"
-
-#include <qvariant.h>
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_3Sel3Spin1Check_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_3Sel3Spin1Check_QTD::DlgRef_3Sel3Spin1Check_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_3Sel3Spin1Check_QTD" );
-    resize( 380, 229 ); 
-    setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
-    setCaption( trUtf8( "DlgRef_3Sel3Spin1Check_QTD" ) );
-    DlgRef_3Sel3Spin1Check_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_3Sel3Spin1Check_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, GroupBox1->sizePolicy().hasHeightForWidth() ) );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    SpinBox_2 = new QSpinBox( GroupBox1, "SpinBox_2" );
-    SpinBox_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox_2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox_2, 4, 2 );
-
-    LineEdit3 = new QLineEdit( GroupBox1, "LineEdit3" );
-
-    Layout1->addWidget( LineEdit3, 2, 2 );
-
-    SpinBox_3 = new QSpinBox( GroupBox1, "SpinBox_3" );
-    SpinBox_3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox_3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox_3, 5, 2 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addWidget( TextLabel3, 2, 0 );
-
-    CheckBox1 = new QCheckBox( GroupBox1, "CheckBox1" );
-    CheckBox1->setText( trUtf8( "" ) );
-
-    Layout1->addMultiCellWidget( CheckBox1, 6, 6, 0, 1 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout1->addWidget( TextLabel4, 3, 0 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    PushButton3 = new QPushButton( GroupBox1, "PushButton3" );
-    PushButton3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton3->sizePolicy().hasHeightForWidth() ) );
-    PushButton3->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton3, 2, 1 );
-
-    TextLabel6 = new QLabel( GroupBox1, "TextLabel6" );
-    TextLabel6->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel6->sizePolicy().hasHeightForWidth() ) );
-    TextLabel6->setText( trUtf8( "TL6" ) );
-
-    Layout1->addWidget( TextLabel6, 5, 0 );
-
-    SpinBox_1 = new QSpinBox( GroupBox1, "SpinBox_1" );
-    SpinBox_1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox_1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox_1, 3, 2 );
-
-    TextLabel5 = new QLabel( GroupBox1, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-    TextLabel5->setText( trUtf8( "TL5" ) );
-
-    Layout1->addWidget( TextLabel5, 4, 0 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 250, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 7, 2 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_3Sel3Spin1Check_QTDLayout->addWidget( GroupBox1, 0, 0 );
-
-    // tab order
-    setTabOrder( PushButton1, LineEdit1 );
-    setTabOrder( LineEdit1, PushButton2 );
-    setTabOrder( PushButton2, LineEdit2 );
-    setTabOrder( LineEdit2, PushButton3 );
-    setTabOrder( PushButton3, LineEdit3 );
-    setTabOrder( LineEdit3, SpinBox_1 );
-    setTabOrder( SpinBox_1, SpinBox_2 );
-    setTabOrder( SpinBox_2, SpinBox_3 );
-    setTabOrder( SpinBox_3, CheckBox1 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_3Sel3Spin1Check_QTD::~DlgRef_3Sel3Spin1Check_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.h b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.h
deleted file mode 100644 (file)
index a4c0c63..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_3Sel3Spin1Check_QTD.ui'
-**
-** Created: Mon Apr 19 16:36:48 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_3SEL3SPIN1CHECK_QTD_H
-#define DLGREF_3SEL3SPIN1CHECK_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QCheckBox;
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_3Sel3Spin1Check_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_3Sel3Spin1Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_3Sel3Spin1Check_QTD();
-
-    QGroupBox* GroupBox1;
-    QSpinBox* SpinBox_2;
-    QLineEdit* LineEdit3;
-    QSpinBox* SpinBox_3;
-    QLabel* TextLabel1;
-    QLabel* TextLabel3;
-    QCheckBox* CheckBox1;
-    QPushButton* PushButton1;
-    QLabel* TextLabel4;
-    QLineEdit* LineEdit2;
-    QPushButton* PushButton3;
-    QLabel* TextLabel6;
-    QSpinBox* SpinBox_1;
-    QLabel* TextLabel5;
-    QLabel* TextLabel2;
-    QLineEdit* LineEdit1;
-    QPushButton* PushButton2;
-
-
-protected:
-    QGridLayout* DlgRef_3Sel3Spin1Check_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // DLGREF_3SEL3SPIN1CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui
new file mode 100644 (file)
index 0000000..ac29be9
--- /dev/null
@@ -0,0 +1,258 @@
+<ui version="4.0" >
+ <class>DlgRef_3Sel3Spin1Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_3Sel3Spin1Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>201</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="6" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckBox1" >
+        <property name="text" >
+         <string>Check</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="QtxDoubleSpinBox" name="SpinBox1" />
+      </item>
+      <item row="5" column="1" colspan="2" >
+       <widget class="QtxDoubleSpinBox" name="SpinBox3" />
+      </item>
+      <item row="4" column="1" colspan="2" >
+       <widget class="QtxDoubleSpinBox" name="SpinBox2" />
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="PushButton3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="QLineEdit" name="LineEdit3" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="TextLabel5" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL5</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="TextLabel6" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL6</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>QtxDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >QtxDoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>PushButton3</tabstop>
+  <tabstop>LineEdit3</tabstop>
+  <tabstop>SpinBox1</tabstop>
+  <tabstop>SpinBox2</tabstop>
+  <tabstop>SpinBox3</tabstop>
+  <tabstop>CheckBox1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.ui b/src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.ui
new file mode 100644 (file)
index 0000000..10ee30b
--- /dev/null
@@ -0,0 +1,230 @@
+<ui version="4.0" >
+ <class>DlgRef_3Sel3Spin2Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_3Sel3Spin2Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>120</width>
+    <height>242</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="PushButton3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="QLineEdit" name="LineEdit3" />
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox1" />
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="TextLabel5" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL5</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox2" />
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="TextLabel6" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL6</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox3" />
+      </item>
+      <item row="6" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckBox1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckBox2" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>PushButton3</tabstop>
+  <tabstop>LineEdit3</tabstop>
+  <tabstop>SpinBox1</tabstop>
+  <tabstop>SpinBox2</tabstop>
+  <tabstop>SpinBox3</tabstop>
+  <tabstop>CheckBox1</tabstop>
+  <tabstop>CheckBox2</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_3Sel4Spin2Check.cxx b/src/DlgRef/DlgRef_3Sel4Spin2Check.cxx
deleted file mode 100644 (file)
index d8faeac..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_3Sel4Spin2Check.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_3Sel4Spin2Check.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-#include <qpushbutton.h>
-
-/* 
- *  Constructs a DlgRef_2Sel1Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_3Sel4Spin2Check::DlgRef_3Sel4Spin2Check(QWidget* parent, const char* name, WFlags fl)
-  :DlgRef_3Sel4Spin2Check_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox3->close(TRUE);
-  SpinBox4->close(TRUE);
-  SpinBox_DX1 = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX1");
-  SpinBox_DY1 = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY1");
-  SpinBox_DX2 = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX2");
-  SpinBox_DY2 = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY2");
-  Layout2->addWidget(SpinBox_DX1, 0, 1);
-  Layout2->addWidget(SpinBox_DY1, 1, 1);
-  Layout3->addWidget(SpinBox_DX2, 0, 1);
-  Layout3->addWidget(SpinBox_DY2, 1, 1);
-
-  // PAL6532
-  PushButton1->setAutoDefault( false );
-  PushButton2->setAutoDefault( false );
-  PushButton3->setAutoDefault( false );
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_3Sel4Spin2Check::~DlgRef_3Sel4Spin2Check()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_3Sel4Spin2Check.h b/src/DlgRef/DlgRef_3Sel4Spin2Check.h
deleted file mode 100644 (file)
index 696c646..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_3Sel4Spin2Check.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_3SEL4SPIN2CHECK_H
-#define DLGREF_3SEL4SPIN2CHECK_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_3Sel4Spin2Check_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_3Sel4Spin2Check : public DlgRef_3Sel4Spin2Check_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_3Sel4Spin2Check(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~DlgRef_3Sel4Spin2Check();
-
-    DlgRef_SpinBox* SpinBox_DX1;
-    DlgRef_SpinBox* SpinBox_DY1;
-    DlgRef_SpinBox* SpinBox_DX2;
-    DlgRef_SpinBox* SpinBox_DY2;
-
-};
-
-#endif // DLGREF_3SEL4SPIN2CHECK_H
diff --git a/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.cxx b/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.cxx
deleted file mode 100644 (file)
index c0f469b..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_3Sel4Spin2Check_QTD.ui'
-**
-** Created: Tue Jun 1 16:29:29 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_3Sel4Spin2Check_QTD.h"
-
-#include <qvariant.h>
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_3Sel4Spin2Check_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_3Sel4Spin2Check_QTD::DlgRef_3Sel4Spin2Check_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_3Sel4Spin2Check_QTD" );
-    resize( 269, 281 ); 
-    setCaption( trUtf8( "DlgRef_3Sel4Spin2Check_QTD" ) );
-    DlgRef_3Sel4Spin2Check_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_3Sel4Spin2Check_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    CheckButton2 = new QCheckBox( GroupBox1, "CheckButton2" );
-    CheckButton2->setText( trUtf8( "" ) );
-
-    Layout1->addMultiCellWidget( CheckButton2, 6, 6, 0, 2 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addWidget( TextLabel3, 2, 0 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-
-    LineEdit3 = new QLineEdit( GroupBox1, "LineEdit3" );
-
-    Layout1->addWidget( LineEdit3, 2, 2 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-
-    SpinBox4 = new QSpinBox( GroupBox1, "SpinBox4" );
-    SpinBox4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox4->sizePolicy().hasHeightForWidth() ) );
-
-    Layout3->addWidget( SpinBox4, 1, 1 );
-
-    SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
-    SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout3->addWidget( SpinBox3, 0, 1 );
-
-    TextLabel7 = new QLabel( GroupBox1, "TextLabel7" );
-    TextLabel7->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel7->sizePolicy().hasHeightForWidth() ) );
-    TextLabel7->setText( trUtf8( "TL7" ) );
-
-    Layout3->addWidget( TextLabel7, 1, 0 );
-
-    TextLabel6 = new QLabel( GroupBox1, "TextLabel6" );
-    TextLabel6->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel6->sizePolicy().hasHeightForWidth() ) );
-    TextLabel6->setText( trUtf8( "TL6" ) );
-
-    Layout3->addWidget( TextLabel6, 0, 0 );
-
-    Layout1->addMultiCellLayout( Layout3, 5, 5, 0, 2 );
-
-    CheckButton1 = new QCheckBox( GroupBox1, "CheckButton1" );
-    CheckButton1->setText( trUtf8( "" ) );
-
-    Layout1->addMultiCellWidget( CheckButton1, 4, 4, 0, 2 );
-
-    PushButton3 = new QPushButton( GroupBox1, "PushButton3" );
-    PushButton3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton3->sizePolicy().hasHeightForWidth() ) );
-    PushButton3->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton3, 2, 1 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 7, 2 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    TextLabel5 = new QLabel( GroupBox1, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-    TextLabel5->setText( trUtf8( "TL5" ) );
-
-    Layout2->addWidget( TextLabel5, 1, 0 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout2->addWidget( TextLabel4, 0, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox1, 0, 1 );
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout2->addWidget( SpinBox2, 1, 1 );
-
-    Layout1->addMultiCellLayout( Layout2, 3, 3, 0, 2 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_3Sel4Spin2Check_QTDLayout->addWidget( GroupBox1, 0, 0 );
-
-    // tab order
-    setTabOrder( PushButton1, LineEdit1 );
-    setTabOrder( LineEdit1, PushButton2 );
-    setTabOrder( PushButton2, LineEdit2 );
-    setTabOrder( LineEdit2, PushButton3 );
-    setTabOrder( PushButton3, LineEdit3 );
-    setTabOrder( LineEdit3, SpinBox1 );
-    setTabOrder( SpinBox1, SpinBox2 );
-    setTabOrder( SpinBox2, CheckButton1 );
-    setTabOrder( CheckButton1, SpinBox3 );
-    setTabOrder( SpinBox3, SpinBox4 );
-    setTabOrder( SpinBox4, CheckButton2 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_3Sel4Spin2Check_QTD::~DlgRef_3Sel4Spin2Check_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.h b/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.h
deleted file mode 100644 (file)
index 9503dec..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_3Sel4Spin2Check_QTD.ui'
-**
-** Created: Tue Jun 1 16:29:29 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_3SEL4SPIN2CHECK_QTD_H
-#define DLGREF_3SEL4SPIN2CHECK_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QCheckBox;
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_3Sel4Spin2Check_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_3Sel4Spin2Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_3Sel4Spin2Check_QTD();
-
-    QGroupBox* GroupBox1;
-    QCheckBox* CheckButton2;
-    QLineEdit* LineEdit1;
-    QLabel* TextLabel3;
-    QPushButton* PushButton2;
-    QLineEdit* LineEdit3;
-    QPushButton* PushButton1;
-    QSpinBox* SpinBox4;
-    QSpinBox* SpinBox3;
-    QLabel* TextLabel7;
-    QLabel* TextLabel6;
-    QCheckBox* CheckButton1;
-    QPushButton* PushButton3;
-    QLabel* TextLabel1;
-    QLineEdit* LineEdit2;
-    QLabel* TextLabel5;
-    QLabel* TextLabel4;
-    QSpinBox* SpinBox1;
-    QSpinBox* SpinBox2;
-    QLabel* TextLabel2;
-
-
-protected:
-    QGridLayout* DlgRef_3Sel4Spin2Check_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QGridLayout* Layout3;
-    QGridLayout* Layout2;
-};
-
-#endif // DLGREF_3SEL4SPIN2CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.ui b/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.ui
new file mode 100644 (file)
index 0000000..41fcdd0
--- /dev/null
@@ -0,0 +1,274 @@
+<ui version="4.0" >
+ <class>DlgRef_3Sel4Spin2Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_3Sel4Spin2Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>241</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="7" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY2" />
+      </item>
+      <item row="6" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX2" />
+      </item>
+      <item row="4" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY1" />
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX1" />
+      </item>
+      <item row="5" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0" >
+       <widget class="QLabel" name="TextLabel6" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL6</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0" >
+       <widget class="QLabel" name="TextLabel7" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL7</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="TextLabel5" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL5</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="PushButton3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="QLineEdit" name="LineEdit3" />
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="8" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton2" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>PushButton3</tabstop>
+  <tabstop>LineEdit3</tabstop>
+  <tabstop>SpinBox_DX1</tabstop>
+  <tabstop>SpinBox_DY1</tabstop>
+  <tabstop>CheckButton1</tabstop>
+  <tabstop>SpinBox_DX2</tabstop>
+  <tabstop>SpinBox_DY2</tabstop>
+  <tabstop>CheckButton2</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_3Sel_QTD.cxx b/src/DlgRef/DlgRef_3Sel_QTD.cxx
deleted file mode 100644 (file)
index 66a0386..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_3Sel_QTD.ui'
-**
-** Created: lun sep 29 11:05:21 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_3Sel_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_3Sel_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_3Sel_QTD::DlgRef_3Sel_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_3Sel_QTD" );
-    resize( 129, 117 ); 
-    setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
-    setCaption( trUtf8( "DlgRef_3Sel_QTD" ) );
-    DlgRef_3Sel_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_3Sel_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    LineEdit3 = new QLineEdit( GroupBox1, "LineEdit3" );
-
-    Layout1->addWidget( LineEdit3, 2, 2 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addWidget( TextLabel3, 2, 0 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 159, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 2 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    PushButton3 = new QPushButton( GroupBox1, "PushButton3" );
-    PushButton3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton3->sizePolicy().hasHeightForWidth() ) );
-    PushButton3->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton3, 2, 1 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_3Sel_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_3Sel_QTD::~DlgRef_3Sel_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_3Sel_QTD.h b/src/DlgRef/DlgRef_3Sel_QTD.h
deleted file mode 100644 (file)
index f4b44a5..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_3Sel_QTD.ui'
-**
-** Created: lun sep 29 11:05:21 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_3SEL_QTD_H
-#define DLGREF_3SEL_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-
-class GEOM_DLGREF_EXPORT DlgRef_3Sel_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_3Sel_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_3Sel_QTD();
-
-    QGroupBox* GroupBox1;
-    QLineEdit* LineEdit3;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit2;
-    QLabel* TextLabel1;
-    QLabel* TextLabel3;
-    QLineEdit* LineEdit1;
-    QLabel* TextLabel2;
-    QPushButton* PushButton3;
-    QPushButton* PushButton2;
-
-
-protected:
-    QGridLayout* DlgRef_3Sel_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // DLGREF_3SEL_QTD_H
diff --git a/src/DlgRef/DlgRef_3Sel_QTD.ui b/src/DlgRef/DlgRef_3Sel_QTD.ui
new file mode 100644 (file)
index 0000000..b16200b
--- /dev/null
@@ -0,0 +1,167 @@
+<ui version="4.0" >
+ <class>DlgRef_3Sel_QTD</class>
+ <widget class="QWidget" name="DlgRef_3Sel_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>103</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>7</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="PushButton3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="QLineEdit" name="LineEdit3" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>PushButton3</tabstop>
+  <tabstop>LineEdit3</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_3Spin.cxx b/src/DlgRef/DlgRef_3Spin.cxx
deleted file mode 100644 (file)
index bd2f5ce..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_3Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_3Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_3Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_3Spin::DlgRef_3Spin(QWidget* parent,  const char* name, WFlags fl)
-  :DlgRef_3Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox3->close(TRUE);
-
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout1->addWidget(SpinBox_DX, 0, 1);
-
-  SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
-  Layout1->addWidget(SpinBox_DY, 1, 1);
-
-  SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ");
-  Layout1->addWidget(SpinBox_DZ, 2, 1);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_3Spin::~DlgRef_3Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_3Spin.h b/src/DlgRef/DlgRef_3Spin.h
deleted file mode 100644 (file)
index 18ca9f6..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_3Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_3SPIN_H
-#define DLGREF_3SPIN_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_3Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_3Spin : public DlgRef_3Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_3Spin( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_3Spin();
-
-    DlgRef_SpinBox* SpinBox_DX;
-    DlgRef_SpinBox* SpinBox_DY;
-    DlgRef_SpinBox* SpinBox_DZ;
-
-};
-
-#endif // DLGREF_3SPIN_H
diff --git a/src/DlgRef/DlgRef_3Spin1Check.cxx b/src/DlgRef/DlgRef_3Spin1Check.cxx
deleted file mode 100644 (file)
index 2cf12b7..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_3Spin1Check.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_3Spin1Check.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_3Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_3Spin1Check::DlgRef_3Spin1Check(QWidget* parent,  const char* name, WFlags fl)
-  :DlgRef_3Spin1Check_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox3->close(TRUE);
-
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout1->addWidget(SpinBox_DX, 0, 1);
-
-  SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
-  Layout1->addWidget(SpinBox_DY, 1, 1);
-
-  SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ");
-  Layout1->addWidget(SpinBox_DZ, 2, 1);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_3Spin1Check::~DlgRef_3Spin1Check()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/DlgRef/DlgRef_3Spin1Check.h b/src/DlgRef/DlgRef_3Spin1Check.h
deleted file mode 100644 (file)
index 36c5fc2..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_3Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_3SPIN1CHECK_H
-#define DLGREF_3SPIN1CHECK_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_3Spin1Check_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_3Spin1Check : public DlgRef_3Spin1Check_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_3Spin1Check(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~DlgRef_3Spin1Check();
-
-    DlgRef_SpinBox* SpinBox_DX;
-    DlgRef_SpinBox* SpinBox_DY;
-    DlgRef_SpinBox* SpinBox_DZ;
-
-};
-
-#endif // DLGREF_3SPIN1CHECK_H
diff --git a/src/DlgRef/DlgRef_3Spin1Check_QTD.cxx b/src/DlgRef/DlgRef_3Spin1Check_QTD.cxx
deleted file mode 100644 (file)
index 2be5501..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_3Spin1Check_QTD.ui'
-**
-** Created: dim sep 28 18:11:19 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_3Spin1Check_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_3Spin1Check_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_3Spin1Check_QTD::DlgRef_3Spin1Check_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_3Spin1Check_QTD" );
-    resize( 124, 130 ); 
-    setCaption( trUtf8( "DlgRef_3Spin1Check_QTD" ) );
-    DlgRef_3Spin1Check_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_3Spin1Check_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    CheckBox1 = new QRadioButton( GroupBox1, "CheckBox1" );
-    CheckBox1->setText( trUtf8( "" ) );
-
-    Layout1->addMultiCellWidget( CheckBox1, 3, 3, 0, 1 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 4, 1 );
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox2, 1, 1 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addWidget( TextLabel3, 2, 0 );
-
-    SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
-    SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox3, 2, 1 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox1, 0, 1 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_3Spin1Check_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_3Spin1Check_QTD::~DlgRef_3Spin1Check_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_3Spin1Check_QTD.h b/src/DlgRef/DlgRef_3Spin1Check_QTD.h
deleted file mode 100644 (file)
index 6df92fb..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_3Spin1Check_QTD.ui'
-**
-** Created: dim sep 28 18:11:19 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_3SPIN1CHECK_QTD_H
-#define DLGREF_3SPIN1CHECK_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QRadioButton;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_3Spin1Check_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_3Spin1Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_3Spin1Check_QTD();
-
-    QGroupBox* GroupBox1;
-    QRadioButton* CheckBox1;
-    QSpinBox* SpinBox2;
-    QLabel* TextLabel3;
-    QSpinBox* SpinBox3;
-    QSpinBox* SpinBox1;
-    QLabel* TextLabel1;
-    QLabel* TextLabel2;
-
-
-protected:
-    QGridLayout* DlgRef_3Spin1Check_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // DLGREF_3SPIN1CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_3Spin1Check_QTD.ui b/src/DlgRef/DlgRef_3Spin1Check_QTD.ui
new file mode 100644 (file)
index 0000000..7408ae9
--- /dev/null
@@ -0,0 +1,144 @@
+<ui version="4.0" >
+ <class>DlgRef_3Spin1Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_3Spin1Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>100</width>
+    <height>110</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="3" column="0" colspan="2" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="1" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" />
+      </item>
+      <item row="2" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+  <tabstop>SpinBox_DZ</tabstop>
+  <tabstop>CheckButton1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_3Spin_QTD.cxx b/src/DlgRef/DlgRef_3Spin_QTD.cxx
deleted file mode 100644 (file)
index 99a1d46..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_3Spin_QTD.ui'
-**
-** Created: mar sep 23 16:05:10 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_3Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_3Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_3Spin_QTD::DlgRef_3Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_3Spin_QTD" );
-    resize( 124, 111 ); 
-    setCaption( trUtf8( "DlgRef_3Spin_QTD" ) );
-    DlgRef_3Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_3Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox2, 1, 1 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 1 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addWidget( TextLabel3, 2, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox1, 0, 1 );
-
-    SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
-    SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox3, 2, 1 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_3Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_3Spin_QTD::~DlgRef_3Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_3Spin_QTD.h b/src/DlgRef/DlgRef_3Spin_QTD.h
deleted file mode 100644 (file)
index 7f76b90..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_3Spin_QTD.ui'
-**
-** Created: mar sep 23 16:05:09 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_3SPIN_QTD_H
-#define DLGREF_3SPIN_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_3Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_3Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_3Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QSpinBox* SpinBox2;
-    QLabel* TextLabel3;
-    QSpinBox* SpinBox1;
-    QSpinBox* SpinBox3;
-    QLabel* TextLabel1;
-    QLabel* TextLabel2;
-
-
-protected:
-    QGridLayout* DlgRef_3Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // DLGREF_3SPIN_QTD_H
diff --git a/src/DlgRef/DlgRef_3Spin_QTD.ui b/src/DlgRef/DlgRef_3Spin_QTD.ui
new file mode 100644 (file)
index 0000000..4ac7e5d
--- /dev/null
@@ -0,0 +1,136 @@
+<ui version="4.0" >
+ <class>DlgRef_3Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_3Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>100</width>
+    <height>91</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ" />
+      </item>
+      <item row="1" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+  <tabstop>SpinBox_DZ</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_4Sel1List1Check_QTD.cxx b/src/DlgRef/DlgRef_4Sel1List1Check_QTD.cxx
deleted file mode 100644 (file)
index c47a7a4..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_4Sel1List1Check_QTD.ui'
-**
-** Created: lun oct 27 17:21:04 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_4Sel1List1Check_QTD.h"
-
-#include <qvariant.h>
-#include <qcombobox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
-
-/* 
- *  Constructs a DlgRef_4Sel1List1Check_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_4Sel1List1Check_QTD::DlgRef_4Sel1List1Check_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_4Sel1List1Check_QTD" );
-    resize( 129, 210 ); 
-    setCaption( trUtf8( "DlgRef_4Sel1List1Check_QTD" ) );
-    DlgRef_4Sel1List1Check_QTDLayout =
-      new QGridLayout( this, 1, 1, 0, 6, "DlgRef_4Sel1List1Check_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-    
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-   
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-    
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 );
-    
-    ComboBox1 = new QComboBox( FALSE, GroupBox1, "ComboBox1" );
-    ComboBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, ComboBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( ComboBox1, 2, 2 );
-   
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-    
-    DlgRef_4Sel1List1Check_QTDLayout->addWidget( GroupBox1, 0, 0 );
-
-    
-    GroupBox2 = new QGroupBox( this, "GroupBox2" );
-    GroupBox2->setTitle( trUtf8( "" ) );
-    GroupBox2->setColumnLayout(0, Qt::Vertical );
-    GroupBox2->layout()->setSpacing( 6 );
-    GroupBox2->layout()->setMargin( 11 );
-    GroupBox2Layout = new QGridLayout( GroupBox2->layout() );
-    GroupBox2Layout->setAlignment( Qt::AlignTop );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-    
-    TextLabel4 = new QLabel( GroupBox2, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-    
-    Layout2->addWidget( TextLabel4, 0, 0 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 80, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 5, 2 );
-
-    PushButton3 = new QPushButton( GroupBox2, "PushButton3" );
-    PushButton3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton3->sizePolicy().hasHeightForWidth() ) );
-    PushButton3->setText( trUtf8( "" ) );
-
-    Layout2->addWidget( PushButton3, 0, 1 );
-
-    LineEdit3 = new QLineEdit( GroupBox2, "LineEdit3" );
-
-    Layout2->addWidget( LineEdit3, 0, 2 );
-
-
-    TextLabel5 = new QLabel( GroupBox2, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-    TextLabel5->setText( trUtf8( "TL5" ) );
-
-    Layout2->addWidget( TextLabel5, 1, 0 );
-
-    PushButton4 = new QPushButton( GroupBox2, "PushButton4" );
-    PushButton4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton4->sizePolicy().hasHeightForWidth() ) );
-    PushButton4->setText( trUtf8( "" ) );
-
-    Layout2->addWidget( PushButton4, 1, 1 );
-
-    LineEdit4 = new QLineEdit( GroupBox2, "LineEdit4" );
-
-    Layout2->addWidget( LineEdit4, 1, 2 );
-
-    CheckBox1 = new QCheckBox( GroupBox1, "CheckBox1" );
-    CheckBox1->setText( trUtf8( "" ) );
-    Layout1->addMultiCellWidget( CheckBox1, 5, 5, 0, 1 );
-
-    PushButton5 = new QPushButton( GroupBox1, "PushButton5" );
-    PushButton5->setText( trUtf8( "" ) );
-    Layout1->addWidget( PushButton5, 5, 2 );
-
-    GroupBox2Layout->addLayout( Layout2, 0, 0 );
-    
-    DlgRef_4Sel1List1Check_QTDLayout->addWidget( GroupBox2, 1, 0 );
-
-    // tab order
-    setTabOrder(PushButton1 , LineEdit1);
-    setTabOrder(LineEdit1 ,   PushButton2);
-    setTabOrder(PushButton2 , LineEdit2);
-    setTabOrder(LineEdit2,    ComboBox1);
-    setTabOrder(ComboBox1,    CheckBox1);
-    setTabOrder(CheckBox1,    PushButton5);
-    setTabOrder(PushButton5,  PushButton3);
-    setTabOrder(PushButton3 , LineEdit3);
-    setTabOrder(LineEdit3,    PushButton4 );
-    setTabOrder(PushButton4 , LineEdit4);
-                   
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_4Sel1List1Check_QTD::~DlgRef_4Sel1List1Check_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h b/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h
deleted file mode 100644 (file)
index 3d4a9a4..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_4Sel1List1Check_QTD.ui'
-**
-** Created: lun oct 27 17:21:03 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_4SEL1LIST1CHECK_QTD_H
-#define DLGREF_4SEL1LIST1CHECK_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QComboBox;
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QCheckBox;
-class QPushButton;
-
-class GEOM_DLGREF_EXPORT DlgRef_4Sel1List1Check_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_4Sel1List1Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_4Sel1List1Check_QTD();
-
-    QGroupBox* GroupBox1;
-    QGroupBox* GroupBox2;
-    QLabel* TextLabel1;
-    QLabel* TextLabel2;
-    QLabel* TextLabel3;
-    QLabel* TextLabel4;
-    QLabel* TextLabel5;
-    QPushButton* PushButton1;
-    QPushButton* PushButton2;
-    QPushButton* PushButton3;
-    QPushButton* PushButton4;
-    QLineEdit* LineEdit1;
-    QLineEdit* LineEdit2;
-    QLineEdit* LineEdit3;
-    QLineEdit* LineEdit4;
-    QComboBox* ComboBox1;
-    QCheckBox* CheckBox1;
-    QPushButton* PushButton5;
-
-protected:
-    QGridLayout* DlgRef_4Sel1List1Check_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* GroupBox2Layout;
-    QGridLayout* Layout1;
-    QGridLayout* Layout2;
-};
-
-#endif // DLGREF_4SEL1LIST1CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_4Sel1List1Check_QTD.ui b/src/DlgRef/DlgRef_4Sel1List1Check_QTD.ui
new file mode 100644 (file)
index 0000000..516d9a2
--- /dev/null
@@ -0,0 +1,244 @@
+<ui version="4.0" >
+ <class>DlgRef_4Sel1List1Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_4Sel1List1Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>216</width>
+    <height>187</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QComboBox" name="ComboBox1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>7</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="4" column="1" >
+       <widget class="QPushButton" name="PushButton4" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="2" >
+       <widget class="QLineEdit" name="LineEdit4" />
+      </item>
+      <item row="3" column="1" >
+       <widget class="QPushButton" name="PushButton3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="TextLabel5" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL5</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2" >
+       <widget class="QLineEdit" name="LineEdit3" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" colspan="2" >
+       <widget class="QCheckBox" name="CheckBox1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="2" >
+       <widget class="QPushButton" name="PushButton5" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>ComboBox1</tabstop>
+  <tabstop>PushButton3</tabstop>
+  <tabstop>LineEdit3</tabstop>
+  <tabstop>PushButton4</tabstop>
+  <tabstop>LineEdit4</tabstop>
+  <tabstop>CheckBox1</tabstop>
+  <tabstop>PushButton5</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_4Sel1List_QTD.cxx b/src/DlgRef/DlgRef_4Sel1List_QTD.cxx
deleted file mode 100644 (file)
index 1c7c3a6..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_4Sel1List_QTD.ui'
-**
-** Created: lun oct 27 17:21:04 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_4Sel1List_QTD.h"
-
-#include <qvariant.h>
-#include <qcombobox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_4Sel1List_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_4Sel1List_QTD::DlgRef_4Sel1List_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_4Sel1List_QTD" );
-    resize( 129, 175 ); 
-    setCaption( trUtf8( "DlgRef_4Sel1List_QTD" ) );
-    DlgRef_4Sel1List_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_4Sel1List_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-    
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-   
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-    
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 );
-    
-    ComboBox1 = new QComboBox( FALSE, GroupBox1, "ComboBox1" );
-    ComboBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, ComboBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( ComboBox1, 2, 2 );
-   
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-    
-    DlgRef_4Sel1List_QTDLayout->addWidget( GroupBox1, 0, 0 );
-
-    
-    GroupBox2 = new QGroupBox( this, "GroupBox2" );
-    GroupBox2->setTitle( trUtf8( "" ) );
-    GroupBox2->setColumnLayout(0, Qt::Vertical );
-    GroupBox2->layout()->setSpacing( 6 );
-    GroupBox2->layout()->setMargin( 11 );
-    GroupBox2Layout = new QGridLayout( GroupBox2->layout() );
-    GroupBox2Layout->setAlignment( Qt::AlignTop );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-    
-    TextLabel4 = new QLabel( GroupBox2, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-    
-    Layout2->addWidget( TextLabel4, 0, 0 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 80, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 5, 2 );
-
-    PushButton3 = new QPushButton( GroupBox2, "PushButton3" );
-    PushButton3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton3->sizePolicy().hasHeightForWidth() ) );
-    PushButton3->setText( trUtf8( "" ) );
-
-    Layout2->addWidget( PushButton3, 0, 1 );
-
-    LineEdit3 = new QLineEdit( GroupBox2, "LineEdit3" );
-
-    Layout2->addWidget( LineEdit3, 0, 2 );
-
-
-    TextLabel5 = new QLabel( GroupBox2, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-    TextLabel5->setText( trUtf8( "TL5" ) );
-
-    Layout2->addWidget( TextLabel5, 1, 0 );
-
-    PushButton4 = new QPushButton( GroupBox2, "PushButton4" );
-    PushButton4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton4->sizePolicy().hasHeightForWidth() ) );
-    PushButton4->setText( trUtf8( "" ) );
-
-    Layout2->addWidget( PushButton4, 1, 1 );
-
-    LineEdit4 = new QLineEdit( GroupBox2, "LineEdit4" );
-
-    Layout2->addWidget( LineEdit4, 1, 2 );
-
-    GroupBox2Layout->addLayout( Layout2, 0, 0 );
-    
-    DlgRef_4Sel1List_QTDLayout->addWidget( GroupBox2, 1, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_4Sel1List_QTD::~DlgRef_4Sel1List_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_4Sel1List_QTD.h b/src/DlgRef/DlgRef_4Sel1List_QTD.h
deleted file mode 100644 (file)
index d391942..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_4Sel1List_QTD.ui'
-**
-** Created: lun oct 27 17:21:03 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_4SEL1LIST_QTD_H
-#define DLGREF_4SEL1LIST_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QComboBox;
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-
-class GEOM_DLGREF_EXPORT DlgRef_4Sel1List_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_4Sel1List_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_4Sel1List_QTD();
-
-    QGroupBox* GroupBox1;
-    QGroupBox* GroupBox2;
-    QLineEdit* LineEdit2;
-    QPushButton* PushButton4;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit4;
-    QPushButton* PushButton3;
-    QPushButton* PushButton2;
-    QLabel* TextLabel1;
-    QLabel* TextLabel4;
-    QLineEdit* LineEdit1;
-    QLabel* TextLabel5;
-    QLineEdit* LineEdit3;
-    QLabel* TextLabel2;
-    QComboBox* ComboBox1;
-    QLabel* TextLabel3;
-
-
-protected:
-    QGridLayout* DlgRef_4Sel1List_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* GroupBox2Layout;
-    QGridLayout* Layout1;
-    QGridLayout* Layout2;
-};
-
-#endif // DLGREF_4SEL1LIST_QTD_H
diff --git a/src/DlgRef/DlgRef_4Sel1List_QTD.ui b/src/DlgRef/DlgRef_4Sel1List_QTD.ui
new file mode 100644 (file)
index 0000000..5388836
--- /dev/null
@@ -0,0 +1,228 @@
+<ui version="4.0" >
+ <class>DlgRef_4Sel1List_QTD</class>
+ <widget class="QWidget" name="DlgRef_4Sel1List_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>158</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" >
+       <widget class="QPushButton" name="PushButton4" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="2" >
+       <widget class="QLineEdit" name="LineEdit4" />
+      </item>
+      <item row="3" column="1" >
+       <widget class="QPushButton" name="PushButton3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="TextLabel5" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL5</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2" >
+       <widget class="QLineEdit" name="LineEdit3" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QComboBox" name="ComboBox1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>7</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>ComboBox1</tabstop>
+  <tabstop>PushButton3</tabstop>
+  <tabstop>LineEdit3</tabstop>
+  <tabstop>PushButton4</tabstop>
+  <tabstop>LineEdit4</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_4Sel1Spin2Check.cxx b/src/DlgRef/DlgRef_4Sel1Spin2Check.cxx
deleted file mode 100644 (file)
index 8fc0e90..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_4Sel1Spin2Check.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "DlgRef_4Sel1Spin2Check.h"
-
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a DlgRef_4Sel1Spin2Check which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-DlgRef_4Sel1Spin2Check::DlgRef_4Sel1Spin2Check(QWidget* parent, const char* name, WFlags fl)
-  :DlgRef_4Sel1Spin2Check_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout1->addWidget(SpinBox_DX, 4, 2);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_4Sel1Spin2Check::~DlgRef_4Sel1Spin2Check()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
-void DlgRef_4Sel1Spin2Check::ShowRows(int fromRow, int toRow, bool toShow)
-{
-  typedef void (QWidget::* ShowFun)(); 
-  ShowFun pShowFun;    
-
-  if (toShow)
-       pShowFun = &QWidget::show;
-  else
-        pShowFun = &QWidget::hide;
-
-  if (fromRow >= 0 && toRow >= 0 && toRow >= fromRow)
-  {
-    if ( fromRow == 0)
-    {
-      (TextLabel1->*pShowFun)();
-      (PushButton1->*pShowFun)();
-      (LineEdit1->*pShowFun)();
-    }
-    if ( fromRow <= 1 && 1 <= toRow)
-    {
-      (TextLabel2->*pShowFun)();
-      (PushButton2->*pShowFun)();
-      (LineEdit2->*pShowFun)(); 
-    }
-    if ( fromRow <= 2 && 2 <= toRow)
-    {
-      (TextLabel4->*pShowFun)();
-      (PushButton4->*pShowFun)();
-      (LineEdit4->*pShowFun)(); 
-    }
-    if ( fromRow <= 3 && 3 <= toRow)
-    {
-      (TextLabel5->*pShowFun)();
-      (PushButton5->*pShowFun)();
-      (LineEdit5->*pShowFun)(); 
-    }
-    if ( fromRow <= 4 && 4 <= toRow)
-    {
-      (TextLabel3->*pShowFun)();
-      (SpinBox_DX->*pShowFun)();
-      (CheckButton2->*pShowFun)();
-    }
-    if ( fromRow <= 5 && 5 <= toRow)
-    (CheckButton1->*pShowFun)();
-  }
-}
-
diff --git a/src/DlgRef/DlgRef_4Sel1Spin2Check.h b/src/DlgRef/DlgRef_4Sel1Spin2Check.h
deleted file mode 100644 (file)
index ab366ba..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_4Sel1Spin2Check.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef DLGREF_4SEL1SPIN2CHECK_H
-#define DLGREF_4SEL1SPIN2CHECK_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "DlgRef_4Sel1Spin2Check_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_DLGREF_EXPORT DlgRef_4Sel1Spin2Check : public DlgRef_4Sel1Spin2Check_QTD
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_4Sel1Spin2Check(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~DlgRef_4Sel1Spin2Check();
-
-    DlgRef_SpinBox* SpinBox_DX;
-
-    void ShowRows(int fromRow, int toRow, bool toShow = true);
-
-};
-
-#endif // DLGREF_4SEL1SPIN2CHECK_H
diff --git a/src/DlgRef/DlgRef_4Sel1Spin2Check_QTD.cxx b/src/DlgRef/DlgRef_4Sel1Spin2Check_QTD.cxx
deleted file mode 100644 (file)
index 0039c9d..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_4Sel1Spin2Check_QTD.ui'
-**
-** Created: Wed Oct 25 20:32:42 2006
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#include "DlgRef_4Sel1Spin2Check_QTD.h"
-
-#include <qvariant.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/*
- *  Constructs a DlgRef_4Sel1Spin2Check_QTD as a child of 'parent', with the
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_4Sel1Spin2Check_QTD::DlgRef_4Sel1Spin2Check_QTD( QWidget* parent, const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_4Sel1Spin2Check_QTD" );
-    DlgRef_4Sel1Spin2Check_QTDLayout = new QVBoxLayout( this, 0, 6, "DlgRef_4Sel1Spin2Check_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QVBoxLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 6, 6, "Layout1"); 
-
-    CheckButton2 = new QCheckBox( GroupBox1, "CheckButton2" );
-
-    Layout1->addWidget( CheckButton2, 4, 3 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-
-    LineEdit5 = new QLineEdit( GroupBox1, "LineEdit5" );
-
-    Layout1->addMultiCellWidget( LineEdit5, 3, 3, 2, 3 );
-
-    TextLabel5 = new QLabel( GroupBox1, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel5, 3, 0 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addMultiCellWidget( LineEdit1, 0, 0, 2, 3 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox1, 4, 2 );
-
-    CheckButton1 = new QCheckBox( GroupBox1, "CheckButton1" );
-
-    Layout1->addMultiCellWidget( CheckButton1, 5, 5, 0, 2 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    PushButton5 = new QPushButton( GroupBox1, "PushButton5" );
-    PushButton5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton5->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( PushButton5, 3, 1 );
-
-    PushButton4 = new QPushButton( GroupBox1, "PushButton4" );
-    PushButton4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton4->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( PushButton4, 2, 1 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel4, 2, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    LineEdit4 = new QLineEdit( GroupBox1, "LineEdit4" );
-
-    Layout1->addMultiCellWidget( LineEdit4, 2, 2, 2, 3 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addMultiCellWidget( LineEdit2, 1, 1, 2, 3 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel3, 4, 0 );
-    GroupBox1Layout->addLayout( Layout1 );
-    DlgRef_4Sel1Spin2Check_QTDLayout->addWidget( GroupBox1 );
-    languageChange();
-    resize( QSize(261, 198).expandedTo(minimumSizeHint()) );
-    clearWState( WState_Polished );
-
-    // tab order
-    setTabOrder( PushButton1, LineEdit1 );
-    setTabOrder( LineEdit1, PushButton2 );
-    setTabOrder( PushButton2, LineEdit2 );
-    setTabOrder( LineEdit2, SpinBox1 );
-    setTabOrder( SpinBox1, CheckButton2 );
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_4Sel1Spin2Check_QTD::~DlgRef_4Sel1Spin2Check_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_4Sel1Spin2Check_QTD::languageChange()
-{
-    setCaption( tr( "DlgRef_4Sel1Spin2Check_QTD" ) );
-    GroupBox1->setTitle( QString::null );
-    CheckButton2->setText( QString::null );
-    PushButton2->setText( QString::null );
-    TextLabel5->setText( tr( "TL5" ) );
-    TextLabel1->setText( tr( "TL1" ) );
-    CheckButton1->setText( QString::null );
-    TextLabel2->setText( tr( "TL2" ) );
-    PushButton5->setText( QString::null );
-    PushButton4->setText( QString::null );
-    TextLabel4->setText( tr( "TL4" ) );
-    PushButton1->setText( QString::null );
-    TextLabel3->setText( tr( "TL3" ) );
-}
-
diff --git a/src/DlgRef/DlgRef_4Sel1Spin2Check_QTD.h b/src/DlgRef/DlgRef_4Sel1Spin2Check_QTD.h
deleted file mode 100644 (file)
index 0d1e1d4..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_4Sel1Spin2Check_QTD.ui'
-**
-** Created: Wed Oct 25 20:32:41 2006
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#ifndef DLGREF_4SEL1SPIN2CHECK_QTD_H
-#define DLGREF_4SEL1SPIN2CHECK_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QSpacerItem;
-class QGroupBox;
-class QCheckBox;
-class QPushButton;
-class QLineEdit;
-class QLabel;
-class QSpinBox;
-
-class GEOM_DLGREF_EXPORT DlgRef_4Sel1Spin2Check_QTD : public QWidget
-{
-    Q_OBJECT
-
-public:
-    DlgRef_4Sel1Spin2Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_4Sel1Spin2Check_QTD();
-
-    QGroupBox* GroupBox1;
-    QCheckBox* CheckButton2;
-    QPushButton* PushButton2;
-    QLineEdit* LineEdit5;
-    QLabel* TextLabel5;
-    QLabel* TextLabel1;
-    QLineEdit* LineEdit1;
-    QSpinBox* SpinBox1;
-    QCheckBox* CheckButton1;
-    QLabel* TextLabel2;
-    QPushButton* PushButton5;
-    QPushButton* PushButton4;
-    QLabel* TextLabel4;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit4;
-    QLineEdit* LineEdit2;
-    QLabel* TextLabel3;
-
-protected:
-    QVBoxLayout* DlgRef_4Sel1Spin2Check_QTDLayout;
-    QVBoxLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-
-protected slots:
-    virtual void languageChange();
-
-};
-
-#endif // DLGREF_4SEL1SPIN2CHECK_QTD_H
diff --git a/src/DlgRef/DlgRef_4Sel1Spin2Check_QTD.ui b/src/DlgRef/DlgRef_4Sel1Spin2Check_QTD.ui
new file mode 100644 (file)
index 0000000..83501ec
--- /dev/null
@@ -0,0 +1,252 @@
+<ui version="4.0" >
+ <class>DlgRef_4Sel1Spin2Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_4Sel1Spin2Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>225</width>
+    <height>306</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="4" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel5" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL5</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit5" />
+      </item>
+      <item row="0" column="2" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="3" column="1" >
+       <widget class="QPushButton" name="PushButton5" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="PushButton4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit4" />
+      </item>
+      <item row="1" column="2" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="6" column="0" colspan="4" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0" colspan="4" >
+       <widget class="QCheckBox" name="CheckButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+     <zorder>SpinBox_DX</zorder>
+     <zorder>TextLabel3</zorder>
+     <zorder>TextLabel5</zorder>
+     <zorder>TextLabel4</zorder>
+     <zorder>TextLabel2</zorder>
+     <zorder>TextLabel1</zorder>
+     <zorder>PushButton2</zorder>
+     <zorder>LineEdit5</zorder>
+     <zorder>LineEdit1</zorder>
+     <zorder>PushButton5</zorder>
+     <zorder>PushButton4</zorder>
+     <zorder>PushButton1</zorder>
+     <zorder>LineEdit4</zorder>
+     <zorder>LineEdit2</zorder>
+     <zorder>CheckButton1</zorder>
+     <zorder>CheckButton2</zorder>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>PushButton4</tabstop>
+  <tabstop>LineEdit4</tabstop>
+  <tabstop>PushButton5</tabstop>
+  <tabstop>LineEdit5</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>CheckButton1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_4Sel1Spin3Check_QTD.ui b/src/DlgRef/DlgRef_4Sel1Spin3Check_QTD.ui
new file mode 100755 (executable)
index 0000000..7dc96d0
--- /dev/null
@@ -0,0 +1,265 @@
+<ui version="4.0" >
+ <class>DlgRef_4Sel1Spin3Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_4Sel1Spin3Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>225</width>
+    <height>306</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="4" column="1" colspan="2" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel5" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL5</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit5" />
+      </item>
+      <item row="0" column="2" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="3" column="1" >
+       <widget class="QPushButton" name="PushButton5" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="PushButton4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit4" />
+      </item>
+      <item row="1" column="2" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="6" column="0" colspan="4" >
+       <widget class="QCheckBox" name="CheckButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0" colspan="4" >
+       <widget class="QCheckBox" name="CheckButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="0" colspan="4" >
+       <widget class="QCheckBox" name="CheckButton3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+     <zorder>SpinBox_DX</zorder>
+     <zorder>TextLabel3</zorder>
+     <zorder>TextLabel5</zorder>
+     <zorder>TextLabel4</zorder>
+     <zorder>TextLabel2</zorder>
+     <zorder>TextLabel1</zorder>
+     <zorder>PushButton2</zorder>
+     <zorder>LineEdit5</zorder>
+     <zorder>LineEdit1</zorder>
+     <zorder>PushButton5</zorder>
+     <zorder>PushButton4</zorder>
+     <zorder>PushButton1</zorder>
+     <zorder>LineEdit4</zorder>
+     <zorder>LineEdit2</zorder>
+     <zorder>CheckButton1</zorder>
+     <zorder>CheckButton2</zorder>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>PushButton4</tabstop>
+  <tabstop>LineEdit4</tabstop>
+  <tabstop>PushButton5</tabstop>
+  <tabstop>LineEdit5</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>CheckButton1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_6Sel_QTD.cxx b/src/DlgRef/DlgRef_6Sel_QTD.cxx
deleted file mode 100644 (file)
index bc3ebe6..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_6Sel_QTD.ui'
-**
-** Created: Tue Aug 24 18:18:57 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "DlgRef_6Sel_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a DlgRef_6Sel_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-DlgRef_6Sel_QTD::DlgRef_6Sel_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "DlgRef_6Sel_QTD" );
-    resize( 235, 196 ); 
-    setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
-    setCaption( trUtf8( "DlgRef_6Sel_QTD" ) );
-    DlgRef_6Sel_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "DlgRef_6Sel_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addWidget( TextLabel3, 2, 0 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout1->addWidget( TextLabel4, 3, 0 );
-
-    TextLabel5 = new QLabel( GroupBox1, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-    TextLabel5->setText( trUtf8( "TL5" ) );
-
-    Layout1->addWidget( TextLabel5, 4, 0 );
-
-    TextLabel6 = new QLabel( GroupBox1, "TextLabel6" );
-    TextLabel6->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel6->sizePolicy().hasHeightForWidth() ) );
-    TextLabel6->setText( trUtf8( "TL6" ) );
-
-    Layout1->addWidget( TextLabel6, 5, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-    PushButton2->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-
-    PushButton3 = new QPushButton( GroupBox1, "PushButton3" );
-    PushButton3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton3->sizePolicy().hasHeightForWidth() ) );
-    PushButton3->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton3, 2, 1 );
-
-    PushButton4 = new QPushButton( GroupBox1, "PushButton4" );
-    PushButton4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton4->sizePolicy().hasHeightForWidth() ) );
-    PushButton4->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton4, 3, 1 );
-
-    PushButton5 = new QPushButton( GroupBox1, "PushButton5" );
-    PushButton5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton5->sizePolicy().hasHeightForWidth() ) );
-    PushButton5->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton5, 4, 1 );
-
-    PushButton6 = new QPushButton( GroupBox1, "PushButton6" );
-    PushButton6->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton6->sizePolicy().hasHeightForWidth() ) );
-    PushButton6->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton6, 5, 1 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    LineEdit3 = new QLineEdit( GroupBox1, "LineEdit3" );
-
-    Layout1->addWidget( LineEdit3, 2, 2 );
-
-    LineEdit4 = new QLineEdit( GroupBox1, "LineEdit4" );
-
-    Layout1->addWidget( LineEdit4, 3, 2 );
-
-    LineEdit5 = new QLineEdit( GroupBox1, "LineEdit5" );
-
-    Layout1->addWidget( LineEdit5, 4, 2 );
-
-    LineEdit6 = new QLineEdit( GroupBox1, "LineEdit6" );
-
-    Layout1->addWidget( LineEdit6, 5, 2 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    DlgRef_6Sel_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-DlgRef_6Sel_QTD::~DlgRef_6Sel_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/DlgRef/DlgRef_6Sel_QTD.h b/src/DlgRef/DlgRef_6Sel_QTD.h
deleted file mode 100644 (file)
index 517c3a5..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_6Sel_QTD.ui'
-**
-** Created: Tue Aug 24 18:18:28 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef DLGREF_6SEL_QTD_H
-#define DLGREF_6SEL_QTD_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-
-class GEOM_DLGREF_EXPORT DlgRef_6Sel_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    DlgRef_6Sel_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~DlgRef_6Sel_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel1;
-    QLabel* TextLabel2;
-    QLabel* TextLabel3;
-    QLabel* TextLabel4;
-    QLabel* TextLabel5;
-    QLabel* TextLabel6;
-    QPushButton* PushButton1;
-    QPushButton* PushButton2;
-    QPushButton* PushButton3;
-    QPushButton* PushButton4;
-    QPushButton* PushButton5;
-    QPushButton* PushButton6;
-    QLineEdit* LineEdit1;
-    QLineEdit* LineEdit2;
-    QLineEdit* LineEdit3;
-    QLineEdit* LineEdit4;
-    QLineEdit* LineEdit5;
-    QLineEdit* LineEdit6;
-
-
-protected:
-    QGridLayout* DlgRef_6Sel_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // DLGREF_6SEL_QTD_H
diff --git a/src/DlgRef/DlgRef_6Sel_QTD.ui b/src/DlgRef/DlgRef_6Sel_QTD.ui
new file mode 100644 (file)
index 0000000..22ce904
--- /dev/null
@@ -0,0 +1,281 @@
+<ui version="4.0" >
+ <class>DlgRef_6Sel_QTD</class>
+ <widget class="QWidget" name="DlgRef_6Sel_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>156</width>
+    <height>190</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>7</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="5" column="2" >
+       <widget class="QLineEdit" name="LineEdit6" />
+      </item>
+      <item row="4" column="2" >
+       <widget class="QLineEdit" name="LineEdit5" />
+      </item>
+      <item row="3" column="2" >
+       <widget class="QLineEdit" name="LineEdit4" />
+      </item>
+      <item row="2" column="2" >
+       <widget class="QLineEdit" name="LineEdit3" />
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="5" column="1" >
+       <widget class="QPushButton" name="PushButton6" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" >
+       <widget class="QPushButton" name="PushButton5" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QPushButton" name="PushButton4" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="PushButton3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="TextLabel6" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL6</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="TextLabel5" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL5</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>PushButton3</tabstop>
+  <tabstop>LineEdit3</tabstop>
+  <tabstop>PushButton4</tabstop>
+  <tabstop>LineEdit4</tabstop>
+  <tabstop>PushButton5</tabstop>
+  <tabstop>LineEdit5</tabstop>
+  <tabstop>PushButton6</tabstop>
+  <tabstop>LineEdit6</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_Skeleton_QTD.cxx b/src/DlgRef/DlgRef_Skeleton_QTD.cxx
deleted file mode 100644 (file)
index 0e2b081..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'DlgRef_Skeleton_QTD.ui'
-**
-** Created: Tue Mar 13 14:40:34 2007
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#include "DlgRef_Skeleton_QTD.h"
-
-#include <qvariant.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/*
- *  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 )
-    : QDialog( parent, name, modal, fl )
-{
-    if ( !name )
-       setName( "DlgRef_Skeleton_QTD" );
-    setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
-    setSizeGripEnabled( TRUE );
-    DlgRef_Skeleton_QTDLayout = new QGridLayout( this, 1, 1, 11, 6, "DlgRef_Skeleton_QTDLayout"); 
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    GroupButtons = new QGroupBox( this, "GroupButtons" );
-    GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) );
-    GroupButtons->setColumnLayout(0, Qt::Vertical );
-    GroupButtons->layout()->setSpacing( 6 );
-    GroupButtons->layout()->setMargin( 11 );
-    GroupButtonsLayout = new QHBoxLayout( GroupButtons->layout() );
-    GroupButtonsLayout->setAlignment( Qt::AlignTop );
-
-    Layout3 = new QHBoxLayout( 0, 0, 6, "Layout3"); 
-
-    buttonOk = new QPushButton( GroupButtons, "buttonOk" );
-    Layout3->addWidget( buttonOk );
-
-    buttonApply = new QPushButton( GroupButtons, "buttonApply" );
-    Layout3->addWidget( buttonApply );
-    Spacer1 = new QSpacerItem( 91, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
-    Layout3->addItem( Spacer1 );
-
-    buttonCancel = new QPushButton( GroupButtons, "buttonCancel" );
-    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->setColumnLayout(0, Qt::Vertical );
-    GroupConstructors->layout()->setSpacing( 6 );
-    GroupConstructors->layout()->setMargin( 11 );
-    GroupConstructorsLayout = new QHBoxLayout( GroupConstructors->layout() );
-    GroupConstructorsLayout->setAlignment( Qt::AlignTop );
-
-    Layout2 = new QHBoxLayout( 0, 0, 6, "Layout2"); 
-
-    RadioButton1 = new QRadioButton( GroupConstructors, "RadioButton1" );
-    Layout2->addWidget( RadioButton1 );
-
-    RadioButton2 = new QRadioButton( GroupConstructors, "RadioButton2" );
-    Layout2->addWidget( RadioButton2 );
-
-    RadioButton3 = new QRadioButton( GroupConstructors, "RadioButton3" );
-    Layout2->addWidget( RadioButton3 );
-
-    RadioButton4 = new QRadioButton( GroupConstructors, "RadioButton4" );
-    Layout2->addWidget( RadioButton4 );
-    GroupConstructorsLayout->addLayout( Layout2 );
-
-    Layout1->addWidget( GroupConstructors, 0, 0 );
-
-    GroupBoxName = new QGroupBox( this, "GroupBoxName" );
-    GroupBoxName->setColumnLayout(0, Qt::Vertical );
-    GroupBoxName->layout()->setSpacing( 6 );
-    GroupBoxName->layout()->setMargin( 11 );
-    GroupBoxNameLayout = new QGridLayout( GroupBoxName->layout() );
-    GroupBoxNameLayout->setAlignment( Qt::AlignTop );
-
-    Layout66 = new QGridLayout( 0, 1, 1, 0, 6, "Layout66"); 
-
-    ResultName = new QLineEdit( GroupBoxName, "ResultName" );
-
-    Layout66->addWidget( ResultName, 0, 1 );
-
-    NameLabel = new QLabel( GroupBoxName, "NameLabel" );
-
-    Layout66->addWidget( NameLabel, 0, 0 );
-
-    GroupBoxNameLayout->addLayout( Layout66, 0, 0 );
-
-    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()
-{
-    // 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()
-{
-}
-
diff --git a/src/DlgRef/DlgRef_Skeleton_QTD.h b/src/DlgRef/DlgRef_Skeleton_QTD.h
deleted file mode 100644 (file)
index 0ecfdfc..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'DlgRef_Skeleton_QTD.ui'
-**
-** Created: Tue Mar 13 14:40:29 2007
-**      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
-
-#include "GEOM_DlgRef.hxx"
-
-#include <qvariant.h>
-#include <qdialog.h>
-
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QSpacerItem;
-class QGroupBox;
-class QPushButton;
-class QButtonGroup;
-class QRadioButton;
-class QLineEdit;
-class QLabel;
-
-class GEOM_DLGREF_EXPORT DlgRef_Skeleton_QTD : public QDialog
-{
-    Q_OBJECT
-
-public:
-    DlgRef_Skeleton_QTD( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
-    ~DlgRef_Skeleton_QTD();
-
-    QGroupBox* GroupButtons;
-    QPushButton* buttonOk;
-    QPushButton* buttonApply;
-    QPushButton* buttonCancel;
-    QPushButton* buttonHelp;
-    QButtonGroup* GroupConstructors;
-    QRadioButton* RadioButton1;
-    QRadioButton* RadioButton2;
-    QRadioButton* RadioButton3;
-    QRadioButton* RadioButton4;
-    QGroupBox* GroupBoxName;
-    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_Skeleton_QTD.ui b/src/DlgRef/DlgRef_Skeleton_QTD.ui
new file mode 100644 (file)
index 0000000..02624d4
--- /dev/null
@@ -0,0 +1,226 @@
+<ui version="4.0" >
+ <class>DlgRef_Skeleton_QTD</class>
+ <widget class="QWidget" name="DlgRef_Skeleton_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>364</width>
+    <height>217</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupConstructors" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QHBoxLayout" >
+      <item>
+       <widget class="QRadioButton" name="RadioButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="RadioButton2" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="RadioButton3" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="RadioButton4" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="RadioButton5" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QGroupBox" name="GroupBoxName" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="NameLabel" >
+        <property name="text" >
+         <string/>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="ResultName" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QWidget" native="1" name="GroupMedium" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" >
+    <widget class="QGroupBox" name="GroupBoxPublish" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QHBoxLayout" >
+      <item>
+       <widget class="QCheckBox" name="CheckBoxRestoreSS" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="4" column="0" >
+    <widget class="QGroupBox" name="GroupButtons" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <item>
+       <widget class="QPushButton" name="buttonOk" >
+        <property name="text" >
+         <string>&amp;Ok</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="buttonApply" >
+        <property name="text" >
+         <string>&amp;Apply</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>91</width>
+          <height>0</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="buttonCancel" >
+        <property name="text" >
+         <string>&amp;Cancel</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="buttonHelp" >
+        <property name="text" >
+         <string>&amp;Help</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>CheckBoxRestoreSS</tabstop>
+  <tabstop>buttonOk</tabstop>
+  <tabstop>buttonApply</tabstop>
+  <tabstop>buttonCancel</tabstop>
+  <tabstop>buttonHelp</tabstop>
+  <tabstop>RadioButton1</tabstop>
+  <tabstop>RadioButton2</tabstop>
+  <tabstop>RadioButton3</tabstop>
+  <tabstop>RadioButton4</tabstop>
+  <tabstop>RadioButton5</tabstop>
+  <tabstop>ResultName</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/DlgRef/DlgRef_SpinBox.cxx b/src/DlgRef/DlgRef_SpinBox.cxx
deleted file mode 100644 (file)
index 35bec55..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_SpinBox.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
-#include "DlgRef_SpinBox.h"
-
-#include <qvalidator.h>
-
-//=================================================================================
-// class    : DlgRef_SpinBox()
-// purpose  : constructor of specific widget accepting floats in double precision.
-//=================================================================================
-DlgRef_SpinBox::DlgRef_SpinBox(QWidget* parent, const char* name)
-  : QtxDblSpinBox(parent, name)
-{
-}
-
-
-//=================================================================================
-// function : ~DlgRef_SpinBox()
-// purpose  : destructor
-//=================================================================================
-DlgRef_SpinBox::~DlgRef_SpinBox()
-{
-}
-
-
-//=================================================================================
-// function : SetStep()  [SLOT]
-// purpose  :
-//=================================================================================
-void DlgRef_SpinBox::SetStep(double newStep)
-{
-  setLineStep(newStep);
-}
-
-
-//=================================================================================
-// function : SetValue()
-// purpose  :
-//=================================================================================
-void DlgRef_SpinBox::SetValue(double v)
-{
-  setValue(v);
-}
-
-
-//=================================================================================
-// function : GetValue()
-// purpose  : returns a double
-//=================================================================================
-double DlgRef_SpinBox::GetValue()
-{
-  return value();
-}
-
-
-//=================================================================================
-// function : GetString()
-// purpose  : returns a QString
-//=================================================================================
-QString DlgRef_SpinBox::GetString()
-{
-  return cleanText();
-}
-
-
-//=================================================================================
-// function : RangeStepAndValidator()
-// purpose  :
-//=================================================================================
-void DlgRef_SpinBox::RangeStepAndValidator(double min, double max,double step,
-                                          unsigned short decimals)
-{
-  setPrecision(-decimals); // PAL12789. Minus is for using 'g' double->string conversion specifier,
-  //                          see QtxDblSpinBox::mapValueToText( double v )
-  setRange(min, max);
-  setLineStep(step);
-  ((QDoubleValidator*)validator())->setRange(min, max, decimals);
-}
-
-QString DlgRef_SpinBox::PrintDoubleValue (double theValue, int thePrecision)
-{
-  QString aRes;
-  aRes.setNum(theValue, 'g', thePrecision);
-
-  // remove trailing zeroes
-  QString delim( "." );
-
-  int idx = aRes.findRev( delim );
-  if ( idx == -1 )
-    return aRes;
-
-  QString iPart = aRes.left( idx );
-  QString fPart = aRes.mid( idx + 1 );
-
-  while ( !fPart.isEmpty() && fPart.at( fPart.length() - 1 ) == '0' )
-    fPart.remove( fPart.length() - 1, 1 );
-
-  aRes = iPart;
-  if ( !fPart.isEmpty() )
-    aRes += delim + fPart;
-
-  return aRes;
-}
diff --git a/src/DlgRef/DlgRef_SpinBox.h b/src/DlgRef/DlgRef_SpinBox.h
deleted file mode 100644 (file)
index e576781..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : DlgRef_SpinBox.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
-#ifndef  GEOMSPINBOX_H
-#define  GEOMSPINBOX_H
-
-#include "GEOM_DlgRef.hxx"
-
-#include "QtxDblSpinBox.h"
-
-#define COORD_MIN -1e+15
-#define COORD_MAX +1e+15
-#define MAX_NUMBER 100000
-#define DBL_DIGITS_DISPLAY 16
-
-//=================================================================================
-// class    : DlgRef_SpinBox
-// purpose  : Derivated from QSpinBox class and modified to accept floats
-//=================================================================================
-class GEOM_DLGREF_EXPORT DlgRef_SpinBox : public QtxDblSpinBox
-{
-  Q_OBJECT
-
-public :
-  DlgRef_SpinBox(QWidget* parent, const char* name = 0);
-  ~DlgRef_SpinBox();
-  
-  void RangeStepAndValidator(double min = -1000000.0, double max = +1000000.0, 
-                            double step = 100.0, unsigned short decimals = 3);
-  void SetValue(double v);
-  double GetValue();
-  QString GetString();
-
-  static QString PrintDoubleValue (double theValue, int Precision = DBL_DIGITS_DISPLAY);
-  
-public slots:
-  void SetStep(double newStep);
-};
-
-#endif //  GEOMSPINBOX_H
diff --git a/src/DlgRef/GEOM_DlgRef.hxx b/src/DlgRef/GEOM_DlgRef.hxx
deleted file mode 100755 (executable)
index f0497ac..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-//  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_DlgRef.hxx
-//  Author : Alexander A. BORODIN
-//  Module : GEOM
-
-#ifndef _GEOM_DlgRef_HXX_
-#define _GEOM_DlgRef_HXX_
-
-#ifdef WNT
- #if defined DLGREF_EXPORTS
-  #if defined WIN32
-   #define GEOM_DLGREF_EXPORT __declspec( dllexport )
-  #else
-   #define GEOM_DLGREF_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define GEOM_DLGREF_EXPORT __declspec( dllimport )
-  #else
-   #define GEOM_DLGREF_EXPORT
-  #endif
- #endif
-#else
- #define GEOM_DLGREF_EXPORT
-#endif
-
-#endif
index 960a9ad065b5a3fda687af1c5a560c25878f0542..3a4606f029d3b9475075e2ac80ec7468ef32c1f2 100644 (file)
-#  GEOM DLGREF : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM DLGREF : 
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : DlgRef
 #
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
 lib_LTLIBRARIES = libDlgRef.la
 
 # Sources files
-dist_libDlgRef_la_SOURCES = \
-       DlgRef_Skeleton_QTD.cxx \
-       DlgRef_1Sel_QTD.cxx \
-       DlgRef_2Sel_QTD.cxx \
-       DlgRef_3Sel_QTD.cxx \
-       DlgRef_1Sel1Check_QTD.cxx \
-       DlgRef_1Sel3Check_QTD.cxx \
-       DlgRef_1Sel1Check1List_QTD.cxx \
-       DlgRef_1Sel1Spin_QTD.cxx \
-       DlgRef_1Sel2Spin_QTD.cxx \
-       DlgRef_1Sel3Spin_QTD.cxx \
-       DlgRef_1Sel4Spin_QTD.cxx \
-       DlgRef_1Sel5Spin_QTD.cxx \
-       DlgRef_1Sel5Spin1Check_QTD.cxx \
-       DlgRef_2Sel1Spin_QTD.cxx \
-       DlgRef_2Sel2Spin_QTD.cxx \
-       DlgRef_2Sel3Spin_QTD.cxx \
-       DlgRef_1Sel1Spin1Check_QTD.cxx \
-       DlgRef_2Sel1Spin2Check_QTD.cxx \
-       DlgRef_2Sel2Spin1Check_QTD.cxx \
-       DlgRef_2Sel4Spin1Check_QTD.cxx \
-       DlgRef_3Sel4Spin2Check_QTD.cxx \
-       DlgRef_2Sel3Spin2Rb_QTD.cxx \
-       DlgRef_2Sel3Spin2Rb.cxx \
-       DlgRef_4Sel1List_QTD.cxx \
-       DlgRef_2Sel1List_QTD.cxx \
-       DlgRef_2Sel1List1Check_QTD.cxx \
-       DlgRef_1List1Spin1Btn_QTD.cxx \
-       DlgRef_4Sel1List1Check_QTD.cxx \
-       DlgRef_1Spin_QTD.cxx \
-       DlgRef_2Spin_QTD.cxx \
-       DlgRef_3Spin_QTD.cxx \
-       DlgRef_3Spin1Check_QTD.cxx \
-       DlgRef_3Sel3Spin1Check_QTD.cxx \
-       DlgRef_4Sel1Spin2Check_QTD.cxx \
-       DlgRef_SpinBox.cxx \
-       DlgRef_1Sel1Spin.cxx \
-       DlgRef_1Sel2Spin.cxx \
-       DlgRef_1Sel3Spin.cxx \
-       DlgRef_1Sel4Spin.cxx \
-       DlgRef_1Sel5Spin.cxx \
-       DlgRef_1Sel5Spin1Check.cxx \
-       DlgRef_2Sel1Spin.cxx \
-       DlgRef_2Sel2Spin.cxx \
-       DlgRef_2Sel3Spin.cxx \
-       DlgRef_1Sel1Spin1Check.cxx \
-       DlgRef_2Sel1Spin2Check.cxx \
-       DlgRef_2Sel2Spin1Check.cxx \
-       DlgRef_2Sel4Spin1Check.cxx \
-       DlgRef_3Sel4Spin2Check.cxx \
-       DlgRef_3Sel3Spin1Check.cxx \
-       DlgRef_1Spin.cxx \
-       DlgRef_2Spin.cxx \
-       DlgRef_3Spin.cxx \
-       DlgRef_3Spin1Check.cxx \
-       DlgRef_3Sel1Spin.cxx \
-       DlgRef_3Check_QTD.cxx \
-       DlgRef_6Sel_QTD.cxx \
-       DlgRef_4Sel1Spin2Check.cxx \
-       DlgRef_3Sel1Check_QTD.cxx
+dist_libDlgRef_la_SOURCES =    \
+       DlgRef.h                \
+       DlgRef.cxx
+
+MOC_FILES =                    \
+       DlgRef_moc.cxx
+
+UIC_FILES =                                    \
+       ui_DlgRef_1List1Spin1Btn_QTD.h          \
+       ui_DlgRef_1Sel1Check1List_QTD.h         \
+       ui_DlgRef_1Sel1Check1Sel_QTD.h          \
+       ui_DlgRef_1Sel1Check_QTD.h              \
+       ui_DlgRef_1Sel1List1Check3Btn_QTD.h     \
+       ui_DlgRef_1Sel1Spin1Check_QTD.h         \
+       ui_DlgRef_1Sel1Spin_QTD.h               \
+       ui_DlgRef_1Sel2Spin1View1Check_QTD.h    \
+       ui_DlgRef_1Sel2Spin_QTD.h               \
+       ui_DlgRef_1Sel3Check_QTD.h              \
+       ui_DlgRef_1Sel3Spin_QTD.h               \
+       ui_DlgRef_1Sel3Spin1Check_QTD.h         \
+       ui_DlgRef_1Sel4Spin_QTD.h               \
+       ui_DlgRef_1Sel5Spin1Check_QTD.h         \
+       ui_DlgRef_1Sel5Spin_QTD.h               \
+       ui_DlgRef_1Sel_QTD.h                    \
+       ui_DlgRef_1SelExt_QTD.h                 \
+       ui_DlgRef_1Spin_QTD.h                   \
+       ui_DlgRef_2Sel1List1Check_QTD.h         \
+       ui_DlgRef_2Sel1List_QTD.h               \
+       ui_DlgRef_2Sel1Spin2Check_QTD.h         \
+       ui_DlgRef_2Sel1Spin_QTD.h               \
+       ui_DlgRef_2Sel2List_QTD.h               \
+       ui_DlgRef_2Sel2Spin1Check_QTD.h         \
+       ui_DlgRef_2Sel2Spin_QTD.h               \
+       ui_DlgRef_2Sel3Spin2Rb_QTD.h            \
+       ui_DlgRef_2Sel3Spin_QTD.h               \
+       ui_DlgRef_2Sel4Spin1Check_QTD.h         \
+       ui_DlgRef_2Sel_QTD.h                    \
+       ui_DlgRef_2SelExt_QTD.h                 \
+       ui_DlgRef_2Spin_QTD.h                   \
+       ui_DlgRef_3Check_QTD.h                  \
+       ui_DlgRef_3Radio_QTD.h                  \
+       ui_DlgRef_3Radio1Sel1Spin_QTD.h         \
+       ui_DlgRef_3Sel1Check_QTD.h              \
+       ui_DlgRef_3Sel1Spin_QTD.h               \
+       ui_DlgRef_3Sel3Spin1Check_QTD.h         \
+       ui_DlgRef_3Sel3Spin2Check_QTD.h         \
+       ui_DlgRef_3Sel4Spin2Check_QTD.h         \
+       ui_DlgRef_3Sel_QTD.h                    \
+       ui_DlgRef_3Spin1Check_QTD.h             \
+       ui_DlgRef_3Spin_QTD.h                   \
+       ui_DlgRef_4Sel1List1Check_QTD.h         \
+       ui_DlgRef_4Sel1List_QTD.h               \
+       ui_DlgRef_4Sel1Spin2Check_QTD.h         \
+       ui_DlgRef_4Sel1Spin3Check_QTD.h         \
+       ui_DlgRef_6Sel_QTD.h                    \
+       ui_DlgRef_Skeleton_QTD.h
 
-MOC_FILES = \
-       DlgRef_Skeleton_QTD_moc.cxx \
-       DlgRef_1Sel_QTD_moc.cxx \
-       DlgRef_2Sel_QTD_moc.cxx \
-       DlgRef_3Sel_QTD_moc.cxx \
-       DlgRef_1Sel1Check_QTD_moc.cxx \
-       DlgRef_1Sel3Check_QTD_moc.cxx \
-       DlgRef_1Sel1Check1List_QTD_moc.cxx \
-       DlgRef_1Sel1Spin_QTD_moc.cxx \
-       DlgRef_1Sel2Spin_QTD_moc.cxx \
-       DlgRef_1Sel3Spin_QTD_moc.cxx \
-       DlgRef_1Sel4Spin_QTD_moc.cxx \
-       DlgRef_1Sel5Spin_QTD_moc.cxx \
-       DlgRef_1Sel5Spin1Check_QTD_moc.cxx \
-       DlgRef_2Sel1Spin_QTD_moc.cxx \
-       DlgRef_2Sel2Spin_QTD_moc.cxx \
-       DlgRef_2Sel3Spin_QTD_moc.cxx \
-       DlgRef_2Sel3Spin2Rb_QTD_moc.cxx \
-       DlgRef_2Sel3Spin2Rb_moc.cxx \
-       DlgRef_1Sel1Spin1Check_QTD_moc.cxx \
-       DlgRef_2Sel1Spin2Check_QTD_moc.cxx \
-       DlgRef_2Sel2Spin1Check_QTD_moc.cxx \
-       DlgRef_2Sel4Spin1Check_QTD_moc.cxx \
-       DlgRef_3Sel4Spin2Check_QTD_moc.cxx \
-       DlgRef_4Sel1List_QTD_moc.cxx \
-       DlgRef_2Sel1List_QTD_moc.cxx \
-       DlgRef_2Sel1List1Check_QTD_moc.cxx \
-       DlgRef_1List1Spin1Btn_QTD_moc.cxx \
-       DlgRef_4Sel1List1Check_QTD_moc.cxx \
-       DlgRef_1Spin_QTD_moc.cxx \
-       DlgRef_2Spin_QTD_moc.cxx \
-       DlgRef_3Spin_QTD_moc.cxx \
-       DlgRef_3Spin1Check_QTD_moc.cxx \
-       DlgRef_3Sel3Spin1Check_QTD_moc.cxx \
-       DlgRef_4Sel1Spin2Check_QTD_moc.cxx \
-       DlgRef_SpinBox_moc.cxx \
-       DlgRef_1Sel1Spin_moc.cxx \
-       DlgRef_1Sel2Spin_moc.cxx \
-       DlgRef_1Sel3Spin_moc.cxx \
-       DlgRef_1Sel4Spin_moc.cxx \
-       DlgRef_1Sel5Spin_moc.cxx \
-       DlgRef_1Sel5Spin1Check_moc.cxx \
-       DlgRef_2Sel1Spin_moc.cxx \
-       DlgRef_2Sel2Spin_moc.cxx \
-       DlgRef_2Sel3Spin_moc.cxx \
-       DlgRef_1Sel1Spin1Check_moc.cxx \
-       DlgRef_2Sel1Spin2Check_moc.cxx \
-       DlgRef_2Sel2Spin1Check_moc.cxx \
-       DlgRef_2Sel4Spin1Check_moc.cxx \
-       DlgRef_3Sel4Spin2Check_moc.cxx \
-       DlgRef_3Sel3Spin1Check_moc.cxx \
-       DlgRef_1Spin_moc.cxx \
-       DlgRef_2Spin_moc.cxx \
-       DlgRef_3Spin_moc.cxx \
-       DlgRef_3Spin1Check_moc.cxx \
-       DlgRef_3Sel1Spin_moc.cxx \
-       DlgRef_1Sel_Ext_moc.cxx \
-       DlgRef_3Check_QTD_moc.cxx \
-       DlgRef_6Sel_QTD_moc.cxx \
-       DlgRef_4Sel1Spin2Check_moc.cxx \
-       DlgRef_3Sel1Check_QTD_moc.cxx
+BUILT_SOURCES = $(UIC_FILES)
 
-# header files 
-salomeinclude_HEADERS = \
-       DlgRef_Skeleton_QTD.h \
-       DlgRef_1Sel_QTD.h \
-       DlgRef_2Sel_QTD.h \
-       DlgRef_3Sel_QTD.h \
-       DlgRef_1Sel1Check_QTD.h \
-       DlgRef_1Sel3Check_QTD.h \
-       DlgRef_1Sel1Check1List_QTD.h \
-       DlgRef_1Sel1Spin_QTD.h \
-       DlgRef_1Sel2Spin_QTD.h \
-       DlgRef_1Sel3Spin_QTD.h \
-       DlgRef_1Sel4Spin_QTD.h \
-       DlgRef_1Sel5Spin_QTD.h \
-       DlgRef_1Sel5Spin1Check_QTD.h \
-       DlgRef_2Sel1Spin_QTD.h \
-       DlgRef_2Sel2Spin_QTD.h \
-       DlgRef_2Sel3Spin_QTD.h \
-       DlgRef_1Sel1Spin1Check_QTD.h \
-       DlgRef_2Sel1Spin2Check_QTD.h \
-       DlgRef_2Sel2Spin1Check_QTD.h \
-       DlgRef_2Sel4Spin1Check_QTD.h \
-       DlgRef_3Sel4Spin2Check_QTD.h \
-       DlgRef_2Sel3Spin2Rb_QTD.h \
-       DlgRef_2Sel3Spin2Rb.h \
-       DlgRef_4Sel1List_QTD.h \
-       DlgRef_2Sel1List_QTD.h \
-       DlgRef_2Sel1List1Check_QTD.h \
-       DlgRef_1List1Spin1Btn_QTD.h \
-       DlgRef_4Sel1List1Check_QTD.h \
-       DlgRef_1Spin_QTD.h \
-       DlgRef_2Spin_QTD.h \
-       DlgRef_3Spin_QTD.h \
-       DlgRef_3Spin1Check_QTD.h \
-       DlgRef_3Sel3Spin1Check_QTD.h \
-       DlgRef_4Sel1Spin2Check_QTD.h \
-       DlgRef_SpinBox.h \
-       DlgRef_1Sel1Spin.h \
-       DlgRef_1Sel2Spin.h \
-       DlgRef_1Sel3Spin.h \
-       DlgRef_1Sel4Spin.h \
-       DlgRef_1Sel5Spin.h \
-       DlgRef_1Sel5Spin1Check.h \
-       DlgRef_2Sel1Spin.h \
-       DlgRef_2Sel2Spin.h \
-       DlgRef_2Sel3Spin.h \
-       DlgRef_1Sel1Spin1Check.h \
-       DlgRef_2Sel1Spin2Check.h \
-       DlgRef_2Sel2Spin1Check.h \
-       DlgRef_2Sel4Spin1Check.h \
-       DlgRef_3Sel4Spin2Check.h \
-       DlgRef_3Sel3Spin1Check.h \
-       DlgRef_1Spin.h \
-       DlgRef_2Spin.h \
-       DlgRef_3Spin.h \
-       DlgRef_3Spin1Check.h \
-       DlgRef_3Sel1Spin.h \
-       DlgRef_1Sel_Ext.h \
-       DlgRef_3Check_QTD.h \
-       DlgRef_6Sel_QTD.h \
-       DlgRef_4Sel1Spin2Check.h \
-       DlgRef_3Sel1Check_QTD.h \
-       GEOM_DlgRef.hxx
+nodist_libDlgRef_la_SOURCES =  \
+       $(MOC_FILES)            \
+       $(UIC_FILES)
 
-nodist_libDlgRef_la_SOURCES= \
-       $(MOC_FILES)
+# additional information to compile and link file
 
-# additionnal information to compil and link file
-libDlgRef_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(KERNEL_CXXFLAGS) \
+libDlgRef_la_CPPFLAGS =                \
+       $(QT_INCLUDES)          \
        $(GUI_CXXFLAGS)
 
-libDlgRef_la_LDFLAGS  = \
-       $(GUI_LDFLAGS) -lqtx \
-       $(STDLIB) \
+libDlgRef_la_LDFLAGS  =                \
+       $(STDLIB)               \
        $(QT_MT_LIBS) 
diff --git a/src/DlgRef/UIFiles/DlgRef_1List1Spin1Btn_QTD.ui b/src/DlgRef/UIFiles/DlgRef_1List1Spin1Btn_QTD.ui
deleted file mode 100644 (file)
index 6366a74..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_1List1Spin1Btn_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_1List1Spin1Btn_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>204</width>
-            <height>148</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_3Sel4Spin2Check_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>11</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <spacer row="3" column="1">
-                    <property name="name">
-                        <cstring>Spacer1</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Vertical</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>0</width>
-                            <height>23</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget class="QListView" row="0" column="0" rowspan="4" colspan="1">
-                    <property name="name">
-                        <cstring>ListView1</cstring>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="0" column="1">
-                    <property name="name">
-                        <cstring>TextLabel1</cstring>
-                    </property>
-                    <property name="text">
-                        <string>TL1</string>
-                    </property>
-                </widget>
-                <widget class="QSpinBox" row="1" column="1">
-                    <property name="name">
-                        <cstring>SpinBox1</cstring>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="2" column="1">
-                    <property name="name">
-                        <cstring>PushButton1</cstring>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_1Sel1Check1List_QTD.ui b/src/DlgRef/UIFiles/DlgRef_1Sel1Check1List_QTD.ui
deleted file mode 100644 (file)
index 677fe88..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_1Sel1Check1List_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_1Sel1Check1List_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>129</width>
-            <height>104</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_1Sel1Check1List_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <spacer row="3" column="2">
-                            <property name="name">
-                                <cstring>Spacer5</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>166</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>CheckButton1</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <widget class="QComboBox" row="1" column="2">
-                            <property name="name">
-                                <cstring>ComboBox1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_1Sel1Check_QTD.ui b/src/DlgRef/UIFiles/DlgRef_1Sel1Check_QTD.ui
deleted file mode 100644 (file)
index f860813..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_1Sel1Check_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_1Sel1Check_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>382</width>
-            <height>219</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_1Sel1Check_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout3</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>CheckButton1</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <spacer row="2" column="2">
-                            <property name="name">
-                                <cstring>Spacer5</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>16</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>PushButton1</tabstop>
-    <tabstop>LineEdit1</tabstop>
-    <tabstop>CheckButton1</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_1Sel1Spin1Check_QTD.ui b/src/DlgRef/UIFiles/DlgRef_1Sel1Spin1Check_QTD.ui
deleted file mode 100644 (file)
index c90e9c6..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_1Sel1Spin1Check_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_1Sel1Spin1Check_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>163</width>
-            <height>109</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_1Sel1Spin1Check_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout8</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>CheckButton1</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <spacer row="3" column="2">
-                            <property name="name">
-                                <cstring>Spacer5</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>16</height>
-                                </size>
-                            </property>
-                        </spacer>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>PushButton1</tabstop>
-    <tabstop>LineEdit1</tabstop>
-    <tabstop>SpinBox1</tabstop>
-    <tabstop>CheckButton1</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_1Sel1Spin_QTD.ui b/src/DlgRef/UIFiles/DlgRef_1Sel1Spin_QTD.ui
deleted file mode 100644 (file)
index e3551d1..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_1Sel1Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_1Sel1Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>129</width>
-            <height>87</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_1Sel1Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <spacer row="2" column="2">
-                            <property name="name">
-                                <cstring>Spacer7</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>16</height>
-                                </size>
-                            </property>
-                        </spacer>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_1Sel2Spin_QTD.ui b/src/DlgRef/UIFiles/DlgRef_1Sel2Spin_QTD.ui
deleted file mode 100644 (file)
index 641264b..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_1Sel2Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_1Sel2Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>129</width>
-            <height>115</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_1Sel2Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <spacer row="2" column="2">
-                            <property name="name">
-                                <cstring>Spacer7</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>30</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_1Sel3Check_QTD.ui b/src/DlgRef/UIFiles/DlgRef_1Sel3Check_QTD.ui
deleted file mode 100644 (file)
index c2e482a..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_1Sel3Check_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_1Sel3Check_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>163</width>
-            <height>116</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_1Sel3Check_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout6</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <spacer row="4" column="2">
-                            <property name="name">
-                                <cstring>Spacer5</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>16</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>CheckButton2</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>CheckButton1</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>CheckButton3</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>PushButton1</tabstop>
-    <tabstop>LineEdit1</tabstop>
-    <tabstop>CheckButton1</tabstop>
-    <tabstop>CheckButton2</tabstop>
-    <tabstop>CheckButton3</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_1Sel3Spin_QTD.ui b/src/DlgRef/UIFiles/DlgRef_1Sel3Spin_QTD.ui
deleted file mode 100644 (file)
index de8d35e..0000000
+++ /dev/null
@@ -1,223 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_1Sel3Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_1Sel3Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>129</width>
-            <height>143</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_1Sel3Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <spacer row="2" column="2">
-                            <property name="name">
-                                <cstring>Spacer6</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>150</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="2" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="2" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_1Sel4Spin_QTD.ui b/src/DlgRef/UIFiles/DlgRef_1Sel4Spin_QTD.ui
deleted file mode 100644 (file)
index 49a0cd1..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_1Sel4Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_1Sel4Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>284</width>
-            <height>119</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_1Sel4Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="1" column="0">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="0" column="5">
-                                    <property name="name">
-                                        <cstring>TextLabel5</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL5</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="3">
-                                    <property name="name">
-                                        <cstring>TextLabel4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="6">
-                                    <property name="name">
-                                        <cstring>SpinBox3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="2">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="4">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <spacer row="3" column="0">
-                            <property name="name">
-                                <cstring>Spacer6</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>16</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLayoutWidget" row="2" column="0">
-                            <property name="name">
-                                <cstring>Layout4</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel6</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL6</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox4</cstring>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <hbox>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel">
-                                    <property name="name">
-                                        <cstring>TextLabel1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL1</string>
-                                    </property>
-                                </widget>
-                                <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>PushButton1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string></string>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit">
-                                    <property name="name">
-                                        <cstring>LineEdit1</cstring>
-                                    </property>
-                                </widget>
-                            </hbox>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_1Sel5Spin1Check_QTD.ui b/src/DlgRef/UIFiles/DlgRef_1Sel5Spin1Check_QTD.ui
deleted file mode 100644 (file)
index 155cbec..0000000
+++ /dev/null
@@ -1,290 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_1Sel5Spin1Check_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_1Sel5Spin1Check_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>162</width>
-            <height>143</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_1Sel5Spin1Check_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QSpinBox" row="0" column="3">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="2" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel5</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL5</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="2">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="2" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="2">
-                                    <property name="name">
-                                        <cstring>TextLabel6</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL6</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="3">
-                                    <property name="name">
-                                        <cstring>SpinBox5</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QCheckBox" row="2"
-                               column="2" rowspan="1" colspan="2">
-                                    <property name="name">
-                                        <cstring>CheckBox1</cstring>
-                                    </property>
-                                    <property name="text">
-                                       <string></string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <spacer row="2" column="2">
-                            <property name="name">
-                                <cstring>Spacer6</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>120</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_1Sel5Spin_QTD.ui b/src/DlgRef/UIFiles/DlgRef_1Sel5Spin_QTD.ui
deleted file mode 100644 (file)
index c1bca88..0000000
+++ /dev/null
@@ -1,281 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_1Sel5Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_1Sel5Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>162</width>
-            <height>143</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_1Sel5Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QSpinBox" row="0" column="3">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="2" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel5</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL5</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="2">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="2" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="2">
-                                    <property name="name">
-                                        <cstring>TextLabel6</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL6</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="3">
-                                    <property name="name">
-                                        <cstring>SpinBox5</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <spacer row="2" column="2">
-                            <property name="name">
-                                <cstring>Spacer6</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>120</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_1Sel_QTD.ui b/src/DlgRef/UIFiles/DlgRef_1Sel_QTD.ui
deleted file mode 100644 (file)
index 3816fd1..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_1Sel_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_1Sel_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>129</width>
-            <height>57</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_1Sel_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>7</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <spacer row="1" column="2">
-                            <property name="name">
-                                <cstring>Spacer8</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>16</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_1Spin_QTD.ui b/src/DlgRef/UIFiles/DlgRef_1Spin_QTD.ui
deleted file mode 100644 (file)
index ddeca87..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_1Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_1Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>124</width>
-            <height>55</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_1Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <spacer row="3" column="1">
-                            <property name="name">
-                                <cstring>Spacer1</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>16</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QSpinBox" row="0" column="1">
-                            <property name="name">
-                                <cstring>SpinBox1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_2Sel1Spin2Check_QTD.ui b/src/DlgRef/UIFiles/DlgRef_2Sel1Spin2Check_QTD.ui
deleted file mode 100644 (file)
index a2e4e0a..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_2Sel1Spin2Check_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_2Sel1Spin2Check_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>256</width>
-            <height>139</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_2Sel1Spin2Check_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="2" column="0">
-                            <property name="name">
-                                <cstring>TextLabel3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL3</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <spacer row="4" column="2">
-                            <property name="name">
-                                <cstring>Spacer5</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>316</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QCheckBox" row="2" column="3">
-                            <property name="name">
-                                <cstring>CheckButton2</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="1" column="2" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="4">
-                            <property name="name">
-                                <cstring>CheckButton1</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QSpinBox" row="2" column="2">
-                            <property name="name">
-                                <cstring>SpinBox1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>PushButton1</tabstop>
-    <tabstop>LineEdit1</tabstop>
-    <tabstop>PushButton2</tabstop>
-    <tabstop>LineEdit2</tabstop>
-    <tabstop>SpinBox1</tabstop>
-    <tabstop>CheckButton2</tabstop>
-    <tabstop>CheckButton1</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_2Sel1Spin_QTD.ui b/src/DlgRef/UIFiles/DlgRef_2Sel1Spin_QTD.ui
deleted file mode 100644 (file)
index df95281..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_2Sel1Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_2Sel1Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>163</width>
-            <height>122</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_2Sel1Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="1" column="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="frameShape">
-                                <enum>NoFrame</enum>
-                            </property>
-                            <property name="frameShadow">
-                                <enum>Plain</enum>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <spacer row="3" column="2">
-                            <property name="name">
-                                <cstring>Spacer5</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>16</height>
-                                </size>
-                            </property>
-                        </spacer>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>PushButton1</tabstop>
-    <tabstop>LineEdit1</tabstop>
-    <tabstop>PushButton2</tabstop>
-    <tabstop>LineEdit2</tabstop>
-    <tabstop>SpinBox1</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_2Sel2Spin1Check_QTD.ui b/src/DlgRef/UIFiles/DlgRef_2Sel2Spin1Check_QTD.ui
deleted file mode 100644 (file)
index 1a97c87..0000000
+++ /dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_2Sel2Spin1Check_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_2Sel2Spin1Check_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>163</width>
-            <height>170</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_2Sel2Spin1Check_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <spacer row="4" column="2">
-                            <property name="name">
-                                <cstring>Spacer1</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>16</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>CheckButton1</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="1" column="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>PushButton1</tabstop>
-    <tabstop>LineEdit1</tabstop>
-    <tabstop>PushButton2</tabstop>
-    <tabstop>LineEdit2</tabstop>
-    <tabstop>SpinBox1</tabstop>
-    <tabstop>SpinBox2</tabstop>
-    <tabstop>CheckButton1</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_2Sel2Spin_QTD.ui b/src/DlgRef/UIFiles/DlgRef_2Sel2Spin_QTD.ui
deleted file mode 100644 (file)
index b935dc8..0000000
+++ /dev/null
@@ -1,231 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_2Sel2Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_2Sel2Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>129</width>
-            <height>145</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_2Sel2Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <spacer row="3" column="2">
-                            <property name="name">
-                                <cstring>Spacer5</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>20</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="1" column="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_2Sel3Spin2Rb_QTD.ui b/src/DlgRef/UIFiles/DlgRef_2Sel3Spin2Rb_QTD.ui
deleted file mode 100644 (file)
index ca4821c..0000000
+++ /dev/null
@@ -1,279 +0,0 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>DlgRef_2Sel3Spin2Rb_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_2Sel3Spin2Rb_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>439</width>
-            <height>340</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_2Sel3Spin2Rb_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="1" column="3">
-                                    <property name="name">
-                                        <cstring>TextLabel5</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL5</string>
-                                    </property>
-                                </widget>
-                                <widget class="QRadioButton" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>RadioButton2</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string></string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="2" rowspan="1" colspan="3">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QRadioButton" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>RadioButton1</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string></string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="4">
-                                    <property name="name">
-                                        <cstring>SpinBox3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="2">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>TextLabel4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <spacer row="3" column="2">
-                            <property name="name">
-                                <cstring>Spacer5</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>207</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLineEdit" row="1" column="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<slots>
-    <slot>RadioButton_Clicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_2Sel3Spin_QTD.ui b/src/DlgRef/UIFiles/DlgRef_2Sel3Spin_QTD.ui
deleted file mode 100644 (file)
index e51bd75..0000000
+++ /dev/null
@@ -1,260 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_2Sel3Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_2Sel3Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>129</width>
-            <height>173</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_2Sel3Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="2" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel5</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="2" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <spacer row="3" column="2">
-                            <property name="name">
-                                <cstring>Spacer5</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>20</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLineEdit" row="1" column="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_2Sel4Spin1Check_QTD.ui b/src/DlgRef/UIFiles/DlgRef_2Sel4Spin1Check_QTD.ui
deleted file mode 100644 (file)
index f148e2c..0000000
+++ /dev/null
@@ -1,324 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_2Sel4Spin1Check_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_2Sel4Spin1Check_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>262</width>
-            <height>230</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_2Sel4Spin1Check_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout5</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="4">
-                            <property name="name">
-                                <cstring>CheckButton1</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QLineEdit" row="1" column="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <spacer row="5" column="3">
-                            <property name="name">
-                                <cstring>Spacer1</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>16</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel5</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL5</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel6</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL6</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>PushButton1</tabstop>
-    <tabstop>LineEdit1</tabstop>
-    <tabstop>PushButton2</tabstop>
-    <tabstop>LineEdit2</tabstop>
-    <tabstop>SpinBox1</tabstop>
-    <tabstop>SpinBox2</tabstop>
-    <tabstop>CheckButton1</tabstop>
-    <tabstop>SpinBox3</tabstop>
-    <tabstop>SpinBox4</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_2Sel_QTD.ui b/src/DlgRef/UIFiles/DlgRef_2Sel_QTD.ui
deleted file mode 100644 (file)
index 46e7f5b..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_2Sel_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_2Sel_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>129</width>
-            <height>87</height>
-        </rect>
-    </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>7</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </property>
-    <property name="caption">
-        <string>DlgRef_2Sel_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <spacer row="2" column="2">
-                            <property name="name">
-                                <cstring>Spacer3</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>16</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLineEdit" row="1" column="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_2Spin_QTD.ui b/src/DlgRef/UIFiles/DlgRef_2Spin_QTD.ui
deleted file mode 100644 (file)
index 3fe8a9f..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_2Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_2Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>124</width>
-            <height>83</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_2Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QSpinBox" row="1" column="1">
-                            <property name="name">
-                                <cstring>SpinBox2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <spacer row="3" column="1">
-                            <property name="name">
-                                <cstring>Spacer1</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>16</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QSpinBox" row="0" column="1">
-                            <property name="name">
-                                <cstring>SpinBox1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_3Check_QTD.ui b/src/DlgRef/UIFiles/DlgRef_3Check_QTD.ui
deleted file mode 100644 (file)
index 9573bb2..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_3Check_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_3Check_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>135</width>
-            <height>108</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_3Check_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QButtonGroup" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QRadioButton" row="2" column="0">
-                            <property name="name">
-                                <cstring>RadioButton3</cstring>
-                            </property>
-                            <property name="text">
-                                <string>RadioButton3</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton" row="0" column="0">
-                            <property name="name">
-                                <cstring>RadioButton1</cstring>
-                            </property>
-                            <property name="text">
-                                <string>RadioButton1</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton" row="1" column="0">
-                            <property name="name">
-                                <cstring>RadioButton2</cstring>
-                            </property>
-                            <property name="text">
-                                <string>RadioButton2</string>
-                            </property>
-                        </widget>
-                        <spacer row="3" column="0">
-                            <property name="name">
-                                <cstring>Spacer1</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>91</height>
-                                </size>
-                            </property>
-                        </spacer>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>RadioButton1</tabstop>
-    <tabstop>RadioButton2</tabstop>
-    <tabstop>RadioButton3</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_3Sel1Check_QTD.ui b/src/DlgRef/UIFiles/DlgRef_3Sel1Check_QTD.ui
deleted file mode 100644 (file)
index b14325d..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>DlgRef_3Sel1Check_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_3Sel1Check_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>403</width>
-            <height>441</height>
-        </rect>
-    </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>5</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </property>
-    <property name="caption">
-        <string>DlgRef_3Sel3Spin1Check_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>5</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QPushButton" row="0" column="1">
-                    <property name="name">
-                        <cstring>PushButton1</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>0</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="0" column="2" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>LineEdit1</cstring>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="0" column="0">
-                    <property name="name">
-                        <cstring>TextLabel1</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>0</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="text">
-                        <string>TL1</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="1" column="1">
-                    <property name="name">
-                        <cstring>PushButton2</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>0</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="1" column="2" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>LineEdit2</cstring>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="1" column="0">
-                    <property name="name">
-                        <cstring>TextLabel2</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>0</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="text">
-                        <string>TL2</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="2" column="1">
-                    <property name="name">
-                        <cstring>PushButton3</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>0</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="2" column="2" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>LineEdit3</cstring>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="2" column="0">
-                    <property name="name">
-                        <cstring>TextLabel3</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>0</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="text">
-                        <string>TL3</string>
-                    </property>
-                </widget>
-                <spacer row="4" column="3">
-                    <property name="name">
-                        <cstring>Spacer3</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Vertical</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>16</width>
-                            <height>721</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3">
-                    <property name="name">
-                        <cstring>CheckButton1</cstring>
-                    </property>
-                    <property name="text">
-                        <string>CheckButton1</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>PushButton1</tabstop>
-    <tabstop>LineEdit1</tabstop>
-    <tabstop>PushButton2</tabstop>
-    <tabstop>LineEdit2</tabstop>
-    <tabstop>PushButton3</tabstop>
-    <tabstop>LineEdit3</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_3Sel3Spin1Check_QTD.ui b/src/DlgRef/UIFiles/DlgRef_3Sel3Spin1Check_QTD.ui
deleted file mode 100644 (file)
index c48cc30..0000000
+++ /dev/null
@@ -1,317 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_3Sel3Spin1Check_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_3Sel3Spin1Check_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>380</width>
-            <height>229</height>
-        </rect>
-    </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>5</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </property>
-    <property name="caption">
-        <string>DlgRef_3Sel3Spin1Check_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>5</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QSpinBox" row="4" column="2">
-                            <property name="name">
-                                <cstring>SpinBox_2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="2" column="2">
-                            <property name="name">
-                                <cstring>LineEdit3</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QSpinBox" row="5" column="2">
-                            <property name="name">
-                                <cstring>SpinBox_3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="2" column="0">
-                            <property name="name">
-                                <cstring>TextLabel3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL3</string>
-                            </property>
-                        </widget>
-                        <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>CheckBox1</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="3" column="0">
-                            <property name="name">
-                                <cstring>TextLabel4</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL4</string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="1" column="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="2" column="1">
-                            <property name="name">
-                                <cstring>PushButton3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="5" column="0">
-                            <property name="name">
-                                <cstring>TextLabel6</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL6</string>
-                            </property>
-                        </widget>
-                        <widget class="QSpinBox" row="3" column="2">
-                            <property name="name">
-                                <cstring>SpinBox_1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="4" column="0">
-                            <property name="name">
-                                <cstring>TextLabel5</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL5</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <spacer row="7" column="2">
-                            <property name="name">
-                                <cstring>Spacer3</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>250</height>
-                                </size>
-                            </property>
-                        </spacer>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>PushButton1</tabstop>
-    <tabstop>LineEdit1</tabstop>
-    <tabstop>PushButton2</tabstop>
-    <tabstop>LineEdit2</tabstop>
-    <tabstop>PushButton3</tabstop>
-    <tabstop>LineEdit3</tabstop>
-    <tabstop>SpinBox_1</tabstop>
-    <tabstop>SpinBox_2</tabstop>
-    <tabstop>SpinBox_3</tabstop>
-    <tabstop>CheckBox1</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_3Sel4Spin2Check_QTD.ui b/src/DlgRef/UIFiles/DlgRef_3Sel4Spin2Check_QTD.ui
deleted file mode 100644 (file)
index 441a99a..0000000
+++ /dev/null
@@ -1,372 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_3Sel4Spin2Check_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_3Sel4Spin2Check_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>269</width>
-            <height>281</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_3Sel4Spin2Check_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>CheckButton2</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="2" column="0">
-                            <property name="name">
-                                <cstring>TextLabel3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL3</string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="2" column="2">
-                            <property name="name">
-                                <cstring>LineEdit3</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel7</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL7</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel6</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL6</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>CheckButton1</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="2" column="1">
-                            <property name="name">
-                                <cstring>PushButton3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <spacer row="7" column="2">
-                            <property name="name">
-                                <cstring>Spacer1</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>16</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLineEdit" row="1" column="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel5</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL5</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>PushButton1</tabstop>
-    <tabstop>LineEdit1</tabstop>
-    <tabstop>PushButton2</tabstop>
-    <tabstop>LineEdit2</tabstop>
-    <tabstop>PushButton3</tabstop>
-    <tabstop>LineEdit3</tabstop>
-    <tabstop>SpinBox1</tabstop>
-    <tabstop>SpinBox2</tabstop>
-    <tabstop>CheckButton1</tabstop>
-    <tabstop>SpinBox3</tabstop>
-    <tabstop>SpinBox4</tabstop>
-    <tabstop>CheckButton2</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_3Sel_QTD.ui b/src/DlgRef/UIFiles/DlgRef_3Sel_QTD.ui
deleted file mode 100644 (file)
index 0fe9988..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_3Sel_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_3Sel_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>129</width>
-            <height>117</height>
-        </rect>
-    </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>7</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </property>
-    <property name="caption">
-        <string>DlgRef_3Sel_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLineEdit" row="2" column="2">
-                            <property name="name">
-                                <cstring>LineEdit3</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="1" column="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="2" column="0">
-                            <property name="name">
-                                <cstring>TextLabel3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL3</string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <spacer row="3" column="2">
-                            <property name="name">
-                                <cstring>Spacer3</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>159</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="2" column="1">
-                            <property name="name">
-                                <cstring>PushButton3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_3Spin1Check_QTD.ui b/src/DlgRef/UIFiles/DlgRef_3Spin1Check_QTD.ui
deleted file mode 100644 (file)
index fd3317f..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_3Spin1Check_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_3Spin1Check_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>124</width>
-            <height>130</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_3Spin1Check_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>CheckBox1</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <spacer row="4" column="1">
-                            <property name="name">
-                                <cstring>Spacer1</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>20</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QSpinBox" row="1" column="1">
-                            <property name="name">
-                                <cstring>SpinBox2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="2" column="0">
-                            <property name="name">
-                                <cstring>TextLabel3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL3</string>
-                            </property>
-                        </widget>
-                        <widget class="QSpinBox" row="2" column="1">
-                            <property name="name">
-                                <cstring>SpinBox3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QSpinBox" row="0" column="1">
-                            <property name="name">
-                                <cstring>SpinBox1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_3Spin_QTD.ui b/src/DlgRef/UIFiles/DlgRef_3Spin_QTD.ui
deleted file mode 100644 (file)
index 96f6b4d..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_3Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_3Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>124</width>
-            <height>111</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_3Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QSpinBox" row="1" column="1">
-                            <property name="name">
-                                <cstring>SpinBox2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <spacer row="3" column="1">
-                            <property name="name">
-                                <cstring>Spacer1</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>16</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLabel" row="2" column="0">
-                            <property name="name">
-                                <cstring>TextLabel3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL3</string>
-                            </property>
-                        </widget>
-                        <widget class="QSpinBox" row="0" column="1">
-                            <property name="name">
-                                <cstring>SpinBox1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QSpinBox" row="2" column="1">
-                            <property name="name">
-                                <cstring>SpinBox3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_4Sel1List_QTD.ui b/src/DlgRef/UIFiles/DlgRef_4Sel1List_QTD.ui
deleted file mode 100644 (file)
index 831768d..0000000
+++ /dev/null
@@ -1,260 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_4Sel1List_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_4Sel1List_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>129</width>
-            <height>175</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_4Sel1List_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLineEdit" row="1" column="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="4" column="1">
-                            <property name="name">
-                                <cstring>PushButton4</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="4" column="2">
-                            <property name="name">
-                                <cstring>LineEdit4</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="3" column="1">
-                            <property name="name">
-                                <cstring>PushButton3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="3" column="0">
-                            <property name="name">
-                                <cstring>TextLabel4</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL4</string>
-                            </property>
-                        </widget>
-                        <spacer row="5" column="2">
-                            <property name="name">
-                                <cstring>Spacer5</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>80</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="4" column="0">
-                            <property name="name">
-                                <cstring>TextLabel5</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL5</string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="3" column="2">
-                            <property name="name">
-                                <cstring>LineEdit3</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <widget class="QComboBox" row="2" column="2">
-                            <property name="name">
-                                <cstring>ComboBox1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>TextLabel3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL3</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_4Sel1Spin2Check_QTD.ui b/src/DlgRef/UIFiles/DlgRef_4Sel1Spin2Check_QTD.ui
deleted file mode 100644 (file)
index 2d23f60..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>DlgRef_4Sel1Spin2Check_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_4Sel1Spin2Check_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>261</width>
-            <height>198</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>DlgRef_4Sel1Spin2Check_QTD</string>
-    </property>
-    <vbox>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <vbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>6</number>
-                        </property>
-                        <widget class="QCheckBox" row="4" column="3">
-                            <property name="name">
-                                <cstring>CheckButton2</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="3" column="2" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>LineEdit5</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="3" column="0">
-                            <property name="name">
-                                <cstring>TextLabel5</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL5</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QSpinBox" row="4" column="2">
-                            <property name="name">
-                                <cstring>SpinBox1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>CheckButton1</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="3" column="1">
-                            <property name="name">
-                                <cstring>PushButton5</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="2" column="1">
-                            <property name="name">
-                                <cstring>PushButton4</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="2" column="0">
-                            <property name="name">
-                                <cstring>TextLabel4</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL4</string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="2" column="2" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>LineEdit4</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="1" column="2" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="4" column="0">
-                            <property name="name">
-                                <cstring>TextLabel3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL3</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </vbox>
-        </widget>
-    </vbox>
-</widget>
-<tabstops>
-    <tabstop>PushButton1</tabstop>
-    <tabstop>LineEdit1</tabstop>
-    <tabstop>PushButton2</tabstop>
-    <tabstop>LineEdit2</tabstop>
-    <tabstop>SpinBox1</tabstop>
-    <tabstop>CheckButton2</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_6Sel_QTD.ui b/src/DlgRef/UIFiles/DlgRef_6Sel_QTD.ui
deleted file mode 100644 (file)
index c5ff406..0000000
+++ /dev/null
@@ -1,296 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_6Sel_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DlgRef_6Sel_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>235</width>
-            <height>196</height>
-        </rect>
-    </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>7</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </property>
-    <property name="caption">
-        <string>DlgRef_6Sel_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="2" column="0">
-                            <property name="name">
-                                <cstring>TextLabel3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL3</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="3" column="0">
-                            <property name="name">
-                                <cstring>TextLabel4</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL4</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="4" column="0">
-                            <property name="name">
-                                <cstring>TextLabel5</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL5</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="5" column="0">
-                            <property name="name">
-                                <cstring>TextLabel6</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL6</string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="2" column="1">
-                            <property name="name">
-                                <cstring>PushButton3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="3" column="1">
-                            <property name="name">
-                                <cstring>PushButton4</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="4" column="1">
-                            <property name="name">
-                                <cstring>PushButton5</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="5" column="1">
-                            <property name="name">
-                                <cstring>PushButton6</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="1" column="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="2" column="2">
-                            <property name="name">
-                                <cstring>LineEdit3</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="3" column="2">
-                            <property name="name">
-                                <cstring>LineEdit4</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="4" column="2">
-                            <property name="name">
-                                <cstring>LineEdit5</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="5" column="2">
-                            <property name="name">
-                                <cstring>LineEdit6</cstring>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui b/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui
deleted file mode 100644 (file)
index 8979116..0000000
+++ /dev/null
@@ -1,234 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>DlgRef_Skeleton_QTD</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>DlgRef_Skeleton_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>307</width>
-            <height>378</height>
-        </rect>
-    </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>7</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </property>
-    <property name="sizeGripEnabled">
-        <bool>true</bool>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>11</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QLayoutWidget" row="0" column="0">
-            <property name="name">
-                <cstring>Layout1</cstring>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>0</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QGroupBox" row="3" column="0">
-                    <property name="name">
-                        <cstring>GroupButtons</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <hbox>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>11</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
-                            </property>
-                            <hbox>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                               <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>buttonOk</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>buttonApply</cstring>
-                                    </property>
-                                </widget>
-                                <spacer>
-                                    <property name="name">
-                                        <cstring>Spacer1</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Horizontal</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>91</width>
-                                            <height>0</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>buttonCancel</cstring>
-                                    </property>
-                                </widget>
-                               <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>buttonHelp</cstring>
-                                    </property>
-                                </widget>
-                            </hbox>
-                        </widget>
-                    </hbox>
-                </widget>
-                <widget class="QButtonGroup" row="0" column="0">
-                    <property name="name">
-                        <cstring>GroupConstructors</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>5</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <hbox>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>11</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <hbox>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QRadioButton">
-                                    <property name="name">
-                                        <cstring>RadioButton1</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QRadioButton">
-                                    <property name="name">
-                                        <cstring>RadioButton2</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QRadioButton">
-                                    <property name="name">
-                                        <cstring>RadioButton3</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QRadioButton">
-                                    <property name="name">
-                                        <cstring>RadioButton4</cstring>
-                                    </property>
-                                </widget>
-                            </hbox>
-                        </widget>
-                    </hbox>
-                </widget>
-                <widget class="QGroupBox" row="1" column="0">
-                    <property name="name">
-                        <cstring>GroupBoxName</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>11</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout66</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLineEdit" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>ResultName</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>NameLabel</cstring>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/DlgRef/UIFiles/ui_to_cxx b/src/DlgRef/UIFiles/ui_to_cxx
deleted file mode 100755 (executable)
index 60e5b02..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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
-#uic -o DlgRef_Skeleton_QTD.cxx -impl DlgRef_Skeleton_QTD.h DlgRef_Skeleton_QTD.ui
-
-#uic -o DlgRef_1Sel_QTD.h DlgRef_1Sel_QTD.ui
-#uic -o DlgRef_1Sel_QTD.cxx -impl DlgRef_1Sel_QTD.h DlgRef_1Sel_QTD.ui
-
-#uic -o DlgRef_1Sel1Spin_QTD.h DlgRef_1Sel1Spin_QTD.ui
-#uic -o DlgRef_1Sel1Spin_QTD.cxx -impl DlgRef_1Sel1Spin_QTD.h DlgRef_1Sel1Spin_QTD.ui
-
-#uic -o DlgRef_1Sel1Spin1Check_QTD.h DlgRef_1Sel1Spin1Check_QTD.ui
-#uic -o DlgRef_1Sel1Spin1Check_QTD.cxx -impl DlgRef_1Sel1Spin1Check_QTD.h DlgRef_1Sel1Spin1Check_QTD.ui
-
-#uic -o DlgRef_1Sel2Spin_QTD.h DlgRef_1Sel2Spin_QTD.ui
-#uic -o DlgRef_1Sel2Spin_QTD.cxx -impl DlgRef_1Sel2Spin_QTD.h DlgRef_1Sel2Spin_QTD.ui
-
-#uic -o DlgRef_1Sel3Spin_QTD.h DlgRef_1Sel3Spin_QTD.ui
-#uic -o DlgRef_1Sel3Spin_QTD.cxx -impl DlgRef_1Sel3Spin_QTD.h DlgRef_1Sel3Spin_QTD.ui
-
-#uic -o DlgRef_1Sel4Spin_QTD.h DlgRef_1Sel4Spin_QTD.ui
-#uic -o DlgRef_1Sel4Spin_QTD.cxx -impl DlgRef_1Sel4Spin_QTD.h DlgRef_1Sel4Spin_QTD.ui
-
-#uic -o DlgRef_1Sel5Spin_QTD.h DlgRef_1Sel5Spin_QTD.ui
-#uic -o DlgRef_1Sel5Spin_QTD.cxx -impl DlgRef_1Sel5Spin_QTD.h DlgRef_1Sel5Spin_QTD.ui
-
-#uic -o DlgRef_1Sel5Spin1Check_QTD.h DlgRef_1Sel5Spin1Check_QTD.ui
-#uic -o DlgRef_1Sel5Spin1Check_QTD.cxx -impl DlgRef_1Sel5Spin1Check_QTD.h DlgRef_1Sel5Spin1Check_QTD.ui
-
-#uic -o DlgRef_1Sel1Check_QTD.h DlgRef_1Sel1Check_QTD.ui
-#uic -o DlgRef_1Sel1Check_QTD.cxx -impl DlgRef_1Sel1Check_QTD.h DlgRef_1Sel1Check_QTD.ui
-
-#uic -o DlgRef_1Sel3Check_QTD.h DlgRef_1Sel3Check_QTD.ui
-#uic -o DlgRef_1Sel3Check_QTD.cxx -impl DlgRef_1Sel3Check_QTD.h DlgRef_1Sel3Check_QTD.ui
-
-#uic -o DlgRef_1Sel1Check1List_QTD.h DlgRef_1Sel1Check1List_QTD.ui
-#uic -o DlgRef_1Sel1Check1List_QTD.cxx -impl DlgRef_1Sel1Check1List_QTD.h DlgRef_1Sel1Check1List_QTD.ui
-
-#uic -o DlgRef_2Sel_QTD.h DlgRef_2Sel_QTD.ui
-#uic -o DlgRef_2Sel_QTD.cxx -impl DlgRef_2Sel_QTD.h DlgRef_2Sel_QTD.ui
-
-#uic -o DlgRef_2Sel1Spin_QTD.h DlgRef_2Sel1Spin_QTD.ui
-#uic -o DlgRef_2Sel1Spin_QTD.cxx -impl DlgRef_2Sel1Spin_QTD.h DlgRef_2Sel1Spin_QTD.ui
-
-#uic -o DlgRef_2Sel1Spin2Check_QTD.h DlgRef_2Sel1Spin2Check_QTD.ui
-#uic -o DlgRef_2Sel1Spin2Check_QTD.cxx -impl DlgRef_2Sel1Spin2Check_QTD.h DlgRef_2Sel1Spin2Check_QTD.ui
-
-#uic -o DlgRef_2Sel2Spin_QTD.h DlgRef_2Sel2Spin_QTD.ui
-#uic -o DlgRef_2Sel2Spin_QTD.cxx -impl DlgRef_2Sel2Spin_QTD.h DlgRef_2Sel2Spin_QTD.ui
-
-#uic -o DlgRef_2Sel2Spin1Check_QTD.h DlgRef_2Sel2Spin1Check_QTD.ui
-#uic -o DlgRef_2Sel2Spin1Check_QTD.cxx -impl DlgRef_2Sel2Spin1Check_QTD.h DlgRef_2Sel2Spin1Check_QTD.ui
-
-#uic -o DlgRef_2Sel3Spin_QTD.h DlgRef_2Sel3Spin_QTD.ui
-#uic -o DlgRef_2Sel3Spin_QTD.cxx -impl DlgRef_2Sel3Spin_QTD.h DlgRef_2Sel3Spin_QTD.ui
-
-#uic -o DlgRef_2Sel4Spin1Check_QTD.h DlgRef_2Sel4Spin1Check_QTD.ui
-#uic -o DlgRef_2Sel4Spin1Check_QTD.cxx -impl DlgRef_2Sel4Spin1Check_QTD.h DlgRef_2Sel4Spin1Check_QTD.ui
-
-#uic -o DlgRef_4Sel1List_QTD.h DlgRef_4Sel1List_QTD.ui
-#uic -o DlgRef_4Sel1List_QTD.cxx -impl DlgRef_4Sel1List_QTD.h DlgRef_4Sel1List_QTD.ui
-
-#uic -o DlgRef_3Sel_QTD.h DlgRef_3Sel_QTD.ui
-#uic -o DlgRef_3Sel_QTD.cxx -impl DlgRef_3Sel_QTD.h DlgRef_3Sel_QTD.ui
-
-#uic -o DlgRef_3Sel4Spin2Check_QTD.h DlgRef_3Sel4Spin2Check_QTD.ui
-#uic -o DlgRef_3Sel4Spin2Check_QTD.cxx -impl DlgRef_3Sel4Spin2Check_QTD.h DlgRef_3Sel4Spin2Check_QTD.ui
-
-#uic -o DlgRef_1Spin_QTD.h DlgRef_1Spin_QTD.ui
-#uic -o DlgRef_1Spin_QTD.cxx -impl DlgRef_1Spin_QTD.h DlgRef_1Spin_QTD.ui
-
-#uic -o DlgRef_2Spin_QTD.h DlgRef_2Spin_QTD.ui
-#uic -o DlgRef_2Spin_QTD.cxx -impl DlgRef_2Spin_QTD.h DlgRef_2Spin_QTD.ui
-
-#uic -o DlgRef_3Spin_QTD.h DlgRef_3Spin_QTD.ui
-#uic -o DlgRef_3Spin_QTD.cxx -impl DlgRef_3Spin_QTD.h DlgRef_3Spin_QTD.ui
-
-#uic -o DlgRef_3Spin1Check_QTD.h DlgRef_3Spin1Check_QTD.ui
-#uic -o DlgRef_3Spin1Check_QTD.cxx -impl DlgRef_3Spin1Check_QTD.h DlgRef_3Spin1Check_QTD.ui
-
-#uic -o DlgRef_3Sel3Spin1Check_QTD.h DlgRef_3Sel3Spin1Check_QTD.ui
-#uic -o DlgRef_3Sel3Spin1Check_QTD.cxx -impl DlgRef_3Sel3Spin1Check_QTD.h DlgRef_3Sel3Spin1Check_QTD.ui
-
-#uic -o DlgRef_6Sel_QTD.h DlgRef_6Sel_QTD.ui
-#uic -o DlgRef_6Sel_QTD.cxx -impl DlgRef_6Sel_QTD.h DlgRef_6Sel_QTD.ui
-
-#uic -o DlgRef_3Check_QTD.h DlgRef_3Check_QTD.ui
-#uic -o DlgRef_3Check_QTD.cxx -impl DlgRef_3Check_QTD.h DlgRef_3Check_QTD.ui
-
-#uic -o DlgRef_4Sel1Spin2Check_QTD.h DlgRef_4Sel1Spin2Check_QTD.ui
-#uic -o DlgRef_4Sel1Spin2Check_QTD.cxx -impl DlgRef_4Sel1Spin2Check_QTD.h DlgRef_4Sel1Spin2Check_QTD.ui
-
-#uic -o DlgRef_4Sel1Spin2Check_QTD.h DlgRef_4Sel1Spin2Check_QTD.ui
-#uic -o DlgRef_4Sel1Spin2Check_QTD.cxx -impl DlgRef_4Sel1Spin2Check_QTD.h DlgRef_4Sel1Spin2Check_QTD.ui
-
-#uic -o DlgRef_2Sel3Spin2Rb_QTD.h DlgRef_2Sel3Spin2Rb_QTD.ui
-#uic -o DlgRef_2Sel3Spin2Rb_QTD.cxx -impl DlgRef_2Sel3Spin2Rb_QTD.h DlgRef_2Sel3Spin2Rb_QTD.ui
-
-uic -o DlgRef_3Sel1Check_QTD.h DlgRef_3Sel1Check_QTD.ui
-uic -o DlgRef_3Sel1Check_QTD.cxx -impl DlgRef_3Sel1Check_QTD.h DlgRef_3Sel1Check_QTD.ui>>>>>>> 1.6.2.3
index 8bdee4ae6c135be6223b465e3881cfcdf18abd1b..25e0103f68eef9f2dacaf28e85e3a2316509c81f 100644 (file)
@@ -1,55 +1,44 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : EntityGUI.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : EntityGUI.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "EntityGUI.h"
-#include "GeometryGUI.h"
-#include "GEOM_AssemblyBuilder.h"
-
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SUIT_ViewWindow.h"
-#include "OCCViewer_ViewModel.h"
-#include "OCCViewer_ViewManager.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Tools.h"
-#include "SalomeApp_Application.h"
-
-#include <TopoDS_Compound.hxx>
-#include <BRep_Builder.hxx>
-#include <TopExp_Explorer.hxx>
 
-#include "EntityGUI_SketcherDlg.h" // Sketcher
-#include "EntityGUI_SubShapeDlg.h" // Method SUBSHAPE
+#include <GeometryGUI.h>
+
+#include <SUIT_Desktop.h>
+#include <SUIT_ViewWindow.h>
+#include <OCCViewer_ViewModel.h>
+#include <OCCViewer_ViewManager.h>
+#include <SalomeApp_Study.h>
+#include <SalomeApp_Application.h>
 
-#include "utilities.h"
+#include <TopoDS_Shape.hxx>
 
-using namespace boost;
-using namespace std;
+#include "EntityGUI_SketcherDlg.h" // Sketcher
+#include "EntityGUI_3DSketcherDlg.h" // Sketcher
+#include "EntityGUI_SubShapeDlg.h" // Method SUBSHAPE
 
 //=======================================================================
 // function : EntityGUI()
@@ -57,8 +46,8 @@ using namespace std;
 //=======================================================================
 EntityGUI::EntityGUI( GeometryGUI* parent ) :  GEOMGUI( parent )
 {
-  mySimulationShape1 = new AIS_Shape(TopoDS_Shape());
-  mySimulationShape2 = new AIS_Shape(TopoDS_Shape());
+  mySimulationShape1 = new AIS_Shape( TopoDS_Shape() );
+  mySimulationShape2 = new AIS_Shape( TopoDS_Shape() );
 }
 
 //=======================================================================
@@ -74,7 +63,7 @@ EntityGUI::~EntityGUI()
 // function : OnGUIEvent()
 // purpose  : 
 //=======================================================================
-bool EntityGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
+bool EntityGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 {
   SalomeApp_Application* app = getGeometryGUI()->getApp();
   if ( !app ) return false;
@@ -82,22 +71,24 @@ bool EntityGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
   getGeometryGUI()->EmitSignalDeactivateDialog();
   QDialog* aDlg = NULL;
 
-  switch (theCommandID)
-  {
-    case 404: // SKETCHER
-      getGeometryGUI()->ActiveWorkingPlane();
-      aDlg = new EntityGUI_SketcherDlg(getGeometryGUI(), parent, "");
-      break;
-    case 407: // EXPLODE : use ic
-      aDlg = new EntityGUI_SubShapeDlg(getGeometryGUI(), parent, "");
-      break;
-    default:
-      app->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
-      break;
+  switch ( theCommandID ) {
+  case 404: // SKETCHER
+    getGeometryGUI()->ActiveWorkingPlane();
+    aDlg = new EntityGUI_SketcherDlg( getGeometryGUI(), parent );
+    break;
+  case 405: // 3D SKETCHER
+    aDlg = new EntityGUI_3DSketcherDlg( getGeometryGUI(), parent );
+    break;
+  case 407: // EXPLODE : use ic
+    aDlg = new EntityGUI_SubShapeDlg( getGeometryGUI(), parent );
+    break;
+  default:
+    app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
+    break;
   }
   if ( aDlg )
     aDlg->show();
-
+  
   return true;
 }
 
@@ -106,49 +97,48 @@ bool EntityGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
 // function : DisplaySimulationShape() 
 // purpose  : Displays 'this->mySimulationShape' a pure graphical shape from a TopoDS_Shape
 //=====================================================================================
-void EntityGUI::DisplaySimulationShape(const TopoDS_Shape& S1, const TopoDS_Shape& S2
+void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Shape& S2 
 {
   SalomeApp_Application* app = getGeometryGUI()->getApp();
   if ( !app ) return;
 
   SUIT_ViewManager* aVM = app->desktop()->activeWindow()->getViewManager();
-  if (aVM->getType() != OCCViewer_Viewer::Type())
+  if ( aVM->getType() != OCCViewer_Viewer::Type() )
     return;
 
-  OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)aVM)->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);
+      ic->Erase( mySimulationShape1, Standard_True, Standard_False );
+      ic->ClearPrs( mySimulationShape1 );
 
-      mySimulationShape1 = new AIS_Shape(TopoDS_Shape());
-      mySimulationShape1->Set(S1);
-      mySimulationShape1->SetColor(Quantity_NOC_RED);
+      mySimulationShape1 = new AIS_Shape( TopoDS_Shape() );
+      mySimulationShape1->Set( S1 );
+      mySimulationShape1->SetColor( Quantity_NOC_RED );
 
-      ic->Deactivate(mySimulationShape1);
-      ic->Display(mySimulationShape1, Standard_False);
+      ic->Deactivate( mySimulationShape1 );
+      ic->Display( mySimulationShape1, Standard_False );
       mySimulationShape1->UnsetColor();
     }
-    if (!S2.IsNull()) {
-      ic->Erase(mySimulationShape2, Standard_True, Standard_False);
-      ic->ClearPrs(mySimulationShape2);
+    if ( !S2.IsNull() ) {
+      ic->Erase( mySimulationShape2, Standard_True, Standard_False );
+      ic->ClearPrs( mySimulationShape2 );
 
-      mySimulationShape2 = new AIS_Shape(TopoDS_Shape());
-      mySimulationShape2->Set(S2);
-      mySimulationShape2->SetColor(Quantity_NOC_VIOLET);
+      mySimulationShape2 = new AIS_Shape( TopoDS_Shape() );
+      mySimulationShape2->Set( S2 );
+      mySimulationShape2->SetColor( Quantity_NOC_VIOLET );
 
-      ic->Deactivate(mySimulationShape2);
-      ic->Display(mySimulationShape2, Standard_False);
+      ic->Deactivate( mySimulationShape2 );
+      ic->Display( mySimulationShape2, Standard_False );
       mySimulationShape2->UnsetColor();
     }
     ic->UpdateCurrentViewer();
   }
-  catch(Standard_Failure) {
-    MESSAGE("Exception catched in EntityGUI::DisplaySimulationShape ");
+  catch( Standard_Failure ) {
+    MESSAGE( "Exception catched in EntityGUI::DisplaySimulationShape" );
   } 
-  return;
 }
 
 //==================================================================================
@@ -161,22 +151,25 @@ void EntityGUI::EraseSimulationShape()
   if ( !app ) return;
 
   // get all view windows at the desktop
-  QPtrList<SUIT_ViewWindow> aWndLst = app->desktop()->windows();
+  QList<SUIT_ViewWindow*> aWndLst = app->desktop()->windows();
   //get all view windows, which belong to the active study
-  QPtrList<SUIT_ViewWindow> aWndLstAS;
+  QList<SUIT_ViewWindow*> aWndLstAS;
   SUIT_ViewWindow* vw;
-  for ( vw = aWndLst.first(); vw; vw = aWndLst.next() )
+
+  QListIterator<SUIT_ViewWindow*> itWL( aWndLst );
+  while ( itWL.hasNext() && ( vw = itWL.next() ) )
     if ( vw->getViewManager()->study() == app->activeStudy() )
       aWndLstAS.append( vw );
 
-  for ( vw = aWndLstAS.first(); vw; vw = aWndLstAS.next() ) {
+  QListIterator<SUIT_ViewWindow*> itWLAS( aWndLstAS );
+  while ( itWLAS.hasNext() && ( vw = itWLAS.next() ) ) {
     if ( vw->getViewManager()->getType() == OCCViewer_Viewer::Type() ) {
-      OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(vw->getViewManager()))->getOCCViewer();
+      OCCViewer_Viewer* v3d = ( (OCCViewer_ViewManager*)( vw->getViewManager() ) )->getOCCViewer();
       Handle(AIS_InteractiveContext) ic = v3d->getAISContext();
-      ic->Erase(mySimulationShape1, Standard_True, Standard_False);
-      ic->ClearPrs(mySimulationShape1);
-      ic->Erase(mySimulationShape2, Standard_True, Standard_False);
-      ic->ClearPrs(mySimulationShape2);
+      ic->Erase( mySimulationShape1, Standard_True, Standard_False );
+      ic->ClearPrs( mySimulationShape1 );
+      ic->Erase( mySimulationShape2, Standard_True, Standard_False );
+      ic->ClearPrs( mySimulationShape2 );
       ic->UpdateCurrentViewer();
     } 
   }
@@ -186,7 +179,7 @@ void EntityGUI::EraseSimulationShape()
 // function : SObjectExist()
 // purpose  :
 //=====================================================================================
-bool EntityGUI::SObjectExist(const _PTR(SObject)& theFatherObject, const char* IOR)
+bool EntityGUI::SObjectExist( const _PTR(SObject)& theFatherObject, const char* IOR )
 {
   SalomeApp_Application* app = getGeometryGUI()->getApp();
   if ( !app ) return false;
@@ -194,20 +187,20 @@ bool EntityGUI::SObjectExist(const _PTR(SObject)& theFatherObject, const char* I
   if ( !appStudy ) return false;
 
   _PTR(Study) aStudy = appStudy->studyDS();
-  _PTR(ChildIterator) it ( aStudy->NewChildIterator(theFatherObject) );
+  _PTR(ChildIterator) it ( aStudy->NewChildIterator( theFatherObject ) );
   _PTR(SObject) RefSO;
   _PTR(GenericAttribute) anAttr;
-  for(; it->More();it->Next()) {
+  for ( ; it->More();it->Next() ) {
     _PTR(SObject) SO ( it->Value() );
-    if(SO->FindAttribute(anAttr, "AttributeIOR")) {
+    if ( SO->FindAttribute( anAttr, "AttributeIOR" ) ) {
       _PTR(AttributeIOR) anIOR ( anAttr  );
-      if(strcmp( anIOR->Value().c_str(), IOR ) == 0)
+      if ( strcmp( anIOR->Value().c_str(), IOR ) == 0 )
        return true;
     }
-    if(SO->ReferencedObject(RefSO)) {
-      if(RefSO->FindAttribute(anAttr, "AttributeIOR")) {
+    if ( SO->ReferencedObject( RefSO ) ) {
+      if ( RefSO->FindAttribute( anAttr, "AttributeIOR" ) ) {
         _PTR(AttributeIOR) anIOR ( anAttr );
-       if(strcmp(anIOR->Value().c_str(), IOR) == 0)
+       if ( strcmp( anIOR->Value().c_str(), IOR ) == 0 )
          return true;
       }
     }
@@ -221,7 +214,9 @@ bool EntityGUI::SObjectExist(const _PTR(SObject)& theFatherObject, const char* I
 //=====================================================================================
 extern "C"
 {
-GEOM_ENTITYGUI_EXPORT
+#ifdef WIN32
+  __declspec( dllexport )
+#endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
     return new EntityGUI( parent );
index a4fd8c0014dd23835e8a4e54fb978b6afa16ff4f..bc401c68c8bbdcff5d864aa92d2bb1f366bbb2c3 100644 (file)
@@ -1,63 +1,61 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : EntityGUI.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : EntityGUI.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
 #ifndef ENTITYGUI_H
 #define ENTITYGUI_H
 
-#include "GEOM_EntityGUI.hxx"
+#include <GEOMGUI.h>
 
-#include "GEOMGUI.h"
+#include <SALOMEDSClient.hxx>
 
-#include "SALOMEDSClient.hxx"
-
-#include <TopoDS_Shape.hxx>
 #include <AIS_Shape.hxx>
 
+class TopoDS_Shape;
+
 //=================================================================================
 // class    : EntityGUI
 // purpose  :
 //=================================================================================
-class GEOM_ENTITYGUI_EXPORT EntityGUI : public GEOMGUI
+class EntityGUI : public GEOMGUI
 {
 public :
-  EntityGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation
+  EntityGUI( GeometryGUI* );
   ~EntityGUI();
 
-  bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent);
+  bool              OnGUIEvent( int, SUIT_Desktop* );
 
-  void DisplaySimulationShape(const TopoDS_Shape& S1, const TopoDS_Shape& S2); 
-  void EraseSimulationShape();
+  void              DisplaySimulationShape( const TopoDS_Shape&, const TopoDS_Shape& ); 
+  void              EraseSimulationShape();
 
   // Methods for sub shapes explode
-  bool SObjectExist(const _PTR(SObject)& theFatherObject, const char* IOR);
+  bool              SObjectExist( const _PTR(SObject)&, const char* );
 
+public:
   // AIS shape used only during topo/geom simulations
   Handle(AIS_Shape) mySimulationShape1;
   Handle(AIS_Shape) mySimulationShape2;
 };
 
-#endif
+#endif // ENTITYGUI_H
diff --git a/src/EntityGUI/EntityGUI.pro b/src/EntityGUI/EntityGUI.pro
new file mode 100644 (file)
index 0000000..4c46d59
--- /dev/null
@@ -0,0 +1,72 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = EntityGUI
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+QT_MT_LIBS = -L$$(QTDIR)/lib -lQtCore -lQtXml -lQtGui -lQtOpenGL
+
+CAS_TKTopAlgo = -L$${CASROOT}/Linux/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo
+
+INCLUDEPATH += $${QT_INCLUDES} $${VTK_INCLUDES} $${CAS_CPPFLAGS} $${PYTHON_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} $${CORBA_INCLUDES} ../GEOMGUI ../DlgRef ../GEOMBase ../OBJECT ../GEOMClient ../GEOMImpl ../GEOMFiltersSelection ../SKETCHER $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lGEOMFiltersSelection -lGEOMBase -lGEOMSketcher -lGEOM $${QT_MT_LIBS} $${CAS_TKTopAlgo} -lTKernel
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += ENTITYGUI_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+HEADERS  = GEOM_EntityGUI.hxx
+
+SOURCES  = EntityGUI.cxx
+SOURCES += EntityGUI_1Spin.cxx
+SOURCES += EntityGUI_2Spin.cxx
+SOURCES += EntityGUI_3Spin.cxx
+SOURCES += EntityGUI_4Spin.cxx
+SOURCES += EntityGUI_SketcherDlg.cxx
+SOURCES += EntityGUI_SubShapeDlg.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
diff --git a/src/EntityGUI/EntityGUI_1Sel_QTD.cxx b/src/EntityGUI/EntityGUI_1Sel_QTD.cxx
deleted file mode 100644 (file)
index be05efc..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_1Sel_QTD.ui'
-**
-** Created: Thu Aug 12 19:03:19 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_1Sel_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_1Sel_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_1Sel_QTD::EntityGUI_1Sel_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_1Sel_QTD" );
-    resize( 329, 112 ); 
-    setCaption( trUtf8( "EntityGUI_1Sel_QTD" ) );
-    EntityGUI_1Sel_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_1Sel_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "Values" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); 
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-    QSpacerItem* spacer = new QSpacerItem( 0, 163, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout3->addItem( spacer, 2, 0 );
-
-    buttonApply = new QPushButton( GroupBox1, "buttonApply" );
-    buttonApply->setText( trUtf8( "Create" ) );
-
-    Layout3->addWidget( buttonApply, 0, 0 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    buttonRedo = new QPushButton( GroupBox1, "buttonRedo" );
-    buttonRedo->setText( trUtf8( "Redo" ) );
-
-    Layout2->addWidget( buttonRedo, 0, 1 );
-
-    buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
-    buttonUndo->setText( trUtf8( "Undo" ) );
-
-    Layout2->addWidget( buttonUndo, 0, 0 );
-
-    Layout3->addLayout( Layout2, 1, 0 );
-
-    Layout4->addLayout( Layout3, 0, 1 );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-    QSpacerItem* spacer_2 = new QSpacerItem( 0, 180, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer_2, 1, 2 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-    LineEdit1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)0, 0, 0, LineEdit1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    Layout4->addLayout( Layout1, 0, 0 );
-
-    GroupBox1Layout->addLayout( Layout4, 0, 0 );
-
-    EntityGUI_1Sel_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_1Sel_QTD::~EntityGUI_1Sel_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/EntityGUI/EntityGUI_1Sel_QTD.h b/src/EntityGUI/EntityGUI_1Sel_QTD.h
deleted file mode 100644 (file)
index 401dddd..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_1Sel_QTD.ui'
-**
-** Created: Fri Jul 30 16:06:00 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef ENTITYGUI_1SEL_QTD_H
-#define ENTITYGUI_1SEL_QTD_H
-
-#include "GEOM_EntityGUI.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-
-class GEOM_ENTITYGUI_EXPORT EntityGUI_1Sel_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    EntityGUI_1Sel_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_1Sel_QTD();
-
-    QGroupBox* GroupBox1;
-    QPushButton* buttonApply;
-    QPushButton* buttonRedo;
-    QPushButton* buttonUndo;
-    QLabel* TextLabel1;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit1;
-
-
-protected:
-    QGridLayout* EntityGUI_1Sel_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout4;
-    QGridLayout* Layout3;
-    QGridLayout* Layout2;
-    QGridLayout* Layout1;
-};
-
-#endif // ENTITYGUI_1SEL_QTD_H
diff --git a/src/EntityGUI/EntityGUI_1Sel_QTD.ui b/src/EntityGUI/EntityGUI_1Sel_QTD.ui
new file mode 100644 (file)
index 0000000..b5af6d1
--- /dev/null
@@ -0,0 +1,126 @@
+<ui version="4.0" >
+ <class>EntityGUI_1Sel_QTD</class>
+ <widget class="QWidget" name="EntityGUI_1Sel_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>402</width>
+    <height>88</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>EntityGUI_1Sel_QTD</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string>Values</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="1" column="3" >
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <widget class="QPushButton" name="buttonUndo" >
+          <property name="text" >
+           <string>Undo</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="buttonRedo" >
+          <property name="text" >
+           <string>Redo</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>3</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3" >
+       <widget class="QPushButton" name="buttonApply" >
+        <property name="text" >
+         <string>Create</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>buttonApply</tabstop>
+  <tabstop>buttonUndo</tabstop>
+  <tabstop>buttonRedo</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/EntityGUI/EntityGUI_1Spin.cxx b/src/EntityGUI/EntityGUI_1Spin.cxx
deleted file mode 100644 (file)
index c8a6296..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : EntityGUI_1Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "EntityGUI_1Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a EntityGUI_1Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-EntityGUI_1Spin::EntityGUI_1Spin(QWidget* parent, const char* name, WFlags fl)
-  :EntityGUI_1Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout1->addWidget(SpinBox_DX, 0, 1);
-
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_1Spin::~EntityGUI_1Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/EntityGUI/EntityGUI_1Spin.h b/src/EntityGUI/EntityGUI_1Spin.h
deleted file mode 100644 (file)
index 5631e0b..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : EntityGUI_1Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef ENTITYGUI_1SPIN_H
-#define ENTITYGUI_1SPIN_H
-
-#include "GEOM_EntityGUI.hxx"
-
-#include "EntityGUI_1Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_ENTITYGUI_EXPORT EntityGUI_1Spin : public EntityGUI_1Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    EntityGUI_1Spin(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~EntityGUI_1Spin();
-
-    DlgRef_SpinBox* SpinBox_DX;
-
-};
-
-#endif // ENTITYGUI_1SPIN_H
diff --git a/src/EntityGUI/EntityGUI_1Spin_QTD.cxx b/src/EntityGUI/EntityGUI_1Spin_QTD.cxx
deleted file mode 100644 (file)
index 98a476c..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_1Spin_QTD.ui'
-**
-** Created: Fri Jul 30 16:05:59 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_1Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_1Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_1Spin_QTD::EntityGUI_1Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_1Spin_QTD" );
-    resize( 255, 112 ); 
-    setCaption( trUtf8( "EntityGUI_1Spin_QTD" ) );
-    EntityGUI_1Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_1Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "Values" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); 
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox1, 0, 1 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 1 );
-
-    Layout4->addLayout( Layout1, 0, 0 );
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    buttonRedo = new QPushButton( GroupBox1, "buttonRedo" );
-    buttonRedo->setText( trUtf8( "Redo" ) );
-
-    Layout2->addWidget( buttonRedo, 0, 1 );
-
-    buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
-    buttonUndo->setText( trUtf8( "Undo" ) );
-
-    Layout2->addWidget( buttonUndo, 0, 0 );
-
-    Layout3->addLayout( Layout2, 1, 0 );
-
-    buttonApply = new QPushButton( GroupBox1, "buttonApply" );
-    buttonApply->setText( trUtf8( "Create" ) );
-
-    Layout3->addWidget( buttonApply, 0, 0 );
-    QSpacerItem* spacer_2 = new QSpacerItem( 0, 40, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout3->addItem( spacer_2, 2, 0 );
-
-    Layout4->addLayout( Layout3, 0, 1 );
-
-    GroupBox1Layout->addLayout( Layout4, 0, 0 );
-
-    EntityGUI_1Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_1Spin_QTD::~EntityGUI_1Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/EntityGUI/EntityGUI_1Spin_QTD.h b/src/EntityGUI/EntityGUI_1Spin_QTD.h
deleted file mode 100644 (file)
index e525552..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_1Spin_QTD.ui'
-**
-** Created: Fri Jul 30 16:05:59 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef ENTITYGUI_1SPIN_QTD_H
-#define ENTITYGUI_1SPIN_QTD_H
-
-#include "GEOM_EntityGUI.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_ENTITYGUI_EXPORT EntityGUI_1Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    EntityGUI_1Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_1Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel1;
-    QSpinBox* SpinBox1;
-    QPushButton* buttonRedo;
-    QPushButton* buttonUndo;
-    QPushButton* buttonApply;
-
-
-protected:
-    QGridLayout* EntityGUI_1Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout4;
-    QGridLayout* Layout1;
-    QGridLayout* Layout3;
-    QGridLayout* Layout2;
-};
-
-#endif // ENTITYGUI_1SPIN_QTD_H
diff --git a/src/EntityGUI/EntityGUI_1Spin_QTD.ui b/src/EntityGUI/EntityGUI_1Spin_QTD.ui
new file mode 100644 (file)
index 0000000..687f962
--- /dev/null
@@ -0,0 +1,108 @@
+<ui version="4.0" >
+ <class>EntityGUI_1Spin_QTD</class>
+ <widget class="QWidget" name="EntityGUI_1Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>268</width>
+    <height>88</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>EntityGUI_1Spin_QTD</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string>Values</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="1" column="2" >
+       <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item row="0" column="1" >
+         <widget class="QPushButton" name="buttonRedo" >
+          <property name="text" >
+           <string>Redo</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0" >
+         <widget class="QPushButton" name="buttonUndo" >
+          <property name="text" >
+           <string>Undo</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QPushButton" name="buttonApply" >
+        <property name="text" >
+         <string>Create</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>buttonApply</tabstop>
+  <tabstop>buttonUndo</tabstop>
+  <tabstop>buttonRedo</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/EntityGUI/EntityGUI_2Spin.cxx b/src/EntityGUI/EntityGUI_2Spin.cxx
deleted file mode 100644 (file)
index 8ed08ec..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : EntityGUI_2Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "EntityGUI_2Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a EntityGUI_2Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-EntityGUI_2Spin::EntityGUI_2Spin(QWidget* parent, const char* name, WFlags fl)
-  :EntityGUI_2Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout1->addWidget(SpinBox_DX, 0, 1);
-
-  SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
-  Layout1->addWidget(SpinBox_DY, 1, 1);
-
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_2Spin::~EntityGUI_2Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/EntityGUI/EntityGUI_2Spin.h b/src/EntityGUI/EntityGUI_2Spin.h
deleted file mode 100644 (file)
index 9d79e47..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : EntityGUI_2Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef ENTITYGUI_2SPIN_H
-#define ENTITYGUI_2SPIN_H
-
-#include "GEOM_EntityGUI.hxx"
-
-#include "EntityGUI_2Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_ENTITYGUI_EXPORT EntityGUI_2Spin : public EntityGUI_2Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    EntityGUI_2Spin(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-    ~EntityGUI_2Spin();
-
-    DlgRef_SpinBox* SpinBox_DX;
-    DlgRef_SpinBox* SpinBox_DY;
-
-};
-
-#endif // ENTITYGUI_2SPIN_H
diff --git a/src/EntityGUI/EntityGUI_2Spin_QTD.cxx b/src/EntityGUI/EntityGUI_2Spin_QTD.cxx
deleted file mode 100644 (file)
index b6f254d..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_2Spin_QTD.ui'
-**
-** Created: Fri Jul 30 16:06:00 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_2Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_2Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_2Spin_QTD::EntityGUI_2Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_2Spin_QTD" );
-    resize( 255, 112 ); 
-    setCaption( trUtf8( "EntityGUI_2Spin_QTD" ) );
-    EntityGUI_2Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_2Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "Values" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); 
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox1, 0, 1 );
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox2, 1, 1 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 1 );
-
-    Layout4->addLayout( Layout1, 0, 0 );
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-    QSpacerItem* spacer_2 = new QSpacerItem( 0, 51, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout3->addItem( spacer_2, 2, 0 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
-    buttonUndo->setText( trUtf8( "Undo" ) );
-
-    Layout2->addWidget( buttonUndo, 0, 0 );
-
-    buttonRedo = new QPushButton( GroupBox1, "buttonRedo" );
-    buttonRedo->setText( trUtf8( "Redo" ) );
-
-    Layout2->addWidget( buttonRedo, 0, 1 );
-
-    Layout3->addLayout( Layout2, 1, 0 );
-
-    buttonApply = new QPushButton( GroupBox1, "buttonApply" );
-    buttonApply->setText( trUtf8( "Create" ) );
-
-    Layout3->addWidget( buttonApply, 0, 0 );
-
-    Layout4->addLayout( Layout3, 0, 1 );
-
-    GroupBox1Layout->addLayout( Layout4, 0, 0 );
-
-    EntityGUI_2Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_2Spin_QTD::~EntityGUI_2Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/EntityGUI/EntityGUI_2Spin_QTD.h b/src/EntityGUI/EntityGUI_2Spin_QTD.h
deleted file mode 100644 (file)
index 718f80e..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_2Spin_QTD.ui'
-**
-** Created: Fri Jul 30 16:06:00 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef ENTITYGUI_2SPIN_QTD_H
-#define ENTITYGUI_2SPIN_QTD_H
-
-#include "GEOM_EntityGUI.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_ENTITYGUI_EXPORT EntityGUI_2Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    EntityGUI_2Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_2Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel2;
-    QLabel* TextLabel1;
-    QSpinBox* SpinBox1;
-    QSpinBox* SpinBox2;
-    QPushButton* buttonUndo;
-    QPushButton* buttonRedo;
-    QPushButton* buttonApply;
-
-
-protected:
-    QGridLayout* EntityGUI_2Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout4;
-    QGridLayout* Layout1;
-    QGridLayout* Layout3;
-    QGridLayout* Layout2;
-};
-
-#endif // ENTITYGUI_2SPIN_QTD_H
diff --git a/src/EntityGUI/EntityGUI_2Spin_QTD.ui b/src/EntityGUI/EntityGUI_2Spin_QTD.ui
new file mode 100644 (file)
index 0000000..f28257d
--- /dev/null
@@ -0,0 +1,130 @@
+<ui version="4.0" >
+ <class>EntityGUI_2Spin_QTD</class>
+ <widget class="QWidget" name="EntityGUI_2Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>264</width>
+    <height>88</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>EntityGUI_2Spin_QTD</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string>Values</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="1" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item row="0" column="0" >
+         <widget class="QPushButton" name="buttonUndo" >
+          <property name="text" >
+           <string>Undo</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" >
+         <widget class="QPushButton" name="buttonRedo" >
+          <property name="text" >
+           <string>Redo</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QPushButton" name="buttonApply" >
+        <property name="text" >
+         <string>Create</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+  <tabstop>buttonApply</tabstop>
+  <tabstop>buttonUndo</tabstop>
+  <tabstop>buttonRedo</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
new file mode 100755 (executable)
index 0000000..134cbd3
--- /dev/null
@@ -0,0 +1,629 @@
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File   : EntityGUI_3DSketcherDlg.cxx
+// Author : DMV, OCN
+//
+
+#include "EntityGUI_3DSketcherDlg.h"
+#include "EntityGUI_Widgets.h"
+#include <QtxDoubleSpinBox.h>
+
+#include <GEOMBase.h>
+#include <GeometryGUI.h>
+#include <GEOMImpl_Types.hxx>
+#include <Precision.hxx>  
+
+#include <DlgRef.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 <BRep_Tool.hxx>
+#include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopoDS.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <BRepBuilderAPI_Transform.hxx>
+#include <BRepBuilderAPI_MakeWire.hxx>
+
+class Locker
+{
+public:
+  Locker( bool& l ) : myLock( l ) { myLock = true;  }
+  ~Locker()                       { myLock = false; }
+private:
+  bool& myLock;
+};
+
+//=================================================================================
+// class    : EntityGUI_3DSketcherDlg()
+// purpose  : Constructs a EntityGUI_3DSketcherDlg which is 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_3DSketcherDlg::EntityGUI_3DSketcherDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                 bool modal, Qt::WindowFlags fl,
+                                                 const double lineWidth )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl ),
+    myGeometryGUI( theGeometryGUI ),
+    myLineWidth( lineWidth )
+{
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_UNDO" ) ) );
+  QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_REDO" ) ) );
+  QPixmap image3( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICO_3DSKETCH" ) ) );
+
+  setWindowTitle( tr( "GEOM_3DSKETCHER_TITLE" ) );
+
+  /***************************************************************/
+
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_3DSKETCHER" ) );
+  mainFrame()->RadioButton1->setIcon( image3 );;
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->close();
+
+  GroupType = new DlgRef_3Radio(centralWidget());
+  GroupType->GroupBox1->setTitle(tr("GEOM_COORDINATES_TYPE"));
+  GroupType->RadioButton1->setText(tr("GEOM_SKETCHER_ABS"));
+  GroupType->RadioButton2->setText(tr("GEOM_SKETCHER_REL"));
+  GroupType->RadioButton3->close();
+
+  Group3Spin = new EntityGUI_3Spin( centralWidget() );
+  Group3Spin->GroupBox1->setTitle( tr( "GEOM_SKETCHER_VALUES" ) );
+  Group3Spin->buttonApply->setText( tr( "GEOM_SKETCHER_APPLY" ) );
+  Group3Spin->buttonUndo->setIcon( image1 );
+  Group3Spin->buttonRedo->setIcon( image2 );
+  Group3Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_X2" ) );
+  Group3Spin->TextLabel2->setText( tr( "GEOM_SKETCHER_Y2" ) );
+  Group3Spin->TextLabel3->setText( tr( "GEOM_SKETCHER_Z2" ) );
+
+  buttonOk()->setText( tr( "GEOM_BUT_END_SKETCH" ) );
+  buttonApply()->setText( tr( "GEOM_BUT_CLOSE_SKETCH" ) );
+  
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupType );
+  layout->addWidget( Group3Spin );
+
+  setHelpFileName( "create_3dsketcher_page.html" );
+
+  resize(0,0);
+  Init();
+}  
+
+
+
+//=================================================================================
+// function : ~EntityGUI_3DSketcherDlg()
+// purpose  : Destroys the object and frees any allocated resources
+//=================================================================================
+EntityGUI_3DSketcherDlg::~EntityGUI_3DSketcherDlg()
+{
+  myGeomGUI->SetActiveDialogBox( 0 );
+}
+
+//=================================================================================
+// function : Init()
+// purpose  :
+//=================================================================================
+void EntityGUI_3DSketcherDlg::Init()
+{
+  myOK = false;
+
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+
+  /* Get setting of step value from file configuration */
+  double step = SUIT_Session::session()->resourceMgr()->doubleValue( "Geometry", "SettingsGeomStep", 100.0 );
+
+  /* min, max, step and decimals for spin boxes */
+  initSpinBox( Group3Spin->SpinBox_DX, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( Group3Spin->SpinBox_DY, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( Group3Spin->SpinBox_DZ, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+
+  /* signals and slots connections */
+  connect( this,           SIGNAL( constructorsClicked( int ) ), this, SLOT( PointClicked( int ) ) );
+
+  connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+
+  connect( Group3Spin->buttonApply,  SIGNAL( clicked() ), this, SLOT( ClickOnAddPoint() ) );
+  connect( Group3Spin->buttonUndo,   SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) );
+  connect( Group3Spin->buttonRedo,   SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) ) ;
+
+  connect( GroupType->RadioButton1,  SIGNAL( clicked() ), this, SLOT( TypeClicked() ) );
+  connect( GroupType->RadioButton2,  SIGNAL( clicked() ), this, SLOT( TypeClicked() ) );
+
+  connect( Group3Spin->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( Group3Spin->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( Group3Spin->SpinBox_DZ, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+
+  connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
+
+  connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
+  connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
+
+  initName( tr( "GEOM_3DSKETCHER" ) );
+
+  UpdateButtonsState();
+  GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
+}
+
+//=================================================================================
+// function : TypeClicked()
+// purpose  : Radio button management
+//=================================================================================
+void EntityGUI_3DSketcherDlg::TypeClicked()
+{
+  bool blocked = Group3Spin->SpinBox_DX->signalsBlocked();
+  Group3Spin->SpinBox_DX->blockSignals(true);
+  Group3Spin->SpinBox_DY->blockSignals(true);
+  Group3Spin->SpinBox_DZ->blockSignals(true);
+  // Get setting of step value from file configuration
+  double x, y, z;
+  GetLastPoints(x, y, z);
+  if ( GroupType->RadioButton1->isChecked() ) {  // XY
+    Group3Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_X2" ) );
+    Group3Spin->TextLabel2->setText( tr( "GEOM_SKETCHER_Y2" ) );
+    Group3Spin->TextLabel3->setText( tr( "GEOM_SKETCHER_Z2" ) );
+    Group3Spin->SpinBox_DX->setValue( x + Group3Spin->SpinBox_DX->value() );
+    Group3Spin->SpinBox_DY->setValue( y + Group3Spin->SpinBox_DY->value() );
+    Group3Spin->SpinBox_DZ->setValue( z + Group3Spin->SpinBox_DZ->value() );
+    Group3Spin->buttonApply->setFocus();
+  } else if ( GroupType->RadioButton2->isChecked() ) {  // DXDY
+    Group3Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_DX2" ) );
+    Group3Spin->TextLabel2->setText( tr( "GEOM_SKETCHER_DY2" ) );
+    Group3Spin->TextLabel3->setText( tr( "GEOM_SKETCHER_DZ2" ) );
+    Group3Spin->SpinBox_DX->setValue( Group3Spin->SpinBox_DX->value() - x );
+    Group3Spin->SpinBox_DY->setValue( Group3Spin->SpinBox_DY->value() - y );
+    Group3Spin->SpinBox_DZ->setValue( Group3Spin->SpinBox_DZ->value() - z );
+    Group3Spin->buttonApply->setFocus();
+  }
+  Group3Spin->SpinBox_DX->blockSignals(blocked);
+  Group3Spin->SpinBox_DY->blockSignals(blocked);
+  Group3Spin->SpinBox_DZ->blockSignals(blocked);
+}
+
+//=================================================================================
+// function : ClickOnAddPoint()
+// purpose  : called when the point coordinates is Applyed
+//=================================================================================
+void EntityGUI_3DSketcherDlg::ClickOnAddPoint()
+{
+  Locker lock( myOK );
+
+  double x, y, z;
+  GetCurrentPoints(x, y, z);
+  myPointsList.append(x);
+  myPointsList.append(y);
+  myPointsList.append(z);
+
+  myRedoList.clear();
+
+  if ( GroupType->RadioButton2->isChecked() ) {
+    Group3Spin->SpinBox_DX->setValue( 0.0 );
+    Group3Spin->SpinBox_DY->setValue( 0.0 );
+    Group3Spin->SpinBox_DZ->setValue( 0.0 );
+  }
+  GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
+  UpdateButtonsState();
+}
+
+//=================================================================================
+// function : UpdateButtonsState()
+// purpose  : 
+//=================================================================================
+void EntityGUI_3DSketcherDlg::UpdateButtonsState()
+{
+  if ( !myPointsList.count() )
+    GroupType->RadioButton1->setChecked( true );
+  GroupType->RadioButton2->setEnabled( myPointsList.count() > 2 );
+  Group3Spin->buttonUndo->setEnabled( myPointsList.count() > 2 );
+  Group3Spin->buttonRedo->setEnabled( myRedoList.count() > 2 );
+}
+
+//=================================================================================
+// function : ClickOnUndo()
+// purpose  :
+//=================================================================================
+void EntityGUI_3DSketcherDlg::ClickOnUndo()
+{
+  if (myPointsList.count() > 2) {
+    double x, y, z;
+    GetLastPoints(x, y, z);
+    myRedoList.append(x);
+    myRedoList.append(y);
+    myRedoList.append(z);
+    myPointsList.removeLast();
+    myPointsList.removeLast();
+    myPointsList.removeLast();
+
+    UpdateButtonsState();
+    GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
+  }
+}
+
+//=================================================================================
+// function : ClickOnRedo()
+// purpose  :
+//=================================================================================
+void EntityGUI_3DSketcherDlg::ClickOnRedo()
+{
+  int count = myRedoList.count();
+  if ( count > 2 ) {
+    myPointsList.append( myRedoList[count-3] );
+    myPointsList.append( myRedoList[count-2] );
+    myPointsList.append( myRedoList[count-1] );
+    myRedoList.removeLast();
+    myRedoList.removeLast();
+    myRedoList.removeLast();
+
+    UpdateButtonsState();
+    GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
+  }
+}
+
+//=================================================================================
+// function : SelectionIntoArgument()
+// purpose  : Called when selection as changed
+//=================================================================================
+void EntityGUI_3DSketcherDlg::SelectionIntoArgument()
+{
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  int nbSel = aSelList.Extent();
+  if ( nbSel == 1 ) {
+    Standard_Boolean aRes = Standard_False;
+    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aRes);
+    if (!CORBA::is_nil(aSelectedObject) && aRes) {
+      TopoDS_Shape aShape;
+      if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE)) { // Explore the shape if its a local selection
+       TColStd_IndexedMapOfInteger aMap;
+       aSelMgr->GetIndexes(aSelList.First(), aMap);
+       if (aMap.Extent() == 1)
+         {
+           int anIndex = aMap(1);
+           GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
+           aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+         }
+      }
+      bool isOk = true;
+      if ( aShape.ShapeType() != TopAbs_VERTEX )
+       isOk = GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_VERTEX);
+      if (isOk) {
+       gp_Pnt aPnt;
+       if ( GEOMBase::VertexToPoint( aShape, aPnt ) ) {
+         // set coordinates to the Spin Boxes
+         double aX, aY, aZ;
+         aX = aPnt.X();
+         aY = aPnt.Y();
+         aZ = aPnt.Z();
+         bool blocked = Group3Spin->SpinBox_DX->signalsBlocked();
+         Group3Spin->SpinBox_DX->blockSignals(true);
+         Group3Spin->SpinBox_DY->blockSignals(true);
+         Group3Spin->SpinBox_DZ->blockSignals(true);
+         if ( GroupType->RadioButton1->isChecked() ) {
+           Group3Spin->SpinBox_DX->setValue( aX );
+           Group3Spin->SpinBox_DY->setValue( aY );
+           Group3Spin->SpinBox_DZ->setValue( aZ );
+         } else if ( GroupType->RadioButton2->isChecked() ) {
+           double x, y, z;
+           GetLastPoints(x, y, z);
+           Group3Spin->SpinBox_DX->setValue( aX - x );
+           Group3Spin->SpinBox_DY->setValue( aY - y );
+           Group3Spin->SpinBox_DZ->setValue( aZ - z );
+         }
+         Group3Spin->SpinBox_DX->blockSignals(blocked);
+         Group3Spin->SpinBox_DY->blockSignals(blocked);
+         Group3Spin->SpinBox_DZ->blockSignals(blocked);
+       }
+      }
+    }
+  }
+  GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
+}
+
+//=================================================================================
+// function : DeactivateActiveDialog()
+// purpose  :
+//=================================================================================
+void EntityGUI_3DSketcherDlg::DeactivateActiveDialog()
+{
+  setEnabled( false );
+  globalSelection();
+  disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
+  myGeomGUI->SetActiveDialogBox( 0 );
+}
+
+
+//=================================================================================
+// function : ActivateThisDialog()
+// purpose  :
+//=================================================================================
+void EntityGUI_3DSketcherDlg::ActivateThisDialog()
+{
+  myGeomGUI->EmitSignalDeactivateDialog();
+  setEnabled( true );
+  myGeomGUI->SetActiveDialogBox( this );
+
+  connect( myGeomGUI->getApp()->selectionMgr(),
+         SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+  GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
+}
+
+
+//=================================================================================
+// function : ValueChangedInSpinBox()
+// purpose  :
+//=================================================================================
+void EntityGUI_3DSketcherDlg::ValueChangedInSpinBox( double newValue )
+{
+  GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
+}
+
+//=================================================================================
+// function : enterEvent()
+// purpose  :
+//=================================================================================
+void EntityGUI_3DSketcherDlg::enterEvent( QEvent* )
+{
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
+    ActivateThisDialog();
+}
+
+//=================================================================================
+// function : createOperation
+// purpose  :
+//=================================================================================
+GEOM::GEOM_IOperations_ptr EntityGUI_3DSketcherDlg::createOperation()
+{
+  return getGeomEngine()->GetICurvesOperations( getStudyId() );
+}
+
+//=================================================================================
+// function : isValid
+// purpose  :
+//=================================================================================
+bool EntityGUI_3DSketcherDlg::isValid( QString& msg )
+{
+  return true;
+}
+
+//=================================================================================
+// function : execute
+// purpose  :
+//=================================================================================
+bool EntityGUI_3DSketcherDlg::execute( ObjectList& objects )
+{
+  GEOM::ListOfDouble_var aCoordsArray = new GEOM::ListOfDouble;
+  if (!myOK || myPointsList.size() == 0)
+    aCoordsArray->length(myPointsList.size()+3);
+  else
+    aCoordsArray->length(myPointsList.size());
+
+  int i = 0;
+  QList<double>::const_iterator it;
+  for(it = myPointsList.begin(); it != myPointsList.end(); ++it ) {
+    aCoordsArray[i] = *it;
+    i++;
+  }
+
+  if (!myOK || myPointsList.size() == 0) {
+    double x, y, z;
+    GetCurrentPoints(x, y, z);
+    aCoordsArray[i] = x;
+    aCoordsArray[i+1] = y;
+    aCoordsArray[i+2] = z;
+  } 
+
+  GEOM::GEOM_Object_var anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->Make3DSketcher( aCoordsArray );
+
+  if ( !anObj->_is_nil() )
+    objects.push_back( anObj._retn() );
+
+  return true;
+}
+
+//=================================================================================
+// function : initSpinBox()
+// purpose  :
+//=================================================================================
+
+void EntityGUI_3DSketcherDlg::initSpinBox( QDoubleSpinBox* spinBox,
+                                        double min,  double max,
+                                        double step, int decimals )
+{
+  spinBox->setDecimals( decimals );
+  spinBox->setRange( min, max );
+  spinBox->setSingleStep( step );
+}
+
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void EntityGUI_3DSketcherDlg::SetDoubleSpinBoxStep( double step )
+{
+  Group3Spin->SpinBox_DX->setSingleStep(step);
+  Group3Spin->SpinBox_DY->setSingleStep(step);
+  Group3Spin->SpinBox_DZ->setSingleStep(step);
+}
+
+//=================================================================================
+// function : ClickOnOk()
+// purpose  :
+//=================================================================================
+void EntityGUI_3DSketcherDlg::ClickOnOk()
+{
+  Locker lock( myOK );
+
+  if ( !onAccept() )
+    return;
+
+  ClickOnCancel();
+}
+
+//=================================================================================
+// function : ClickOnApply()
+// purpose  :
+//=================================================================================
+bool EntityGUI_3DSketcherDlg::ClickOnApply()
+{
+  if (myPointsList.count() > 3) {
+    myPointsList.append(myPointsList[0]);
+    myPointsList.append(myPointsList[1]);
+    myPointsList.append(myPointsList[2]);
+  }
+
+  Locker lock( myOK );
+
+  if ( !onAccept() )
+    return false;
+
+  ClickOnCancel();
+  return true;
+}
+
+//=================================================================================
+// function : GetLastPoints()
+// purpose  : return last points from list
+//=================================================================================
+void EntityGUI_3DSketcherDlg::GetLastPoints(double& x, double& y, double& z)
+{
+  int count = myPointsList.count();
+  x = count > 2 ? myPointsList[count-3] : 0.0;
+  y = count > 2 ? myPointsList[count-2] : 0.0;
+  z = count > 2 ? myPointsList[count-1] : 0.0;
+}
+
+//=================================================================================
+// function : GetCurrentPoints()
+// purpose  : returns current points
+//=================================================================================
+void EntityGUI_3DSketcherDlg::GetCurrentPoints(double& x, double& y, double& z)
+{
+  if ( GroupType->RadioButton1->isChecked() ) {
+    x = Group3Spin->SpinBox_DX->value();
+    y = Group3Spin->SpinBox_DY->value();
+    z = Group3Spin->SpinBox_DZ->value();
+  } else { // if (GroupType->RadioButton2->isChecked())
+    GetLastPoints(x, y, z);
+    x += Group3Spin->SpinBox_DX->value();
+    y += Group3Spin->SpinBox_DY->value();
+    z += Group3Spin->SpinBox_DZ->value();
+  }
+}
+
+//================================================================
+// Function : displayPreview
+// Purpose  : Method for displaying preview of resulting shape
+//            Redefined from GEOMBase_Helper.
+//================================================================
+void EntityGUI_3DSketcherDlg::displayPreview( GEOM::GEOM_Object_ptr object,
+                                             const bool            append,
+                                             const bool            activate,
+                                             const bool            update,
+                                             const double          lineWidth,
+                                             const int             displayMode,
+                                             const int             color )
+{
+  // Set color for preview shape
+  getDisplayer()->SetColor( Quantity_NOC_RED );
+
+  // set width of displayed shape
+  getDisplayer()->SetWidth( (lineWidth == -1)?myLineWidth:lineWidth ); 
+
+  // Disable activation of selection
+  getDisplayer()->SetToActivate( activate );
+
+  // Make a reference to GEOM_Object
+  CORBA::String_var objStr = myGeometryGUI->getApp()->orb()->object_to_string( object );
+  getDisplayer()->SetName( objStr.in() );
+
+  // Create wire from applayed object
+  TopoDS_Shape anApplyedWire, aLastSegment;
+  if ( !createShapes( object, anApplyedWire, aLastSegment ) )
+    return;
+
+  // Build prs
+  SALOME_Prs* aPrs = getDisplayer()->BuildPrs( anApplyedWire );
+  if ( aPrs != 0 && !aPrs->IsNull() )
+    GEOMBase_Helper::displayPreview( aPrs, append, update );
+
+  getDisplayer()->SetColor( Quantity_NOC_VIOLET );
+  aPrs = getDisplayer()->BuildPrs( aLastSegment );
+  if ( aPrs != 0 && !aPrs->IsNull() )
+    GEOMBase_Helper::displayPreview( aPrs, append, update );
+
+  getDisplayer()->UnsetName();
+
+  // Enable activation of displayed objects
+  getDisplayer()->SetToActivate( true );
+}
+
+//================================================================
+// Function : createShapes
+// Purpose  : Create applyed wire, and last segment from entry object
+//================================================================
+bool EntityGUI_3DSketcherDlg::createShapes( GEOM::GEOM_Object_ptr theObject,
+                                           TopoDS_Shape&         theApplyedWire,
+                                           TopoDS_Shape&         theLastSegment )
+{
+  TopoDS_Shape aShape;
+  if ( !GEOMBase::GetShape( theObject, aShape ) ||
+       aShape.ShapeType() != TopAbs_WIRE && aShape.ShapeType() != TopAbs_VERTEX )
+    return false;
+
+  if ( myOK  ) {
+     theApplyedWire = aShape;
+     return true;
+  }
+
+  BRepBuilderAPI_MakeWire aBuilder;
+  TopExp_Explorer anExp( aShape, TopAbs_EDGE );
+  while ( 1 ) {
+    TopoDS_Shape anEdge = anExp.Current();
+    anExp.Next();
+    if ( anExp.More() ) // i.e. non-last edge
+      aBuilder.Add( TopoDS::Edge( anEdge ) );
+    else {
+      theLastSegment = anEdge;
+      break;
+    }
+  }
+
+  if ( aBuilder.IsDone() )
+    theApplyedWire = aBuilder.Shape();
+
+  return true;
+}
diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.h b/src/EntityGUI/EntityGUI_3DSketcherDlg.h
new file mode 100755 (executable)
index 0000000..19cdb32
--- /dev/null
@@ -0,0 +1,111 @@
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File   : EntityGUI_3DSketcherDlg.h
+// Author : DMV, OCN
+//
+
+#ifndef ENTITYGUI_3DSKETCHERDLG_H
+#define ENTITYGUI_3DSKETCHERDLG_H
+
+#include <GEOMBase_Skeleton.h>
+
+class QDoubleSpinBox;
+class EntityGUI_3Spin;
+class DlgRef_3Radio;
+
+#ifndef COORD_MIN
+#  define COORD_MIN -1e+15
+#  define COORD_MAX +1e+15
+#  define MAX_NUMBER 100000
+#  define DBL_DIGITS_DISPLAY 16
+#endif // COORD_MIN
+
+//=================================================================================
+// class    : EntityGUI_Dlg
+// purpose  :
+//=================================================================================
+class EntityGUI_3DSketcherDlg : public GEOMBase_Skeleton
+{ 
+  Q_OBJECT
+
+public:
+  EntityGUI_3DSketcherDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0, const double = 2. );
+  ~EntityGUI_3DSketcherDlg();
+
+protected:
+  void                               initSpinBox( QDoubleSpinBox*, 
+                                                 double, double, double = 0.1, 
+                                                 int = 3 );
+
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+
+  virtual void                       displayPreview( GEOM::GEOM_Object_ptr,
+                                                    const bool = false,
+                                                    const bool = false,
+                                                    const bool = true,
+                                                    const double = -1,
+                                                    const int  = -1,
+                                                    const int  = -1);
+
+  bool                               createShapes( GEOM::GEOM_Object_ptr,
+                                                  TopoDS_Shape&,
+                                                  TopoDS_Shape& );
+
+private:
+  QList<double>                      myPointsList;
+  QList<double>                      myRedoList;
+
+  EntityGUI_3Spin*                   Group3Spin;
+  DlgRef_3Radio*                     GroupType;
+
+  bool                               myOK;
+  double                             myLineWidth;
+  GeometryGUI*                       myGeometryGUI;
+
+private slots:
+  void                               ClickOnOk();
+  void                               ClickOnAddPoint();
+  bool                               ClickOnApply();
+  //  bool                               isSameAsPrevious();
+  void                               UpdateButtonsState();
+  void                               GetLastPoints(double&, double&, double&);
+  void                               GetCurrentPoints(double&, double&, double&);
+
+  void                               ClickOnUndo();
+  void                               ClickOnRedo();
+
+  void                               SelectionIntoArgument();
+  void                               DeactivateActiveDialog();
+  void                               ActivateThisDialog();
+  void                               TypeClicked();
+  void                               ValueChangedInSpinBox( double );
+  void                               SetDoubleSpinBoxStep( double );
+};
+
+#endif // ENTITYGUI_SKETCHERDLG_H
diff --git a/src/EntityGUI/EntityGUI_3Spin.cxx b/src/EntityGUI/EntityGUI_3Spin.cxx
deleted file mode 100644 (file)
index 8a0fb7e..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : EntityGUI_3Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "EntityGUI_3Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a EntityGUI_3Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-EntityGUI_3Spin::EntityGUI_3Spin(QWidget* parent,  const char* name, WFlags fl)
-  :EntityGUI_3Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox3->close(TRUE);
-
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout1->addWidget(SpinBox_DX, 0, 1);
-
-  SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
-  Layout1->addWidget(SpinBox_DY, 1, 1);
-
-  SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ");
-  Layout1->addWidget(SpinBox_DZ, 2, 1);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_3Spin::~EntityGUI_3Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/EntityGUI/EntityGUI_3Spin.h b/src/EntityGUI/EntityGUI_3Spin.h
deleted file mode 100644 (file)
index 4b612bd..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : EntityGUI_3Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef ENTITYGUI_3SPIN_H
-#define ENTITYGUI_3SPIN_H
-
-#include "GEOM_EntityGUI.hxx"
-
-#include "EntityGUI_3Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_ENTITYGUI_EXPORT EntityGUI_3Spin : public EntityGUI_3Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    EntityGUI_3Spin( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_3Spin();
-
-    DlgRef_SpinBox* SpinBox_DX;
-    DlgRef_SpinBox* SpinBox_DY;
-    DlgRef_SpinBox* SpinBox_DZ;
-
-};
-
-#endif // ENTITYGUI_3SPIN_H
diff --git a/src/EntityGUI/EntityGUI_3Spin_QTD.cxx b/src/EntityGUI/EntityGUI_3Spin_QTD.cxx
deleted file mode 100644 (file)
index 98dbf69..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_3Spin_QTD.ui'
-**
-** Created: Fri Jul 30 16:06:00 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_3Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_3Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_3Spin_QTD::EntityGUI_3Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_3Spin_QTD" );
-    resize( 255, 125 ); 
-    setCaption( trUtf8( "EntityGUI_3Spin_QTD" ) );
-    EntityGUI_3Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_3Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "Values" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); 
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-
-    buttonApply = new QPushButton( GroupBox1, "buttonApply" );
-    buttonApply->setText( trUtf8( "Create" ) );
-
-    Layout3->addWidget( buttonApply, 0, 0 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 121, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout3->addItem( spacer, 2, 0 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
-    buttonUndo->setText( trUtf8( "Undo" ) );
-
-    Layout2->addWidget( buttonUndo, 0, 0 );
-
-    buttonRedo = new QPushButton( GroupBox1, "buttonRedo" );
-    buttonRedo->setText( trUtf8( "Redo" ) );
-
-    Layout2->addWidget( buttonRedo, 0, 1 );
-
-    Layout3->addLayout( Layout2, 1, 0 );
-
-    Layout4->addLayout( Layout3, 0, 1 );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox1, 0, 1 );
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox2, 1, 1 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addWidget( TextLabel3, 2, 0 );
-    QSpacerItem* spacer_2 = new QSpacerItem( 0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer_2, 3, 1 );
-
-    SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
-    SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox3, 2, 1 );
-
-    Layout4->addLayout( Layout1, 0, 0 );
-
-    GroupBox1Layout->addLayout( Layout4, 0, 0 );
-
-    EntityGUI_3Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_3Spin_QTD::~EntityGUI_3Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/EntityGUI/EntityGUI_3Spin_QTD.h b/src/EntityGUI/EntityGUI_3Spin_QTD.h
deleted file mode 100644 (file)
index 1235b16..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_3Spin_QTD.ui'
-**
-** Created: Fri Jul 30 16:06:00 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef ENTITYGUI_3SPIN_QTD_H
-#define ENTITYGUI_3SPIN_QTD_H
-
-#include "GEOM_EntityGUI.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_ENTITYGUI_EXPORT EntityGUI_3Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    EntityGUI_3Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_3Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QPushButton* buttonApply;
-    QPushButton* buttonUndo;
-    QPushButton* buttonRedo;
-    QLabel* TextLabel2;
-    QLabel* TextLabel1;
-    QSpinBox* SpinBox1;
-    QSpinBox* SpinBox2;
-    QLabel* TextLabel3;
-    QSpinBox* SpinBox3;
-
-
-protected:
-    QGridLayout* EntityGUI_3Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout4;
-    QGridLayout* Layout3;
-    QGridLayout* Layout2;
-    QGridLayout* Layout1;
-};
-
-#endif // ENTITYGUI_3SPIN_QTD_H
diff --git a/src/EntityGUI/EntityGUI_3Spin_QTD.ui b/src/EntityGUI/EntityGUI_3Spin_QTD.ui
new file mode 100644 (file)
index 0000000..51dd64c
--- /dev/null
@@ -0,0 +1,152 @@
+<ui version="4.0" >
+ <class>EntityGUI_3Spin_QTD</class>
+ <widget class="QWidget" name="EntityGUI_3Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>264</width>
+    <height>114</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>EntityGUI_3Spin_QTD</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string>Values</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ" />
+      </item>
+      <item row="1" column="2" >
+       <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item row="0" column="0" >
+         <widget class="QPushButton" name="buttonUndo" >
+          <property name="text" >
+           <string>Undo</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" >
+         <widget class="QPushButton" name="buttonRedo" >
+          <property name="text" >
+           <string>Redo</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QPushButton" name="buttonApply" >
+        <property name="text" >
+         <string>Create</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+  <tabstop>SpinBox_DZ</tabstop>
+  <tabstop>buttonApply</tabstop>
+  <tabstop>buttonUndo</tabstop>
+  <tabstop>buttonRedo</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/EntityGUI/EntityGUI_4Spin.cxx b/src/EntityGUI/EntityGUI_4Spin.cxx
deleted file mode 100644 (file)
index 76ea42b..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : EntityGUI_4Spin.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#include "EntityGUI_4Spin.h"
-
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
-
-/* 
- *  Constructs a EntityGUI_4Spin which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
- */
-EntityGUI_4Spin::EntityGUI_4Spin(QWidget* parent,  const char* name, WFlags fl)
-  :EntityGUI_4Spin_QTD(parent, name, fl)
-{
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox3->close(TRUE);
-  SpinBox4->close(TRUE);
-
-  SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout1->addWidget(SpinBox_DX, 0, 1);
-
-  SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
-  Layout1->addWidget(SpinBox_DY, 1, 1);
-
-  SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ");
-  Layout1->addWidget(SpinBox_DZ, 2, 1);
-
-  SpinBox_DS = new DlgRef_SpinBox(GroupBox1, "SpinBox_DS");
-  Layout1->addWidget(SpinBox_DS, 3, 1);
-}
-
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_4Spin::~EntityGUI_4Spin()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/src/EntityGUI/EntityGUI_4Spin.h b/src/EntityGUI/EntityGUI_4Spin.h
deleted file mode 100644 (file)
index eeaf196..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : EntityGUI_4Spin.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header: 
-
-#ifndef ENTITYGUI_4SPIN_H
-#define ENTITYGUI_4SPIN_H
-
-#include "GEOM_EntityGUI.hxx"
-
-#include "EntityGUI_4Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
-
-class GEOM_ENTITYGUI_EXPORT EntityGUI_4Spin : public EntityGUI_4Spin_QTD
-{ 
-    Q_OBJECT
-
-public:
-    EntityGUI_4Spin( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_4Spin();
-
-    DlgRef_SpinBox* SpinBox_DX;
-    DlgRef_SpinBox* SpinBox_DY;
-    DlgRef_SpinBox* SpinBox_DZ;
-    DlgRef_SpinBox* SpinBox_DS;
-
-};
-
-#endif // ENTITYGUI_4SPIN_H
diff --git a/src/EntityGUI/EntityGUI_4Spin_QTD.cxx b/src/EntityGUI/EntityGUI_4Spin_QTD.cxx
deleted file mode 100644 (file)
index 8d8debd..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_4Spin_QTD.ui'
-**
-** Created: Fri Jul 30 16:06:00 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_4Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_4Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_4Spin_QTD::EntityGUI_4Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_4Spin_QTD" );
-    resize( 255, 154 ); 
-    setCaption( trUtf8( "EntityGUI_4Spin_QTD" ) );
-    EntityGUI_4Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_4Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "Values" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); 
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    buttonRedo = new QPushButton( GroupBox1, "buttonRedo" );
-    buttonRedo->setText( trUtf8( "Redo" ) );
-
-    Layout2->addWidget( buttonRedo, 0, 1 );
-
-    buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
-    buttonUndo->setText( trUtf8( "Undo" ) );
-
-    Layout2->addWidget( buttonUndo, 0, 0 );
-
-    Layout3->addLayout( Layout2, 1, 0 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 45, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout3->addItem( spacer, 2, 0 );
-
-    buttonApply = new QPushButton( GroupBox1, "buttonApply" );
-    buttonApply->setText( trUtf8( "Create" ) );
-
-    Layout3->addWidget( buttonApply, 0, 0 );
-
-    Layout4->addLayout( Layout3, 0, 1 );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
-    SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox3, 2, 1 );
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox2, 1, 1 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-    QSpacerItem* spacer_2 = new QSpacerItem( 0, 70, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer_2, 4, 1 );
-
-    SpinBox4 = new QSpinBox( GroupBox1, "SpinBox4" );
-    SpinBox4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox4->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox4, 3, 1 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addWidget( TextLabel3, 2, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox1, 0, 1 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout1->addWidget( TextLabel4, 3, 0 );
-
-    Layout4->addLayout( Layout1, 0, 0 );
-
-    GroupBox1Layout->addLayout( Layout4, 0, 0 );
-
-    EntityGUI_4Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_4Spin_QTD::~EntityGUI_4Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/EntityGUI/EntityGUI_4Spin_QTD.h b/src/EntityGUI/EntityGUI_4Spin_QTD.h
deleted file mode 100644 (file)
index 6ec375d..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_4Spin_QTD.ui'
-**
-** Created: Fri Jul 30 16:06:00 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef ENTITYGUI_4SPIN_QTD_H
-#define ENTITYGUI_4SPIN_QTD_H
-
-#include "GEOM_EntityGUI.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QPushButton;
-class QSpinBox;
-
-class GEOM_ENTITYGUI_EXPORT EntityGUI_4Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    EntityGUI_4Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_4Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QPushButton* buttonRedo;
-    QPushButton* buttonUndo;
-    QPushButton* buttonApply;
-    QSpinBox* SpinBox3;
-    QSpinBox* SpinBox2;
-    QLabel* TextLabel2;
-    QSpinBox* SpinBox4;
-    QLabel* TextLabel3;
-    QSpinBox* SpinBox1;
-    QLabel* TextLabel1;
-    QLabel* TextLabel4;
-
-
-protected:
-    QGridLayout* EntityGUI_4Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout4;
-    QGridLayout* Layout3;
-    QGridLayout* Layout2;
-    QGridLayout* Layout1;
-};
-
-#endif // ENTITYGUI_4SPIN_QTD_H
diff --git a/src/EntityGUI/EntityGUI_4Spin_QTD.ui b/src/EntityGUI/EntityGUI_4Spin_QTD.ui
new file mode 100644 (file)
index 0000000..661beab
--- /dev/null
@@ -0,0 +1,174 @@
+<ui version="4.0" >
+ <class>EntityGUI_4Spin_QTD</class>
+ <widget class="QWidget" name="EntityGUI_4Spin_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>264</width>
+    <height>140</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>EntityGUI_4Spin_QTD</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string>Values</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ" />
+      </item>
+      <item row="3" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DS" />
+      </item>
+      <item row="1" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="1" column="2" >
+       <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item row="0" column="1" >
+         <widget class="QPushButton" name="buttonRedo" >
+          <property name="text" >
+           <string>Redo</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0" >
+         <widget class="QPushButton" name="buttonUndo" >
+          <property name="text" >
+           <string>Undo</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QPushButton" name="buttonApply" >
+        <property name="text" >
+         <string>Create</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+  <tabstop>SpinBox_DZ</tabstop>
+  <tabstop>SpinBox_DS</tabstop>
+  <tabstop>buttonApply</tabstop>
+  <tabstop>buttonUndo</tabstop>
+  <tabstop>buttonRedo</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/EntityGUI/EntityGUI_Dir1_QTD.cxx b/src/EntityGUI/EntityGUI_Dir1_QTD.cxx
deleted file mode 100644 (file)
index 9f051b2..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_Dir1_QTD.ui'
-**
-** Created: ven déc 12 11:17:09 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_Dir1_QTD.h"
-
-#include <qvariant.h>
-#include <qbuttongroup.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_Dir1_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_Dir1_QTD::EntityGUI_Dir1_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_Dir1_QTD" );
-    resize( 131, 123 ); 
-    setCaption( trUtf8( "EntityGUI_Dir1_QTD" ) );
-    EntityGUI_Dir1_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_Dir1_QTDLayout"); 
-
-    GroupDir1 = new QButtonGroup( this, "GroupDir1" );
-    GroupDir1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupDir1->sizePolicy().hasHeightForWidth() ) );
-    GroupDir1->setTitle( trUtf8( "Direction" ) );
-    GroupDir1->setColumnLayout(0, Qt::Vertical );
-    GroupDir1->layout()->setSpacing( 6 );
-    GroupDir1->layout()->setMargin( 11 );
-    GroupDir1Layout = new QGridLayout( GroupDir1->layout() );
-    GroupDir1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    RB_Dir12 = new QRadioButton( GroupDir1, "RB_Dir12" );
-    RB_Dir12->setText( trUtf8( "Perpendicular" ) );
-
-    Layout1->addWidget( RB_Dir12, 1, 0 );
-
-    RB_Dir13 = new QRadioButton( GroupDir1, "RB_Dir13" );
-    RB_Dir13->setText( trUtf8( "Tangent" ) );
-
-    Layout1->addWidget( RB_Dir13, 2, 0 );
-
-    RB_Dir11 = new QRadioButton( GroupDir1, "RB_Dir11" );
-    RB_Dir11->setText( trUtf8( "Angle" ) );
-
-    Layout1->addWidget( RB_Dir11, 0, 0 );
-
-    RB_Dir14 = new QRadioButton( GroupDir1, "RB_Dir14" );
-    RB_Dir14->setText( trUtf8( "VX-VY" ) );
-
-    Layout1->addWidget( RB_Dir14, 3, 0 );
-
-    GroupDir1Layout->addLayout( Layout1, 0, 0 );
-
-    EntityGUI_Dir1_QTDLayout->addWidget( GroupDir1, 0, 0 );
-
-    // tab order
-    setTabOrder( RB_Dir11, RB_Dir12 );
-    setTabOrder( RB_Dir12, RB_Dir13 );
-    setTabOrder( RB_Dir13, RB_Dir14 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_Dir1_QTD::~EntityGUI_Dir1_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/EntityGUI/EntityGUI_Dir1_QTD.h b/src/EntityGUI/EntityGUI_Dir1_QTD.h
deleted file mode 100644 (file)
index 6ca2a11..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_Dir1_QTD.ui'
-**
-** Created: ven déc 12 11:17:09 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef ENTITYGUI_DIR1_QTD_H
-#define ENTITYGUI_DIR1_QTD_H
-
-#include "GEOM_EntityGUI.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QButtonGroup;
-class QRadioButton;
-
-class GEOM_ENTITYGUI_EXPORT EntityGUI_Dir1_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    EntityGUI_Dir1_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_Dir1_QTD();
-
-    QButtonGroup* GroupDir1;
-    QRadioButton* RB_Dir12;
-    QRadioButton* RB_Dir13;
-    QRadioButton* RB_Dir11;
-    QRadioButton* RB_Dir14;
-
-
-protected:
-    QGridLayout* EntityGUI_Dir1_QTDLayout;
-    QGridLayout* GroupDir1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // ENTITYGUI_DIR1_QTD_H
diff --git a/src/EntityGUI/EntityGUI_Dir1_QTD.ui b/src/EntityGUI/EntityGUI_Dir1_QTD.ui
new file mode 100644 (file)
index 0000000..009fbaf
--- /dev/null
@@ -0,0 +1,85 @@
+<ui version="4.0" >
+ <class>EntityGUI_Dir1_QTD</class>
+ <widget class="QWidget" name="EntityGUI_Dir1_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>120</width>
+    <height>124</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>EntityGUI_Dir1_QTD</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupDir1" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Direction</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="3" column="0" >
+       <widget class="QRadioButton" name="RB_Dir14" >
+        <property name="text" >
+         <string>VX-VY</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QRadioButton" name="RB_Dir13" >
+        <property name="text" >
+         <string>Tangent</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QRadioButton" name="RB_Dir11" >
+        <property name="text" >
+         <string>Angle</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QRadioButton" name="RB_Dir12" >
+        <property name="text" >
+         <string>Perpendicular</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>RB_Dir11</tabstop>
+  <tabstop>RB_Dir12</tabstop>
+  <tabstop>RB_Dir13</tabstop>
+  <tabstop>RB_Dir14</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/EntityGUI/EntityGUI_Dir2_QTD.cxx b/src/EntityGUI/EntityGUI_Dir2_QTD.cxx
deleted file mode 100644 (file)
index bb50998..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_Dir2_QTD.ui'
-**
-** Created: ven déc 12 11:17:10 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_Dir2_QTD.h"
-
-#include <qvariant.h>
-#include <qbuttongroup.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_Dir2_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_Dir2_QTD::EntityGUI_Dir2_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_Dir2_QTD" );
-    resize( 124, 106 ); 
-    setCaption( trUtf8( "EntityGUI_Dir2_QTD" ) );
-    EntityGUI_Dir2_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_Dir2_QTDLayout"); 
-
-    GroupDir2 = new QButtonGroup( this, "GroupDir2" );
-    GroupDir2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupDir2->sizePolicy().hasHeightForWidth() ) );
-    GroupDir2->setTitle( trUtf8( "Direction" ) );
-    GroupDir2->setColumnLayout(0, Qt::Vertical );
-    GroupDir2->layout()->setSpacing( 6 );
-    GroupDir2->layout()->setMargin( 11 );
-    GroupDir2Layout = new QGridLayout( GroupDir2->layout() );
-    GroupDir2Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    RB_Dir22 = new QRadioButton( GroupDir2, "RB_Dir22" );
-    RB_Dir22->setText( trUtf8( "X" ) );
-
-    Layout1->addWidget( RB_Dir22, 1, 0 );
-
-    RB_Dir23 = new QRadioButton( GroupDir2, "RB_Dir23" );
-    RB_Dir23->setText( trUtf8( "Y" ) );
-
-    Layout1->addWidget( RB_Dir23, 2, 0 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 0 );
-
-    RB_Dir21 = new QRadioButton( GroupDir2, "RB_Dir21" );
-    RB_Dir21->setText( trUtf8( "Length" ) );
-
-    Layout1->addWidget( RB_Dir21, 0, 0 );
-
-    GroupDir2Layout->addLayout( Layout1, 0, 0 );
-
-    EntityGUI_Dir2_QTDLayout->addWidget( GroupDir2, 0, 0 );
-
-    // tab order
-    setTabOrder( RB_Dir21, RB_Dir22 );
-    setTabOrder( RB_Dir22, RB_Dir23 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_Dir2_QTD::~EntityGUI_Dir2_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/EntityGUI/EntityGUI_Dir2_QTD.h b/src/EntityGUI/EntityGUI_Dir2_QTD.h
deleted file mode 100644 (file)
index 17480e8..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_Dir2_QTD.ui'
-**
-** Created: ven déc 12 11:17:09 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef ENTITYGUI_DIR2_QTD_H
-#define ENTITYGUI_DIR2_QTD_H
-
-#include "GEOM_EntityGUI.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QButtonGroup;
-class QRadioButton;
-
-class GEOM_ENTITYGUI_EXPORT EntityGUI_Dir2_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    EntityGUI_Dir2_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_Dir2_QTD();
-
-    QButtonGroup* GroupDir2;
-    QRadioButton* RB_Dir22;
-    QRadioButton* RB_Dir23;
-    QRadioButton* RB_Dir21;
-
-
-protected:
-    QGridLayout* EntityGUI_Dir2_QTDLayout;
-    QGridLayout* GroupDir2Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // ENTITYGUI_DIR2_QTD_H
diff --git a/src/EntityGUI/EntityGUI_Dir2_QTD.ui b/src/EntityGUI/EntityGUI_Dir2_QTD.ui
new file mode 100644 (file)
index 0000000..67d7398
--- /dev/null
@@ -0,0 +1,77 @@
+<ui version="4.0" >
+ <class>EntityGUI_Dir2_QTD</class>
+ <widget class="QWidget" name="EntityGUI_Dir2_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>91</width>
+    <height>100</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>EntityGUI_Dir2_QTD</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupDir2" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>7</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Direction</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="0" >
+       <widget class="QRadioButton" name="RB_Dir21" >
+        <property name="text" >
+         <string>Length</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QRadioButton" name="RB_Dir23" >
+        <property name="text" >
+         <string>Y</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QRadioButton" name="RB_Dir22" >
+        <property name="text" >
+         <string>X</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>RB_Dir21</tabstop>
+  <tabstop>RB_Dir22</tabstop>
+  <tabstop>RB_Dir23</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/EntityGUI/EntityGUI_Point_QTD.cxx b/src/EntityGUI/EntityGUI_Point_QTD.cxx
deleted file mode 100644 (file)
index bc2a482..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_Point_QTD.ui'
-**
-** Created: ven déc 12 11:17:08 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_Point_QTD.h"
-
-#include <qvariant.h>
-#include <qbuttongroup.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_Point_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_Point_QTD::EntityGUI_Point_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_Point_QTD" );
-    resize( 124, 106 ); 
-    setCaption( trUtf8( "EntityGUI_Point_QTD" ) );
-    EntityGUI_Point_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_Point_QTDLayout"); 
-
-    GroupPoint = new QButtonGroup( this, "GroupPoint" );
-    GroupPoint->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupPoint->sizePolicy().hasHeightForWidth() ) );
-    GroupPoint->setTitle( trUtf8( "Point" ) );
-    GroupPoint->setColumnLayout(0, Qt::Vertical );
-    GroupPoint->layout()->setSpacing( 6 );
-    GroupPoint->layout()->setMargin( 11 );
-    GroupPointLayout = new QGridLayout( GroupPoint->layout() );
-    GroupPointLayout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    RB_Point2 = new QRadioButton( GroupPoint, "RB_Point2" );
-    RB_Point2->setText( trUtf8( "Relative" ) );
-
-    Layout1->addWidget( RB_Point2, 1, 0 );
-
-    RB_Point1 = new QRadioButton( GroupPoint, "RB_Point1" );
-    RB_Point1->setText( trUtf8( "Absolute" ) );
-
-    Layout1->addWidget( RB_Point1, 0, 0 );
-
-    RB_Point3 = new QRadioButton( GroupPoint, "RB_Point3" );
-    RB_Point3->setText( trUtf8( "Selection" ) );
-
-    Layout1->addWidget( RB_Point3, 2, 0 );
-
-    GroupPointLayout->addLayout( Layout1, 0, 0 );
-
-    EntityGUI_Point_QTDLayout->addWidget( GroupPoint, 0, 0 );
-
-    // tab order
-    setTabOrder( RB_Point1, RB_Point2 );
-    setTabOrder( RB_Point2, RB_Point3 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_Point_QTD::~EntityGUI_Point_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/EntityGUI/EntityGUI_Point_QTD.h b/src/EntityGUI/EntityGUI_Point_QTD.h
deleted file mode 100644 (file)
index 453b098..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_Point_QTD.ui'
-**
-** Created: ven déc 12 11:17:08 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef ENTITYGUI_POINT_QTD_H
-#define ENTITYGUI_POINT_QTD_H
-
-#include "GEOM_EntityGUI.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QButtonGroup;
-class QRadioButton;
-
-class GEOM_ENTITYGUI_EXPORT EntityGUI_Point_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    EntityGUI_Point_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_Point_QTD();
-
-    QButtonGroup* GroupPoint;
-    QRadioButton* RB_Point2;
-    QRadioButton* RB_Point1;
-    QRadioButton* RB_Point3;
-
-
-protected:
-    QGridLayout* EntityGUI_Point_QTDLayout;
-    QGridLayout* GroupPointLayout;
-    QGridLayout* Layout1;
-};
-
-#endif // ENTITYGUI_POINT_QTD_H
diff --git a/src/EntityGUI/EntityGUI_Point_QTD.ui b/src/EntityGUI/EntityGUI_Point_QTD.ui
new file mode 100644 (file)
index 0000000..a0bc2d6
--- /dev/null
@@ -0,0 +1,77 @@
+<ui version="4.0" >
+ <class>EntityGUI_Point_QTD</class>
+ <widget class="QWidget" name="EntityGUI_Point_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>97</width>
+    <height>100</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>EntityGUI_Point_QTD</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupPoint" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Point</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="1" column="0" >
+       <widget class="QRadioButton" name="RB_Point2" >
+        <property name="text" >
+         <string>Relative</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QRadioButton" name="RB_Point3" >
+        <property name="text" >
+         <string>Selection</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QRadioButton" name="RB_Point1" >
+        <property name="text" >
+         <string>Absolute</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>RB_Point1</tabstop>
+  <tabstop>RB_Point2</tabstop>
+  <tabstop>RB_Point3</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx b/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx
deleted file mode 100644 (file)
index 302635f..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_Skeleton_QTD.ui'
-**
-** Created: Tue Mar 13 14:04:48 2007
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#include "EntityGUI_Skeleton_QTD.h"
-
-#include <qvariant.h>
-#include <qpushbutton.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
-#include <qgroupbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/*
- *  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 )
-    : QDialog( parent, name, modal, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_Skeleton_QTD" );
-    setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
-    EntityGUI_Skeleton_QTDLayout = new QGridLayout( this, 1, 1, 11, 6, "EntityGUI_Skeleton_QTDLayout"); 
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    GroupConstructors = new QButtonGroup( this, "GroupConstructors" );
-    GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) );
-    GroupConstructors->setColumnLayout(0, Qt::Vertical );
-    GroupConstructors->layout()->setSpacing( 6 );
-    GroupConstructors->layout()->setMargin( 11 );
-    GroupConstructorsLayout = new QGridLayout( GroupConstructors->layout() );
-    GroupConstructorsLayout->setAlignment( Qt::AlignTop );
-
-    Layout2 = new QHBoxLayout( 0, 0, 6, "Layout2"); 
-
-    RadioButton1 = new QRadioButton( GroupConstructors, "RadioButton1" );
-    Layout2->addWidget( RadioButton1 );
-
-    RadioButton2 = new QRadioButton( GroupConstructors, "RadioButton2" );
-    Layout2->addWidget( RadioButton2 );
-
-    GroupConstructorsLayout->addLayout( Layout2, 0, 0 );
-
-    Layout1->addWidget( GroupConstructors, 0, 0 );
-
-    GroupDest = new QGroupBox( this, "GroupDest" );
-    GroupDest->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupDest->sizePolicy().hasHeightForWidth() ) );
-    GroupDest->setColumnLayout(0, Qt::Vertical );
-    GroupDest->layout()->setSpacing( 6 );
-    GroupDest->layout()->setMargin( 11 );
-    GroupDestLayout = new QGridLayout( GroupDest->layout() );
-    GroupDestLayout->setAlignment( Qt::AlignTop );
-
-    Layout5 = new QGridLayout( 0, 1, 1, 0, 6, "Layout5"); 
-
-    GroupDest1 = new QButtonGroup( GroupDest, "GroupDest1" );
-    GroupDest1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupDest1->sizePolicy().hasHeightForWidth() ) );
-    GroupDest1->setColumnLayout(0, Qt::Vertical );
-    GroupDest1->layout()->setSpacing( 6 );
-    GroupDest1->layout()->setMargin( 11 );
-    GroupDest1Layout = new QGridLayout( GroupDest1->layout() );
-    GroupDest1Layout->setAlignment( Qt::AlignTop );
-
-    Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); 
-
-    RB_Dest2 = new QRadioButton( GroupDest1, "RB_Dest2" );
-
-    Layout4->addWidget( RB_Dest2, 0, 1 );
-
-    RB_Dest1 = new QRadioButton( GroupDest1, "RB_Dest1" );
-
-    Layout4->addWidget( RB_Dest1, 0, 0 );
-
-    GroupDest1Layout->addLayout( Layout4, 0, 0 );
-
-    Layout5->addMultiCellWidget( GroupDest1, 0, 0, 0, 1 );
-
-    GroupDestLayout->addLayout( Layout5, 0, 0 );
-
-    Layout1->addWidget( GroupDest, 1, 0 );
-
-    GroupButtons = new QGroupBox( this, "GroupButtons" );
-    GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) );
-    GroupButtons->setColumnLayout(0, Qt::Vertical );
-    GroupButtons->layout()->setSpacing( 6 );
-    GroupButtons->layout()->setMargin( 11 );
-    GroupButtonsLayout = new QHBoxLayout( GroupButtons->layout() );
-    GroupButtonsLayout->setAlignment( Qt::AlignTop );
-
-    Layout3 = new QHBoxLayout( 0, 0, 6, "Layout3"); 
-
-    buttonEnd = new QPushButton( GroupButtons, "buttonEnd" );
-    Layout3->addWidget( buttonEnd );
-
-    buttonClose = new QPushButton( GroupButtons, "buttonClose" );
-    Layout3->addWidget( buttonClose );
-    Spacer1 = new QSpacerItem( 91, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
-    Layout3->addItem( Spacer1 );
-
-    buttonCancel = new QPushButton( GroupButtons, "buttonCancel" );
-    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 );
-    setTabOrder( RadioButton2, RB_Dest1 );
-    setTabOrder( RB_Dest1, RB_Dest2 );
-    setTabOrder( RB_Dest2, buttonEnd );
-    setTabOrder( buttonEnd, buttonClose );
-    setTabOrder( buttonClose, buttonCancel );
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-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()
-{
-}
-
diff --git a/src/EntityGUI/EntityGUI_Skeleton_QTD.h b/src/EntityGUI/EntityGUI_Skeleton_QTD.h
deleted file mode 100644 (file)
index 11b95f5..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_Skeleton_QTD.ui'
-**
-** Created: Tue Mar 13 14:04:42 2007
-**      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
-
-#include "GEOM_EntityGUI.hxx"
-
-#include <qvariant.h>
-#include <qdialog.h>
-
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QSpacerItem;
-class QButtonGroup;
-class QRadioButton;
-class QGroupBox;
-class QPushButton;
-
-class GEOM_ENTITYGUI_EXPORT EntityGUI_Skeleton_QTD : public QDialog
-{
-    Q_OBJECT
-
-public:
-    EntityGUI_Skeleton_QTD( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
-    ~EntityGUI_Skeleton_QTD();
-
-    QButtonGroup* GroupConstructors;
-    QRadioButton* RadioButton1;
-    QRadioButton* RadioButton2;
-    QGroupBox* GroupDest;
-    QButtonGroup* GroupDest1;
-    QRadioButton* RB_Dest2;
-    QRadioButton* RB_Dest1;
-    QGroupBox* GroupButtons;
-    QPushButton* buttonEnd;
-    QPushButton* buttonClose;
-    QPushButton* buttonCancel;
-    QPushButton* buttonHelp;
-
-protected:
-    QGridLayout* EntityGUI_Skeleton_QTDLayout;
-    QGridLayout* Layout1;
-    QGridLayout* GroupConstructorsLayout;
-    QHBoxLayout* Layout2;
-    QGridLayout* GroupDestLayout;
-    QGridLayout* Layout5;
-    QGridLayout* GroupDest1Layout;
-    QGridLayout* Layout4;
-    QHBoxLayout* GroupButtonsLayout;
-    QHBoxLayout* Layout3;
-    QSpacerItem* Spacer1;
-
-protected slots:
-    virtual void languageChange();
-
-};
-
-#endif // ENTITYGUI_SKELETON_QTD_H
diff --git a/src/EntityGUI/EntityGUI_Skeleton_QTD.ui b/src/EntityGUI/EntityGUI_Skeleton_QTD.ui
new file mode 100644 (file)
index 0000000..dd25295
--- /dev/null
@@ -0,0 +1,249 @@
+<ui version="4.0" >
+ <class>EntityGUI_Skeleton_QTD</class>
+ <widget class="QWidget" name="EntityGUI_Skeleton_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>363</width>
+    <height>234</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="3" column="0" >
+    <widget class="QGroupBox" name="GroupButtons" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <item>
+       <widget class="QPushButton" name="buttonEnd" >
+        <property name="text" >
+         <string>End Sketch</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="buttonClose" >
+        <property name="text" >
+         <string>Close Sketch</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>91</width>
+          <height>0</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="buttonCancel" >
+        <property name="text" >
+         <string>&amp;Cancel</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="buttonHelp" >
+        <property name="text" >
+         <string>&amp;Help</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QWidget" native="1" name="SkeletonCnt" />
+   </item>
+   <item row="1" column="0" >
+    <widget class="QGroupBox" name="GroupDest" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Destination</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="1" column="0" >
+       <widget class="QWidget" native="1" name="DestCnt" />
+      </item>
+      <item row="0" column="0" >
+       <widget class="QGroupBox" name="GroupDest1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="title" >
+         <string>Type</string>
+        </property>
+        <layout class="QHBoxLayout" >
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <property name="leftMargin" >
+          <number>9</number>
+         </property>
+         <property name="topMargin" >
+          <number>9</number>
+         </property>
+         <property name="rightMargin" >
+          <number>9</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>9</number>
+         </property>
+         <item>
+          <widget class="QRadioButton" name="RB_Dest1" >
+           <property name="text" >
+            <string>Point</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QRadioButton" name="RB_Dest2" >
+           <property name="text" >
+            <string>Direction</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupConstructors" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Element Type</string>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <item>
+       <widget class="QRadioButton" name="RadioButton1" >
+        <property name="text" >
+         <string>Segment</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="RadioButton2" >
+        <property name="text" >
+         <string>Arc</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>buttonEnd</tabstop>
+  <tabstop>buttonClose</tabstop>
+  <tabstop>buttonCancel</tabstop>
+  <tabstop>buttonHelp</tabstop>
+  <tabstop>RadioButton1</tabstop>
+  <tabstop>RadioButton2</tabstop>
+  <tabstop>RB_Dest1</tabstop>
+  <tabstop>RB_Dest2</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
index 2e0446a184fc0dcac84f82d69224ec662cc8e67f..7f07b966f185a13c9f41b1b84fc7551dfd247c32 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : EntityGUI_SketcherDlg.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//
-//  File   : EntityGUI_SketcherDlg.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "EntityGUI_SketcherDlg.h"
-#include "Sketcher_Profile.hxx"
-#include "GEOM_Displayer.h"
-#include "GEOMBase.h"
+#include "EntityGUI_Widgets.h"
+#include <QtxDoubleSpinBox.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 <GEOMBase.h>
+#include <GeometryGUI.h>
+#include <GEOMImpl_Types.hxx>
 
-#include <qpushbutton.h>
-#include <qlabel.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 <QKeyEvent>
 
 #include <BRep_Tool.hxx>
 #include <TopExp.hxx>
 #include <TopoDS.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <Sketcher_Profile.hxx>
 
 //=================================================================================
 // class    : EntityGUI_SketcherDlg()
@@ -63,177 +57,168 @@ 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,
-                                            const double lineWidth)
-  :EntityGUI_Skeleton_QTD(parent, name, modal, WStyle_Customize |
-                          WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose),
-   myIsAllAdded( false ),
-   GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
-   myGeometryGUI( GUI ),
-   myLineWidth( lineWidth )
+EntityGUI_SketcherDlg::EntityGUI_SketcherDlg( GeometryGUI* GUI, QWidget* parent,
+                                             bool modal, Qt::WindowFlags fl,
+                                             const double lineWidth )
+  : QDialog( parent, fl ),
+    myIsAllAdded( false ),
+    myIsApply( false ),
+    GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
+    myGeometryGUI( GUI ),
+    myLineWidth( lineWidth )
 {
+  setModal( modal );
+  setAttribute( Qt::WA_DeleteOnClose );
+
   myGeometryGUI->SetActiveDialogBox(this);
 
-  if ( !name ) setName("EntityGUI_SketcherDlg");
+  MainWidget = new EntityGUI_Skeleton( this );
+  QVBoxLayout* topLayout = new QVBoxLayout( this );
+  topLayout->setMargin( 9 ); topLayout->setSpacing( 6 );
+  topLayout->addWidget( MainWidget );
 
-  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"));
+  MainWidget->buttonCancel->setText( tr( "GEOM_BUT_CANCEL" ) );
+  MainWidget->buttonEnd->setText( tr( "GEOM_BUT_END_SKETCH" ) );
+  MainWidget->buttonClose->setText( tr( "GEOM_BUT_CLOSE_SKETCH" ) );
+  MainWidget->buttonHelp->setText( tr( "GEOM_BUT_HELP" ) );
 
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_UNDO")));
-  QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_REDO")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_UNDO" ) ) );
+  QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_REDO" ) ) );
 
-  setCaption(tr("GEOM_SKETCHER_TITLE"));
+  setWindowTitle( tr( "GEOM_SKETCHER_TITLE" ) );
 
-  GroupConstructors->setTitle(tr("GEOM_SKETCHER_EL"));
-  RadioButton1->setText(tr("GEOM_SKETCHER_SEGMENT"));
-  RadioButton2->setText(tr("GEOM_SKETCHER_ARC"));
-  GroupDest->setTitle(tr("GEOM_SKETCHER_DEST"));
-  GroupDest1->setTitle(tr("GEOM_SKETCHER_TYPE"));
-  RB_Dest1->setText(tr("GEOM_SKETCHER_POINT"));
-  RB_Dest2->setText(tr("GEOM_SKETCHER_DIR"));
+  MainWidget->GroupConstructors->setTitle( tr( "GEOM_SKETCHER_EL" ) );
+  MainWidget->RadioButton1->setText( tr( "GEOM_SKETCHER_SEGMENT" ) );
+  MainWidget->RadioButton2->setText( tr( "GEOM_SKETCHER_ARC" ) );
+  MainWidget->GroupDest->setTitle( tr( "GEOM_SKETCHER_DEST" ) );
+  MainWidget->GroupDest1->setTitle( tr( "GEOM_SKETCHER_TYPE" ) );
+  MainWidget->RB_Dest1->setText( tr( "GEOM_SKETCHER_POINT" ) );
+  MainWidget->RB_Dest2->setText( tr( "GEOM_SKETCHER_DIR" ) );
 
   /***************************************************************/
-  GroupPt = new EntityGUI_Point_QTD(GroupDest, "GroupPt");
-  GroupPt->GroupPoint->setTitle(tr("GEOM_SKETCHER_POINT"));
-  GroupPt->RB_Point1->setText(tr("GEOM_SKETCHER_ABS"));
-  GroupPt->RB_Point2->setText(tr("GEOM_SKETCHER_REL"));
-  GroupPt->RB_Point3->setText(tr("GEOM_SKETCHER_SEL"));
-
-  GroupD1 = new EntityGUI_Dir1_QTD(GroupDest, "GroupD1");
-  GroupD1->GroupDir1->setTitle(tr("GEOM_SKETCHER_DIR"));
-  GroupD1->RB_Dir11->setText(tr("GEOM_SKETCHER_ANGLE"));
-  GroupD1->RB_Dir12->setText(tr("GEOM_SKETCHER_PER"));
-  GroupD1->RB_Dir13->setText(tr("GEOM_SKETCHER_TAN"));
-  GroupD1->RB_Dir14->setText(tr("GEOM_SKETCHER_VXVY"));
-
-  GroupD2 = new EntityGUI_Dir2_QTD(GroupDest, "GroupD2");
-  GroupD2->GroupDir2->setTitle(tr("GEOM_SKETCHER_DIR"));
-  GroupD2->RB_Dir21->setText(tr("GEOM_SKETCHER_LENGTH"));
-  GroupD2->RB_Dir22->setText(tr("GEOM_SKETCHER_X"));
-  GroupD2->RB_Dir23->setText(tr("GEOM_SKETCHER_Y"));
-
-  Group1Sel = new EntityGUI_1Sel_QTD(this, "Group1Sel");
-  Group1Sel->TextLabel1->setText(tr("GEOM_SKETCHER_POINT2"));
-  Group1Sel->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES"));
-  Group1Sel->buttonApply->setText(tr("GEOM_SKETCHER_APPLY"));
-  Group1Sel->PushButton1->setPixmap(image0);
-  Group1Sel->buttonUndo->setPixmap(image1);
-  Group1Sel->buttonRedo->setPixmap(image2);
+  GroupPt = new EntityGUI_Point( MainWidget->DestCnt );
+
+  GroupPt->GroupPoint->setTitle( tr( "GEOM_SKETCHER_POINT" ) );
+  GroupPt->RB_Point1->setText( tr( "GEOM_SKETCHER_ABS" ) );
+  GroupPt->RB_Point2->setText( tr( "GEOM_SKETCHER_REL" ) );
+  GroupPt->RB_Point3->setText( tr( "GEOM_SKETCHER_SEL" ) );
+
+  GroupD1 = new EntityGUI_Dir1( MainWidget->DestCnt );
+
+  GroupD1->GroupDir1->setTitle( tr( "GEOM_SKETCHER_DIR" ) );
+  GroupD1->RB_Dir11->setText( tr( "GEOM_SKETCHER_ANGLE" ) );
+  GroupD1->RB_Dir12->setText( tr( "GEOM_SKETCHER_PER" ) );
+  GroupD1->RB_Dir13->setText( tr( "GEOM_SKETCHER_TAN" ) );
+  GroupD1->RB_Dir14->setText( tr( "GEOM_SKETCHER_VXVY" ) );
+
+  GroupD2 = new EntityGUI_Dir2( MainWidget->DestCnt );
+
+  GroupD2->GroupDir2->setTitle( tr( "GEOM_SKETCHER_DIR" ) );
+  GroupD2->RB_Dir21->setText( tr( "GEOM_SKETCHER_LENGTH" ) );
+  GroupD2->RB_Dir22->setText( tr( "GEOM_SKETCHER_X" ) );
+  GroupD2->RB_Dir23->setText( tr( "GEOM_SKETCHER_Y" ) );
+
+  Group1Sel = new EntityGUI_1Sel( MainWidget->SkeletonCnt );
+
+  Group1Sel->TextLabel1->setText( tr( "GEOM_SKETCHER_POINT2" ) );
+  Group1Sel->GroupBox1->setTitle( tr( "GEOM_SKETCHER_VALUES" ) );
+  Group1Sel->buttonApply->setText( tr( "GEOM_SKETCHER_APPLY" ) );
+  Group1Sel->PushButton1->setIcon( image0 );
+  Group1Sel->buttonUndo->setIcon( image1 );
+  Group1Sel->buttonRedo->setIcon( image2 );
   Group1Sel->LineEdit1->setReadOnly( true );
 
-  Group1Spin = new EntityGUI_1Spin(this, "Group1Spin");
-  Group1Spin->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES"));
-  Group1Spin->buttonApply->setText(tr("GEOM_SKETCHER_APPLY"));
-  Group1Spin->buttonUndo->setPixmap(image1);
-  Group1Spin->buttonRedo->setPixmap(image2);
-  QWidget::setTabOrder(Group1Spin->SpinBox_DX , Group1Spin->buttonApply);
-  QWidget::setTabOrder(Group1Spin->buttonApply, Group1Spin->buttonUndo);
-  QWidget::setTabOrder(Group1Spin->buttonUndo , Group1Spin->buttonRedo);
-
-  Group2Spin = new EntityGUI_2Spin(this, "Group2Spin");
-  Group2Spin->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES"));
-  Group2Spin->buttonApply->setText(tr("GEOM_SKETCHER_APPLY"));
-  Group2Spin->buttonUndo->setPixmap(image1);
-  Group2Spin->buttonRedo->setPixmap(image2);
-  QWidget::setTabOrder(Group2Spin->SpinBox_DX , Group2Spin->SpinBox_DY);
-  QWidget::setTabOrder(Group2Spin->SpinBox_DY , Group2Spin->buttonApply);
-  QWidget::setTabOrder(Group2Spin->buttonApply, Group2Spin->buttonUndo);
-  QWidget::setTabOrder(Group2Spin->buttonUndo , Group2Spin->buttonRedo);
-
-  Group3Spin = new EntityGUI_3Spin(this, "Group3Spin");
-  Group3Spin->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES"));
-  Group3Spin->buttonApply->setText(tr("GEOM_SKETCHER_APPLY"));
-  Group3Spin->buttonUndo->setPixmap(image1);
-  Group3Spin->buttonRedo->setPixmap(image2);
-  QWidget::setTabOrder(Group3Spin->SpinBox_DX , Group3Spin->SpinBox_DY);
-  QWidget::setTabOrder(Group3Spin->SpinBox_DY , Group3Spin->SpinBox_DZ);
-  QWidget::setTabOrder(Group3Spin->SpinBox_DZ , Group3Spin->buttonApply);
-  QWidget::setTabOrder(Group3Spin->buttonApply, Group3Spin->buttonUndo);
-  QWidget::setTabOrder(Group3Spin->buttonUndo , Group3Spin->buttonRedo);
-
-  Group4Spin = new EntityGUI_4Spin(this, "Group4Spin");
-  Group4Spin->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES"));
-  Group4Spin->buttonApply->setText(tr("GEOM_SKETCHER_APPLY"));
-  Group4Spin->buttonUndo->setPixmap(image1);
-  Group4Spin->buttonRedo->setPixmap(image2);
-  QWidget::setTabOrder(Group4Spin->SpinBox_DX , Group4Spin->SpinBox_DY);
-  QWidget::setTabOrder(Group4Spin->SpinBox_DY , Group4Spin->SpinBox_DZ);
-  QWidget::setTabOrder(Group4Spin->SpinBox_DZ , Group4Spin->SpinBox_DS);
-  QWidget::setTabOrder(Group4Spin->SpinBox_DS , Group4Spin->buttonApply);
-  QWidget::setTabOrder(Group4Spin->buttonApply, Group4Spin->buttonUndo);
-  QWidget::setTabOrder(Group4Spin->buttonUndo , Group4Spin->buttonRedo);
-
-  Layout5->addMultiCellWidget(GroupPt, 1, 1, 0, 1);
-  Layout5->addWidget(GroupD1, 1, 0);
-  Layout5->addWidget(GroupD2, 1, 1);
-
-  Layout1->addWidget(Group1Sel, 2, 0);
-  Layout1->addWidget(Group1Spin, 2, 0);
-  Layout1->addWidget(Group2Spin, 2, 0);
-  Layout1->addWidget(Group3Spin, 2, 0);
-  Layout1->addWidget(Group4Spin, 2, 0);
+  Group1Spin = new EntityGUI_1Spin( MainWidget->SkeletonCnt );
+  Group1Spin->GroupBox1->setTitle( tr( "GEOM_SKETCHER_VALUES" ) );
+  Group1Spin->buttonApply->setText( tr( "GEOM_SKETCHER_APPLY" ) );
+  Group1Spin->buttonUndo->setIcon( image1 );
+  Group1Spin->buttonRedo->setIcon( image2 );
+
+  Group2Spin = new EntityGUI_2Spin( MainWidget->SkeletonCnt );
+  Group2Spin->GroupBox1->setTitle( tr( "GEOM_SKETCHER_VALUES" ) );
+  Group2Spin->buttonApply->setText( tr( "GEOM_SKETCHER_APPLY" ) );
+  Group2Spin->buttonUndo->setIcon( image1 );
+  Group2Spin->buttonRedo->setIcon( image2 );
+
+  Group3Spin = new EntityGUI_3Spin( MainWidget->SkeletonCnt );
+  Group3Spin->GroupBox1->setTitle( tr( "GEOM_SKETCHER_VALUES" ) );
+  Group3Spin->buttonApply->setText( tr( "GEOM_SKETCHER_APPLY" ) );
+  Group3Spin->buttonUndo->setIcon( image1 );
+  Group3Spin->buttonRedo->setIcon( image2 );
+
+  Group4Spin = new EntityGUI_4Spin( MainWidget->SkeletonCnt );
+  Group4Spin->GroupBox1->setTitle( tr( "GEOM_SKETCHER_VALUES" ) );
+  Group4Spin->buttonApply->setText( tr( "GEOM_SKETCHER_APPLY" ) );
+  Group4Spin->buttonUndo->setIcon( image1 );
+  Group4Spin->buttonRedo->setIcon( image2 );
+
+  QGridLayout* DestCntLayout = new QGridLayout( MainWidget->DestCnt );
+  DestCntLayout->setMargin( 0 ); DestCntLayout->setSpacing( 6 );
+  DestCntLayout->addWidget( GroupPt, 0, 0, 1, 2 );
+  DestCntLayout->addWidget( GroupD1, 1, 0 );
+  DestCntLayout->addWidget( GroupD2, 1, 1 );
+
+  QVBoxLayout* SkeletonCntlayout = new QVBoxLayout( MainWidget->SkeletonCnt );
+  SkeletonCntlayout->setMargin( 0 ); SkeletonCntlayout->setSpacing( 6 );
+  SkeletonCntlayout->addWidget( Group1Sel,  0, 0 );
+  SkeletonCntlayout->addWidget( Group1Spin, 0, 0 );
+  SkeletonCntlayout->addWidget( Group2Spin, 0, 0 );
+  SkeletonCntlayout->addWidget( Group3Spin, 0, 0 );
+  SkeletonCntlayout->addWidget( Group4Spin, 0, 0 );
   /***************************************************************/
 
-  /* signals and slots connections */
-  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()));
-  connect(Group1Sel->buttonRedo, SIGNAL(clicked()), this, SLOT(ClickOnRedo()));
-  connect(Group1Spin->buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-  connect(Group1Spin->buttonUndo, SIGNAL(clicked()), this, SLOT(ClickOnUndo()));
-  connect(Group1Spin->buttonRedo, SIGNAL(clicked()), this, SLOT(ClickOnRedo()));
-  connect(Group2Spin->buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-  connect(Group2Spin->buttonUndo, SIGNAL(clicked()), this, SLOT(ClickOnUndo()));
-  connect(Group2Spin->buttonRedo, SIGNAL(clicked()), this, SLOT(ClickOnRedo()));
-  connect(Group3Spin->buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-  connect(Group3Spin->buttonUndo, SIGNAL(clicked()), this, SLOT(ClickOnUndo()));
-  connect(Group3Spin->buttonRedo, SIGNAL(clicked()), this, SLOT(ClickOnRedo()));
-  connect(Group4Spin->buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-  connect(Group4Spin->buttonUndo, SIGNAL(clicked()), this, SLOT(ClickOnUndo()));
-  connect(Group4Spin->buttonRedo, SIGNAL(clicked()), this, SLOT(ClickOnRedo()));
-
-  connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(TypeClicked(int)));
-  connect(GroupDest1, SIGNAL(clicked(int)), this, SLOT(DestClicked(int)));
-  connect(GroupPt->GroupPoint, SIGNAL(clicked(int)), this, SLOT(PointClicked(int)));
-  connect(GroupD1->GroupDir1, SIGNAL(clicked(int)), this, SLOT(Dir1Clicked(int)));
-  connect(GroupD2->GroupDir2, SIGNAL(clicked(int)), this, SLOT(Dir2Clicked(int)));
-
-  connect(Group1Sel->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group1Sel->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-
-  connect(Group1Spin->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(Group2Spin->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(Group2Spin->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(Group3Spin->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(Group3Spin->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(Group3Spin->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(Group4Spin->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(Group4Spin->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(Group4Spin->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(Group4Spin->SpinBox_DS, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-
-  connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), Group1Spin->SpinBox_DX, SLOT(SetStep(double)));
-  connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), Group2Spin->SpinBox_DX, SLOT(SetStep(double)));
-  connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), Group2Spin->SpinBox_DY, SLOT(SetStep(double)));
-  connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), Group3Spin->SpinBox_DX, SLOT(SetStep(double)));
-  connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), Group3Spin->SpinBox_DY, SLOT(SetStep(double)));
-  connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), Group3Spin->SpinBox_DZ, SLOT(SetStep(double)));
-  connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), Group4Spin->SpinBox_DX, SLOT(SetStep(double)));
-  connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), Group4Spin->SpinBox_DY, SLOT(SetStep(double)));
-  connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), Group4Spin->SpinBox_DZ, SLOT(SetStep(double)));
-  connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), Group4Spin->SpinBox_DS, SLOT(SetStep(double)));
-
-  connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
-  connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
+  QButtonGroup* ButtonGroup = new QButtonGroup( this );
+  ButtonGroup->addButton( MainWidget->RB_Dest1, 1 );
+  ButtonGroup->addButton( MainWidget->RB_Dest2, 0 );
 
+  /* signals and slots connections */
+  connect( MainWidget->buttonEnd,    SIGNAL( clicked() ), this, SLOT( ClickOnEnd() ) );
+  connect( MainWidget->buttonClose,  SIGNAL( clicked() ), this, SLOT( ClickOnEnd() ) );
+  connect( MainWidget->buttonCancel, SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) );
+  connect( MainWidget->buttonHelp,   SIGNAL( clicked() ), this, SLOT( ClickOnHelp() ) );
+
+  connect( Group1Sel->buttonApply,   SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+  connect( Group1Sel->buttonUndo,    SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) );
+  connect( Group1Sel->buttonRedo,    SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) );
+  connect( Group1Spin->buttonApply,  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+  connect( Group1Spin->buttonUndo,   SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) );
+  connect( Group1Spin->buttonRedo,   SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) );
+  connect( Group2Spin->buttonApply,  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+  connect( Group2Spin->buttonUndo,   SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) );
+  connect( Group2Spin->buttonRedo,   SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) );
+  connect( Group3Spin->buttonApply,  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+  connect( Group3Spin->buttonUndo,   SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) );
+  connect( Group3Spin->buttonRedo,   SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) ) ;
+  connect( Group4Spin->buttonApply,  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+  connect( Group4Spin->buttonUndo,   SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) );
+  connect( Group4Spin->buttonRedo,   SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) );
+
+  connect( MainWidget->ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( TypeClicked( int ) ) );
+  connect( ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( DestClicked( int ) ) );
+  connect( GroupPt->ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( PointClicked( int ) ) );
+  connect( GroupD1->ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( Dir1Clicked( int ) ) );
+  connect( GroupD2->ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( Dir2Clicked( int ) ));
+
+  connect( Group1Sel->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( Group1Sel->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+
+  connect( Group1Spin->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( Group2Spin->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( Group2Spin->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( Group3Spin->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( Group3Spin->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( Group3Spin->SpinBox_DZ, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( Group4Spin->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( Group4Spin->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( Group4Spin->SpinBox_DZ, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( Group4Spin->SpinBox_DS, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+
+  connect( myGeometryGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
+
+  connect( myGeometryGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
+  connect( myGeometryGUI, SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
+  
   // install event filter on spin-boxes to provide Apply action on Return pressed
   Group1Spin->SpinBox_DX->installEventFilter(this);
   Group2Spin->SpinBox_DX->installEventFilter(this);
@@ -249,6 +234,7 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent,
   Init();
 }
 
+
 //=================================================================================
 // function : ~EntityGUI_SketcherDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -258,6 +244,7 @@ EntityGUI_SketcherDlg::~EntityGUI_SketcherDlg()
   myGeometryGUI->SetActiveDialogBox( 0 );
 }
 
+
 //=================================================================================
 // function : eventFilter()
 // purpose  : event filter for spin-boxes to provide Apply action on Return pressed
@@ -266,7 +253,7 @@ bool EntityGUI_SketcherDlg::eventFilter (QObject* object, QEvent* event)
 {
   if (event->type() == QEvent::KeyPress) {
     QKeyEvent* ke = (QKeyEvent*)event;
-    if (ke->key() == Key_Return) {
+    if (ke->key() == Qt::Key_Return) {
       if (object == Group1Spin->SpinBox_DX) {
         Group1Spin->buttonApply->animateClick();
         return true;
@@ -289,17 +276,9 @@ bool EntityGUI_SketcherDlg::eventFilter (QObject* object, QEvent* event)
     }
   }
 
-  if (event->type() == QEvent::KeyRelease) {
-    // NPAL16010 (Sketcher Apply non available if only one line is modified)
-    // To have Apply active as soon as value text changed
-    QString s = ((QtxDblSpinBox*) object)->text();
-    bool ok;
-    double newVal = s.toDouble( &ok );
-    if ( ok )
-      ValueChangedInSpinBox( newVal );
-  }
+  // Fix of the NPAL16010 bug is removed, because it's not actual with the Qt-4.x
 
-  return EntityGUI_Skeleton_QTD::eventFilter(object, event);
+  return QDialog::eventFilter(object, event);
 }
 
 
@@ -328,29 +307,29 @@ void EntityGUI_SketcherDlg::Init()
   double step = SUIT_Session::session()->resourceMgr()->doubleValue( "Geometry", "SettingsGeomStep", 100.0 );
 
   /* min, max, step and decimals for spin boxes */
-  Group1Spin->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  Group2Spin->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  Group2Spin->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  Group3Spin->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  Group3Spin->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  Group3Spin->SpinBox_DZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  Group4Spin->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, 0.1, DBL_DIGITS_DISPLAY);
-  Group4Spin->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, 0.1, DBL_DIGITS_DISPLAY);
-  Group4Spin->SpinBox_DZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  Group4Spin->SpinBox_DS->RangeStepAndValidator(COORD_MIN, COORD_MAX, 5., DBL_DIGITS_DISPLAY);
+  initSpinBox( Group1Spin->SpinBox_DX, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( Group2Spin->SpinBox_DX, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( Group2Spin->SpinBox_DY, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( Group3Spin->SpinBox_DX, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( Group3Spin->SpinBox_DY, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( Group3Spin->SpinBox_DZ, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( Group4Spin->SpinBox_DX, COORD_MIN, COORD_MAX, 0.1, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( Group4Spin->SpinBox_DY, COORD_MIN, COORD_MAX, 0.1, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( Group4Spin->SpinBox_DZ, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( Group4Spin->SpinBox_DS, COORD_MIN, COORD_MAX, 5., 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
 
   /* displays Dialog */
-  GroupConstructors->setEnabled(false);
-  GroupDest1->setEnabled(false);
-  setEnabledUndo(false);
-  setEnabledRedo(false);
+  MainWidget->GroupConstructors->setEnabled( false );
+  MainWidget->GroupDest1->setEnabled( false );
+  setEnabledUndo( false );
+  setEnabledRedo( false );
 
-  RadioButton1->setChecked(true);
+  MainWidget->RadioButton1->setChecked( true );
 
   resize( 0, 0 );
-  TypeClicked(0);
+  TypeClicked( 0 );
 
-  GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
+  GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
 }
 
 
@@ -360,7 +339,7 @@ void EntityGUI_SketcherDlg::Init()
 //=================================================================================
 void EntityGUI_SketcherDlg::InitClick()
 {
-  disconnect(myGeometryGUI->getApp()->selectionMgr(), 0, this, 0);
+  disconnect( myGeometryGUI->getApp()->selectionMgr(), 0, this, 0 );
 
   Group1Sel->hide();
   Group1Spin->hide();
@@ -368,7 +347,7 @@ void EntityGUI_SketcherDlg::InitClick()
   Group3Spin->hide();
   Group4Spin->hide();
 
-  resize(0, 0);
+  resize( 0, 0 );
 }
 
 
@@ -376,22 +355,20 @@ void EntityGUI_SketcherDlg::InitClick()
 // function : TypeClicked()
 // purpose  : Radio button management
 //=================================================================================
-void EntityGUI_SketcherDlg::TypeClicked(int constructorId)
+void EntityGUI_SketcherDlg::TypeClicked( int constructorId )
 {
   myConstructorId = constructorId;
-  if ( myConstructorId == 0 )     // SEGMENT
-  {
-    GroupD2->setEnabled(true);
-    RB_Dest1->setEnabled(true);
-    RB_Dest1->setChecked(true);
-    DestClicked(1);
+  if ( myConstructorId == 0 ) {    // SEGMENT
+    GroupD2->setEnabled( true );
+    MainWidget->RB_Dest1->setEnabled( true );
+    MainWidget->RB_Dest1->setChecked( true );
+    DestClicked( 1 );
   }
-  else if (  myConstructorId == 1 ) // ARC
-  {
-    GroupD2->setEnabled(false);
-    RB_Dest1->setEnabled(false);
-    RB_Dest2->setChecked(true);
-    DestClicked(0);
+  else if (  myConstructorId == 1 ) { // ARC
+    GroupD2->setEnabled( false );
+    MainWidget->RB_Dest1->setEnabled( false );
+    MainWidget->RB_Dest2->setChecked( true );
+    DestClicked( 0 );
   }
 }
 
@@ -406,18 +383,18 @@ void EntityGUI_SketcherDlg::DestClicked( int constructorId )
   GroupD1->hide();
   GroupD2->hide();
 
-  if ( constructorId == 1 )
-  {  // Point
-    GroupPt->RB_Point1->setChecked(true);
+  if ( constructorId == 1 ) {
+    // Point
+    GroupPt->RB_Point1->setChecked( true );
     GroupPt->show();
-    PointClicked(1);  // XY
+    PointClicked( 1 );  // XY
   }
-  else if (  constructorId == 0 )
-  {  // Direction
-    GroupD1->RB_Dir11->setChecked(true);
+  else if (  constructorId == 0 ) {
+    // Direction
+    GroupD1->RB_Dir11->setChecked( true );
     GroupD1->show();
     GroupD2->show();
-    Dir1Clicked(2);  // Angle
+    Dir1Clicked( 2 );  // Angle
   }
 }
 
@@ -426,53 +403,49 @@ void EntityGUI_SketcherDlg::DestClicked( int constructorId )
 // function : PointClicked()
 // purpose  : Radio button management
 //=================================================================================
-void EntityGUI_SketcherDlg::PointClicked(int constructorId)
+void EntityGUI_SketcherDlg::PointClicked( int constructorId )
 {
   InitClick();
 
   // Get setting of step value from file configuration
-  double step = SUIT_Session::session()->resourceMgr()->doubleValue("Geometry", "SettingsGeomStep", 100.0);
+  double step = SUIT_Session::session()->resourceMgr()->doubleValue( "Geometry", "SettingsGeomStep", 100.0 );
 
-  if ( myConstructorId == 0 )
-  {  // SEGMENT
-    if ( constructorId == 1 )
-    {  // XY
+  if ( myConstructorId == 0 ) {  // SEGMENT
+    if ( constructorId == 1 ) {  // XY
       mySketchType = PT_ABS;
-      Group2Spin->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-      Group2Spin->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-      Group2Spin->TextLabel1->setText(tr("GEOM_SKETCHER_X2"));
-      Group2Spin->TextLabel2->setText(tr("GEOM_SKETCHER_Y2"));
+      initSpinBox( Group2Spin->SpinBox_DX, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+      initSpinBox( Group2Spin->SpinBox_DY, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+      Group2Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_X2" ) );
+      Group2Spin->TextLabel2->setText( tr( "GEOM_SKETCHER_Y2" ) );
       myX = 0.0;
-      Group2Spin->SpinBox_DX->SetValue(myX);
+      Group2Spin->SpinBox_DX->setValue( myX );
       myY = 0.0;
-      Group2Spin->SpinBox_DY->SetValue(myY);
+      Group2Spin->SpinBox_DY->setValue( myY );
       Group2Spin->show();
       Group2Spin->buttonApply->setFocus();
 
-      GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
+      GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
     }
-    else if ( constructorId == 0 )
-    {  // DXDY
+    else if ( constructorId == 0 ) {  // DXDY
       mySketchType = PT_RELATIVE;
-      Group2Spin->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-      Group2Spin->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-      Group2Spin->TextLabel1->setText(tr("GEOM_SKETCHER_DX2"));
-      Group2Spin->TextLabel2->setText(tr("GEOM_SKETCHER_DY2"));
+      initSpinBox( Group2Spin->SpinBox_DX, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+      initSpinBox( Group2Spin->SpinBox_DY, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+      Group2Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_DX2" ) );
+      Group2Spin->TextLabel2->setText( tr( "GEOM_SKETCHER_DY2" ) );
       myDX = 0.0;
-      Group2Spin->SpinBox_DX->SetValue(myDX);
+      Group2Spin->SpinBox_DX->setValue( myDX );
       myDY = 0.0;
-      Group2Spin->SpinBox_DY->SetValue(myDY);
+      Group2Spin->SpinBox_DY->setValue( myDY );
       Group2Spin->show();
       Group2Spin->buttonApply->setFocus();
 
-      GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
+      GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
     }
-    else if ( constructorId == 2 )
-    {  // Selection
+    else if ( constructorId == 2 ) {  // Selection
       mySketchType = PT_SEL;
       myEditCurrentArgument = Group1Sel->LineEdit1;
-      connect(myGeometryGUI->getApp()->selectionMgr(),
-             SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+      connect( myGeometryGUI->getApp()->selectionMgr(),
+              SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
       Group1Sel->show();
       Group1Sel->buttonApply->setFocus();
       SelectionIntoArgument();
@@ -485,11 +458,11 @@ void EntityGUI_SketcherDlg::PointClicked(int constructorId)
 // function : Dir1Clicked()
 // purpose  : Radio button management
 //=================================================================================
-void EntityGUI_SketcherDlg::Dir1Clicked(int constructorId)
+void EntityGUI_SketcherDlg::Dir1Clicked( int constructorId )
 {
   myConstructorDirId = constructorId;
-  GroupD2->RB_Dir21->setChecked(true);
-  Dir2Clicked(2);
+  GroupD2->RB_Dir21->setChecked( true );
+  Dir2Clicked( 2 );
 }
 
 
@@ -497,209 +470,183 @@ void EntityGUI_SketcherDlg::Dir1Clicked(int constructorId)
 // function : Dir2Clicked()
 // purpose  : Radio button management
 //=================================================================================
-void EntityGUI_SketcherDlg::Dir2Clicked(int constructorId)
+void EntityGUI_SketcherDlg::Dir2Clicked( int constructorId )
 {
   InitClick();
   myAngle = 0.0;
 
   // Get setting of step value from file configuration
-  double step = SUIT_Session::session()->resourceMgr()->doubleValue("Geometry", "SettingsGeomStep", 100.0);
+  double step = SUIT_Session::session()->resourceMgr()->doubleValue( "Geometry", "SettingsGeomStep", 100.0 );
 
-  if ( myConstructorId == 0 )
-  {  // SEGMENT
+  if ( myConstructorId == 0 ) {  // SEGMENT
     myX = 0.0;
     myY = 0.0;
     myLength = 100.0;
-    if ( myConstructorDirId == 2 )
-    {  // Angle
-      Group2Spin->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, 5., DBL_DIGITS_DISPLAY);
-      Group2Spin->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-      Group2Spin->TextLabel1->setText(tr("GEOM_SKETCHER_ANGLE2"));
-      Group2Spin->SpinBox_DX->SetValue(myAngle);
+    if ( myConstructorDirId == 2 ) {  // Angle
+      initSpinBox( Group2Spin->SpinBox_DX, COORD_MIN, COORD_MAX, 5., 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+      initSpinBox( Group2Spin->SpinBox_DY, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+      Group2Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_ANGLE2" ) );
+      Group2Spin->SpinBox_DX->setValue( myAngle );
       Group2Spin->buttonApply->setFocus();
       Group2Spin->show();
 
-      if ( constructorId == 2 )
-      {  // Length
-                               mySketchType = DIR_ANGLE_LENGTH;
-                               Group2Spin->TextLabel2->setText(tr("GEOM_SKETCHER_LENGTH2"));
-                               Group2Spin->SpinBox_DY->SetValue(myLength);
+      if ( constructorId == 2 ) {  // Length
+       mySketchType = DIR_ANGLE_LENGTH;
+       Group2Spin->TextLabel2->setText( tr( "GEOM_SKETCHER_LENGTH2" ) );
+       Group2Spin->SpinBox_DY->setValue( myLength );
       }
-      else if ( constructorId == 0 )
-      {  // X
-                               mySketchType = DIR_ANGLE_X;
-                               Group2Spin->TextLabel2->setText(tr("GEOM_SKETCHER_X3"));
-                               Group2Spin->SpinBox_DY->SetValue(myX);
+      else if ( constructorId == 0 ) {  // X
+       mySketchType = DIR_ANGLE_X;
+       Group2Spin->TextLabel2->setText( tr( "GEOM_SKETCHER_X3" ) );
+       Group2Spin->SpinBox_DY->setValue( myX );
       }
-      else if ( constructorId == 1 )
-      {  // Y
-                               mySketchType = DIR_ANGLE_Y;
-                               Group2Spin->TextLabel2->setText(tr("GEOM_SKETCHER_Y3"));
-                               Group2Spin->SpinBox_DY->SetValue(myY);
+      else if ( constructorId == 1 ) {  // Y
+       mySketchType = DIR_ANGLE_Y;
+       Group2Spin->TextLabel2->setText( tr( "GEOM_SKETCHER_Y3" ) );
+       Group2Spin->SpinBox_DY->setValue( myY );
       }
     }
-    else if ( myConstructorDirId == 0 )
-    {  // Perpendicular
+    else if ( myConstructorDirId == 0 ) {  // Perpendicular
       Group1Spin->show();
       Group1Spin->buttonApply->setFocus();
 
-      if ( constructorId == 2 )
-      {  // Length
-                               mySketchType = DIR_PER_LENGTH;
-                               Group1Spin->TextLabel1->setText(tr("GEOM_SKETCHER_LENGTH2"));
-                               Group1Spin->SpinBox_DX->SetValue(myLength);
+      if ( constructorId == 2 ) {  // Length
+       mySketchType = DIR_PER_LENGTH;
+       Group1Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_LENGTH2" ) );
+       Group1Spin->SpinBox_DX->setValue( myLength );
       }
-      else if ( constructorId == 0 )
-      {  // X
-                               mySketchType = DIR_PER_X;
-                               Group1Spin->TextLabel1->setText(tr("GEOM_SKETCHER_X3"));
-                               Group1Spin->SpinBox_DX->SetValue(myX);
+      else if ( constructorId == 0 ) {  // X
+       mySketchType = DIR_PER_X;
+       Group1Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_X3" ) );
+       Group1Spin->SpinBox_DX->setValue( myX );
       }
-      else if ( constructorId == 1 )
-      {  // Y
-                               mySketchType = DIR_PER_Y;
-                               Group1Spin->TextLabel1->setText(tr("GEOM_SKETCHER_Y3"));
-                               Group1Spin->SpinBox_DX->SetValue(myY);
+      else if ( constructorId == 1 ) {  // Y
+       mySketchType = DIR_PER_Y;
+       Group1Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_Y3" ) );
+       Group1Spin->SpinBox_DX->setValue( myY );
       }
     }
-    else if ( myConstructorDirId == 1 )
-    {  // Tangent
+    else if ( myConstructorDirId == 1 ) {  // Tangent
       Group1Spin->show();
       Group1Spin->buttonApply->setFocus();
 
-      if ( constructorId == 2 )
-      {  // Length
-                               mySketchType = DIR_TAN_LENGTH;
-                               Group1Spin->TextLabel1->setText(tr("GEOM_SKETCHER_LENGTH2"));
-                               Group1Spin->SpinBox_DX->SetValue(myLength);
+      if ( constructorId == 2 ) {  // Length
+       mySketchType = DIR_TAN_LENGTH;
+       Group1Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_LENGTH2" ) );
+       Group1Spin->SpinBox_DX->setValue( myLength );
       }
-      else if ( constructorId == 0 )
-      {  // X
-                               mySketchType = DIR_TAN_X;
-                               Group1Spin->TextLabel1->setText(tr("GEOM_SKETCHER_X3"));
-                               Group1Spin->SpinBox_DX->SetValue(myX);
+      else if ( constructorId == 0 ) {  // X
+       mySketchType = DIR_TAN_X;
+       Group1Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_X3" ) );
+       Group1Spin->SpinBox_DX->setValue( myX );
       }
-      else if ( constructorId == 1 )
-      {  // Y
-                               mySketchType = DIR_TAN_Y;
-                               Group1Spin->TextLabel1->setText(tr("GEOM_SKETCHER_Y3"));
-                               Group1Spin->SpinBox_DX->SetValue(myY);
+      else if ( constructorId == 1 ) {  // Y
+       mySketchType = DIR_TAN_Y;
+       Group1Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_Y3" ) );
+       Group1Spin->SpinBox_DX->setValue( myY );
       }
     }
-    else if ( myConstructorDirId == 3 )
-    {  // DXDY
-      Group3Spin->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, 0.1, DBL_DIGITS_DISPLAY);
-      Group3Spin->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, 0.1, DBL_DIGITS_DISPLAY);
-      Group3Spin->SpinBox_DZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-      Group3Spin->TextLabel1->setText(tr("GEOM_SKETCHER_VX2"));
-      Group3Spin->TextLabel2->setText(tr("GEOM_SKETCHER_VY2"));
+    else if ( myConstructorDirId == 3 ) {  // DXDY
+      initSpinBox( Group3Spin->SpinBox_DX, COORD_MIN, COORD_MAX, 0.1, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+      initSpinBox( Group3Spin->SpinBox_DY, COORD_MIN, COORD_MAX, 0.1, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+      initSpinBox( Group3Spin->SpinBox_DZ, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+      Group3Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_VX2" ) );
+      Group3Spin->TextLabel2->setText( tr( "GEOM_SKETCHER_VY2" ) );
       myDX = 0.0;
-      Group3Spin->SpinBox_DX->SetValue(myDX);
+      Group3Spin->SpinBox_DX->setValue( myDX );
       myDY = 0.0;
-      Group3Spin->SpinBox_DY->SetValue(myDY);
+      Group3Spin->SpinBox_DY->setValue( myDY );
       Group3Spin->show();
       Group3Spin->buttonApply->setFocus();
 
-      if ( constructorId == 2 )
-      {  // Length
-                               mySketchType = DIR_DXDY_LENGTH;
-                               Group3Spin->TextLabel3->setText(tr("GEOM_SKETCHER_LENGTH2"));
-                               Group3Spin->SpinBox_DZ->SetValue(myLength);
+      if ( constructorId == 2 ) {  // Length
+       mySketchType = DIR_DXDY_LENGTH;
+       Group3Spin->TextLabel3->setText( tr( "GEOM_SKETCHER_LENGTH2" ) );
+       Group3Spin->SpinBox_DZ->setValue( myLength );
       }
-      else if ( constructorId == 0 )
-      {  // X
-                               mySketchType = DIR_DXDY_X;
-                               Group3Spin->TextLabel3->setText(tr("GEOM_SKETCHER_X3"));
-                               Group3Spin->SpinBox_DZ->SetValue(myX);
+      else if ( constructorId == 0 ) { // X
+       mySketchType = DIR_DXDY_X;
+       Group3Spin->TextLabel3->setText( tr( "GEOM_SKETCHER_X3" ) );
+       Group3Spin->SpinBox_DZ->setValue( myX );
       }
-      else if ( constructorId == 1 )
-      {  // Y
-                               mySketchType = DIR_DXDY_Y;
-                               Group3Spin->TextLabel3->setText(tr("GEOM_SKETCHER_Y3"));
-                               Group3Spin->SpinBox_DZ->SetValue(myY);
+      else if ( constructorId == 1 ) {  // Y
+       mySketchType = DIR_DXDY_Y;
+       Group3Spin->TextLabel3->setText( tr( "GEOM_SKETCHER_Y3" ) );
+       Group3Spin->SpinBox_DZ->setValue( myY );
       }
     }
   }
-  else if ( myConstructorId == 1 )
-  {  // ARC
-    if ( myConstructorDirId == 2 )
-    {  // Angle
-      if ( constructorId == 2 )
-      {  // Length
-        mySketchType = DIR_ANGLE_LENGTH;
-        Group3Spin->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, 5., DBL_DIGITS_DISPLAY);
-        Group3Spin->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-        Group3Spin->SpinBox_DZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, 5., DBL_DIGITS_DISPLAY);
-        Group3Spin->TextLabel1->setText(tr("GEOM_SKETCHER_ANGLE2"));
-        Group3Spin->TextLabel2->setText(tr("GEOM_SKETCHER_RADIUS2"));
-        Group3Spin->TextLabel3->setText(tr("GEOM_SKETCHER_ANGLE2"));
-        Group3Spin->SpinBox_DX->SetValue(myAngle);
-        myRadius = 100.0;
-        Group3Spin->SpinBox_DY->SetValue(myRadius);
-        myLength = 30.0;
-        Group3Spin->SpinBox_DZ->SetValue(myLength);
-        Group3Spin->show();
-        Group3Spin->buttonApply->setFocus();
+  else if ( myConstructorId == 1 ) {  // ARC
+    if ( myConstructorDirId == 2 ) {  // Angle
+      if ( constructorId == 2 ) {  // Length
+       mySketchType = DIR_ANGLE_LENGTH;
+       initSpinBox( Group3Spin->SpinBox_DX, COORD_MIN, COORD_MAX, 5., 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+       initSpinBox( Group3Spin->SpinBox_DY, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+       initSpinBox( Group3Spin->SpinBox_DZ, COORD_MIN, COORD_MAX, 5., 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+       Group3Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_ANGLE2" ) );
+       Group3Spin->TextLabel2->setText( tr( "GEOM_SKETCHER_RADIUS2" ) );
+       Group3Spin->TextLabel3->setText( tr( "GEOM_SKETCHER_ANGLE2" ));
+       Group3Spin->SpinBox_DX->setValue( myAngle );
+       myRadius = 100.0;
+       Group3Spin->SpinBox_DY->setValue( myRadius );
+       myLength = 30.0;
+       Group3Spin->SpinBox_DZ->setValue( myLength );
+       Group3Spin->show();
+       Group3Spin->buttonApply->setFocus();
       }
     }
-    else if ( myConstructorDirId == 0 )
-    {  // Perpendicular
-      if ( constructorId == 2 )
-      {  // Length
-        mySketchType = DIR_PER_LENGTH;
-        Group2Spin->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-        Group2Spin->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, 5., DBL_DIGITS_DISPLAY);
-        Group2Spin->TextLabel1->setText(tr("GEOM_SKETCHER_RADIUS2"));
-        Group2Spin->TextLabel2->setText(tr("GEOM_SKETCHER_ANGLE2"));
-        myRadius = 100.0;
-        Group2Spin->SpinBox_DX->SetValue(myRadius);
-        myLength = 30.0;
-        Group2Spin->SpinBox_DY->SetValue(myLength);
-        Group2Spin->show();
-        Group2Spin->buttonApply->setFocus();
+    else if ( myConstructorDirId == 0 ) {  // Perpendicular
+      if ( constructorId == 2 ) {  // Length
+       mySketchType = DIR_PER_LENGTH;
+       initSpinBox( Group2Spin->SpinBox_DY, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+       initSpinBox( Group2Spin->SpinBox_DY, COORD_MIN, COORD_MAX, 5., 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+       Group2Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_RADIUS2" ) );
+       Group2Spin->TextLabel2->setText( tr( "GEOM_SKETCHER_ANGLE2" ) );
+       myRadius = 100.0;
+       Group2Spin->SpinBox_DX->setValue( myRadius );
+       myLength = 30.0;
+       Group2Spin->SpinBox_DY->setValue( myLength );
+       Group2Spin->show();
+       Group2Spin->buttonApply->setFocus();
       }
     }
-    else if ( myConstructorDirId == 1 )
-    {  // Tangent
-      if ( constructorId == 2 )
-      {  // Length
-        mySketchType = DIR_TAN_LENGTH;
-        Group2Spin->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-        Group2Spin->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, 5., DBL_DIGITS_DISPLAY);
-        Group2Spin->TextLabel1->setText(tr("GEOM_SKETCHER_RADIUS2"));
-        Group2Spin->TextLabel2->setText(tr("GEOM_SKETCHER_ANGLE2"));
-        myRadius = 100.0;
-        Group2Spin->SpinBox_DX->SetValue(myRadius);
-        myLength = 30.0;
-        Group2Spin->SpinBox_DY->SetValue(myLength);
-        Group2Spin->show();
-        Group2Spin->buttonApply->setFocus();
+    else if ( myConstructorDirId == 1 ) {  // Tangent
+      if ( constructorId == 2 ) {  // Length
+       mySketchType = DIR_TAN_LENGTH;
+       initSpinBox( Group2Spin->SpinBox_DY, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+       initSpinBox( Group2Spin->SpinBox_DY, COORD_MIN, COORD_MAX, 5., 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+       Group2Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_RADIUS2" ) );
+       Group2Spin->TextLabel2->setText( tr( "GEOM_SKETCHER_ANGLE2" ) );
+       myRadius = 100.0;
+       Group2Spin->SpinBox_DX->setValue( myRadius );
+       myLength = 30.0;
+       Group2Spin->SpinBox_DY->setValue( myLength );
+       Group2Spin->show();
+       Group2Spin->buttonApply->setFocus();
       }
     }
-    else if ( myConstructorDirId == 3 )
-    {  // DXDY
-      if ( constructorId == 2 )
-      {  // Length
-                               mySketchType = DIR_DXDY_LENGTH;
-                               Group4Spin->TextLabel1->setText(tr("GEOM_SKETCHER_VX2"));
-                               Group4Spin->TextLabel2->setText(tr("GEOM_SKETCHER_VY2"));
-                               Group4Spin->TextLabel3->setText(tr("GEOM_SKETCHER_RADIUS2"));
-                               Group4Spin->TextLabel4->setText(tr("GEOM_SKETCHER_ANGLE2"));
-                               myDX = 0.0;
-                               Group4Spin->SpinBox_DX->SetValue(myDX);
-                               myDY = 0.0;
-                               Group4Spin->SpinBox_DY->SetValue(myDY);
-                               myRadius = 100.0;
-                               Group4Spin->SpinBox_DZ->SetValue(myRadius);
-                               myLength = 30.0;
-                               Group4Spin->SpinBox_DS->SetValue(myLength);
-                               Group4Spin->show();
-                               Group4Spin->buttonApply->setFocus();
+    else if ( myConstructorDirId == 3 ) {  // DXDY
+      if ( constructorId == 2 ) {  // Length
+       mySketchType = DIR_DXDY_LENGTH;
+       Group4Spin->TextLabel1->setText( tr( "GEOM_SKETCHER_VX2" ) );
+       Group4Spin->TextLabel2->setText( tr( "GEOM_SKETCHER_VY2" ) );
+       Group4Spin->TextLabel3->setText( tr( "GEOM_SKETCHER_RADIUS2" ) );
+       Group4Spin->TextLabel4->setText( tr( "GEOM_SKETCHER_ANGLE2" ) );
+       myDX = 0.0;
+       Group4Spin->SpinBox_DX->setValue( myDX );
+       myDY = 0.0;
+       Group4Spin->SpinBox_DY->setValue( myDY );
+       myRadius = 100.0;
+       Group4Spin->SpinBox_DZ->setValue( myRadius );
+       myLength = 30.0;
+       Group4Spin->SpinBox_DS->setValue( myLength );
+       Group4Spin->show();
+       Group4Spin->buttonApply->setFocus();
       }
     }
   }
 
-  GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
+  GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
 }
 
 
@@ -719,44 +666,41 @@ void EntityGUI_SketcherDlg::ClickOnCancel()
 //=================================================================================
 void EntityGUI_SketcherDlg::ClickOnEnd()
 {
-  if ( sender() == buttonClose )
-  {
+  if ( sender() == MainWidget->buttonClose ) {
     // Verify validity of commands
-    if ( myCommand.count() <= 2 )
-    {
-      SUIT_MessageBox::error1( SUIT_Session::session()->activeApplication()->desktop(),
-                              tr( "GEOM_ERROR_STATUS" ), tr( "CANNOT_CLOSE" ), tr( "BUT_OK" ) );
+    if ( myCommand.count() <= 2 ) {
+      SUIT_MessageBox::critical( SUIT_Session::session()->activeApplication()->desktop(),
+                                tr( "GEOM_ERROR_STATUS" ), tr( "CANNOT_CLOSE" ), tr( "BUT_OK" ) );
       return;
     }
 
-    QString Command = myCommand.join( "" ) + GetNewCommand();
-    Sketcher_Profile aProfile (Command.ascii());
+    QString Parameters;
+    QString Command = myCommand.join( "" ) + GetNewCommand( Parameters );
+    Sketcher_Profile aProfile( Command.toAscii() );
 
     Command = myCommand.join( "" );
-    aProfile = Sketcher_Profile(Command.ascii());
+    aProfile = Sketcher_Profile( Command.toAscii() );
     TopoDS_Shape myShape;
     if ( aProfile.IsDone() )
       myShape = aProfile.GetShape();
 
-    if(myShape.ShapeType() != TopAbs_VERTEX)
+    if ( myShape.ShapeType() != TopAbs_VERTEX )
       myCommand.append( ":WW" );
   }
-  else
-  {
+  else {
     // PAL16008 (Sketcher Validation should be equal to Apply&Close)
-    if (Group1Spin->buttonApply->isEnabled() && Group1Spin->isVisible() ||
-        Group2Spin->buttonApply->isEnabled() && Group2Spin->isVisible() ||
-        Group3Spin->buttonApply->isEnabled() && Group3Spin->isVisible() ||
-        Group4Spin->buttonApply->isEnabled() && Group4Spin->isVisible() ||
-        Group1Sel ->buttonApply->isEnabled() && Group1Sel->isVisible() )
-    {
+    if ( Group1Spin->buttonApply->isEnabled() && Group1Spin->isVisible() ||
+        Group2Spin->buttonApply->isEnabled() && Group2Spin->isVisible() ||
+        Group3Spin->buttonApply->isEnabled() && Group3Spin->isVisible() ||
+        Group4Spin->buttonApply->isEnabled() && Group4Spin->isVisible() ||
+        Group1Sel ->buttonApply->isEnabled() && Group1Sel->isVisible() ) {
       ClickOnApply();
     }
     myIsAllAdded = true;
   }
 
-  if( myCommand.size() > 2 )
-    if( !onAccept() )
+  if ( myCommand.size() > 2 )
+    if ( !onAccept() )
       return;
 
   close();
@@ -768,36 +712,42 @@ void EntityGUI_SketcherDlg::ClickOnEnd()
 //=================================================================================
 bool EntityGUI_SketcherDlg::ClickOnApply()
 {
-  if (sender() && sender()->inherits("QPushButton"))
-    ((QPushButton*)sender())->setFocus(); // to update value of currently edited spin-box (PAL11948)
+  if ( sender() && sender()->inherits( "QPushButton" ) )
+    ( (QPushButton*)sender() )->setFocus(); // to update value of currently edited spin-box (PAL11948)
 
-  myCommand.append( GetNewCommand() );
+  QString aParameters;
+  myCommand.append( GetNewCommand( aParameters ) );
   mySketchState = NEXT_POINT;
 
   myUndoCommand.clear();
   myUndoCommand.append( "Sketcher" );
 
-  GroupConstructors->setEnabled(true);
-  GroupDest1->setEnabled(true);
-  setEnabledUndo(true);
-  setEnabledRedo(false);
+  myParameters.append( aParameters );
+  myUndoParameters.clear();
+
+  MainWidget->GroupConstructors->setEnabled( true );
+  MainWidget->GroupDest1->setEnabled( true );
+  setEnabledUndo( true );
+  setEnabledRedo( false );
 
-  GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
+  myIsApply = true;
+  GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
+  myIsApply = false;
 
   // Set focus to SpinBox_DX
-  if (sender() == Group1Spin->buttonApply) {
+  if ( sender() == Group1Spin->buttonApply ) {
     (Group1Spin->SpinBox_DX)->setFocus();
     (Group1Spin->SpinBox_DX)->selectAll();
   }
-  else if (sender() == Group2Spin->buttonApply) {
+  else if ( sender() == Group2Spin->buttonApply ) {
     (Group2Spin->SpinBox_DX)->setFocus();
     (Group2Spin->SpinBox_DX)->selectAll();
   }
-  else if (sender() == Group3Spin->buttonApply) {
+  else if ( sender() == Group3Spin->buttonApply ) {
     (Group3Spin->SpinBox_DX)->setFocus();
     (Group3Spin->SpinBox_DX)->selectAll();
   }
-  else if (sender() == Group4Spin->buttonApply) {
+  else if ( sender() == Group4Spin->buttonApply ) {
     (Group4Spin->SpinBox_DX)->setFocus();
     (Group4Spin->SpinBox_DX)->selectAll();
   }
@@ -811,21 +761,21 @@ bool EntityGUI_SketcherDlg::ClickOnApply()
 //=================================================================================
 void EntityGUI_SketcherDlg::ClickOnHelp()
 {
-  LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
-  if (app)
-    app->onHelpContextModule(myGeometryGUI ? app->moduleName(myGeometryGUI->moduleName()) : QString(""), myHelpFileName);
+  LightApp_Application* app = (LightApp_Application*)( SUIT_Session::session()->activeApplication() );
+  if ( app )
+    app->onHelpContextModule( myGeometryGUI ? app->moduleName( myGeometryGUI->moduleName() ) : QString( "" ), myHelpFileName );
   else {
-               QString platform;
+    QString platform;
 #ifdef WIN32
-               platform = "winapplication";
+    platform = "winapplication";
 #else
-               platform = "application";
+    platform = "application";
 #endif
 
-    SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"),
-                          QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
-                          arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName),
-                          QObject::tr("BUT_OK"));
+    SUIT_MessageBox::warning( 0, QObject::tr( "WRN_WARNING" ),
+                             QObject::tr( "EXTERNAL_BROWSER_CANNOT_SHOW_PAGE" ).
+                             arg( app->resourceMgr()->stringValue( "ExternalBrowser", platform ) ).arg( myHelpFileName ),
+                             QObject::tr( "BUT_OK" ) );
   }
 }
 
@@ -838,20 +788,23 @@ void EntityGUI_SketcherDlg::ClickOnUndo()
   myUndoCommand.append( myCommand.last() );
   myCommand.pop_back();
 
-  if(myCommand.count() == 1) {
+  myUndoParameters.append( myParameters.last() );
+  myParameters.pop_back();
+
+  if ( myCommand.count() == 1 ) {
     mySketchState = FIRST_POINT;
 
-    RadioButton1->setChecked(true);
-    TypeClicked(0);
+    MainWidget->RadioButton1->setChecked( true );
+    TypeClicked( 0 );
 
-    GroupConstructors->setEnabled(false);
-    GroupDest1->setEnabled(false);
-    setEnabledUndo(false);
+    MainWidget->GroupConstructors->setEnabled( false );
+    MainWidget->GroupDest1->setEnabled( false );
+    setEnabledUndo( false );
   }
 
-  setEnabledRedo(true);
+  setEnabledRedo( true );
 
-  GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
+  GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
 }
 
 //=================================================================================
@@ -863,42 +816,45 @@ void EntityGUI_SketcherDlg::ClickOnRedo()
   myCommand.append( myUndoCommand.last() );
   myUndoCommand.pop_back();
 
+  myParameters.append( myUndoParameters.last() );
+  myUndoParameters.pop_back();
+
   mySketchState = NEXT_POINT;
 
-  GroupConstructors->setEnabled(true);
-  GroupDest1->setEnabled(true);
-  setEnabledUndo(true);
+  MainWidget->GroupConstructors->setEnabled( true );
+  MainWidget->GroupDest1->setEnabled( true );
+  setEnabledUndo( true );
 
-  if(myUndoCommand.count() == 1)
-    setEnabledRedo(false);
+  if ( myUndoCommand.count() == 1 )
+    setEnabledRedo( false );
 
-  GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
+  GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
 }
 
 //=================================================================================
 // function : setEnabledUndo()
 // purpose  :
 //=================================================================================
-void EntityGUI_SketcherDlg::setEnabledUndo(bool value)
+void EntityGUI_SketcherDlg::setEnabledUndo( bool value )
 {
-  Group1Sel->buttonUndo->setEnabled(value);
-  Group1Spin->buttonUndo->setEnabled(value);
-  Group2Spin->buttonUndo->setEnabled(value);
-  Group3Spin->buttonUndo->setEnabled(value);
-  Group4Spin->buttonUndo->setEnabled(value);
+  Group1Sel->buttonUndo->setEnabled( value );
+  Group1Spin->buttonUndo->setEnabled( value );
+  Group2Spin->buttonUndo->setEnabled( value );
+  Group3Spin->buttonUndo->setEnabled( value );
+  Group4Spin->buttonUndo->setEnabled( value );
 }
 
 //=================================================================================
 // function : setEnabledRedo()
 // purpose  :
 //=================================================================================
-void EntityGUI_SketcherDlg::setEnabledRedo(bool value)
+void EntityGUI_SketcherDlg::setEnabledRedo( bool value )
 {
-  Group1Sel->buttonRedo->setEnabled(value);
-  Group1Spin->buttonRedo->setEnabled(value);
-  Group2Spin->buttonRedo->setEnabled(value);
-  Group3Spin->buttonRedo->setEnabled(value);
-  Group4Spin->buttonRedo->setEnabled(value);
+  Group1Sel->buttonRedo->setEnabled( value );
+  Group1Spin->buttonRedo->setEnabled( value );
+  Group2Spin->buttonRedo->setEnabled( value );
+  Group3Spin->buttonRedo->setEnabled( value );
+  Group4Spin->buttonRedo->setEnabled( value );
 }
 
 //=================================================================================
@@ -907,23 +863,26 @@ void EntityGUI_SketcherDlg::setEnabledRedo(bool value)
 //=================================================================================
 void EntityGUI_SketcherDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   myX = myLastX1;
   myY = myLastY1;
 
-  int nbSel = IObjectCount();
-  if ( nbSel == 1 && myEditCurrentArgument == Group1Sel->LineEdit1 )
-  {
+  LightApp_SelectionMgr* aSelMgr = myGeometryGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  int nbSel = aSelList.Extent();
+  if (nbSel == 1 && myEditCurrentArgument == Group1Sel->LineEdit1) {
     Standard_Boolean aRes = Standard_False;
-    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
-    if ( !CORBA::is_nil( aSelectedObject ) && aRes ) {
+    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aRes);
+    if (!CORBA::is_nil(aSelectedObject) && aRes) {
       TopoDS_Shape aShape;
-      if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_VERTEX ) ) {
+      if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_VERTEX)) {
        gp_Trsf aTrans;
        gp_Ax3 aWPlane = myGeometryGUI->GetWorkingPlane();
 
        aTrans.SetTransformation(aWPlane);
-       BRepBuilderAPI_Transform aTransformation(aShape, aTrans, Standard_False);
+       BRepBuilderAPI_Transform aTransformation (aShape, aTrans, Standard_False);
        aShape = aTransformation.Shape();
 
        gp_Pnt aPnt;
@@ -936,7 +895,7 @@ void EntityGUI_SketcherDlg::SelectionIntoArgument()
     }
   }
 
-  GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
+  GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
 }
 
 
@@ -946,8 +905,7 @@ void EntityGUI_SketcherDlg::SelectionIntoArgument()
 //=================================================================================
 void EntityGUI_SketcherDlg::SetEditCurrentArgument()
 {
-  if ( sender() == Group1Sel->PushButton1 )
-  {
+  if ( sender() == Group1Sel->PushButton1 ) {
     myEditCurrentArgument = Group1Sel->LineEdit1;
     myEditCurrentArgument->setFocus();
   }
@@ -961,17 +919,21 @@ void EntityGUI_SketcherDlg::SetEditCurrentArgument()
 //=================================================================================
 void EntityGUI_SketcherDlg::LineEditReturnPressed()
 {
-  if ( sender() == Group1Sel->LineEdit1 )
-  {
+  if ( sender() == Group1Sel->LineEdit1 ) {
     myEditCurrentArgument = Group1Sel->LineEdit1;
 
-       /* User name of object input management                          */
-       /* If successfull the selection is changed and signal emitted... */
-       /* so SelectionIntoArgument() is automatically called.           */
-       const QString objectUserName = myEditCurrentArgument->text();
-       QWidget* thisWidget = (QWidget*)this;
-       if(GEOMBase::SelectionByNameInDialogs(thisWidget, objectUserName, selectedIO()))
-       myEditCurrentArgument->setText(objectUserName);
+    /* User name of object input management                          */
+    /* If successfull the selection is changed and signal emitted... */
+    /* so SelectionIntoArgument() is automatically called.           */
+    const QString objectUserName = myEditCurrentArgument->text();
+    QWidget* thisWidget = (QWidget*)this;
+
+    LightApp_SelectionMgr* aSelMgr = myGeometryGUI->getApp()->selectionMgr();
+    SALOME_ListIO aSelList;
+    aSelMgr->selectedObjects(aSelList);
+
+    if (GEOMBase::SelectionByNameInDialogs(thisWidget, objectUserName, aSelList))
+      myEditCurrentArgument->setText( objectUserName );
   }
 }
 
@@ -986,8 +948,8 @@ void EntityGUI_SketcherDlg::DeactivateActiveDialog()
 
   setEnabled( false );
   globalSelection();
-  disconnect(myGeometryGUI->getApp()->selectionMgr(), 0, this, 0);
-  myGeometryGUI->SetActiveDialogBox(0);
+  disconnect( myGeometryGUI->getApp()->selectionMgr(), 0, this, 0 );
+  myGeometryGUI->SetActiveDialogBox( 0 );
 }
 
 
@@ -998,11 +960,11 @@ void EntityGUI_SketcherDlg::DeactivateActiveDialog()
 void EntityGUI_SketcherDlg::ActivateThisDialog()
 {
   myGeometryGUI->EmitSignalDeactivateDialog();
-  setEnabled(true);
-  myGeometryGUI->SetActiveDialogBox((QDialog*)this);
+  setEnabled( true );
+  myGeometryGUI->SetActiveDialogBox( this );
 
-  connect(myGeometryGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeometryGUI->getApp()->selectionMgr(),
+         SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   //myGeometryGUI->SetState( 0 );
   globalSelection( GEOM_POINT );
@@ -1010,7 +972,7 @@ void EntityGUI_SketcherDlg::ActivateThisDialog()
   myEditCurrentArgument = Group1Sel->LineEdit1;
   myEditCurrentArgument->setFocus();
 
-  GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
+  GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
 }
 
 
@@ -1018,9 +980,9 @@ void EntityGUI_SketcherDlg::ActivateThisDialog()
 // function : enterEvent [REDEFINED]
 // purpose  :
 //=================================================================================
-void EntityGUI_SketcherDlg::enterEvent(QEvent* e)
+void EntityGUI_SketcherDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled())
+  if ( !MainWidget->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
@@ -1029,10 +991,11 @@ void EntityGUI_SketcherDlg::enterEvent(QEvent* e)
 // function : closeEvent()
 // purpose  :
 //=================================================================================
-void EntityGUI_SketcherDlg::closeEvent(QCloseEvent* e)
+void EntityGUI_SketcherDlg::closeEvent( QCloseEvent* e )
 {
   //myGeometryGUI->SetState( -1 );
-  disconnect(myGeometryGUI->getApp()->selectionMgr(), 0, this, 0);
+  disconnect( myGeometryGUI->getApp()->selectionMgr(), 0, this, 0 );
+  myGeometryGUI->getApp()->updateActions();
   QDialog::closeEvent( e );
 }
 
@@ -1041,233 +1004,184 @@ void EntityGUI_SketcherDlg::closeEvent(QCloseEvent* e)
 // function : ValueChangedInSpinBox()
 // purpose  :
 //=================================================================================
-void EntityGUI_SketcherDlg::ValueChangedInSpinBox(double newValue)
+void EntityGUI_SketcherDlg::ValueChangedInSpinBox( double newValue )
 {
   QObject* send = (QObject*)sender();
   Standard_Real vx, vy, vz, vs;
   vx = vy = vz = vs = 0.0;
 
-  if ( send == Group1Spin->SpinBox_DX)
-  {
-    vx = newValue;
-  }
-  else if ( send == Group2Spin->SpinBox_DX )
-  {
-    vx = newValue;
-    vy = Group2Spin->SpinBox_DY->GetValue();
-  }
-  else if ( send == Group2Spin->SpinBox_DY)
-  {
-    vx = Group2Spin->SpinBox_DX->GetValue();
-    vy = newValue;
-  }
-  else if ( send == Group3Spin->SpinBox_DX)
-  {
-    vx = newValue;
-    vy = Group3Spin->SpinBox_DY->GetValue();
-    vz = Group3Spin->SpinBox_DZ->GetValue();
-  }
-  else if ( send == Group3Spin->SpinBox_DY)
-  {
-    vx = Group3Spin->SpinBox_DX->GetValue();
-    vy = newValue;
-    vz = Group3Spin->SpinBox_DZ->GetValue();
-  }
-  else if ( send == Group3Spin->SpinBox_DZ)
-  {
-    vx = Group3Spin->SpinBox_DX->GetValue();
-    vy = Group3Spin->SpinBox_DY->GetValue();
-    vz = newValue;
-  }
-  else if ( send == Group4Spin->SpinBox_DX)
-  {
-    vx = newValue;
-    vy = Group4Spin->SpinBox_DY->GetValue();
-    vz = Group4Spin->SpinBox_DZ->GetValue();
-    vs = Group4Spin->SpinBox_DS->GetValue();
-  }
-  else if ( send == Group4Spin->SpinBox_DY)
-  {
-    vx = Group4Spin->SpinBox_DX->GetValue();
-    vy = newValue;
-    vz = Group4Spin->SpinBox_DZ->GetValue();
-    vs = Group4Spin->SpinBox_DS->GetValue();
-  }
-  else if ( send == Group4Spin->SpinBox_DZ)
-  {
-    vx = Group4Spin->SpinBox_DX->GetValue();
-    vy = Group4Spin->SpinBox_DY->GetValue();
-    vz = newValue;
-    vs = Group4Spin->SpinBox_DS->GetValue();
-  }
-  else if ( send == Group4Spin->SpinBox_DS)
-  {
-    vx = Group4Spin->SpinBox_DX->GetValue();
-    vy = Group4Spin->SpinBox_DY->GetValue();
-    vz = Group4Spin->SpinBox_DZ->GetValue();
-    vs = newValue;
+  QString vxStr, vyStr, vzStr, vsStr;
+
+  QString newValueStr;
+  if( SalomeApp_DoubleSpinBox* aDoubleSpinBox = (SalomeApp_DoubleSpinBox*)send )
+    newValueStr = aDoubleSpinBox->text();
+
+  if ( send == Group1Spin->SpinBox_DX ) {
+    vx = newValue;                        vxStr = newValueStr;
   }
-  // NPAL16010 (Sketcher Apply non available if only one line is modified)
-  // if ValueChangedInSpinBox() called from eventFilter()
-  else if ( Group1Spin->SpinBox_DX->hasFocus() )
-  {
-    vx = newValue;
+  else if ( send == Group2Spin->SpinBox_DX ) {
+    vx = newValue;                        vxStr = newValueStr;
+    vy = Group2Spin->SpinBox_DY->value(); vyStr = Group2Spin->SpinBox_DY->text();
   }
-  else if ( Group2Spin->SpinBox_DX ->hasFocus() )
-  {
-    vx = newValue;
-    vy = Group2Spin->SpinBox_DY->GetValue();
+  else if ( send == Group2Spin->SpinBox_DY ) {
+    vx = Group2Spin->SpinBox_DX->value(); vxStr = Group2Spin->SpinBox_DX->text();
+    vy = newValue;                        vyStr = newValueStr;
   }
-  else if ( Group2Spin->SpinBox_DY->hasFocus() )
-  {
-    vx = Group2Spin->SpinBox_DX->GetValue();
-    vy = newValue;
-  }
-  else if ( Group3Spin->SpinBox_DX->hasFocus() )
-  {
-    vx = newValue;
-    vy = Group3Spin->SpinBox_DY->GetValue();
-    vz = Group3Spin->SpinBox_DZ->GetValue();
+  else if ( send == Group3Spin->SpinBox_DX ) {
+    vx = newValue;                        vxStr = newValueStr;
+    vy = Group3Spin->SpinBox_DY->value(); vyStr = Group3Spin->SpinBox_DY->text();
+    vz = Group3Spin->SpinBox_DZ->value(); vzStr = Group3Spin->SpinBox_DZ->text();
   }
-  else if ( Group3Spin->SpinBox_DY->hasFocus() )
-  {
-    vx = Group3Spin->SpinBox_DX->GetValue();
-    vy = newValue;
-    vz = Group3Spin->SpinBox_DZ->GetValue();
+  else if ( send == Group3Spin->SpinBox_DY ) {
+    vx = Group3Spin->SpinBox_DX->value(); vxStr = Group3Spin->SpinBox_DX->text();
+    vy = newValue;                        vyStr = newValueStr;
+    vz = Group3Spin->SpinBox_DZ->value(); vzStr = Group3Spin->SpinBox_DZ->text();
   }
-  else if ( Group3Spin->SpinBox_DZ->hasFocus() )
-  {
-    vx = Group3Spin->SpinBox_DX->GetValue();
-    vy = Group3Spin->SpinBox_DY->GetValue();
-    vz = newValue;
+  else if ( send == Group3Spin->SpinBox_DZ ) {
+    vx = Group3Spin->SpinBox_DX->value(); vxStr = Group3Spin->SpinBox_DX->text();
+    vy = Group3Spin->SpinBox_DY->value(); vyStr = Group3Spin->SpinBox_DY->text();
+    vz = newValue;                        vzStr = newValueStr;
   }
-  else if ( Group4Spin->SpinBox_DX->hasFocus() )
-  {
-    vx = newValue;
-    vy = Group4Spin->SpinBox_DY->GetValue();
-    vz = Group4Spin->SpinBox_DZ->GetValue();
-    vs = Group4Spin->SpinBox_DS->GetValue();
+  else if ( send == Group4Spin->SpinBox_DX ) {
+    vx = newValue;                        vxStr = newValueStr;
+    vy = Group4Spin->SpinBox_DY->value(); vyStr = Group4Spin->SpinBox_DY->text();
+    vz = Group4Spin->SpinBox_DZ->value(); vzStr = Group4Spin->SpinBox_DZ->text();
+    vs = Group4Spin->SpinBox_DS->value(); vsStr = Group4Spin->SpinBox_DS->text();
   }
-  else if ( Group4Spin->SpinBox_DY->hasFocus() )
-  {
-    vx = Group4Spin->SpinBox_DX->GetValue();
-    vy = newValue;
-    vz = Group4Spin->SpinBox_DZ->GetValue();
-    vs = Group4Spin->SpinBox_DS->GetValue();
+  else if ( send == Group4Spin->SpinBox_DY ) {
+    vx = Group4Spin->SpinBox_DX->value(); vxStr = Group4Spin->SpinBox_DX->text();
+    vy = newValue;                        vyStr = newValueStr;
+    vz = Group4Spin->SpinBox_DZ->value(); vzStr = Group4Spin->SpinBox_DZ->text();
+    vs = Group4Spin->SpinBox_DS->value(); vsStr = Group4Spin->SpinBox_DS->text();
   }
-  else if ( Group4Spin->SpinBox_DZ->hasFocus() )
-  {
-    vx = Group4Spin->SpinBox_DX->GetValue();
-    vy = Group4Spin->SpinBox_DY->GetValue();
-    vz = newValue;
-    vs = Group4Spin->SpinBox_DS->GetValue();
+  else if ( send == Group4Spin->SpinBox_DZ ) {
+    vx = Group4Spin->SpinBox_DX->value(); vxStr = Group4Spin->SpinBox_DX->text();
+    vy = Group4Spin->SpinBox_DY->value(); vyStr = Group4Spin->SpinBox_DY->text();
+    vz = newValue;                        vzStr = newValueStr;
+    vs = Group4Spin->SpinBox_DS->value(); vsStr = Group4Spin->SpinBox_DS->text();
   }
-  else if ( Group4Spin->SpinBox_DS->hasFocus() )
-  {
-    vx = Group4Spin->SpinBox_DX->GetValue();
-    vy = Group4Spin->SpinBox_DY->GetValue();
-    vz = Group4Spin->SpinBox_DZ->GetValue();
-    vs = newValue;
+  else if ( send == Group4Spin->SpinBox_DS ) {
+    vx = Group4Spin->SpinBox_DX->value(); vxStr = Group4Spin->SpinBox_DX->text();
+    vy = Group4Spin->SpinBox_DY->value(); vyStr = Group4Spin->SpinBox_DY->text();
+    vz = Group4Spin->SpinBox_DZ->value(); vzStr = Group4Spin->SpinBox_DZ->text();
+    vs = newValue;                        vsStr = newValueStr;
   }
+  // Fix of the NPAL16010 bug is removed, because it's not actual with the Qt-4.x
 
-  if ( myConstructorId == 0 )
-  {  // SEGMENT
-    if ( mySketchType == PT_ABS)
-    {
+  if ( myConstructorId == 0 ) {  // SEGMENT
+    if ( mySketchType == PT_ABS ) {
       myX = vx;
       myY = vy;
+      myXStr = vxStr;
+      myYStr = vyStr;
     }
-    else if ( mySketchType == PT_RELATIVE)
-    {
+    else if ( mySketchType == PT_RELATIVE ) {
       myDX = vx;
       myDY = vy;
+      myDXStr = vxStr;
+      myDYStr = vyStr;
     }
-    else if ( mySketchType == DIR_ANGLE_LENGTH)
-    {
+    else if ( mySketchType == DIR_ANGLE_LENGTH ) {
       myAngle = vx;
       myLength = vy;
+      myAngleStr = vxStr;
+      myLengthStr = vyStr;
     }
-    else if ( mySketchType == DIR_ANGLE_X)
-    {
+    else if ( mySketchType == DIR_ANGLE_X ) {
       myAngle = vx;
       myX = vy;
+      myAngleStr = vxStr;
+      myXStr = vyStr;
     }
-    else if ( mySketchType == DIR_ANGLE_Y)
-    {
+    else if ( mySketchType == DIR_ANGLE_Y ) {
       myAngle = vx;
       myY = vy;
+      myAngleStr = vxStr;
+      myYStr = vyStr;
     }
-    else if ( mySketchType == DIR_PER_LENGTH)
-    {
+    else if ( mySketchType == DIR_PER_LENGTH ) {
       myLength = vx;
+      myLengthStr = vxStr;
     }
-    else if ( mySketchType == DIR_PER_X)
-    {
+    else if ( mySketchType == DIR_PER_X ) {
       myX = vx;
+      myXStr = vxStr;
     }
-    else if ( mySketchType == DIR_PER_Y)
-    {
+    else if ( mySketchType == DIR_PER_Y ) {
       myY = vx;
+      myYStr = vxStr;
     }
-    else if ( mySketchType == DIR_TAN_LENGTH)
-    {
+    else if ( mySketchType == DIR_TAN_LENGTH ) {
       myLength = vx;
+      myLengthStr = vxStr;
     }
-    else if ( mySketchType == DIR_TAN_X)
-    {
+    else if ( mySketchType == DIR_TAN_X ) {
       myX = vx;
+      myXStr = vxStr;
     }
-    else if ( mySketchType == DIR_TAN_Y)
-    {
+    else if ( mySketchType == DIR_TAN_Y ) {
       myY = vx;
+      myYStr = vxStr;
     }
-    else if ( mySketchType == DIR_DXDY_LENGTH)
-    {
+    else if ( mySketchType == DIR_DXDY_LENGTH ) {
       myDX = vx;
       myDY = vy;
       myLength = vz;
+      myDXStr = vxStr;
+      myDYStr = vyStr;
+      myLengthStr = vzStr;
     }
-    else if ( mySketchType == DIR_DXDY_X)
-    {
+    else if ( mySketchType == DIR_DXDY_X ) {
       myDX = vx;
       myDY = vy;
       myX = vz;
+      myDXStr = vxStr;
+      myDYStr = vyStr;
+      myXStr = vzStr;
     }
-    else if ( mySketchType == DIR_DXDY_Y)
-    {
+    else if ( mySketchType == DIR_DXDY_Y ) {
       myDX = vx;
       myDY = vy;
       myY = vz;
+      myDXStr = vxStr;
+      myDYStr = vyStr;
+      myYStr = vzStr;
     }
   }
-  else if ( myConstructorId == 1 )
-  {  // ARC
-    if ( mySketchType == DIR_ANGLE_LENGTH)
-    {
+  else if ( myConstructorId == 1 ) {  // ARC
+    if ( mySketchType == DIR_ANGLE_LENGTH ) {
       myAngle = vx;
       myRadius = vy;
       myLength = vz;
+      myAngleStr = vxStr;
+      myRadiusStr = vyStr;
+      myLengthStr = vzStr;
     }
-    else if ( mySketchType == DIR_PER_LENGTH)
-    {
+    else if ( mySketchType == DIR_PER_LENGTH ) {
       myRadius = vx;
       myLength = vy;
+      myRadiusStr = vxStr;
+      myLengthStr = vyStr;
     }
-    else if ( mySketchType == DIR_TAN_LENGTH)
-    {
+    else if ( mySketchType == DIR_TAN_LENGTH ) {
       myRadius = vx;
       myLength = vy;
+      myRadiusStr = vxStr;
+      myLengthStr = vyStr;
     }
-    else if ( mySketchType == DIR_DXDY_LENGTH)
-    {
+    else if ( mySketchType == DIR_DXDY_LENGTH ) {
       myDX = vx;
       myDY = vy;
       myRadius = vz;
       myLength = vs;
+      myDXStr = vxStr;
+      myDYStr = vyStr;
+      myRadiusStr = vzStr;
+      myLengthStr = vsStr;
     }
   }
 
-  GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
+  GEOMBase_Helper::displayPreview( false, true, true, myLineWidth );
 }
 
 
@@ -1275,95 +1189,108 @@ void EntityGUI_SketcherDlg::ValueChangedInSpinBox(double newValue)
 // function : GetNewCommand()
 // purpose  : Build the new command with context
 //=================================================================================
-QString EntityGUI_SketcherDlg::GetNewCommand()
+QString EntityGUI_SketcherDlg::GetNewCommand( QString& theParameters )
 {
+  theParameters.clear();
   QString myNewCommand = ":";
   if ( mySketchState == FIRST_POINT ) {
-    if ( mySketchType == PT_ABS || mySketchType == PT_SEL)
-      myNewCommand = myNewCommand + "F " + QString::number(myX) + " " + QString::number(myY);
-    if ( mySketchType == PT_RELATIVE)
-      myNewCommand = myNewCommand + "F " + QString::number(myDX) + " " + QString::number(myDY);
+    if ( mySketchType == PT_ABS || mySketchType == PT_SEL ) {
+      myNewCommand = myNewCommand + "F " + QString::number( myX ) + " " + QString::number( myY );
+      theParameters = myXStr + ":" + myYStr;
+    }
+    if ( mySketchType == PT_RELATIVE) {
+      myNewCommand = myNewCommand + "F " + QString::number( myDX ) + " " + QString::number( myDY );
+      theParameters = myDXStr + ":" + myDYStr;
+    }
     return myNewCommand;
   }
 
-  if ( myConstructorId == 0  )
-  {  // SEGMENT
-    if ( mySketchType == PT_ABS || mySketchType == PT_SEL)
-      myNewCommand = myNewCommand + "TT " + QString::number(myX) + " " + QString::number(myY);
-    if ( mySketchType == PT_RELATIVE)
-      myNewCommand = myNewCommand + "T " + QString::number(myDX) + " " + QString::number(myDY);
-    if ( mySketchType == DIR_ANGLE_LENGTH)
-    {
-      myNewCommand = myNewCommand + "R " + QString::number(myAngle);
-      myNewCommand = myNewCommand + ":" + "L " + QString::number(myLength);
-    }
-    if ( mySketchType == DIR_ANGLE_X)
-    {
-      myNewCommand = myNewCommand + "R " + QString::number(myAngle);
-      myNewCommand = myNewCommand + ":" + "IX " + QString::number(myX);
-    }
-    if ( mySketchType == DIR_ANGLE_Y)
-    {
-      myNewCommand = myNewCommand + "R " + QString::number(myAngle);
-      myNewCommand = myNewCommand + ":" + "IY " + QString::number(myY);
-    }
-    if ( mySketchType == DIR_PER_LENGTH)
-    {
-      myNewCommand = myNewCommand + "R " + QString::number(90.0);
-      myNewCommand = myNewCommand + ":" + "L " + QString::number(myLength);
-    }
-    if ( mySketchType == DIR_PER_X)
-    {
-      myNewCommand = myNewCommand + "R " + QString::number(90.0);
-      myNewCommand = myNewCommand + ":" + "IX " + QString::number(myX);
-    }
-    if ( mySketchType == DIR_PER_Y)
-    {
-      myNewCommand = myNewCommand + "R " + QString::number(90.0);
-      myNewCommand = myNewCommand + ":" + "IY " + QString::number(myY);
-    }
-    if ( mySketchType == DIR_TAN_LENGTH)
-      myNewCommand = myNewCommand + "L " + QString::number(myLength);
-    if ( mySketchType == DIR_TAN_X)
-      myNewCommand = myNewCommand + "IX " + QString::number(myX);
-    if ( mySketchType == DIR_TAN_Y)
+  if ( myConstructorId == 0  ) {  // SEGMENT
+    if ( mySketchType == PT_ABS || mySketchType == PT_SEL ) {
+      myNewCommand = myNewCommand + "TT " + QString::number( myX ) + " " + QString::number( myY );
+      theParameters = myXStr + ":" + myYStr;
+    }
+    if ( mySketchType == PT_RELATIVE) {
+      myNewCommand = myNewCommand + "T " + QString::number( myDX ) + " " + QString::number( myDY );
+      theParameters = myDXStr + ":" + myDYStr;
+    }
+    if ( mySketchType == DIR_ANGLE_LENGTH ) {
+      myNewCommand = myNewCommand + "R " + QString::number( myAngle );
+      myNewCommand = myNewCommand + ":" + "L " + QString::number( myLength );
+      theParameters = myAngleStr + ":" + myLengthStr;
+    }
+    if ( mySketchType == DIR_ANGLE_X ) {
+      myNewCommand = myNewCommand + "R " + QString::number( myAngle );
+      myNewCommand = myNewCommand + ":" + "IX " + QString::number( myX );
+      theParameters = myAngleStr + ":" + myXStr;
+    }
+    if ( mySketchType == DIR_ANGLE_Y ) {
+      myNewCommand = myNewCommand + "R " + QString::number( myAngle );
+      myNewCommand = myNewCommand + ":" + "IY " + QString::number( myY );
+      theParameters = myAngleStr + ":" + myYStr;
+    }
+    if ( mySketchType == DIR_PER_LENGTH ) {
+      myNewCommand = myNewCommand + "R " + QString::number( 90.0 );
+      myNewCommand = myNewCommand + ":" + "L " + QString::number( myLength );
+      theParameters = QString::number( 90.0 ) + ":" + myLengthStr;
+    }
+    if ( mySketchType == DIR_PER_X ) {
+      myNewCommand = myNewCommand + "R " + QString::number( 90.0 );
+      myNewCommand = myNewCommand + ":" + "IX " + QString::number( myX );
+      theParameters = QString::number( 90.0 ) + ":" + myXStr;
+    }
+    if ( mySketchType == DIR_PER_Y ) {
+      myNewCommand = myNewCommand + "R " + QString::number( 90.0 );
+      myNewCommand = myNewCommand + ":" + "IY " + QString::number( myY );
+      theParameters = QString::number( 90.0 ) + ":" + myYStr;
+    }
+    if ( mySketchType == DIR_TAN_LENGTH ) {
+      myNewCommand = myNewCommand + "L " + QString::number( myLength );
+      theParameters = myLengthStr;
+    }
+    if ( mySketchType == DIR_TAN_X ) {
+      myNewCommand = myNewCommand + "IX " + QString::number( myX );
+      theParameters = myXStr;
+    }
+    if ( mySketchType == DIR_TAN_Y) {
       myNewCommand = myNewCommand + "IY " + QString::number(myY);
-    if ( mySketchType == DIR_DXDY_LENGTH)
-    {
-      myNewCommand = myNewCommand + "D " + QString::number(myDX) + " " + QString::number(myDY);
-      myNewCommand = myNewCommand + ":" + "L " + QString::number(myLength);
+      theParameters = myYStr;
     }
-    if ( mySketchType == DIR_DXDY_X)
-    {
-      myNewCommand = myNewCommand + "D " + QString::number(myDX) + " " + QString::number(myDY);
-      myNewCommand = myNewCommand + ":" + "IX " + QString::number(myX);
+    if ( mySketchType == DIR_DXDY_LENGTH ) {
+      myNewCommand = myNewCommand + "D " + QString::number( myDX ) + " " + QString::number( myDY );
+      myNewCommand = myNewCommand + ":" + "L " + QString::number( myLength );
+      theParameters = myDXStr + ":" + myDYStr + ":" + myLengthStr;
     }
-    if ( mySketchType == DIR_DXDY_Y)
-    {
-      myNewCommand = myNewCommand + "D " + QString::number(myDX) + " " + QString::number(myDY);
-      myNewCommand = myNewCommand + ":" + "IY " + QString::number(myY);
+    if ( mySketchType == DIR_DXDY_X ) {
+      myNewCommand = myNewCommand + "D " + QString::number( myDX ) + " " + QString::number( myDY );
+      myNewCommand = myNewCommand + ":" + "IX " + QString::number( myX );
+      theParameters = myDXStr + ":" + myDYStr + ":" + myXStr;
+    }
+    if ( mySketchType == DIR_DXDY_Y ) {
+      myNewCommand = myNewCommand + "D " + QString::number( myDX ) + " " + QString::number( myDY );
+      myNewCommand = myNewCommand + ":" + "IY " + QString::number( myY );
+      theParameters = myDXStr + ":" + myDYStr + ":" + myYStr;
     }
   }
-  else if ( myConstructorId == 1 )
-  {  // ARC
-    if ( mySketchType == DIR_ANGLE_LENGTH)
-    {
-      myNewCommand = myNewCommand + "R " + QString::number(myAngle);
-      myNewCommand = myNewCommand + ":" + "C " + QString::number(myRadius) + " " + QString::number(myLength);
-    }
-    if ( mySketchType == DIR_PER_LENGTH)
-    {
-      myNewCommand = myNewCommand + "R " + QString::number(90.0);
-      myNewCommand = myNewCommand + ":" + "C " + QString::number(myRadius) + " " + QString::number(myLength);
-    }
-    if ( mySketchType == DIR_TAN_LENGTH)
-    {
-      myNewCommand = myNewCommand + "C " + QString::number(myRadius) + " " + QString::number(myLength);
-    }
-    if ( mySketchType == DIR_DXDY_LENGTH)
-    {
-      myNewCommand = myNewCommand + "D " + QString::number(myDX) + " " + QString::number(myDY);
-      myNewCommand = myNewCommand + ":" + "C " + QString::number(myRadius) + " " + QString::number(myLength);
+  else if ( myConstructorId == 1 ) {  // ARC
+    if ( mySketchType == DIR_ANGLE_LENGTH ) {
+      myNewCommand = myNewCommand + "R " + QString::number( myAngle );
+      myNewCommand = myNewCommand + ":" + "C " + QString::number( myRadius ) + " " + QString::number( myLength );
+      theParameters = myAngleStr + ":" + myRadiusStr + ":" + myLengthStr;
+    }
+    if ( mySketchType == DIR_PER_LENGTH ) {
+      myNewCommand = myNewCommand + "R " + QString::number( 90.0 );
+      myNewCommand = myNewCommand + ":" + "C " + QString::number( myRadius ) + " " + QString::number( myLength );
+      theParameters = QString::number( 90.0 ) + ":" + myRadiusStr + ":" + myLengthStr;
+    }
+    if ( mySketchType == DIR_TAN_LENGTH ) {
+      myNewCommand = myNewCommand + "C " + QString::number( myRadius ) + " " + QString::number( myLength );
+      theParameters = myRadiusStr + ":" + myLengthStr;
+    }
+    if ( mySketchType == DIR_DXDY_LENGTH ) {
+      myNewCommand = myNewCommand + "D " + QString::number( myDX ) + " " + QString::number( myDY );
+      myNewCommand = myNewCommand + ":" + "C " + QString::number( myRadius ) + " " + QString::number( myLength );
+      theParameters = myDXStr + ":" + myDYStr + ":" + myRadiusStr + ":" + myLengthStr;
     }
   }
   return myNewCommand;
@@ -1384,7 +1311,32 @@ GEOM::GEOM_IOperations_ptr EntityGUI_SketcherDlg::createOperation()
 //=================================================================================
 bool EntityGUI_SketcherDlg::isValid( QString& msg )
 {
-  return true;
+  bool ok = true;
+  bool toCorrect = !IsPreview() || myIsApply;
+
+  if( Group1Spin->isVisible() ) {
+    ok = Group1Spin->SpinBox_DX->isValid( msg, toCorrect ) && ok;
+  }
+  else if( Group2Spin->isVisible() ) {
+    ok = Group2Spin->SpinBox_DX->isValid( msg, toCorrect ) && ok;
+    ok = Group2Spin->SpinBox_DY->isValid( msg, toCorrect ) && ok;
+  }
+  else if( Group3Spin->isVisible() ) {
+    ok = Group3Spin->SpinBox_DX->isValid( msg, toCorrect ) && ok;
+    ok = Group3Spin->SpinBox_DY->isValid( msg, toCorrect ) && ok;
+    ok = Group3Spin->SpinBox_DZ->isValid( msg, toCorrect ) && ok;
+  }
+  else if( Group4Spin->isVisible() ) {
+    ok = Group4Spin->SpinBox_DX->isValid( msg, toCorrect ) && ok;
+    ok = Group4Spin->SpinBox_DY->isValid( msg, toCorrect ) && ok;
+    ok = Group4Spin->SpinBox_DZ->isValid( msg, toCorrect ) && ok;
+    ok = Group4Spin->SpinBox_DS->isValid( msg, toCorrect ) && ok;
+  }
+
+  if( myIsApply && !ok )
+    showError( msg );
+
+  return ok;
 }
 
 //=================================================================================
@@ -1393,7 +1345,9 @@ bool EntityGUI_SketcherDlg::isValid( QString& msg )
 //=================================================================================
 bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
 {
-  if(mySketchState == FIRST_POINT) {
+  QString aParameters;
+
+  if ( mySketchState == FIRST_POINT ) {
     myLastX2 = myX;
     myLastY2 = myY;
   }
@@ -1403,17 +1357,17 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
 
     //Last Shape
     QString Command1 = myCommand.join( "" );
-    Sketcher_Profile aProfile1 (Command1.ascii());
-    if(aProfile1.IsDone())
+    Sketcher_Profile aProfile1( Command1.toAscii() );
+    if ( aProfile1.IsDone() )
       myShape1 = aProfile1.GetShape();
 
     //Current Shape
-    QString Command2 = Command1 + GetNewCommand();
-    Sketcher_Profile aProfile2 (Command2.ascii());
-    if(aProfile2.IsDone())
+    QString Command2 = Command1 + GetNewCommand( aParameters );
+    Sketcher_Profile aProfile2( Command2.toAscii() );
+    if ( aProfile2.IsDone() )
       myShape2 = aProfile2.GetShape();
 
-    if(myShape2.IsNull()) {
+    if ( myShape2.IsNull() ) {
       //the current point is the same as the last one
       myLastX2 = myLastX1;
       myLastY2 = myLastY1;
@@ -1421,79 +1375,79 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
     else {
       TopoDS_Vertex V1, V2;
       gp_Pnt pt;
-      if(myShape1.ShapeType() == TopAbs_VERTEX) {
+      if ( myShape1.ShapeType() == TopAbs_VERTEX ) {
        //the last shape is the first point
-       pt = BRep_Tool::Pnt(TopoDS::Vertex(myShape1));
+       pt = BRep_Tool::Pnt( TopoDS::Vertex( myShape1 ) );
        myLastX1 = pt.X();
        myLastY1 = pt.Y();
       }
       else {
-       TopExp::Vertices(TopoDS::Wire(myShape1), V1, V2);
-       pt = BRep_Tool::Pnt(V2);
+       TopExp::Vertices( TopoDS::Wire( myShape1 ), V1, V2 );
+       pt = BRep_Tool::Pnt( V2 );
        myLastX1 = pt.X();
        myLastY1 = pt.Y();
       }
-      TopExp::Vertices(TopoDS::Wire(myShape2), V1, V2);
-      pt = BRep_Tool::Pnt(V2);
+      TopExp::Vertices( TopoDS::Wire( myShape2 ), V1, V2 );
+      pt = BRep_Tool::Pnt( V2 );
       myLastX2 = pt.X();
       myLastY2 = pt.Y();
     }
   }
 
   QString cmd;
-  if( ( mySketchState != FIRST_POINT &&
-        myLastX1 == myLastX2 && myLastY1 == myLastY2 ) || myIsAllAdded ) {
+  if ( ( mySketchState != FIRST_POINT &&
+        myLastX1 == myLastX2 && myLastY1 == myLastY2 ) || myIsAllAdded ) {
     cmd = myCommand.join( "" );
 
     if ( Group1Sel->isVisible() ) {
-      Group1Sel->buttonApply->setEnabled(false);
+      Group1Sel->buttonApply->setEnabled( false );
       //Group1Sel->buttonApply->setFocus();
     }
     if ( Group1Spin->isVisible() ) {
-      Group1Spin->buttonApply->setEnabled(false);
+      Group1Spin->buttonApply->setEnabled( false );
       //Group1Spin->buttonApply->setFocus();
     }
     if ( Group2Spin->isVisible() ) {
-      Group2Spin->buttonApply->setEnabled(false);
+      Group2Spin->buttonApply->setEnabled( false );
       //Group2Spin->buttonApply->setFocus();
     }
     if ( Group3Spin->isVisible() ) {
-      Group3Spin->buttonApply->setEnabled(false);
+      Group3Spin->buttonApply->setEnabled( false );
       //Group3Spin->buttonApply->setFocus();
     }
     if ( Group4Spin->isVisible() ) {
-      Group4Spin->buttonApply->setEnabled(false);
+      Group4Spin->buttonApply->setEnabled( false );
       //Group4Spin->buttonApply->setFocus();
     }
   }
   else {
-    cmd = myCommand.join( "" ) + GetNewCommand();
+    cmd = myCommand.join( "" ) + GetNewCommand( aParameters );
 
     if ( Group1Sel->isVisible() ) {
-      Group1Sel->buttonApply->setEnabled(true);
+      Group1Sel->buttonApply->setEnabled( true );
       //Group1Sel->buttonApply->setFocus();
     }
     if ( Group1Spin->isVisible() ) {
-      Group1Spin->buttonApply->setEnabled(true);
+      Group1Spin->buttonApply->setEnabled( true );
       //Group1Spin->buttonApply->setFocus();
     }
     if ( Group2Spin->isVisible() ) {
-      Group2Spin->buttonApply->setEnabled(true);
+      Group2Spin->buttonApply->setEnabled( true );
       //Group2Spin->buttonApply->setFocus();
     }
     if ( Group3Spin->isVisible() ) {
-      Group3Spin->buttonApply->setEnabled(true);
+      Group3Spin->buttonApply->setEnabled( true );
       //Group3Spin->buttonApply->setFocus();
     }
     if ( Group4Spin->isVisible() ) {
-      Group4Spin->buttonApply->setEnabled(true);
+      Group4Spin->buttonApply->setEnabled( true );
       //Group4Spin->buttonApply->setFocus();
     }
   }
 
   gp_Ax3 myWPlane = myGeometryGUI->GetWorkingPlane();
   GEOM::ListOfDouble_var WPlane = new GEOM::ListOfDouble;
-  WPlane->length(9);
+  WPlane->length( 9 );
   WPlane[0] = myWPlane.Location().X();
   WPlane[1] = myWPlane.Location().Y();
   WPlane[2] = myWPlane.Location().Z();
@@ -1507,10 +1461,18 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
   WPlane[8] = myWPlane.XDirection().Z();
 
   GEOM::GEOM_Object_var anObj =
-    GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeSketcher( cmd.latin1(), WPlane );
+    GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeSketcher( cmd.toLatin1(), WPlane );
 
   if ( !anObj->_is_nil() )
+  {
+    if( !IsPreview() ) {
+      QStringList aCurrentParameters = myParameters;
+      aCurrentParameters << aParameters;
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aCurrentParameters));
+    }
+
     objects.push_back( anObj._retn() );
+  }
 
   return true;
 }
@@ -1524,7 +1486,9 @@ void EntityGUI_SketcherDlg::displayPreview( GEOM::GEOM_Object_ptr object,
                                             const bool            append,
                                             const bool            activate,
                                             const bool            update,
-                                            const double          lineWidth )
+                                            const double          lineWidth,
+                                            const int             displayMode,
+                                            const int             color )
 {
   // Set color for preview shape
   getDisplayer()->SetColor( Quantity_NOC_RED );
@@ -1577,22 +1541,19 @@ bool EntityGUI_SketcherDlg::createShapes( GEOM::GEOM_Object_ptr theObject,
        Group1Spin->isVisible() && !Group1Spin->buttonApply->isEnabled() ||
        Group2Spin->isVisible() && !Group2Spin->buttonApply->isEnabled() ||
        Group3Spin->isVisible() && !Group3Spin->buttonApply->isEnabled() ||
-       Group4Spin->isVisible() && !Group4Spin->buttonApply->isEnabled() )
-  {
+       Group4Spin->isVisible() && !Group4Spin->buttonApply->isEnabled() ) {
      theApplyedWire = aShape;
      return true;
   }
 
   BRepBuilderAPI_MakeWire aBuilder;
   TopExp_Explorer anExp( aShape, TopAbs_EDGE );
-  while( 1 )
-  {
+  while ( 1 ) {
     TopoDS_Shape anEdge = anExp.Current();
     anExp.Next();
     if ( anExp.More() ) // i.e. non-last edge
       aBuilder.Add( TopoDS::Edge( anEdge ) );
-    else
-    {
+    else {
       theLastSegment = anEdge;
       break;
     }
@@ -1614,9 +1575,35 @@ void  EntityGUI_SketcherDlg::keyPressEvent( QKeyEvent* e )
   if ( e->isAccepted() )
     return;
 
-  if ( e->key() == Key_F1 )
-    {
-      e->accept();
-      ClickOnHelp();
-    }
+  if ( e->key() == Qt::Key_F1 ) {
+    e->accept();
+    ClickOnHelp();
+  }
+}
+
+void EntityGUI_SketcherDlg::initSpinBox( SalomeApp_DoubleSpinBox* spinBox,
+                                        double min,  double max,
+                                        double step, int decimals )
+{
+  spinBox->setDecimals( decimals );
+  spinBox->setRange( min, max );
+  spinBox->setSingleStep( step );
+}
+
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void EntityGUI_SketcherDlg::SetDoubleSpinBoxStep( double step )
+{
+  Group1Spin->SpinBox_DX->setSingleStep(step);
+  Group2Spin->SpinBox_DX->setSingleStep(step);
+  Group2Spin->SpinBox_DY->setSingleStep(step);
+  Group3Spin->SpinBox_DX->setSingleStep(step);
+  Group3Spin->SpinBox_DY->setSingleStep(step);
+  Group3Spin->SpinBox_DZ->setSingleStep(step);
+  Group4Spin->SpinBox_DX->setSingleStep(step);
+  Group4Spin->SpinBox_DY->setSingleStep(step);
+  Group4Spin->SpinBox_DZ->setSingleStep(step);
+  Group4Spin->SpinBox_DS->setSingleStep(step);
 }
index 64260b2ae166c2bd28a3a6fc4cd3506ca24effb9..3a304abf10c0950be352d841559cd5a65692567a 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : EntityGUI_SketcherDlg.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//
-//  File   : EntityGUI_SketcherDlg.h
-//  Author : Damine COQUERET
-//  Module : GEOM
-
 #ifndef ENTITYGUI_SKETCHERDLG_H
 #define ENTITYGUI_SKETCHERDLG_H
 
-#include "GEOM_EntityGUI.hxx"
-
-#include "GEOMBase_Helper.h"
-
-#include "EntityGUI_Skeleton_QTD.h"
-#include "EntityGUI_Point_QTD.h"
-#include "EntityGUI_Dir1_QTD.h"
-#include "EntityGUI_Dir2_QTD.h"
-
-#include "EntityGUI_1Sel_QTD.h"
-#include "EntityGUI_1Spin.h"
-#include "EntityGUI_2Spin.h"
-#include "EntityGUI_3Spin.h"
-#include "EntityGUI_4Spin.h"
-
-#include "EntityGUI.h"
-#include "GeometryGUI.h"
-
-#include <gp_Dir.hxx>
-
-#include <qwidget.h>
-#include <qgroupbox.h>
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <GEOMBase_Helper.h>
+
+#include <QDialog>
+
+class QLineEdit;
+class SalomeApp_DoubleSpinBox;
+class EntityGUI_1Sel;
+class EntityGUI_1Spin;
+class EntityGUI_2Spin;
+class EntityGUI_3Spin;
+class EntityGUI_4Spin;
+class EntityGUI_Point;
+class EntityGUI_Dir1;
+class EntityGUI_Dir2;
+class EntityGUI_Skeleton;
+class GeometryGUI;
+
+#ifndef COORD_MIN
+#  define COORD_MIN -1e+15
+#  define COORD_MAX +1e+15
+#  define MAX_NUMBER 100000
+#  define DBL_DIGITS_DISPLAY 16
+#endif // COORD_MIN
 
 //=================================================================================
 // class    : EntityGUI_Dlg
 // purpose  :
 //=================================================================================
-class GEOM_ENTITYGUI_EXPORT EntityGUI_SketcherDlg : public EntityGUI_Skeleton_QTD, public GEOMBase_Helper
+class EntityGUI_SketcherDlg : public QDialog, GEOMBase_Helper
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent = 0,
-                         const char* name = 0, bool modal = FALSE, WFlags fl = 0,
-                         const double lineWidth = 2.);
-    ~EntityGUI_SketcherDlg();
+  EntityGUI_SketcherDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0,
+                        const double = 2. );
+  ~EntityGUI_SketcherDlg();
 
-    bool eventFilter (QObject* object, QEvent* event);
+  bool eventFilter (QObject* object, QEvent* event);
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-
-    void closeEvent( QCloseEvent* e );
-    void keyPressEvent( QKeyEvent* e );
-
-private :
-    void Init();
-    void enterEvent(QEvent* e);
-    void InitClick();
-    void setEnabledUndo(bool value);
-    void setEnabledRedo(bool value);
-
-    QString GetNewCommand();
-
-    int myConstructorId;
-    int myConstructorDirId;
-    int mySketchType;
-    int mySketchState;
-
-    bool myIsAllAdded;
-
-    QLineEdit* myEditCurrentArgument;   /* Current LineEdit */
-
-    QStringList myCommand;
-    QStringList myUndoCommand;
-
-    Standard_Real myX, myY, myDX, myDY;
-    Standard_Real myLength, myAngle, myRadius;
-    Standard_Real myLastX1, myLastY1;
-    Standard_Real myLastX2, myLastY2;
-
-    EntityGUI_Point_QTD* GroupPt;
-    EntityGUI_Dir1_QTD* GroupD1;
-    EntityGUI_Dir2_QTD* GroupD2;
-
-    EntityGUI_1Sel_QTD* Group1Sel;
-    EntityGUI_1Spin* Group1Spin;
-    EntityGUI_2Spin* Group2Spin;
-    EntityGUI_3Spin* Group3Spin;
-    EntityGUI_4Spin* Group4Spin;
-
-    GeometryGUI*  myGeometryGUI;
-
-    QString myHelpFileName;
-
-    enum SketchState {FIRST_POINT, NEXT_POINT};
-
-    enum SketchType {PT_ABS, PT_RELATIVE, PT_SEL,
-                    DIR_ANGLE_LENGTH, DIR_ANGLE_X, DIR_ANGLE_Y,
-                    DIR_PER_LENGTH, DIR_PER_X, DIR_PER_Y,
-                    DIR_TAN_LENGTH, DIR_TAN_X, DIR_TAN_Y,
-                    DIR_DXDY_LENGTH, DIR_DXDY_X, DIR_DXDY_Y};
-
-  double myLineWidth;
-  virtual void displayPreview  ( GEOM::GEOM_Object_ptr obj,
-                                 const bool            append = false,
-                                 const bool            activate = false,
-                                 const bool            update = true,
-                                 const double          lineWidth = -1 );
-
-  bool createShapes( GEOM::GEOM_Object_ptr theObject,
-                     TopoDS_Shape&         theApplyedWire,
-                     TopoDS_Shape&         theLastSegment );
-
+  void                               initSpinBox( SalomeApp_DoubleSpinBox*, 
+                                                 double, double, double = 0.1, 
+                                                 int = 3 );
+
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+
+  void                               closeEvent( QCloseEvent* );
+  void                               keyPressEvent( QKeyEvent* );
+
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  void                               InitClick();
+  void                               setEnabledUndo( bool );
+  void                               setEnabledRedo( bool );
+    
+  QString                            GetNewCommand( QString& );
+
+  virtual void                       displayPreview( GEOM::GEOM_Object_ptr,
+                                                    const bool = false,
+                                                    const bool = false,
+                                                    const bool = true,
+                                                    const double = -1,
+                                                    const int  = -1,
+                                                    const int  = -1);
+
+  bool                               createShapes( GEOM::GEOM_Object_ptr,
+                                                  TopoDS_Shape&,
+                                                  TopoDS_Shape& );
+
+private:
+  int                                myConstructorId;
+  int                                myConstructorDirId;
+  int                                mySketchType;
+  int                                mySketchState;
+
+  bool                               myIsAllAdded;
+  bool                               myIsApply;
+
+  QLineEdit*                         myEditCurrentArgument;   /* Current LineEdit */
+
+  QStringList                        myCommand;
+  QStringList                        myUndoCommand;
+
+  QStringList                        myParameters;
+  QStringList                        myUndoParameters;
+
+  Standard_Real                      myX, myY, myDX, myDY;
+  Standard_Real                      myLength, myAngle, myRadius;
+  Standard_Real                      myLastX1, myLastY1;
+  Standard_Real                      myLastX2, myLastY2;
+
+  QString                            myXStr, myYStr, myDXStr, myDYStr;
+  QString                            myLengthStr, myAngleStr, myRadiusStr;
+  QString                            myLastX1Str, myLastY1Str;
+  QString                            myLastX2Str, myLastY2Str;                            
+
+  EntityGUI_Skeleton*                MainWidget;
+
+  EntityGUI_Point*                   GroupPt;
+  EntityGUI_Dir1*                    GroupD1;
+  EntityGUI_Dir2*                    GroupD2;
+
+  EntityGUI_1Sel*                    Group1Sel;
+  EntityGUI_1Spin*                   Group1Spin;
+  EntityGUI_2Spin*                   Group2Spin;
+  EntityGUI_3Spin*                   Group3Spin;
+  EntityGUI_4Spin*                   Group4Spin;
+
+  GeometryGUI*                       myGeometryGUI;
+
+  QString                            myHelpFileName;
+  
+  double                             myLineWidth;
+
+private:
+  enum SketchState { FIRST_POINT, NEXT_POINT };
+  
+  enum SketchType { PT_ABS, PT_RELATIVE, PT_SEL,
+                   DIR_ANGLE_LENGTH, DIR_ANGLE_X, DIR_ANGLE_Y,
+                   DIR_PER_LENGTH, DIR_PER_X, DIR_PER_Y,
+                   DIR_TAN_LENGTH, DIR_TAN_X, DIR_TAN_Y,
+                   DIR_DXDY_LENGTH, DIR_DXDY_X, DIR_DXDY_Y };
+  
 private slots:
-    void ClickOnEnd();
-    void ClickOnCancel();
-    bool ClickOnApply();
-    void ClickOnUndo();
-    void ClickOnRedo();
-    void ClickOnHelp();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void DeactivateActiveDialog();
-    void ActivateThisDialog();
-    void TypeClicked(int constructorId);
-    void DestClicked(int constructorId);
-    void PointClicked(int constructorId);
-    void Dir1Clicked(int constructorId);
-    void Dir2Clicked(int constructorId);
-    void ValueChangedInSpinBox(double newValue);
+  void                               ClickOnEnd();
+  void                               ClickOnCancel();
+  bool                               ClickOnApply();
+  void                               ClickOnUndo();
+  void                               ClickOnRedo();
+  void                               ClickOnHelp();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               DeactivateActiveDialog();
+  void                               ActivateThisDialog();
+  void                               TypeClicked( int );
+  void                               DestClicked( int );
+  void                               PointClicked( int );
+  void                               Dir1Clicked( int );
+  void                               Dir2Clicked( int );
+  void                               ValueChangedInSpinBox( double );
+  void                               SetDoubleSpinBoxStep( double );
 };
 
 #endif // ENTITYGUI_SKETCHERDLG_H
index ae82cc4c159b3a61f7a8de98c9beb1a737384709..af81a31bb94685883d964619e6bd0a8dd52a4ba0 100644 (file)
@@ -1,49 +1,49 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : EntityGUI_SubShapeDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : EntityGUI_SubShapeDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "EntityGUI_SubShapeDlg.h"
-#include "GEOM_Displayer.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "OCCViewer_ViewModel.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Desktop.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SUIT_ViewManager.h>
+#include <SUIT_ViewWindow.h>
+#include <OCCViewer_ViewModel.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopTools_MapOfShape.hxx>
 
-#include <qmessagebox.h>
-#include <qlabel.h>
-#include <qcombobox.h>
+#include <QMessageBox>
 
 //=================================================================================
 // class    : EntityGUI_SubShapeDlg
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-EntityGUI_SubShapeDlg::EntityGUI_SubShapeDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
-                                             const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, fl)
+EntityGUI_SubShapeDlg::EntityGUI_SubShapeDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                             bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, 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")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_SUBSHAPE" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_SUBSHAPE_TITLE"));
+  setWindowTitle( tr( "GEOM_SUBSHAPE_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_SUB_SHAPE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel1Check1List_QTD(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_MAIN_OBJECT"));
-  GroupPoints->TextLabel2->setText(tr("GEOM_SUBSHAPE_TYPE"));
-  GroupPoints->CheckButton1->setText(tr("GEOM_SUBSHAPE_SELECT"));
-  GroupPoints->PushButton1->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_SUB_SHAPE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_1Sel1Check1List( centralWidget() );
+
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_MAIN_OBJECT" ) );
+  GroupPoints->TextLabel2->setText( tr( "GEOM_SUBSHAPE_TYPE" ) );
+  GroupPoints->CheckButton1->setText( tr( "GEOM_SUBSHAPE_SELECT" ) );
+  GroupPoints->PushButton1->setIcon( image1 );
   GroupPoints->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget(GroupPoints, 1, 0);
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
   /***************************************************************/
 
-  setHelpFileName("create_explode_page.html");
+  setHelpFileName( "create_explode_page.html" );
+
+  mainFrame()->GroupBoxName->hide();
 
   Init();
 }
@@ -106,34 +113,34 @@ void EntityGUI_SubShapeDlg::Init()
   myWithShape = true;
 
   /* type for sub shape selection */
-  GroupPoints->ComboBox1->insertItem("Compound");
-  GroupPoints->ComboBox1->insertItem("Compsolid");
-  GroupPoints->ComboBox1->insertItem("Solid");
-  GroupPoints->ComboBox1->insertItem("Shell");
-  GroupPoints->ComboBox1->insertItem("Face");
-  GroupPoints->ComboBox1->insertItem("Wire");
-  GroupPoints->ComboBox1->insertItem("Edge");
-  GroupPoints->ComboBox1->insertItem("Vertex");
-  GroupPoints->ComboBox1->insertItem("Shape");
-
-  if (SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType()
-      != OCCViewer_Viewer::Type())
-    GroupPoints->CheckButton1->setEnabled(false);
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Compound" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Compsolid" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Solid" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Shell" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Face" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Wire" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Edge" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Vertex" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Shape" );
+
+  if ( SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType() 
+       != OCCViewer_Viewer::Type() )
+    GroupPoints->CheckButton1->setEnabled( false );
 
   /* signals and slots connections */
-  connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
+  connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
 
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPoints->PushButton1,  SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints->LineEdit1,    SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
-  connect(GroupPoints->ComboBox1, SIGNAL(activated(int)), this, SLOT(ComboTextChanged()));
-  connect(GroupPoints->CheckButton1, SIGNAL(stateChanged(int)), this, SLOT(SubShapeToggled()));
+  connect( GroupPoints->ComboBox1,    SIGNAL( activated( int ) ),    this, SLOT( ComboTextChanged() ) );
+  connect( GroupPoints->CheckButton1, SIGNAL( stateChanged( int ) ), this, SLOT( SubShapeToggled() ) );
 
-  connect(myGeomGUI->getApp()->selectionMgr(),
-          SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(),
+          SIGNAL( currentSelectionChanged( )), this, SLOT( SelectionIntoArgument() ) );
 
   updateButtonState();
 
@@ -158,19 +165,19 @@ void EntityGUI_SubShapeDlg::ClickOnOk()
 //=================================================================================
 bool EntityGUI_SubShapeDlg::ClickOnApply()
 {
-  SUIT_Session::session()->activeApplication()->putInfo(tr(""));
-
+  SUIT_Session::session()->activeApplication()->putInfo( "" );
+    
   /* Explode all sub shapes */
-  if( isAllSubShapes() ) {
+  if ( isAllSubShapes() ) {
     /* More than 30 subshapes : ask confirmation */
-    unsigned int nb = NumberOfSubShapes(myShape, shapeType());
-    if(nb > 30) {
-      const QString caption = tr("GEOM_CONFIRM");
-      const QString text = tr("GEOM_CONFIRM_INFO").arg(nb);
-      const QString button0 = tr("GEOM_BUT_EXPLODE");
-      const QString button1 = tr("GEOM_BUT_CANCEL");
-
-      if(QMessageBox::warning(this, caption, text, button0, button1) != 0)
+    unsigned int nb = NumberOfSubShapes( myShape, shapeType() );
+    if ( nb > 30 ) {
+      const QString caption = tr( "GEOM_CONFIRM" );
+      const QString text = tr( "GEOM_CONFIRM_INFO" ).arg( nb );
+      const QString button0 = tr( "GEOM_BUT_EXPLODE" );
+      const QString button1 = tr( "GEOM_BUT_CANCEL" );
+
+      if ( QMessageBox::warning( this, caption, text, button0, button1 ) != 0 )
         return false;  /* aborted */
     }
   }
@@ -191,78 +198,73 @@ bool EntityGUI_SubShapeDlg::ClickOnApply()
 //=================================================================================
 void EntityGUI_SubShapeDlg::SelectionIntoArgument()
 {
-  if ( !isAllSubShapes() )
+  if (!isAllSubShapes())
     return;
 
   ResetStateOfDialog();
 
   QString aString = ""; /* name of selection */
 
-  int nbSel = GEOMBase::GetNameOfSelectedIObjects( selectedIO(), aString, true );
-  if( nbSel != 1 )
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  int nbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aString, true);
+  if (nbSel != 1)
     return;
 
   TopoDS_Shape S;
-  Handle(SALOME_InteractiveObject) IO = firstIObject();
-  if ( !IO->hasEntry() )
-  {
+  Handle(SALOME_InteractiveObject) IO = aSelList.First();
+  if ( !IO->hasEntry() ) {
     SUIT_Session::session()->activeApplication()->putInfo( tr( "GEOM_PRP_SHAPE_IN_STUDY" ) );
     updateButtonState();
     return;
   }
 
-  if ( !GEOMBase::GetTopoFromSelection( selectedIO(), S ) ||
-       S.IsNull() ||
-       S.ShapeType() == TopAbs_VERTEX )
-  {
+  if (!GEOMBase::GetTopoFromSelection(aSelList, S) ||
+      S.IsNull() ||
+      S.ShapeType() == TopAbs_VERTEX) {
+    myObject = GEOM::GEOM_Object::_nil();
     updateButtonState();
     return;
   }
 
-
   Standard_Boolean testResult;
-  myObject = GEOMBase::ConvertIOinGEOMObject( IO, testResult );
-  if ( !testResult || myObject->_is_nil() )
-  {
+  myObject = GEOMBase::ConvertIOinGEOMObject(IO, testResult);
+  if (!testResult || myObject->_is_nil()) {
     updateButtonState();
     return;
   }
 
   myShape = S;
-  GroupPoints->LineEdit1->setText( aString );
+  GroupPoints->LineEdit1->setText(aString);
 
-
-  int SelectedShapeType = GroupPoints->ComboBox1->currentItem();
+  int SelectedShapeType = GroupPoints->ComboBox1->currentIndex();
   int count = GroupPoints->ComboBox1->count();
 
-  if ( myWithShape )
+  if (myWithShape)
     count = count - 1;
 
   int i = 0;
   // Solving PAL5590
-  if ( myShape.ShapeType() == TopAbs_COMPOUND ) {
+  if (myShape.ShapeType() == TopAbs_COMPOUND) {
     unsigned int nb = NumberOfSubShapes(myShape, TopAbs_COMPOUND);
-    if (nb > 0)
+    if ( nb > 0 )
       i++;
   }
-  while ( i <= myShape.ShapeType())
-  {
-    GroupPoints->ComboBox1->removeItem( 0 );
+  while (i <= myShape.ShapeType()) {
+    GroupPoints->ComboBox1->removeItem(0);
     i++;
   }
 
-  if ( myShape.ShapeType() == TopAbs_COMPOUND )
-  {
-    if ( myWithShape == false )
-    {
-      GroupPoints->ComboBox1->insertItem( "Shape" );
+  if (myShape.ShapeType() == TopAbs_COMPOUND) {
+    if (myWithShape == false) {
+      GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Shape");
       myWithShape = true;
     }
   }
-  else
-  {
-    if ( myWithShape == true )
-    {
+  else {
+    if ( myWithShape == true ) {
       GroupPoints->ComboBox1->removeItem( GroupPoints->ComboBox1->count() - 1 );
       myWithShape = false;
     }
@@ -272,22 +274,18 @@ void EntityGUI_SubShapeDlg::SelectionIntoArgument()
   if ( myWithShape )
     count1 = count1 - 1;
 
-  if ( SelectedShapeType > myShape.ShapeType() )
-  {
-    if ( SelectedShapeType == 8 )
-    {
-      if ( myShape.ShapeType() != TopAbs_COMPOUND )
-      {
-        GroupPoints->ComboBox1->setCurrentItem( 0 );
+  if ( SelectedShapeType > myShape.ShapeType() ) {
+    if ( SelectedShapeType == 8 ) {
+      if ( myShape.ShapeType() != TopAbs_COMPOUND ) {
+        GroupPoints->ComboBox1->setCurrentIndex( 0 );
         ComboTextChanged();
       }
     }
     else
-      GroupPoints->ComboBox1->setCurrentItem(count1 - count + SelectedShapeType);
+      GroupPoints->ComboBox1->setCurrentIndex( count1 - count + SelectedShapeType );
   }
-  else
-  {
-    GroupPoints->ComboBox1->setCurrentItem( 0 );
+  else {
+    GroupPoints->ComboBox1->setCurrentIndex( 0 );
     ComboTextChanged();
   }
 
@@ -303,8 +301,8 @@ void EntityGUI_SubShapeDlg::SetEditCurrentArgument()
 {
   GroupPoints->LineEdit1->setFocus();
   myEditCurrentArgument = GroupPoints->LineEdit1;
-
-  GroupPoints->CheckButton1->setChecked( FALSE );
+  
+  GroupPoints->CheckButton1->setChecked( false );
   SubShapeToggled();
   SelectionIntoArgument();
 }
@@ -315,9 +313,9 @@ void EntityGUI_SubShapeDlg::SetEditCurrentArgument()
 // purpose  :
 //=================================================================================
 void EntityGUI_SubShapeDlg::LineEditReturnPressed()
-{
+{  
   QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1)
+  if ( send == GroupPoints->LineEdit1 )
     SetEditCurrentArgument();
   else
     return;
@@ -332,7 +330,7 @@ void EntityGUI_SubShapeDlg::LineEditReturnPressed()
 //=================================================================================
 void EntityGUI_SubShapeDlg::DeactivateActiveDialog()
 {
-  if (GroupConstructors->isEnabled()) {
+  if ( mainFrame()->GroupConstructors->isEnabled() ) {
     GEOMBase_Skeleton::DeactivateActiveDialog();
   }
 }
@@ -345,8 +343,8 @@ void EntityGUI_SubShapeDlg::DeactivateActiveDialog()
 void EntityGUI_SubShapeDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-          SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
   SubShapeToggled();
   updateButtonState();
 }
@@ -356,9 +354,9 @@ void EntityGUI_SubShapeDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void EntityGUI_SubShapeDlg::enterEvent(QEvent* e)
+void EntityGUI_SubShapeDlg::enterEvent( QEvent* )
 {
-  if (!GroupConstructors->isEnabled())
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
@@ -370,28 +368,28 @@ void EntityGUI_SubShapeDlg::ResetStateOfDialog()
 {
   myObject = GEOM::GEOM_Object::_nil();
   myShape.Nullify();
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
 
-  int SelectedShapeType = GroupPoints->ComboBox1->currentItem();
+  int SelectedShapeType = GroupPoints->ComboBox1->currentIndex();
   int count = GroupPoints->ComboBox1->count();
   if ( myWithShape )
     count = count - 1;
 
   /* type for sub shape selection */
   GroupPoints->ComboBox1->clear();
-  GroupPoints->ComboBox1->insertItem("Compound");
-  GroupPoints->ComboBox1->insertItem("Compsolid");
-  GroupPoints->ComboBox1->insertItem("Solid");
-  GroupPoints->ComboBox1->insertItem("Shell");
-  GroupPoints->ComboBox1->insertItem("Face");
-  GroupPoints->ComboBox1->insertItem("Wire");
-  GroupPoints->ComboBox1->insertItem("Edge");
-  GroupPoints->ComboBox1->insertItem("Vertex");
-  GroupPoints->ComboBox1->insertItem("Shape");
-
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Compound" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Compsolid" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Solid" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Shell" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Face" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Wire" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Edge" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Vertex" );
+  GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Shape" );
+  
   myWithShape = true;
-
-  GroupPoints->ComboBox1->setCurrentItem( 8 - count + SelectedShapeType );
+  
+  GroupPoints->ComboBox1->setCurrentIndex( 8 - count + SelectedShapeType );
   ComboTextChanged();
 
   updateButtonState();
@@ -414,13 +412,13 @@ void EntityGUI_SubShapeDlg::SubShapeToggled()
 
 //=================================================================================
 // function : ComboTextChanged()
-// purpose  :
+// purpose  : 
 //=================================================================================
 void EntityGUI_SubShapeDlg::ComboTextChanged()
 {
   /* Select sub shapes mode not checked */
   updateButtonState();
-  SubShapeToggled();
+  SubShapeToggled();    
 }
 
 
@@ -428,32 +426,33 @@ void EntityGUI_SubShapeDlg::ComboTextChanged()
 // function : NumberOfSubShapes()
 // purpose  :
 //=================================================================================
-unsigned int EntityGUI_SubShapeDlg::NumberOfSubShapes (const TopoDS_Shape& S,
-                                                       const int shapeType) const
+unsigned int EntityGUI_SubShapeDlg::NumberOfSubShapesconst TopoDS_Shape& S,
+                                                      const int shapeType ) const
 {
-  if (S.IsNull())
+  if ( S.IsNull() )
     return 0;
 
   unsigned int index = 0;
   TopTools_MapOfShape M;
 
-  if (S.ShapeType() == TopAbs_COMPOUND &&
-      (TopAbs_ShapeEnum(shapeType) == TopAbs_SHAPE ||
-       TopAbs_ShapeEnum(shapeType) == TopAbs_COMPSOLID ||
-       TopAbs_ShapeEnum(shapeType) == TopAbs_COMPOUND)) {
-    TopoDS_Iterator It (S, Standard_True, Standard_True);
-    for (; It.More(); It.Next()) {
-      if (M.Add(It.Value())) {
-        if (TopAbs_ShapeEnum(shapeType) == TopAbs_SHAPE ||
-            TopAbs_ShapeEnum(shapeType) == It.Value().ShapeType()) {
+  if ( S.ShapeType() == TopAbs_COMPOUND &&
+       ( TopAbs_ShapeEnum(shapeType) == TopAbs_SHAPE ||
+        TopAbs_ShapeEnum(shapeType) == TopAbs_COMPSOLID ||
+        TopAbs_ShapeEnum(shapeType) == TopAbs_COMPOUND ) ) {
+    TopoDS_Iterator It( S, Standard_True, Standard_True );
+    for ( ; It.More(); It.Next() ) {
+      if ( M.Add( It.Value() ) ) {
+        if ( TopAbs_ShapeEnum( shapeType ) == TopAbs_SHAPE ||
+            TopAbs_ShapeEnum( shapeType ) == It.Value().ShapeType() ) {
           index++;
         }
       }
     }
-  } else {
-    TopExp_Explorer Exp (S, TopAbs_ShapeEnum(shapeType));
-    for (; Exp.More(); Exp.Next()) {
-      if (M.Add(Exp.Current())) {
+  } 
+  else {
+    TopExp_Explorer Exp ( S, TopAbs_ShapeEnum( shapeType ) );
+    for ( ; Exp.More(); Exp.Next() ) {
+      if ( M.Add( Exp.Current() ) ) {
         index++;
       }
     }
@@ -471,11 +470,11 @@ void EntityGUI_SubShapeDlg::updateButtonState()
 {
   if ( SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType() != OCCViewer_Viewer::Type() ||
        myObject->_is_nil() || shapeType() == TopAbs_SHAPE || shapeType() == TopAbs_COMPOUND ) {
-    GroupPoints->CheckButton1->setChecked( FALSE );
-    GroupPoints->CheckButton1->setEnabled( FALSE );
+    GroupPoints->CheckButton1->setChecked( false );
+    GroupPoints->CheckButton1->setEnabled( false );
   }
   else
-    GroupPoints->CheckButton1->setEnabled( TRUE );
+    GroupPoints->CheckButton1->setEnabled( true );
 }
 
 //=================================================================================
@@ -493,15 +492,15 @@ bool EntityGUI_SubShapeDlg::isAllSubShapes() const
 //=================================================================================
 int EntityGUI_SubShapeDlg::shapeType() const
 {
-  int type = GroupPoints->ComboBox1->currentItem();
+  int type = GroupPoints->ComboBox1->currentIndex();
 
-  if (myObject->_is_nil())
+  if ( myObject->_is_nil() )
     return type;
 
   // Solving PAL5590
   type += myShape.ShapeType() + 1;
-  if (myShape.ShapeType() == TopAbs_COMPOUND &&
-      NumberOfSubShapes(myShape, TopAbs_COMPOUND) > 0) {
+  if ( myShape.ShapeType() == TopAbs_COMPOUND &&
+       NumberOfSubShapes( myShape, TopAbs_COMPOUND ) > 0 ) {
     type--;
   }
 
@@ -521,33 +520,35 @@ GEOM::GEOM_IOperations_ptr EntityGUI_SubShapeDlg::createOperation()
 // function : isValid
 // purpose  :
 //=================================================================================
-bool EntityGUI_SubShapeDlg::isValid( QString& msg )
+bool EntityGUI_SubShapeDlg::isValid (QString& msg)
 {
   bool isOk = false;
-  Handle(SALOME_InteractiveObject) IO = firstIObject();
-  Standard_Boolean testResult;
-  myObject = GEOMBase::ConvertIOinGEOMObject( IO, testResult );
-  if ( !testResult || myObject->_is_nil() )  {
+
+  if (myObject->_is_nil()) {
     updateButtonState();
     return isOk;
   }
-  if ( !myObject->_is_nil() ) {
-    if ( isAllSubShapes() )
-      isOk = true;
-    else if ( IObjectCount() == 1 ) {
-      Standard_Boolean aResult = Standard_False;
-      GEOM::GEOM_Object_var anObj =
-       GEOMBase::ConvertIOinGEOMObject( firstIObject(), aResult );
 
-      if ( aResult && !anObj->_is_nil() ) {
-       TColStd_IndexedMapOfInteger aMapIndex;
-       myGeomGUI->getApp()->selectionMgr()->GetIndexes( firstIObject(), aMapIndex );
-       isOk = aMapIndex.Extent() > 0;
-       if ( !isOk )
-         msg += tr( "NO_SUBSHAPES_SELECTED" );
+  if (isAllSubShapes())
+    isOk = true;
+  else {
+    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+    SALOME_ListIO aSelList;
+    aSelMgr->selectedObjects(aSelList);
+
+    if (aSelList.Extent() == 1) {
+      Standard_Boolean testResult;  
+      GEOM::GEOM_Object_var anObj = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+      if (testResult && !anObj->_is_nil()) {
+        TColStd_IndexedMapOfInteger aMapIndex;
+        aSelMgr->GetIndexes(aSelList.First(), aMapIndex);
+        isOk = aMapIndex.Extent() > 0;
+        if (!isOk)
+          msg += tr("NO_SUBSHAPES_SELECTED");
       }
     }
   }
+
   return isOk;
 }
 
@@ -555,40 +556,43 @@ bool EntityGUI_SubShapeDlg::isValid( QString& msg )
 // function : execute
 // purpose  :
 //=================================================================================
-bool EntityGUI_SubShapeDlg::execute( ObjectList& objects )
+bool EntityGUI_SubShapeDlg::execute (ObjectList& objects)
 {
-  GEOM::ListOfGO_var aList = GEOM::GEOM_IShapesOperations::_narrow(
-    getOperation() )->MakeExplode( myObject, shapeType(), true );
+  GEOM::ListOfGO_var aList = GEOM::GEOM_IShapesOperations::_narrow(getOperation())->
+    MakeExplode(myObject, shapeType(), true);
 
-  if ( !aList->length() )
+  if (!aList->length())
     return false;
 
-  // Throw away sub-shapes not selected by user if not in preview mode
+  // Throw away sub-shapes not selected by user if not in preview mode 
   // and manual selection is active
-  if ( !isAllSubShapes() )
-  {
-    if ( IObjectCount() == 1 ) {
+  if (!isAllSubShapes()) {
+    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+    SALOME_ListIO aSelList;
+    aSelMgr->selectedObjects(aSelList);
+
+    if (aSelList.Extent() == 1) {
       Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-       GEOMBase::ConvertIOinGEOMObject( firstIObject(), aResult );
+       GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
 
-      if ( aResult && !anObj->_is_nil() ) {
+      if (aResult && !anObj->_is_nil()) {
        TColStd_IndexedMapOfInteger aMapIndex;
-       myGeomGUI->getApp()->selectionMgr()->GetIndexes( firstIObject(), aMapIndex );
+       aSelMgr->GetIndexes(aSelList.First(), aMapIndex);
 
-       GEOM::GEOM_ILocalOperations_var aLocOp =
-         getGeomEngine()->GetILocalOperations( getStudyId() );
+       GEOM::GEOM_ILocalOperations_var aLocOp = 
+         getGeomEngine()->GetILocalOperations(getStudyId());
 
-       for ( int i = 0, n = aList->length(); i < n; i++ )
-         if ( aMapIndex.Contains( aLocOp->GetSubShapeIndex( myObject, aList[i] ) ) )
-           objects.push_back( GEOM::GEOM_Object::_duplicate( aList[i] ) );
+       for (int i = 0, n = aList->length(); i < n; i++)
+         if (aMapIndex.Contains(aLocOp->GetSubShapeIndex(myObject, aList[i])))
+           objects.push_back(GEOM::GEOM_Object::_duplicate(aList[i]));
       }
     }
   }
   else
-    for ( int i = 0, n = aList->length(); i < n; i++ )
-      objects.push_back( GEOM::GEOM_Object::_duplicate( aList[i] ) );
-
+    for (int i = 0, n = aList->length(); i < n; i++)
+      objects.push_back(GEOM::GEOM_Object::_duplicate(aList[i]));
+  
   return objects.size();
 }
 
@@ -602,7 +606,7 @@ GEOM::GEOM_Object_ptr EntityGUI_SubShapeDlg::getFather( GEOM::GEOM_Object_ptr )
   return myObject;
 }
 
-const char* EntityGUI_SubShapeDlg::getNewObjectName() const
+QString EntityGUI_SubShapeDlg::getNewObjectName() const
 {
-  return "";
+  return QString::null;
 }
index 5d70497e9fc9d0194b23615c4e444d50a58dab85..6dbd0cb8f70a416c55edb8ad88103c645d384773 100644 (file)
@@ -1,92 +1,86 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : EntityGUI_SubShapeDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_SUBSHAPE_H
-#define DIALOGBOX_SUBSHAPE_H
-
-#include "GEOM_EntityGUI.hxx"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : EntityGUI_SubShapeDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef ENTITYGUI_SUBSHAPEDLG_H
+#define ENTITYGUI_SUBSHAPEDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel1Check1List_QTD.h"
+#include <GEOMBase_Skeleton.h>
 
+class DlgRef_1Sel1Check1List;
 
 //=================================================================================
 // class    : EntityGUI_SubShapeDlg
 // purpose  :
 //=================================================================================
-class GEOM_ENTITYGUI_EXPORT EntityGUI_SubShapeDlg : public GEOMBase_Skeleton
+class EntityGUI_SubShapeDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    EntityGUI_SubShapeDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                         const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~EntityGUI_SubShapeDlg();
+  EntityGUI_SubShapeDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~EntityGUI_SubShapeDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr  createOperation();
-    virtual bool                        isValid( QString& );
-    virtual bool                        execute( ObjectList& objects );
-    virtual GEOM::GEOM_Object_ptr       getFather( GEOM::GEOM_Object_ptr theObj );
-    virtual const char* getNewObjectName() const;
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr  createOperation();
+  virtual bool                        isValid( QString& );
+  virtual bool                        execute( ObjectList& );
+  virtual GEOM::GEOM_Object_ptr       getFather( GEOM::GEOM_Object_ptr );
+  virtual QString                     getNewObjectName() const;
 
 private slots:
-    void                                ClickOnOk();
-    bool                                ClickOnApply();
-    void                                ActivateThisDialog();
-    void                                DeactivateActiveDialog();
-    void                                LineEditReturnPressed();
-    void                                SelectionIntoArgument();
-    void                                SetEditCurrentArgument();
-    void                                SubShapeToggled();
-    void                                ComboTextChanged();
+  void                                ClickOnOk();
+  bool                                ClickOnApply();
+  void                                ActivateThisDialog();
+  void                                DeactivateActiveDialog();
+  void                                LineEditReturnPressed();
+  void                                SelectionIntoArgument();
+  void                                SetEditCurrentArgument();
+  void                                SubShapeToggled();
+  void                                ComboTextChanged();
 
-private :
-    void                                Init();
-    void                                enterEvent( QEvent* e );
+private:
+  void                                Init();
+  void                                enterEvent( QEvent* );
 
-    void                                ResetStateOfDialog();
-    unsigned int                        NumberOfSubShapes (const TopoDS_Shape& S,
-                                                          const int shapeType) const;
+  void                                ResetStateOfDialog();
+  unsigned int                        NumberOfSubShapes( const TopoDS_Shape&,
+                                                        const int ) const;
 
-    void                                updateButtonState();
-    bool                                isAllSubShapes() const;
-    int                                 shapeType() const;
+  void                                updateButtonState();
+  bool                                isAllSubShapes() const;
+  int                                 shapeType() const;
 
 private:    
-
-    TopoDS_Shape                        myShape;
-    GEOM::GEOM_Object_var               myObject;
-
-    bool                                myWithShape;  
-    
-    DlgRef_1Sel1Check1List_QTD*         GroupPoints;
-    ObjectList                          myResult;
+  TopoDS_Shape                        myShape;
+  GEOM::GEOM_Object_var               myObject;
+  
+  bool                                myWithShape;  
+  
+  DlgRef_1Sel1Check1List*             GroupPoints;
+  ObjectList                          myResult;
 };
 
-#endif // DIALOGBOX_SUBSHAPE_H
+#endif // ENTITYGUI_SUBSHAPEDLG_H
diff --git a/src/EntityGUI/EntityGUI_Widgets.cxx b/src/EntityGUI/EntityGUI_Widgets.cxx
new file mode 100644 (file)
index 0000000..663d80d
--- /dev/null
@@ -0,0 +1,173 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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   : EntityGUI_Widgets.cxx
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
+//
+#include "EntityGUI_Widgets.h"
+#include <QButtonGroup>
+
+//////////////////////////////////////////
+// EntityGUI_1Sel
+//////////////////////////////////////////
+
+EntityGUI_1Sel::EntityGUI_1Sel( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+EntityGUI_1Sel::~EntityGUI_1Sel()
+{
+}
+
+//////////////////////////////////////////
+// EntityGUI_1Spin
+//////////////////////////////////////////
+
+EntityGUI_1Spin::EntityGUI_1Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+EntityGUI_1Spin::~EntityGUI_1Spin()
+{
+}
+
+//////////////////////////////////////////
+// EntityGUI_2Spin
+//////////////////////////////////////////
+
+EntityGUI_2Spin::EntityGUI_2Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+EntityGUI_2Spin::~EntityGUI_2Spin()
+{
+}
+
+//////////////////////////////////////////
+// EntityGUI_3Spin
+//////////////////////////////////////////
+
+EntityGUI_3Spin::EntityGUI_3Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+EntityGUI_3Spin::~EntityGUI_3Spin()
+{
+}
+
+//////////////////////////////////////////
+// EntityGUI_4Spin
+//////////////////////////////////////////
+
+EntityGUI_4Spin::EntityGUI_4Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+EntityGUI_4Spin::~EntityGUI_4Spin()
+{
+}
+
+//////////////////////////////////////////
+// EntityGUI_Dir1
+//////////////////////////////////////////
+
+EntityGUI_Dir1::EntityGUI_Dir1( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+
+  ButtonGroup = new QButtonGroup( this );
+  ButtonGroup->addButton( RB_Dir11, 2 );
+  ButtonGroup->addButton( RB_Dir12, 0 );
+  ButtonGroup->addButton( RB_Dir13, 1 );
+  ButtonGroup->addButton( RB_Dir14, 3 );
+}
+
+EntityGUI_Dir1::~EntityGUI_Dir1()
+{
+}
+
+//////////////////////////////////////////
+// EntityGUI_Dir2
+//////////////////////////////////////////
+
+EntityGUI_Dir2::EntityGUI_Dir2( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+
+  ButtonGroup = new QButtonGroup( this );
+  ButtonGroup->addButton( RB_Dir21, 2 );
+  ButtonGroup->addButton( RB_Dir22, 0 );
+  ButtonGroup->addButton( RB_Dir23, 1 );
+}
+
+EntityGUI_Dir2::~EntityGUI_Dir2()
+{
+}
+
+//////////////////////////////////////////
+// EntityGUI_Point
+//////////////////////////////////////////
+
+EntityGUI_Point::EntityGUI_Point( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+
+  ButtonGroup = new QButtonGroup( this );
+  ButtonGroup->addButton( RB_Point1, 1 );
+  ButtonGroup->addButton( RB_Point2, 0 );
+  ButtonGroup->addButton( RB_Point3, 2 );
+}
+
+EntityGUI_Point::~EntityGUI_Point()
+{
+}
+
+//////////////////////////////////////////
+// EntityGUI_Skeleton
+//////////////////////////////////////////
+
+EntityGUI_Skeleton::EntityGUI_Skeleton( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+
+  ButtonGroup = new QButtonGroup( this );
+  ButtonGroup->addButton( RadioButton1, 0 );
+  ButtonGroup->addButton( RadioButton2, 1 );
+}
+
+EntityGUI_Skeleton::~EntityGUI_Skeleton()
+{
+}
+
diff --git a/src/EntityGUI/EntityGUI_Widgets.h b/src/EntityGUI/EntityGUI_Widgets.h
new file mode 100644 (file)
index 0000000..40cc20e
--- /dev/null
@@ -0,0 +1,182 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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   : EntityGUI_Widgets.h
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
+//
+#ifndef ENTITYGUI_WIDGETS_H
+#define ENTITYGUI_WIDGETS_H
+
+//////////////////////////////////////////
+// EntityGUI_1Sel
+//////////////////////////////////////////
+
+#include "ui_EntityGUI_1Sel_QTD.h"
+
+class EntityGUI_1Sel : public QWidget, 
+                       public Ui::EntityGUI_1Sel_QTD
+{
+  Q_OBJECT
+
+public:
+  EntityGUI_1Sel( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~EntityGUI_1Sel();
+};
+
+//////////////////////////////////////////
+// EntityGUI_1Spin
+//////////////////////////////////////////
+
+#include "ui_EntityGUI_1Spin_QTD.h"
+
+class EntityGUI_1Spin : public QWidget, 
+                        public Ui::EntityGUI_1Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  EntityGUI_1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~EntityGUI_1Spin();
+};
+
+//////////////////////////////////////////
+// EntityGUI_2Spin
+//////////////////////////////////////////
+
+#include "ui_EntityGUI_2Spin_QTD.h"
+
+class EntityGUI_2Spin : public QWidget, 
+                        public Ui::EntityGUI_2Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  EntityGUI_2Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~EntityGUI_2Spin();
+};
+
+//////////////////////////////////////////
+// EntityGUI_3Spin
+//////////////////////////////////////////
+
+#include "ui_EntityGUI_3Spin_QTD.h"
+
+class EntityGUI_3Spin : public QWidget, 
+                        public Ui::EntityGUI_3Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  EntityGUI_3Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~EntityGUI_3Spin();
+};
+
+//////////////////////////////////////////
+// EntityGUI_4Spin
+//////////////////////////////////////////
+
+#include "ui_EntityGUI_4Spin_QTD.h"
+
+class EntityGUI_4Spin : public QWidget, 
+                        public Ui::EntityGUI_4Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  EntityGUI_4Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~EntityGUI_4Spin();
+};
+
+//////////////////////////////////////////
+// EntityGUI_Dir1
+//////////////////////////////////////////
+
+#include "ui_EntityGUI_Dir1_QTD.h"
+
+class EntityGUI_Dir1 : public QWidget, 
+                       public Ui::EntityGUI_Dir1_QTD
+{
+  Q_OBJECT
+
+public:
+  EntityGUI_Dir1( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~EntityGUI_Dir1();
+
+  QButtonGroup* ButtonGroup;
+};
+
+//////////////////////////////////////////
+// EntityGUI_Dir2
+//////////////////////////////////////////
+
+#include "ui_EntityGUI_Dir2_QTD.h"
+
+class EntityGUI_Dir2 : public QWidget, 
+                       public Ui::EntityGUI_Dir2_QTD
+{
+  Q_OBJECT
+
+public:
+  EntityGUI_Dir2( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~EntityGUI_Dir2();
+
+  QButtonGroup* ButtonGroup;
+};
+
+//////////////////////////////////////////
+// EntityGUI_Point
+//////////////////////////////////////////
+
+#include "ui_EntityGUI_Point_QTD.h"
+
+class EntityGUI_Point : public QWidget, 
+                        public Ui::EntityGUI_Point_QTD
+{
+  Q_OBJECT
+
+public:
+  EntityGUI_Point( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~EntityGUI_Point();
+
+  QButtonGroup* ButtonGroup;
+};
+
+//////////////////////////////////////////
+// EntityGUI_Skeleton
+//////////////////////////////////////////
+
+#include "ui_EntityGUI_Skeleton_QTD.h"
+
+class QButtonGroup;
+
+class EntityGUI_Skeleton : public QWidget, 
+                           public Ui::EntityGUI_Skeleton_QTD
+{
+  Q_OBJECT
+
+public:
+  EntityGUI_Skeleton( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~EntityGUI_Skeleton();
+
+  QButtonGroup* ButtonGroup;
+};
+
+#endif // ENTITYGUI_WIDGETS_H
diff --git a/src/EntityGUI/GEOM_EntityGUI.hxx b/src/EntityGUI/GEOM_EntityGUI.hxx
deleted file mode 100755 (executable)
index 2a42f34..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-//  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_EntityGUI.hxx
-//  Author : Alexander A. BORODIN
-//  Module : GEOM
-
-#ifndef _GEOM_EntityGUI_HXX_
-#define _GEOM_EntityGUI_HXX_
-
-#ifdef WNT
- #if defined ENTITYGUI_EXPORTS
-  #if defined WIN32
-   #define GEOM_ENTITYGUI_EXPORT __declspec( dllexport )
-  #else
-   #define GEOM_ENTITYGUI_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define GEOM_ENTITYGUI_EXPORT __declspec( dllimport )
-  #else
-   #define GEOM_ENTITYGUI_EXPORT
-  #endif
- #endif
-#else
- #define GEOM_ENTITYGUI_EXPORT
-#endif
-
-#endif
index 2afe2a1a28a41607c471f2def2db64ffb5a88371..f54555614ef64234e1cfa9c48d0d9c1f56c9c916 100644 (file)
-#  GEOM ENTITYGUI : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM ENTITYGUI : 
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : EntityGUI
 #
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
 lib_LTLIBRARIES = libEntityGUI.la
 
 # header files
-salomeinclude_HEADERS = \
-       GEOM_EntityGUI.hxx
+salomeinclude_HEADERS =                        \
+       EntityGUI.h                     \
+       EntityGUI_Widgets.h             \
+       EntityGUI_SketcherDlg.h         \
+       EntityGUI_3DSketcherDlg.h       \
+       EntityGUI_SubShapeDlg.h 
 
-dist_libEntityGUI_la_SOURCES = EntityGUI.cxx \
-       EntityGUI_Skeleton_QTD.cxx \
-       EntityGUI_Point_QTD.cxx \
-       EntityGUI_Dir1_QTD.cxx \
-       EntityGUI_Dir2_QTD.cxx \
-       EntityGUI_1Sel_QTD.cxx \
-       EntityGUI_1Spin_QTD.cxx \
-       EntityGUI_2Spin_QTD.cxx \
-       EntityGUI_3Spin_QTD.cxx \
-       EntityGUI_4Spin_QTD.cxx \
-       EntityGUI_1Spin.cxx \
-       EntityGUI_2Spin.cxx \
-       EntityGUI_3Spin.cxx \
-       EntityGUI_4Spin.cxx \
-       EntityGUI_SketcherDlg.cxx \
+dist_libEntityGUI_la_SOURCES =                 \
+       EntityGUI.cxx                   \
+       EntityGUI_Widgets.cxx           \
+       EntityGUI_SketcherDlg.cxx       \
+       EntityGUI_3DSketcherDlg.cxx     \
        EntityGUI_SubShapeDlg.cxx
 
-MOC_FILES = \
-       EntityGUI_Skeleton_QTD_moc.cxx \
-       EntityGUI_Point_QTD_moc.cxx \
-       EntityGUI_Dir1_QTD_moc.cxx \
-       EntityGUI_Dir2_QTD_moc.cxx \
-       EntityGUI_1Sel_QTD_moc.cxx \
-       EntityGUI_1Spin_QTD_moc.cxx \
-       EntityGUI_2Spin_QTD_moc.cxx \
-       EntityGUI_3Spin_QTD_moc.cxx \
-       EntityGUI_4Spin_QTD_moc.cxx \
-       EntityGUI_1Spin_moc.cxx \
-       EntityGUI_2Spin_moc.cxx \
-       EntityGUI_3Spin_moc.cxx \
-       EntityGUI_4Spin_moc.cxx \
-       EntityGUI_SketcherDlg_moc.cxx \
+MOC_FILES =                            \
+       EntityGUI_Widgets_moc.cxx       \
+       EntityGUI_SketcherDlg_moc.cxx   \
+       EntityGUI_3DSketcherDlg_moc.cxx \
        EntityGUI_SubShapeDlg_moc.cxx
 
-nodist_libEntityGUI_la_SOURCES= \
+nodist_libEntityGUI_la_SOURCES =       \
         $(MOC_FILES)
 
-# LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
+UIC_FILES =                            \
+       ui_EntityGUI_1Sel_QTD.h         \
+       ui_EntityGUI_1Spin_QTD.h        \
+       ui_EntityGUI_2Spin_QTD.h        \
+       ui_EntityGUI_3Spin_QTD.h        \
+       ui_EntityGUI_4Spin_QTD.h        \
+       ui_EntityGUI_Dir1_QTD.h         \
+       ui_EntityGUI_Dir2_QTD.h         \
+       ui_EntityGUI_Point_QTD.h        \
+       ui_EntityGUI_Skeleton_QTD.h
 
-# LIB_SERVER_IDL =  
+BUILT_SOURCES = $(UIC_FILES)
 
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libEntityGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(VTK_INCLUDES) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../DlgRef \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(srcdir)/../GEOMFiltersSelection \
-       -I$(srcdir)/../SKETCHER \
-       -I$(top_builddir)/idl \
+libEntityGUI_la_CPPFLAGS =                     \
+       $(QT_INCLUDES)                          \
+       $(CAS_CPPFLAGS)                         \
+       $(VTK_INCLUDES)                         \
+       $(PYTHON_INCLUDES)                      \
+       $(BOOST_CPPFLAGS)                       \
+       $(KERNEL_CXXFLAGS)                      \
+       $(GUI_CXXFLAGS)                         \
+       $(CORBA_CXXFLAGS)                       \
+       $(CORBA_INCLUDES)                       \
+       -I$(srcdir)/../GEOMGUI                  \
+       -I$(srcdir)/../DlgRef                   \
+       -I$(srcdir)/../GEOMBase                 \
+       -I$(srcdir)/../OBJECT                   \
+       -I$(srcdir)/../GEOMClient               \
+       -I$(srcdir)/../GEOMImpl                 \
+       -I$(srcdir)/../GEOMFiltersSelection     \
+       -I$(srcdir)/../SKETCHER                 \
+       -I$(top_builddir)/src/DlgRef            \
+       -I$(top_builddir)/idl                   \
        -I$(top_builddir)/salome_adm/unix
 
-libEntityGUI_la_LDFLAGS  = \
-       ../GEOMFiltersSelection/libGEOMFiltersSelection.la \
-       ../GEOMBase/libGEOMBase.la \
-       ../SKETCHER/libGEOMSketcher.la \
-       ../GEOMGUI/libGEOM.la \
-       $(QT_MT_LIBS) \
+libEntityGUI_la_LDFLAGS  =                                     \
+       ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \
+       ../GEOMBase/libGEOMBase.la                              \
+       ../SKETCHER/libGEOMSketcher.la                          \
+       ../GEOMGUI/libGEOM.la                                   \
+       $(QT_MT_LIBS)                                           \
        $(CAS_TKTopAlgo) -lTKernel
 
diff --git a/src/EntityGUI/UIFiles/EntityGUI_1Sel_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_1Sel_QTD.ui
deleted file mode 100644 (file)
index c88df1a..0000000
+++ /dev/null
@@ -1,218 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_1Sel_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_1Sel_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>329</width>
-            <height>112</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>EntityGUI_1Sel_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string>Values</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout4</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="0" column="1">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <spacer row="2" column="0">
-                                    <property name="name">
-                                        <cstring>Spacer5</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>163</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QPushButton" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>buttonApply</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>Create</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLayoutWidget" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>Layout2</cstring>
-                                    </property>
-                                    <grid>
-                                        <property name="name">
-                                            <cstring>unnamed</cstring>
-                                        </property>
-                                        <property name="margin">
-                                            <number>0</number>
-                                        </property>
-                                        <property name="spacing">
-                                            <number>6</number>
-                                        </property>
-                                        <widget class="QPushButton" row="0" column="1">
-                                            <property name="name">
-                                                <cstring>buttonRedo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Redo</string>
-                                            </property>
-                                        </widget>
-                                        <widget class="QPushButton" row="0" column="0">
-                                            <property name="name">
-                                                <cstring>buttonUndo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Undo</string>
-                                            </property>
-                                        </widget>
-                                    </grid>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout1</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL1</string>
-                                    </property>
-                                </widget>
-                                <spacer row="1" column="2">
-                                    <property name="name">
-                                        <cstring>Spacer1</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>180</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QPushButton" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>PushButton1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string></string>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="0" column="2">
-                                    <property name="name">
-                                        <cstring>LineEdit1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>3</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
-
diff --git a/src/EntityGUI/UIFiles/EntityGUI_1Spin_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_1Spin_QTD.ui
deleted file mode 100644 (file)
index e1d0a71..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_1Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_1Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>255</width>
-            <height>112</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>EntityGUI_1Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string>Values</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout4</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout1</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL1</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <spacer row="3" column="1">
-                                    <property name="name">
-                                        <cstring>Spacer1</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>82</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                            </grid>
-                        </widget>
-                        <widget class="QLayoutWidget" row="0" column="1">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLayoutWidget" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>Layout2</cstring>
-                                    </property>
-                                    <grid>
-                                        <property name="name">
-                                            <cstring>unnamed</cstring>
-                                        </property>
-                                        <property name="margin">
-                                            <number>0</number>
-                                        </property>
-                                        <property name="spacing">
-                                            <number>6</number>
-                                        </property>
-                                        <widget class="QPushButton" row="0" column="1">
-                                            <property name="name">
-                                                <cstring>buttonRedo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Redo</string>
-                                            </property>
-                                        </widget>
-                                        <widget class="QPushButton" row="0" column="0">
-                                            <property name="name">
-                                                <cstring>buttonUndo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Undo</string>
-                                            </property>
-                                        </widget>
-                                    </grid>
-                                </widget>
-                                <widget class="QPushButton" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>buttonApply</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>Create</string>
-                                    </property>
-                                </widget>
-                                <spacer row="2" column="0">
-                                    <property name="name">
-                                        <cstring>Spacer5</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>40</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/EntityGUI/UIFiles/EntityGUI_2Spin_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_2Spin_QTD.ui
deleted file mode 100644 (file)
index 938383c..0000000
+++ /dev/null
@@ -1,230 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_2Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_2Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>255</width>
-            <height>112</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>EntityGUI_2Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string>Values</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout4</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout1</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL1</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <spacer row="3" column="1">
-                                    <property name="name">
-                                        <cstring>Spacer1</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>82</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                            </grid>
-                        </widget>
-                        <widget class="QLayoutWidget" row="0" column="1">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <spacer row="2" column="0">
-                                    <property name="name">
-                                        <cstring>Spacer5</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>51</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QLayoutWidget" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>Layout2</cstring>
-                                    </property>
-                                    <grid>
-                                        <property name="name">
-                                            <cstring>unnamed</cstring>
-                                        </property>
-                                        <property name="margin">
-                                            <number>0</number>
-                                        </property>
-                                        <property name="spacing">
-                                            <number>6</number>
-                                        </property>
-                                        <widget class="QPushButton" row="0" column="0">
-                                            <property name="name">
-                                                <cstring>buttonUndo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Undo</string>
-                                            </property>
-                                        </widget>
-                                        <widget class="QPushButton" row="0" column="1">
-                                            <property name="name">
-                                                <cstring>buttonRedo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Redo</string>
-                                            </property>
-                                        </widget>
-                                    </grid>
-                                </widget>
-                                <widget class="QPushButton" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>buttonApply</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>Create</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/EntityGUI/UIFiles/EntityGUI_3Spin_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_3Spin_QTD.ui
deleted file mode 100644 (file)
index c094d57..0000000
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_3Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_3Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>255</width>
-            <height>125</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>EntityGUI_3Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string>Values</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout4</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="0" column="1">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QPushButton" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>buttonApply</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>Create</string>
-                                    </property>
-                                </widget>
-                                <spacer row="2" column="0">
-                                    <property name="name">
-                                        <cstring>Spacer5</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>121</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QLayoutWidget" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>Layout2</cstring>
-                                    </property>
-                                    <grid>
-                                        <property name="name">
-                                            <cstring>unnamed</cstring>
-                                        </property>
-                                        <property name="margin">
-                                            <number>0</number>
-                                        </property>
-                                        <property name="spacing">
-                                            <number>6</number>
-                                        </property>
-                                        <widget class="QPushButton" row="0" column="0">
-                                            <property name="name">
-                                                <cstring>buttonUndo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Undo</string>
-                                            </property>
-                                        </widget>
-                                        <widget class="QPushButton" row="0" column="1">
-                                            <property name="name">
-                                                <cstring>buttonRedo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Redo</string>
-                                            </property>
-                                        </widget>
-                                    </grid>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout1</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL1</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="2" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                                <spacer row="3" column="1">
-                                    <property name="name">
-                                        <cstring>Spacer1</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>82</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QSpinBox" row="2" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/EntityGUI/UIFiles/EntityGUI_4Spin_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_4Spin_QTD.ui
deleted file mode 100644 (file)
index 956ce0d..0000000
+++ /dev/null
@@ -1,288 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_4Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_4Spin_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>255</width>
-            <height>154</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>EntityGUI_4Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="title">
-                <string>Values</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout4</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="0" column="1">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLayoutWidget" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>Layout2</cstring>
-                                    </property>
-                                    <grid>
-                                        <property name="name">
-                                            <cstring>unnamed</cstring>
-                                        </property>
-                                        <property name="margin">
-                                            <number>0</number>
-                                        </property>
-                                        <property name="spacing">
-                                            <number>6</number>
-                                        </property>
-                                        <widget class="QPushButton" row="0" column="1">
-                                            <property name="name">
-                                                <cstring>buttonRedo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Redo</string>
-                                            </property>
-                                        </widget>
-                                        <widget class="QPushButton" row="0" column="0">
-                                            <property name="name">
-                                                <cstring>buttonUndo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Undo</string>
-                                            </property>
-                                        </widget>
-                                    </grid>
-                                </widget>
-                                <spacer row="2" column="0">
-                                    <property name="name">
-                                        <cstring>Spacer5</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>45</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QPushButton" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>buttonApply</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>Create</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout1</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QSpinBox" row="2" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                                <spacer row="4" column="1">
-                                    <property name="name">
-                                        <cstring>Spacer1</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>70</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QSpinBox" row="3" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="2" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL1</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="3" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/EntityGUI/UIFiles/EntityGUI_Dir1_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_Dir1_QTD.ui
deleted file mode 100644 (file)
index 59f6446..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_Dir1_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_Dir1_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>131</width>
-            <height>123</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>EntityGUI_Dir1_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QButtonGroup" row="0" column="0">
-            <property name="name">
-                <cstring>GroupDir1</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>0</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="title">
-                <string>Direction</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QRadioButton" row="1" column="0">
-                            <property name="name">
-                                <cstring>RB_Dir12</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Perpendicular</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton" row="2" column="0">
-                            <property name="name">
-                                <cstring>RB_Dir13</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Tangent</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton" row="0" column="0">
-                            <property name="name">
-                                <cstring>RB_Dir11</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Angle</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton" row="3" column="0">
-                            <property name="name">
-                                <cstring>RB_Dir14</cstring>
-                            </property>
-                            <property name="text">
-                                <string>VX-VY</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>RB_Dir11</tabstop>
-    <tabstop>RB_Dir12</tabstop>
-    <tabstop>RB_Dir13</tabstop>
-    <tabstop>RB_Dir14</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/EntityGUI/UIFiles/EntityGUI_Dir2_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_Dir2_QTD.ui
deleted file mode 100644 (file)
index 617d3c3..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_Dir2_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_Dir2_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>124</width>
-            <height>106</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>EntityGUI_Dir2_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QButtonGroup" row="0" column="0">
-            <property name="name">
-                <cstring>GroupDir2</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>7</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="title">
-                <string>Direction</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QRadioButton" row="1" column="0">
-                            <property name="name">
-                                <cstring>RB_Dir22</cstring>
-                            </property>
-                            <property name="text">
-                                <string>X</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton" row="2" column="0">
-                            <property name="name">
-                                <cstring>RB_Dir23</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Y</string>
-                            </property>
-                        </widget>
-                        <spacer row="3" column="0">
-                            <property name="name">
-                                <cstring>Spacer4</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>20</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QRadioButton" row="0" column="0">
-                            <property name="name">
-                                <cstring>RB_Dir21</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Length</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>RB_Dir21</tabstop>
-    <tabstop>RB_Dir22</tabstop>
-    <tabstop>RB_Dir23</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/EntityGUI/UIFiles/EntityGUI_Point_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_Point_QTD.ui
deleted file mode 100644 (file)
index 8e0bd22..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_Point_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_Point_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>124</width>
-            <height>106</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>EntityGUI_Point_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QButtonGroup" row="0" column="0">
-            <property name="name">
-                <cstring>GroupPoint</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>0</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="title">
-                <string>Point</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QRadioButton" row="1" column="0">
-                            <property name="name">
-                                <cstring>RB_Point2</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Relative</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton" row="0" column="0">
-                            <property name="name">
-                                <cstring>RB_Point1</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Absolute</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton" row="2" column="0">
-                            <property name="name">
-                                <cstring>RB_Point3</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Selection</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>RB_Point1</tabstop>
-    <tabstop>RB_Point2</tabstop>
-    <tabstop>RB_Point3</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui
deleted file mode 100644 (file)
index cdcd864..0000000
+++ /dev/null
@@ -1,278 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_Skeleton_QTD</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>EntityGUI_Skeleton_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>317</width>
-            <height>276</height>
-        </rect>
-    </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>7</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>11</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QLayoutWidget" row="0" column="0">
-            <property name="name">
-                <cstring>Layout1</cstring>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>0</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QButtonGroup" row="0" column="0">
-                    <property name="name">
-                        <cstring>GroupConstructors</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>5</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>11</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <hbox>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QRadioButton">
-                                    <property name="name">
-                                        <cstring>RadioButton1</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QRadioButton">
-                                    <property name="name">
-                                        <cstring>RadioButton2</cstring>
-                                    </property>
-                                </widget>
-                            </hbox>
-                        </widget>
-                    </grid>
-                </widget>
-                <widget class="QGroupBox" row="1" column="0">
-                    <property name="name">
-                        <cstring>GroupDest</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>11</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout5</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2">
-                                    <property name="name">
-                                        <cstring>GroupDest1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <grid>
-                                        <property name="name">
-                                            <cstring>unnamed</cstring>
-                                        </property>
-                                        <property name="margin">
-                                            <number>11</number>
-                                        </property>
-                                        <property name="spacing">
-                                            <number>6</number>
-                                        </property>
-                                        <widget class="QLayoutWidget" row="0" column="0">
-                                            <property name="name">
-                                                <cstring>Layout4</cstring>
-                                            </property>
-                                            <grid>
-                                                <property name="name">
-                                                    <cstring>unnamed</cstring>
-                                                </property>
-                                                <property name="margin">
-                                                    <number>0</number>
-                                                </property>
-                                                <property name="spacing">
-                                                    <number>6</number>
-                                                </property>
-                                                <widget class="QRadioButton" row="0" column="1">
-                                                    <property name="name">
-                                                        <cstring>RB_Dest2</cstring>
-                                                    </property>
-                                                </widget>
-                                                <widget class="QRadioButton" row="0" column="0">
-                                                    <property name="name">
-                                                        <cstring>RB_Dest1</cstring>
-                                                    </property>
-                                                </widget>
-                                            </grid>
-                                        </widget>
-                                    </grid>
-                                </widget>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-                <widget class="QGroupBox" row="3" column="0">
-                    <property name="name">
-                        <cstring>GroupButtons</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <hbox>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>11</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
-                            </property>
-                            <hbox>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>buttonEnd</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>buttonClose</cstring>
-                                    </property>
-                                </widget>
-                                <spacer>
-                                    <property name="name">
-                                        <cstring>Spacer1</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Horizontal</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>91</width>
-                                            <height>0</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>buttonCancel</cstring>
-                                    </property>
-                                </widget>
-                               <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>buttonHelp</cstring>
-                                    </property>
-                                </widget>
-                            </hbox>
-                        </widget>
-                    </hbox>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>RadioButton1</tabstop>
-    <tabstop>RadioButton2</tabstop>
-    <tabstop>RB_Dest1</tabstop>
-    <tabstop>RB_Dest2</tabstop>
-    <tabstop>buttonEnd</tabstop>
-    <tabstop>buttonClose</tabstop>
-    <tabstop>buttonCancel</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/EntityGUI/UIFiles/ui_to_cxx b/src/EntityGUI/UIFiles/ui_to_cxx
deleted file mode 100755 (executable)
index 13bc0ac..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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
-uic -o EntityGUI_Skeleton_QTD.cxx -impl EntityGUI_Skeleton_QTD.h EntityGUI_Skeleton_QTD.ui
-
-uic -o EntityGUI_Point_QTD.h EntityGUI_Point_QTD.ui
-uic -o EntityGUI_Point_QTD.cxx -impl EntityGUI_Point_QTD.h EntityGUI_Point_QTD.ui
-
-uic -o EntityGUI_Dir1_QTD.h EntityGUI_Dir1_QTD.ui
-uic -o EntityGUI_Dir1_QTD.cxx -impl EntityGUI_Dir1_QTD.h EntityGUI_Dir1_QTD.ui
-
-uic -o EntityGUI_Dir2_QTD.h EntityGUI_Dir2_QTD.ui
-uic -o EntityGUI_Dir2_QTD.cxx -impl EntityGUI_Dir2_QTD.h EntityGUI_Dir2_QTD.ui
-
-uic -o EntityGUI_1Spin_QTD.h EntityGUI_1Spin_QTD.ui
-uic -o EntityGUI_1Spin_QTD.cxx -impl EntityGUI_1Spin_QTD.h EntityGUI_1Spin_QTD.ui
-
-uic -o EntityGUI_2Spin_QTD.h EntityGUI_2Spin_QTD.ui
-uic -o EntityGUI_2Spin_QTD.cxx -impl EntityGUI_2Spin_QTD.h EntityGUI_2Spin_QTD.ui
-
-uic -o EntityGUI_3Spin_QTD.h EntityGUI_3Spin_QTD.ui
-uic -o EntityGUI_3Spin_QTD.cxx -impl EntityGUI_3Spin_QTD.h EntityGUI_3Spin_QTD.ui
-
-uic -o EntityGUI_4Spin_QTD.h EntityGUI_4Spin_QTD.ui
-uic -o EntityGUI_4Spin_QTD.cxx -impl EntityGUI_4Spin_QTD.h EntityGUI_4Spin_QTD.ui
-
-uic -o EntityGUI_1Sel_QTD.h EntityGUI_1Sel_QTD.ui
-uic -o EntityGUI_1Sel_QTD.cxx -impl EntityGUI_1Sel_QTD.h EntityGUI_1Sel_QTD.ui
diff --git a/src/GEOM/GEOM.pro b/src/GEOM/GEOM.pro
new file mode 100644 (file)
index 0000000..5de328d
--- /dev/null
@@ -0,0 +1,82 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = GEOMbasic
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+STDLIB = -lstdc++
+
+CAS_LDPATH = -L$${CASROOT}/Linux/lib
+
+CAS_OCAF = -L$${CASROOT}/Linux/lib -lPTKernel -lTKernel -lTKCDF -lTKLCAF -lTKPCAF -lTKStdSchema
+
+CAS_OCAFVIS = -L$${CASROOT}/Linux/lib -lTKCAF -lStdPlugin -lStdLPlugin -lTKPLCAF -lTKPShape -lTKStdLSchema -lTKShapeSchema
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS} $${BOOST_CPPFLAGS} ../../salome_adm/unix
+
+LIBS += $${KERNEL_LDFLAGS} -lSALOMELocalTrace $${STDLIB} $${CAS_LDPATH} -lTKXSBase $${CAS_OCAF} $${CAS_OCAFVIS}
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+HEADERS  = GEOM_Application.hxx
+HEADERS += Handle_GEOM_Application.hxx
+HEADERS += GEOM_Engine.hxx
+HEADERS += GEOM_Function.hxx
+HEADERS += GEOM_Object.hxx
+HEADERS += GEOM_IOperations.hxx
+HEADERS += GEOM_ISubShape.hxx
+HEADERS += GEOM_Solver.hxx
+HEADERS += GEOM_PythonDump.hxx
+HEADERS += GEOM_DataMapOfAsciiStringTransient.hxx
+HEADERS += Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
+
+SOURCES  = GEOM_Application.cxx
+SOURCES += GEOM_Engine.cxx
+SOURCES += GEOM_Function.cxx
+SOURCES += GEOM_Object.cxx
+SOURCES += GEOM_IOperations.cxx
+SOURCES += GEOM_Solver.cxx
+SOURCES += GEOM_SubShapeDriver.cxx
+SOURCES += GEOM_PythonDump.cxx
+SOURCES += GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx
+SOURCES += GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx
+SOURCES += GEOM_DataMapOfAsciiStringTransient_0.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index 6ecba8d6b235dcc0f68025e7f638e7b61a759ace..4de898cb43bedcdd133f228fad92e9904406fd7f 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 #include <GEOM_Application.ixx>
 
index b6aef4b28bf04795e1540512da1fd6e01e88c896..119f84d958c75faea85ad86af974fd9c89c18b6c 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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_Application.hxx
 //  Module : GEOM
-
+//
 #ifndef _GEOM_Application_HeaderFile
 #define _GEOM_Application_HeaderFile
 
index 5f26e54c682aba33d0bdcfe55b2286b35231982b..8a2c33ff7a40395d33a022455302e8fcddf4f461 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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_Application.ixx
 //  Module : GEOM
-
+//
 #include "GEOM_Application.jxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 9056b044552627b37b25154a5633484b95b8f6b9..87ed25a9748b1142df7c593da6a1345111596ea2 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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_Application.jxx
 //  Module : GEOM
-
+//
 #ifndef _TColStd_SequenceOfExtendedString_HeaderFile
 #include <TColStd_SequenceOfExtendedString.hxx>
 #endif
index 54b02b9fea233d41977ebb490df3066da7a10c35..1d590cd2652f582290dbdba883e27bdc565f88b8 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_HeaderFile
 #define _GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_HeaderFile
 
index 18ec2e2832f61b3f470a32db20938b497a67e6c9..9bc173990c4ea58c85a3290da300c3635523bea3 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index 3fd6bb480747eac065573ccdfa1d86127c8083b0..f63d23b3b7b13d462813836f8930570bc5c71753 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
 #define _GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
 
index 18471f8b57d2964ac03ee10540199302c377c3b8..7dbb47f54df715bbbd126010bb3fdf68590e7546 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 0abffeee0a7472409b8bb273df5c583b30adcb57..1b4a70d4c7e21e6bba9626d065698ec060999a55 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_DataMapOfAsciiStringTransient_HeaderFile
 #define _GEOM_DataMapOfAsciiStringTransient_HeaderFile
 
index 11ecc03f5abec5a7630e17a0efe1558299cc157a..4245895b55eff44b1d8526332045042a61521de6 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <GEOM_DataMapOfAsciiStringTransient.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index 335f53435bc43913b6c2677ac4ed601aaeb61b1c..67658d480207b3fd0ec7670b71bea0e7acd02ea7 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 #ifdef WNT
 #pragma warning( disable:4786 )
@@ -34,6 +36,7 @@
 
 #include <TDF_Tool.hxx>
 #include <TDF_Data.hxx>
+#include <TDF_Reference.hxx>
 #include <TDF_LabelSequence.hxx>
 #include <TDataStd_Integer.hxx>
 #include <TDataStd_ChildNodeIterator.hxx>
 #include <Interface_DataMapIteratorOfDataMapOfIntegerTransient.hxx>
 #include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
 
+#include <set>
 #include <map>
 #include <string>
+#include <vector>
 
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
+#define COMMA ','
+#define O_BRACKET '('
+#define C_BRACKET ')'
+#define O_SQR_BRACKET '['
+#define C_SQR_BRACKET ']'
+#define PY_NULL "None"
+
+#ifdef _DEBUG_
+static int MYDEBUG = 0;
+#else
+static int MYDEBUG = 0;
+#endif
+
 static GEOM_Engine* TheEngine = NULL;
 
+using namespace std;
+
 static TCollection_AsciiString BuildIDFromObject(Handle(GEOM_Object)& theObject)
 {
   TCollection_AsciiString anID(theObject->GetDocID()), anEntry;
@@ -82,12 +102,20 @@ static Standard_Integer ExtractDocID(TCollection_AsciiString& theID)
   return aDocID.IntegerValue();
 }
 
-void ProcessFunction(Handle(GEOM_Function)& theFunction, 
-                    TCollection_AsciiString& theScript,
-                    TColStd_MapOfTransient& theProcessed);
+void ProcessFunction(Handle(GEOM_Function)&   theFunction,
+                     TCollection_AsciiString& theScript,
+                     const TVariablesList&    theVariables,
+                     TDF_LabelMap&            theProcessed,
+                     std::set<std::string>&   theDumpedObjs);
+
+void ReplaceVariables(TCollection_AsciiString& theCommand, 
+                      const TVariablesList&    theVariables);
+
+
 
 Handle(TColStd_HSequenceOfInteger) FindEntries(TCollection_AsciiString& theString);
 
+
 //=============================================================================
 /*!
  *  GetEngine
@@ -95,7 +123,6 @@ Handle(TColStd_HSequenceOfInteger) FindEntries(TCollection_AsciiString& theStrin
 //=============================================================================
 GEOM_Engine* GEOM_Engine::GetEngine() { return TheEngine; }
 
-
 //=============================================================================
 /*!
  *  SetEngine
@@ -120,9 +147,9 @@ GEOM_Engine::GEOM_Engine()
  *  Destructor
  */
 GEOM_Engine::~GEOM_Engine()
-{ 
+{
   GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient It(_objects);
-  for(; It.More(); It.Next()) 
+  for(; It.More(); It.Next())
     {
       RemoveObject(Handle(GEOM_Object)::DownCast(It.Value()));
     }
@@ -229,9 +256,9 @@ Handle(GEOM_Object) GEOM_Engine::AddObject(int theDocID, int theType)
  *  AddSubShape
  */
 //=============================================================================
-Handle(GEOM_Object) GEOM_Engine::AddSubShape(Handle(GEOM_Object) theMainShape, 
-                                            Handle(TColStd_HArray1OfInteger) theIndices,
-                                            bool isStandaloneOperation)
+Handle(GEOM_Object) GEOM_Engine::AddSubShape(Handle(GEOM_Object) theMainShape,
+                                             Handle(TColStd_HArray1OfInteger) theIndices,
+                                             bool isStandaloneOperation)
 {
   if(theMainShape.IsNull() || theIndices.IsNull()) return NULL;
 
@@ -284,7 +311,7 @@ Handle(GEOM_Object) GEOM_Engine::AddSubShape(Handle(GEOM_Object) theMainShape,
   _objects.Bind(anID, anObject);
 
   GEOM::TPythonDump pd (aFunction);
+
   if (isStandaloneOperation) {
     pd << anObject << " = geompy.GetSubShape(" << theMainShape << ", [";
     Standard_Integer i = theIndices->Lower(), up = theIndices->Upper();
@@ -316,7 +343,7 @@ bool GEOM_Engine::RemoveObject(Handle(GEOM_Object) theObject)
   Handle(TDataStd_TreeNode) aNode;
   for (int i = 1; i<=nb; i++) {
     Handle(GEOM_Function) aFunction = theObject->GetFunction(i);
-    if (aFunction->GetEntry().FindAttribute(GEOM_Function::GetFunctionTreeID(), aNode)) 
+    if (aFunction->GetEntry().FindAttribute(GEOM_Function::GetFunctionTreeID(), aNode))
       aNode->Remove();
   }
 
@@ -419,38 +446,40 @@ void GEOM_Engine::Close(int theDocID)
  *  DumpPython
  */
 //=============================================================================
-TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, 
-                                               Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
-                                               bool isPublished, 
-                                               bool& aValidScript)
+TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
+                                                Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
+                                                TVariablesList theVariables,
+                                                bool isPublished,
+                                                bool& aValidScript)
 {
   TCollection_AsciiString aScript;
   Handle(TDocStd_Document) aDoc = GetDocument(theDocID);
-  
-  if(aDoc.IsNull()) return TCollection_AsciiString("def RebuildData(theStudy): pass\n");
-  aScript = "import geompy\n";
+
+  if (aDoc.IsNull()) return TCollection_AsciiString("def RebuildData(theStudy): pass\n");
+
+  aScript  = "import geompy\n";
   aScript += "import math\n";
   aScript += "import SALOMEDS\n\n";
   aScript += "def RebuildData(theStudy):";
   aScript += "\n\tgeompy.init_geom(theStudy)";
-  
-  Standard_Integer posToInertGlobalVars = aScript.Length() + 1;
+
+  Standard_Integer posToInsertGlobalVars = aScript.Length() + 1;
 
   Handle(TDataStd_TreeNode) aNode, aRoot;
   Handle(GEOM_Function) aFunction;
-  TColStd_MapOfTransient aMap;
+  TDF_LabelMap aCheckedFuncMap;
+  std::set<std::string> anIgnoreObjMap;
 
-  if(aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) {
+  if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) {
     TDataStd_ChildNodeIterator Itr(aRoot);
-    for(; Itr.More(); Itr.Next()) {
+    for (; Itr.More(); Itr.Next()) {
       aNode = Itr.Value();
       aFunction = GEOM_Function::GetFunction(aNode->Label());
-      if(aFunction.IsNull()) {
-       cout << "Null function !!!!" << endl;
-       continue;
+      if (aFunction.IsNull()) {
+        MESSAGE ( "Null function !!!!" );
+        continue;
       }
-      ProcessFunction(aFunction, aScript, aMap);
+      ProcessFunction(aFunction, aScript, theVariables, aCheckedFuncMap, anIgnoreObjMap);
     }
   }
 
@@ -482,12 +511,12 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
   //Replace entries by the names
   TCollection_AsciiString anUpdatedScript, anEntry, aName, aBaseName("geomObj_"),
     allowedChars ("qwertyuioplkjhgfdsazxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM0987654321_");
-  if(aLen == 0) anUpdatedScript = aScript;
+  if (aLen == 0) anUpdatedScript = aScript;
 
-  for(Standard_Integer i = 1; i <= aLen; i+=2) {
+  for (Standard_Integer i = 1; i <= aLen; i+=2) {
     anUpdatedScript += aScript.SubString(aStart, aSeq->Value(i)-1);
     anEntry = aScript.SubString(aSeq->Value(i), aSeq->Value(i+1));
-    if(theObjectNames.IsBound(anEntry)) {
+    if (theObjectNames.IsBound(anEntry)) {
       aName = theObjectNames.Find(anEntry);
       // check validity of aName
       bool isValidName = true;
@@ -530,8 +559,9 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
   }
 
   //Add final part of the script
-  if(aLen && aSeq->Value(aLen) < aScriptLength)  anUpdatedScript += aScript.SubString(aSeq->Value(aLen)+1, aScriptLength); // mkr : IPAL11865
+  if (aLen && aSeq->Value(aLen) < aScriptLength)
+    anUpdatedScript += aScript.SubString(aSeq->Value(aLen)+1, aScriptLength); // mkr : IPAL11865
+
   // ouv : NPAL12872
   for (anEntryToNameIt.Initialize( theObjectNames );
        anEntryToNameIt.More();
@@ -576,6 +606,8 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
     {
       const TCollection_AsciiString& aEntry = anEntryToNameIt.Key();
       const TCollection_AsciiString& aName = anEntryToNameIt.Value();
+      if (anIgnoreObjMap.count(aEntry.ToCString()))
+        continue; // should not be dumped
       if ( !aEntry2StEntry.IsBound( aEntry ))
         continue; // was not published
       TCollection_AsciiString aCommand("\n\tgeompy."), aFatherEntry;
@@ -596,7 +628,7 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
         aCommand += "addToStudy( ";
       if ( anEntryToBadName.IsBound( aEntry ))
         aCommand += aName + ", \"" + anEntryToBadName( aEntry ) + "\" )";
-      else 
+      else
         aCommand += aName + ", \"" + aName + "\" )";
 
       // bind a command to the last digit of the entry
@@ -612,7 +644,8 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
     }
   }
 
-  anUpdatedScript += "\n\tpass\n";
+  //anUpdatedScript += "\n\tpass\n";
+  anUpdatedScript += "\n";
   aValidScript = true;
 
   // fill _studyEntry2NameMap and build globalVars
@@ -631,15 +664,15 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
   }
   if ( !globalVars.IsEmpty() ) {
     globalVars.Insert( 1, "\n\tglobal " );
-    anUpdatedScript.Insert( posToInertGlobalVars, globalVars );
+    anUpdatedScript.Insert( posToInsertGlobalVars, globalVars );
   }
-  
+
   return anUpdatedScript;
 }
 
 //=======================================================================
 //function : GetDumpName
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 const char* GEOM_Engine::GetDumpName (const char* theStudyEntry) const
@@ -652,7 +685,7 @@ const char* GEOM_Engine::GetDumpName (const char* theStudyEntry) const
 
 //=======================================================================
 //function : GetAllDumpNames
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 Handle(TColStd_HSequenceOfAsciiString) GEOM_Engine::GetAllDumpNames() const
@@ -671,36 +704,66 @@ Handle(TColStd_HSequenceOfAsciiString) GEOM_Engine::GetAllDumpNames() const
 //===========================================================================
 //                     Internal functions
 //===========================================================================
-void ProcessFunction(Handle(GEOM_Function)& theFunction, 
-                    TCollection_AsciiString& theScript,
-                    TColStd_MapOfTransient& theProcessed)
+void ProcessFunction(Handle(GEOM_Function)&   theFunction,
+                     TCollection_AsciiString& theScript,
+                     const TVariablesList&    theVariables,
+                     TDF_LabelMap&            theProcessed,
+                     std::set<std::string>&   theIgnoreObjs)
 {
-  if(theFunction.IsNull() || theProcessed.Contains(theFunction)) return;
+  if (theFunction.IsNull()) return;
+
+  // not to process twice
+  if (theProcessed.Contains(theFunction->GetEntry())) return;
+  theProcessed.Add(theFunction->GetEntry());
 
-/*
+  // pass functions, that depends on nonexisting ones
+  bool doNotProcess = false;
   TDF_LabelSequence aSeq;
   theFunction->GetDependency(aSeq);
   Standard_Integer aLen = aSeq.Length();
-  for(Standard_Integer i = 1; i<= aLen; i++) {
-    Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(aSeq.Value(i));
-    if(aFunction.IsNull()) continue;
-    ProcessFunction(aFunction, theScript, theProcessed);
+  for (Standard_Integer i = 1; i <= aLen && !doNotProcess; i++) {
+    TDF_Label aRefLabel = aSeq.Value(i);
+    Handle(TDF_Reference) aRef;
+    if (!aRefLabel.FindAttribute(TDF_Reference::GetID(), aRef)) {
+      doNotProcess = true;
+    }
+    else {
+      if (aRef.IsNull() || aRef->Get().IsNull()) {
+        doNotProcess = true;
+      }
+      else {
+        Handle(TDataStd_TreeNode) aT;
+        if (!TDataStd_TreeNode::Find(aRef->Get(), aT)) {
+          doNotProcess = true;
+        }
+        else {
+          TDF_Label aDepLabel = aT->Label();
+          Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(aDepLabel);
+
+          if (aFunction.IsNull()) doNotProcess = true;
+          else if (!theProcessed.Contains(aDepLabel)) doNotProcess = true;
+        }
+      }
+    }
   }
-*/
 
-  TCollection_AsciiString aDescr = theFunction->GetDescription();
-  if(aDescr.Length() == 0) {
-    //cout << "Warning: the function has no description" << endl;
+  if (doNotProcess) {
+    TCollection_AsciiString anObjEntry;
+    TDF_Tool::Entry(theFunction->GetOwnerEntry(), anObjEntry);
+    theIgnoreObjs.insert(anObjEntry.ToCString());
     return;
   }
+
+  TCollection_AsciiString aDescr = theFunction->GetDescription();
+  if(aDescr.Length() == 0) return;
+
   //Check if its internal function which doesn't requires dumping
   if(aDescr == "None") return;
 
+  //Replace parameter by notebook variables
+  ReplaceVariables(aDescr,theVariables);
   theScript += "\n\t";
   theScript += aDescr;
-  theProcessed.Add(theFunction);
-  return;
 }
 
 //=============================================================================
@@ -714,28 +777,330 @@ Handle(TColStd_HSequenceOfInteger) FindEntries(TCollection_AsciiString& theStrin
   Standard_Integer aLen = theString.Length();
   Standard_Boolean isFound = Standard_False;
 
-  char* arr = theString.ToCString();
+  const char* arr = theString.ToCString();
   Standard_Integer i = 0, j;
 
   while(i < aLen) {
     int c = (int)arr[i];
     j = i+1;
     if(c >= 48 && c <= 57) { //Is digit?
+
       isFound = Standard_False;
       while((j < aLen) && ((c >= 48 && c <= 57) || c == 58) ) { //Check if it is an entry
-       c = (int)arr[j++];  
-       if(c == 58) isFound = Standard_True;
+        c = (int)arr[j++];
+        if(c == 58) isFound = Standard_True;
       }
-      
+
       if(isFound && arr[j-2] != 58) { // last char should be a diggit
-       aSeq->Append(i+1); // +1 because AsciiString starts from 1
-       aSeq->Append(j-1);
+        aSeq->Append(i+1); // +1 because AsciiString starts from 1
+        aSeq->Append(j-1);
       }
     }
-     
+
     i = j;
   }
 
   return aSeq;
 }
+
+//=============================================================================
+/*!
+ *  ReplaceVariables: Replace parameters of the function by variales from 
+ *                    Notebook if need
+ */
+//=============================================================================
+void ReplaceVariables(TCollection_AsciiString& theCommand, 
+                      const TVariablesList&    theVariables)
+{
+  if (MYDEBUG)
+    cout<<"Command : "<<theCommand<<endl;
+
+  if (MYDEBUG) {
+    cout<<"All Entries:"<<endl;
+    TVariablesList::const_iterator it = theVariables.begin();
+    for(;it != theVariables.end();it++)
+      cout<<"\t'"<<(*it).first<<"'"<<endl;
+  }
+
+  //Additional case - multi-row commands
+  int aCommandIndex = 1;
+  while( aCommandIndex < 10 ) { // tmp check
+    TCollection_AsciiString aCommand = theCommand.Token("\n",aCommandIndex);
+    if( aCommand.Length() == 0 )
+      break;
+
+    if (MYDEBUG)
+      cout<<"Sub-command : "<<aCommand<<endl;
+
+    Standard_Integer aStartCommandPos = theCommand.Location(aCommand,1,theCommand.Length());
+    Standard_Integer aEndCommandPos = aStartCommandPos + aCommand.Length();
+
+    //Get Entry of the result object
+    TCollection_AsciiString anEntry;
+    if( aCommand.Search("=") != -1 ) // command returns an object
+      anEntry = aCommand.Token("=",1);
+    else { // command modifies the object
+      int aStartEntryPos = aCommand.Location(1,'(',1,aCommand.Length());
+      int aEndEntryPos = aCommand.Location(1,',',aStartEntryPos,aCommand.Length());
+      anEntry = aCommand.SubString(aStartEntryPos+1, aEndEntryPos-1);
+    }
+
+    //Remove white spaces
+    anEntry.RightAdjust();
+    anEntry.LeftAdjust();
+    if(MYDEBUG)
+      cout<<"Result entry : '" <<anEntry<<"'"<<endl;
+
+    //Check if result is list of entries - enough to get the first entry in this case
+    int aNbEntries = 1;
+    if( anEntry.Value( 1 ) == O_SQR_BRACKET && anEntry.Value( anEntry.Length() ) == C_SQR_BRACKET ) {
+      while(anEntry.Location(aNbEntries,COMMA,1,anEntry.Length()))
+       aNbEntries++;
+      TCollection_AsciiString aSeparator(COMMA);
+      anEntry = anEntry.Token(aSeparator.ToCString(),1);
+      anEntry.Remove( 1, 1 );
+      anEntry.RightAdjust();
+      anEntry.LeftAdjust();
+      if(MYDEBUG)
+       cout<<"Sub-entry : '" <<anEntry<<"'"<<endl;
+    }
+    
+    //Find variables used for object construction
+    ObjectStates* aStates = 0;
+    TVariablesList::const_iterator it = theVariables.find(anEntry);
+    if( it != theVariables.end() )
+      aStates = (*it).second;
+
+    if(!aStates) {
+      if(MYDEBUG)
+       cout<<"Valiables list empty!!!"<<endl;
+      aCommandIndex++;
+      continue;
+    }
+
+    TState aVariables = aStates->GetCurrectState();
+
+    if(MYDEBUG) {
+      cout<<"Variables from SObject:"<<endl;
+      for (int i = 0; i < aVariables.size();i++)
+       cout<<"\t Variable["<<i<<"] = "<<aVariables[i].myVariable<<endl;
+    }
+
+    //Calculate total number of parameters
+    Standard_Integer aTotalNbParams = 1;
+    while(aCommand.Location(aTotalNbParams,COMMA,1,aCommand.Length()))
+      aTotalNbParams++;
+
+    if(MYDEBUG)
+      cout<<"aTotalNbParams = "<<aTotalNbParams<<endl;
+
+    Standard_Integer aFirstParam = aNbEntries;
+
+    //Replace parameters by variables
+    Standard_Integer aStartPos = 0;
+    Standard_Integer aEndPos = 0;
+    int iVar = 0;
+    TCollection_AsciiString aVar, aReplacedVar;
+    for(Standard_Integer i=aFirstParam;i <= aTotalNbParams;i++) {
+      //Replace first parameter (bettwen '(' character and first ',' character)
+      if(i == aFirstParam)
+      {
+       aStartPos = aCommand.Location(O_BRACKET, 1, aCommand.Length()) + 1;
+       if(aTotalNbParams - aNbEntries > 0 )
+         aEndPos = aCommand.Location(aFirstParam, COMMA, 1, aCommand.Length());
+       else
+         aEndPos = aCommand.Location(C_BRACKET, 1, aCommand.Length()); 
+      }
+      //Replace last parameter (bettwen ',' character and ')' character)
+      else if(i == aTotalNbParams)
+      {
+       aStartPos = aCommand.Location(i-1, COMMA, 1, aCommand.Length()) + 2;
+       aEndPos = aCommand.Location(C_BRACKET, 1, aCommand.Length());
+      }
+      //Replace other parameters (bettwen two ',' characters)
+      else if(i != aFirstParam && i != aTotalNbParams )
+      {
+       aStartPos = aCommand.Location(i-1, COMMA, 1, aCommand.Length()) + 2;
+       aEndPos = aCommand.Location(i, COMMA, 1, aCommand.Length());
+      }
+
+      if( aCommand.Value( aStartPos ) == O_SQR_BRACKET )
+       aStartPos++;
+      if( aCommand.Value( aEndPos-1 ) == C_SQR_BRACKET )
+       aEndPos--;
+
+      if(MYDEBUG) 
+       cout<<"aStartPos = "<<aStartPos<<", aEndPos = "<<aEndPos<<endl;
+
+      aVar = aCommand.SubString(aStartPos, aEndPos-1);
+      aVar.RightAdjust();
+      aVar.LeftAdjust();
+    
+      if(MYDEBUG) 
+       cout<<"Variable: '"<< aVar <<"'"<<endl;
+
+      // specific case for sketcher
+      if(aVar.Location( TCollection_AsciiString("Sketcher:"), 1, aVar.Length() ) != 0) {
+       Standard_Integer aNbSections = 1;
+       while( aVar.Location( aNbSections, ':', 1, aVar.Length() ) )
+         aNbSections++;
+       aNbSections--;
+
+       int aStartSectionPos = 0, aEndSectionPos = 0;
+       TCollection_AsciiString aSection, aReplacedSection;
+       for(Standard_Integer aSectionIndex = 1; aSectionIndex <= aNbSections; aSectionIndex++) {
+         aStartSectionPos = aVar.Location( aSectionIndex, ':', 1, aVar.Length() ) + 1;
+         if( aSectionIndex != aNbSections )
+           aEndSectionPos = aVar.Location( aSectionIndex + 1, ':', 1, aVar.Length() );
+         else
+           aEndSectionPos = aVar.Length();
+
+         aSection = aVar.SubString(aStartSectionPos, aEndSectionPos-1);
+         if(MYDEBUG) 
+           cout<<"aSection: "<<aSection<<endl;
+
+         Standard_Integer aNbParams = 1;
+         while( aSection.Location( aNbParams, ' ', 1, aSection.Length() ) )
+           aNbParams++;
+         aNbParams--;
+
+         int aStartParamPos = 0, aEndParamPos = 0;
+         TCollection_AsciiString aParameter, aReplacedParameter;
+         for(Standard_Integer aParamIndex = 1; aParamIndex <= aNbParams; aParamIndex++) {
+           aStartParamPos = aSection.Location( aParamIndex, ' ', 1, aSection.Length() ) + 1;
+           if( aParamIndex != aNbParams )
+             aEndParamPos = aSection.Location( aParamIndex + 1, ' ', 1, aSection.Length() );
+           else
+             aEndParamPos = aSection.Length() + 1;
+
+           aParameter = aSection.SubString(aStartParamPos, aEndParamPos-1);
+           if(MYDEBUG) 
+             cout<<"aParameter: "<<aParameter<<endl;
+
+           if(iVar >= aVariables.size())
+             continue;
+
+           aReplacedParameter = aVariables[iVar].myVariable;
+           if(aReplacedParameter.IsEmpty()) {
+             iVar++;
+             continue;
+           }
+
+           if(aVariables[iVar].isVariable) {
+             aReplacedParameter.InsertBefore(1,"'");
+             aReplacedParameter.InsertAfter(aReplacedParameter.Length(),"'");
+           }
+
+           if(MYDEBUG) 
+             cout<<"aSection before : "<<aSection<<endl;
+           aSection.Remove(aStartParamPos, aEndParamPos - aStartParamPos);
+           aSection.Insert(aStartParamPos, aReplacedParameter);
+           if(MYDEBUG) 
+             cout<<"aSection after  : "<<aSection<<endl<<endl;
+           iVar++;
+         }
+         if(MYDEBUG) 
+           cout<<"aVar before : "<<aVar<<endl;
+         aVar.Remove(aStartSectionPos, aEndSectionPos - aStartSectionPos);
+         aVar.Insert(aStartSectionPos, aSection);
+         if(MYDEBUG) 
+           cout<<"aVar after  : "<<aVar<<endl<<endl;
+       }
+
+       if(MYDEBUG) 
+         cout<<"aCommand before : "<<aCommand<<endl;
+       aCommand.Remove(aStartPos, aEndPos - aStartPos);
+       aCommand.Insert(aStartPos, aVar);
+       if(MYDEBUG) 
+         cout<<"aCommand after  : "<<aCommand<<endl;
+
+       break;
+      } // end of specific case for sketcher
+
+      //If parameter is entry or 'None', skip it
+      if(theVariables.find(aVar) != theVariables.end() || aVar.Search(":") != -1 || aVar == PY_NULL)
+       continue;
+
+      if(iVar >= aVariables.size())
+       continue;
+
+      aReplacedVar = aVariables[iVar].myVariable;
+      if(aReplacedVar.IsEmpty()) {
+       iVar++;
+       continue;
+      }
+
+      if(aVariables[iVar].isVariable) {
+       aReplacedVar.InsertBefore(1,"\"");
+       aReplacedVar.InsertAfter(aReplacedVar.Length(),"\"");
+      }
+
+      aCommand.Remove(aStartPos, aEndPos - aStartPos);
+      aCommand.Insert(aStartPos, aReplacedVar);
+      iVar++;
+    }
+
+    theCommand.Remove(aStartCommandPos, aEndCommandPos - aStartCommandPos);
+    theCommand.Insert(aStartCommandPos, aCommand);
+
+    aCommandIndex++;
+
+    aStates->IncrementState();
+  }
+
+  if (MYDEBUG)
+    cout<<"Command : "<<theCommand<<endl;
+}
+
+//================================================================================
+/*!
+ * \brief Constructor
+ */
+//================================================================================
+ObjectStates::ObjectStates()
+{
+  _dumpstate = 0;
+}
+
+//================================================================================
+/*!
+ * \brief Destructor
+ */
+//================================================================================
+ObjectStates::~ObjectStates()
+{
+}
+
+//================================================================================
+/*!
+ * \brief Return current object state
+ * \retval state - Object state (vector of notebook variable)
+ */
+//================================================================================
+TState ObjectStates::GetCurrectState() const
+{
+  if(_states.size() > _dumpstate)
+    return _states[_dumpstate];
+  return TState();
+}
+
+//================================================================================
+/*!
+ * \brief Add new object state 
+ * \param theState - Object state (vector of notebook variable)
+ */
+//================================================================================
+void ObjectStates::AddState(const TState &theState)
+{
+  _states.push_back(theState);
+}
+
+//================================================================================
+/*!
+ * \brief Increment object state
+ */
+//================================================================================
+void ObjectStates::IncrementState()
+{
+  _dumpstate++;
+}
index ab6b8282117288344670e1d9dfc0a58292c0fe2c..a9951b26c7eac4099225e375910985838e7be435 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_Engine_HXX_
 #define _GEOM_Engine_HXX_
 
 #include <TColStd_HSequenceOfAsciiString.hxx>
 #include <TDF_Label.hxx>
 
+#include <map>
+#include <vector>
+
+struct TVariable{
+  TCollection_AsciiString myVariable;
+  bool isVariable;
+
+  TVariable(const TCollection_AsciiString& theVariable, bool theFlag = true):
+    myVariable(theVariable),
+    isVariable(theFlag){}
+};
+
+typedef std::vector<TVariable> TState;
+typedef std::vector<TState>    TAllStates;
+
+class ObjectStates
+{
+public:
+  ObjectStates();
+  ~ObjectStates();
+
+  TAllStates GetAllStates() const { return _states; }
+
+  TState GetCurrectState() const;
+  void AddState(const TState &theState);
+  void IncrementState();
+
+private:
+  TAllStates              _states;
+  int                     _dumpstate;
+};
+
+typedef std::map<TCollection_AsciiString, ObjectStates* > TVariablesList;
+
 class GEOM_Engine
 {
  public:
@@ -84,6 +119,7 @@ class GEOM_Engine
 
   Standard_EXPORT TCollection_AsciiString DumpPython(int theDocID, 
                                     Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
+                                     TVariablesList theVariables,
                                     bool isPublished, 
                                     bool& aValidScript);
 
@@ -93,7 +129,7 @@ class GEOM_Engine
 
  protected:
   Standard_EXPORT static void SetEngine(GEOM_Engine* theEngine);       
-
+  
  private:
 
   Handle(GEOM_Application)  _OCAFApp;
index b3166ad0b2e91fc038161b1eb7f1d6e685bd2f5b..d10bd9daf3f5b817f017d3b82e13fd54fcc90127 100644 (file)
@@ -1,23 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <Standard_Stream.hxx>
 
 #include <GEOM_Function.hxx>
index 734dd833df610dea4d3293d667b9c513b95d5922..3e1ea697034be4f2dcdc59821cd73c108895120a 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_Function_HeaderFile
 #define _GEOM_Function_HeaderFile
 
diff --git a/src/GEOM/GEOM_Gen_i.cc b/src/GEOM/GEOM_Gen_i.cc
deleted file mode 100644 (file)
index f07429d..0000000
+++ /dev/null
@@ -1,5467 +0,0 @@
-//  GEOM GEOM : implementaion of GEOM_Gen.idl and GEOM_Shape.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
-//
-//
-//
-//  File   : GEOM_GEN_i.cc file
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
-using namespace std;
-#include "GEOM_Gen_i.hh"
-
-#include "Partition_Spliter.hxx"
-#include "Archimede_VolumeSection.hxx"
-#include "Sketcher_Profile.hxx"
-
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
-
-#include <stdio.h>
-
-// Cascade headers
-
-#include <Standard_Failure.hxx>
-
-#include <gp_Circ.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Elips.hxx>
-#include <Geom_Plane.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_BezierCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <GeomFill_Line.hxx>
-#include <GeomFill_AppSurf.hxx>
-#include <GeomFill_SectionGenerator.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <Geom_TrimmedCurve.hxx>
-#include <GC_MakeArcOfCircle.hxx>
-#include <GeomAPI_PointsToBSpline.hxx>
-#include <GC_Root.hxx>
-
-#include <BRepCheck_Analyzer.hxx>
-#if OCC_VERSION_MAJOR >= 5
-#include <BRepAlgo.hxx>
-#else
-#include <BRepAlgoAPI.hxx>
-#endif
-#include <BRepAlgo_FaceRestrictor.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepBuilderAPI_Copy.hxx>
-#include <BRepAlgoAPI_Common.hxx>
-#include <BRepAlgoAPI_Cut.hxx>
-#include <BRepAlgoAPI_Fuse.hxx>
-#include <BRepAlgoAPI_Section.hxx>
-#include <BRepOffsetAPI_Sewing.hxx>
-#include <BRepOffsetAPI_MakePipe.hxx>
-
-#include <BRepBuilderAPI_MakeVertex.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-
-#include <BRepLib.hxx>
-#include <BRepBndLib.hxx>
-#include <Bnd_Box.hxx>
-
-#include <BRepBuilderAPI_MakeShell.hxx>
-#include <BRepPrim_Builder.hxx>
-#include <BRepBuilderAPI_MakeSolid.hxx>
-#include <BRepClass3d_SolidClassifier.hxx>
-
-#include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepBuilderAPI_Transform.hxx>
-#include <BRepPrimAPI_MakeRevol.hxx>
-#include <BRepPrimAPI_MakePrism.hxx>
-#include <BRepPrimAPI_MakeTorus.hxx>
-#include <BRepPrimAPI_MakeBox.hxx>
-#include <BRepPrimAPI_MakeSphere.hxx>
-#include <BRepPrimAPI_MakeCylinder.hxx>
-#include <BRepPrimAPI_MakeCone.hxx>
-#include <BRepFilletAPI_MakeFillet.hxx>
-#include <BRepFilletAPI_MakeChamfer.hxx>
-#include <BRepTools.hxx>
-#include <BRepTools_Quilt.hxx>
-#include <BRep_Tool.hxx>
-
-#include <GeomAPI_ProjectPointOnCurve.hxx>
-
-#include <BRepGProp.hxx>
-#include <GProp_GProps.hxx>
-#include <Precision.hxx>
-
-//VRV: OCC 4.0 migration
-#include <STEPControl_Reader.hxx>
-#include <IGESControl_Reader.hxx>
-//VRV: OCC 4.0 migration
-
-#include <IFSelect_ReturnStatus.hxx>
-#include <TColStd_HSequenceOfTransient.hxx>
-
-//VRV: OCC 4.0 migration
-#include <IGESControl_Writer.hxx>
-#include <IGESControl_Controller.hxx>
-#include <STEPControl_Writer.hxx>
-#include <Interface_Static.hxx>
-//#include <STEPControlStd_StepModelType.hxx>
-//VRV: OCC 4.0 migration
-
-#include <TopoDS_Shape.hxx>
-#include <TopAbs.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TopoDS_Solid.hxx>
-
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TCollection_ExtendedString.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_Array1OfShape.hxx>
-
-#include <IGESData_IGESEntity.hxx>
-
-#include <TDF_Tool.hxx>
-#include <TDF_Label.hxx>
-#include <TDataStd_Name.hxx>
-#include <TDataStd_Comment.hxx>
-#include <TDF_Reference.hxx>
-#include <TDF_Data.hxx>
-#include <TNaming_Builder.hxx>
-#include <TNaming_NamedShape.hxx>
-#include <TNaming_Tool.hxx>
-//  #include <TDocStd_Owner.hxx>
-
-#include "SALOMEDS_Tool.hxx"
-#include "GEOMDS_Commands.hxx"
-#include "GEOMDS_Explorer.hxx"
-
-#include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
-
-#include "Utils_ExceptHandlers.hxx"
-
-Standard_EXPORT static Standard_Boolean IsValid(const TopoDS_Shape& S) {
-#if OCC_VERSION_MAJOR >= 5
-  return BRepAlgo::IsValid(S);
-#else
-  return BRepAlgoAPI::IsValid(S);
-#endif
-}
-
-//============================================================================
-// function : GEOM_Gen_i()
-// purpose  : constructor to be called for servant creation. 
-//============================================================================
-GEOM_Gen_i::GEOM_Gen_i(CORBA::ORB_ptr orb,
-                      PortableServer::POA_ptr poa,
-                      PortableServer::ObjectId * contId, 
-                      const char *instanceName, 
-                      const char *interfaceName) :
-  Engines_Component_i(orb, poa, contId, instanceName, interfaceName)
-{
-  _thisObj = this ;
-  _id = _poa->activate_object(_thisObj);
-  // SCRUTE(this)
-  name_service = new SALOME_NamingService(_orb);
-  myOCAFApp    = new GEOMDS_Application();
-  myStudyID    = -1;
-  GetCurrentStudy(0);//for correct work of SuperVisor
-}
-
-
-
-//============================================================================
-// function : ~GEOM_Gen_i()
-// purpose  : destructor
-//============================================================================
-GEOM_Gen_i::~GEOM_Gen_i() {
-  delete name_service;
-}
-
-
-//============================================================================
-// function : IORToLocalPersistentID()
-// purpose  :
-//============================================================================
-char* GEOM_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject,
-                                        const char* IORString,
-                                        CORBA::Boolean isMultiFile,
-                                        CORBA::Boolean isASCII)
-{
-  GEOM::GEOM_Shape_var aShape = GEOM::GEOM_Shape::_narrow(_orb->string_to_object(IORString));
-  if (!CORBA::is_nil(aShape)) {
-    return aShape->ShapeId();
-  }
-  return 0;
-}
-
-
-//============================================================================
-// function : LocalPersistentIDToIOR()
-// purpose  : Create/Load CORBA object from a persistent ref (an entry)
-//          : Used when a study is loaded
-//          : The IOR (IORName) of object created is returned
-//============================================================================
-char* GEOM_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject,
-                                        const char* aLocalPersistentID,
-                                        CORBA::Boolean isMultiFile,
-                                        CORBA::Boolean isASCII) 
-{ 
-  SALOMEDS::Study_var myStudy = theSObject->GetStudy();
-  GetCurrentStudy(myStudy->StudyId());
-  Handle(TDocStd_Document) aDoc = Handle(TDocStd_Document)::DownCast(myStudyIDToDoc(myStudy->StudyId()));
-  CORBA::String_var aPersRefString = aLocalPersistentID;
-
-  /* For a GEOM::GEOM_Shape the pers_ref is the Entry in the OCAF document */
-  TCollection_ExtendedString MainIOR;
-  TDF_Label Lab;
-  TDF_Tool::Label(aDoc->GetData(), aPersRefString, Lab );
-
-  if (Lab.IsNull()) {
-    MESSAGE("Can not find label "<<aPersRefString<<" for study "<<myStudy->StudyId());
-    THROW_SALOME_CORBA_EXCEPTION("Incorrect GEOM data loaded",SALOME::BAD_PARAM);
-    //return ""; empty IORs raise new problem: "display" in popup crashes
-  }
-  
-  Handle(TNaming_NamedShape) NS;
-  Lab.FindAttribute( TNaming_NamedShape::GetID(), NS );
-  TopoDS_Shape S = TNaming_Tool::GetShape(NS);
-
-  /* shapetype, index=0, topo, orb, shapetype, ismain=true and name are setted and modified later ? */
-  GEOM::GEOM_Shape_var result = CreateObject(S);
-  GEOMDS_Commands GC( aDoc->Main() ) ;
-  
-  if ( GC.HasIOR(Lab) ) { /* shape already created/loaded */
-    return 0 ;
-  }
-
-  /******************* Dependent object (not a main shape) *********************/
-  if( GC.IsDependentShape(Lab) ) {
-    
-    TDF_Label mainLabel ;
-    Standard_Boolean mainShapeOk = GC.GetMainShapeLabel(Lab, mainLabel) ;
-    
-    /* Main object not yet loaded we load/create it */
-    if( !GC.HasIOR(mainLabel) ) {
-      
-      TCollection_AsciiString entry;
-      TDF_Tool::Entry(mainLabel,entry);
-      CORBA::String_var ent = CORBA::string_dup(entry.ToCString());
-      
-      /* Create the main object recursively */
-      MainIOR = LocalPersistentIDToIOR(theSObject, ent, isMultiFile, isASCII) ;
-    } else {
-      GC.ReturnNameIOR( mainLabel, MainIOR ); 
-    }
-    
-    result->MainName( TCollection_AsciiString(MainIOR).ToCString() ) ;      
-    result->IsMainShape(false) ;
-    result->ShapeId(aPersRefString);
-    
-    Handle(TDF_Reference) aRef;
-    Lab.FindAttribute( TDF_Reference::GetID(), aRef );
-    TDF_Label myL = aRef->Get() ;
-    Handle(TNaming_NamedShape) NN;
-    myL.FindAttribute( TNaming_NamedShape::GetID(), NN );
-    TopoDS_Shape mainTopo = TNaming_Tool::GetShape(NN);
-
-    GEOM::GEOM_Shape::ListOfSubShapeID_var ListOfID = new GEOM::GEOM_Shape::ListOfSubShapeID;
-    
-    if(S.ShapeType() != TopAbs_COMPOUND) {
-      /* to set the index of a unique sub shape (Explode All ONLY for the moment !) */
-      ListOfID->length(1);
-      int index = 1;
-      TopTools_MapOfShape M;
-      TopExp_Explorer Exp ;
-      for( Exp.Init(mainTopo, TopAbs_ShapeEnum( result->ShapeType() )) ; Exp.More(); Exp.Next() )  {
-       if ( M.Add(Exp.Current()) ) {
-         if(Exp.Current().IsSame(S) ) {
-           ListOfID[0] = index;
-           break;
-         }
-         index++ ;
-       }       
-      }
-      result->Index(ListOfID) ;
-      return result->Name(); 
-    }
-    else {
-      /* Here is a TopAbs_COMPOUND : we set the list/index for a compound : containing two or more sub shapes  */
-      /* Warning : the Corba shape has a shapetype Compound : in GEOMDS_Client we have to retrieve the kind of */
-      /* subshapes contained in this compound !                                                                */
-      TopTools_SequenceOfShape SS;
-      TopoDS_Iterator it ;
-      TopExp_Explorer exp ;
-      TopAbs_ShapeEnum subType ;
-      
-      /* Set all sub shapes in a sequence of shapes  */
-      for ( it.Initialize( S, true, true ) ; it.More(); it.Next() ) {
-       subType = it.Value().ShapeType() ;
-       SS.Append( it.Value() ) ;
-      }
-      
-      ListOfID->length( SS.Length() ) ;
-      int j, k ;  /* in TopTools_SequenceOfShape index start at 1 */
-      
-      for( k=1; k<=SS.Length(); k++ ) {
-       j = 1 ;
-       for( exp.Init( mainTopo, subType ); exp.More(); exp.Next() ) {  
-         if( exp.Current().IsSame( SS.Value(k) ) ) {
-           ListOfID[k-1] = j ;
-         }
-         j++ ;
-       }
-      }
-      result->Index(ListOfID) ;
-      return result->Name();
-    }
-    
-  }
-  /******************* Independent object (not a sub shape) *********************/
-  else {
-    result->IsMainShape(true) ;
-    if( !GC.AddIORNameAttribute(Lab, result->Name() ) )  {
-      MESSAGE("in LocalPersistentIDToIOR, NAME/IOR attribute already exist." << endl ) ;
-    }
-    Handle(TNaming_NamedShape) NamedShape ;  
-    bool notTested = Lab.FindAttribute(TNaming_NamedShape::GetID(), NamedShape) ;
-    result->ShapeId(aPersRefString);
-    return result->Name(); 
-  }
-}
-
-//============================================================================
-// function : CanPublishInStudy
-// purpose  : 
-//============================================================================
-bool GEOM_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR)
-{
-  GEOM::GEOM_Shape_var aShape = GEOM::GEOM_Shape::_narrow(theIOR);
-  return !(aShape->_is_nil());
-}
-
-
-//============================================================================
-// function : PublishInStudy
-// purpose  : 
-//============================================================================
-SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
-                                                SALOMEDS::SObject_ptr theSObject,
-                                                CORBA::Object_ptr theObject,
-                                                const char* theName) throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  SALOMEDS::SObject_var aResultSO;
-  if(CORBA::is_nil(theObject)) return aResultSO;
-
-  GEOM::GEOM_Shape_var aShape = GEOM::GEOM_Shape::_narrow(theObject);
-  if(aShape->_is_nil()) return aResultSO;
-
-  if(theStudy->_is_nil()) return aResultSO;
-
-  SALOMEDS::GenericAttribute_var anAttr;
-  SALOMEDS::StudyBuilder_var     aStudyBuilder = theStudy->NewBuilder(); 
-
-  SALOMEDS::SComponent_var       aFather = theStudy->FindComponent("GEOM"); 
-  if (aFather->_is_nil()) {
-    aFather = aStudyBuilder->NewComponent("GEOM");
-    anAttr = aStudyBuilder->FindOrCreateAttribute(aFather, "AttributeName");
-    SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
-    aName->SetValue("Geometry");
-    anAttr = aStudyBuilder->FindOrCreateAttribute(aFather, "AttributePixMap");
-    SALOMEDS::AttributePixMap::_narrow(anAttr)->SetPixMap("ICON_OBJBROWSER_Geometry");
-    aStudyBuilder->DefineComponentInstance(aFather, GEOM_Gen::_this());
-  }
-  if (aFather->_is_nil()) return aResultSO;
-  
-  if (CORBA::is_nil(theSObject)) {
-    aResultSO = aStudyBuilder->NewObject(aFather);
-  } else {
-    if (!theSObject->ReferencedObject(aResultSO)) 
-      THROW_SALOME_CORBA_EXCEPTION("Publish in study supervision graph error",SALOME::BAD_PARAM);
-  }
-  anAttr = aStudyBuilder->FindOrCreateAttribute(aResultSO, "AttributeIOR");
-  SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-  anIOR->SetValue(aShape->Name());
-
-  anAttr = aStudyBuilder->FindOrCreateAttribute(aResultSO, "AttributePixMap");
-  SALOMEDS::AttributePixMap_var aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);
-  TCollection_AsciiString aShapeName("Shape_");  
-
-  if ( aShape->ShapeType() == GEOM::COMPOUND ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_COMPOUND" );
-    aShapeName = "Compound_";
-  } else if ( aShape->ShapeType() == GEOM::COMPSOLID ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_COMPSOLID" );
-    aShapeName = "Compsolid_";
-  } else if ( aShape->ShapeType() == GEOM::SOLID ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_SOLID" );
-    aShapeName = "Solid_";
-  } else if ( aShape->ShapeType() == GEOM::SHELL ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_SHELL" );
-    aShapeName = "Shell_";
-  } else if ( aShape->ShapeType() == GEOM::FACE ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_FACE" );
-    aShapeName = "Face_";
-  } else if ( aShape->ShapeType() == GEOM::WIRE ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_WIRE" );
-    aShapeName = "Wire_";
-  } else if ( aShape->ShapeType() == GEOM::EDGE ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_EDGE" );
-    aShapeName = "Edge_";
-  } else if ( aShape->ShapeType() == GEOM::VERTEX ) {
-    aPixmap->SetPixMap( "ICON_OBJBROWSER_VERTEX" );
-    aShapeName = "Vertex_";
-  }                                          
-  if (strlen(theName) == 0) aShapeName += TCollection_AsciiString(aResultSO->Tag());
-  else aShapeName = TCollection_AsciiString((char*)theName);
-
-  //Set a name of the added shape
-  anAttr = aStudyBuilder->FindOrCreateAttribute(aResultSO, "AttributeName");
-  SALOMEDS::AttributeName_var aNameAttrib = SALOMEDS::AttributeName::_narrow(anAttr);
-  aNameAttrib->SetValue(aShapeName.ToCString());
-
-  //Add a reference to published object
-//    aStudyBuilder->Addreference(theObject, aResultSO);
-  return aResultSO._retn();
-}
-
-//============================================================================
-// function : Save()
-// purpose  : save OCAF/Geom document
-//============================================================================
-SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
-                                   const char* theURL,
-                                   bool isMultiFile) {
-  SALOMEDS::TMPFile_var aStreamFile;
-  // Get a temporary directory to store a file
-  TCollection_AsciiString aTmpDir = (isMultiFile)?TCollection_AsciiString((char*)theURL):(char*)SALOMEDS_Tool::GetTmpDir().c_str();
-  // Create a list to store names of created files
-  SALOMEDS::ListOfFileNames_var aSeq = new SALOMEDS::ListOfFileNames;
-  aSeq->length(1);
-  // Prepare a file name to open
-  TCollection_AsciiString aNameWithExt("");
-  if (isMultiFile)
-    aNameWithExt = TCollection_AsciiString((char*)SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL()).c_str());
-  aNameWithExt += TCollection_AsciiString("_GEOM.sgd");
-  aSeq[0] = aNameWithExt.ToCString();
-  // Build a full file name of temporary file
-  TCollection_AsciiString aFullName = aTmpDir + aNameWithExt;
-  // Save GEOM component in this file
-  myOCAFApp->SaveAs(myCurrentOCAFDoc, aFullName);
-  // Conver a file to the byte stream
-  aStreamFile = SALOMEDS_Tool::PutFilesToStream(aTmpDir.ToCString(), aSeq.in(), isMultiFile);
-  // Remove the created file and tmp directory
-  if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.ToCString(), aSeq.in(), true);
-  // Return the created byte stream
-  return aStreamFile._retn();
-}
-
-SALOMEDS::TMPFile* GEOM_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent,
-                                        const char* theURL,
-                                        bool isMultiFile) {
-  SALOMEDS::TMPFile_var aStreamFile = Save(theComponent, theURL, isMultiFile);
-  return aStreamFile._retn();
-}
-
-
-CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
-                               const SALOMEDS::TMPFile& theStream,
-                               const char* theURL,
-                               bool isMultiFile) {
-
-  if (theStream.length() <= 9) {
-    MESSAGE("The TMPFile is too short : " << theStream.length() << " bytes ");
-    return false;
-  }
-
-  // Get a temporary directory for a file
-  TCollection_AsciiString aTmpDir = isMultiFile?TCollection_AsciiString((char*)theURL):(char*)SALOMEDS_Tool::GetTmpDir().c_str();
-  // Conver the byte stream theStream to a file and place it in tmp directory
-  SALOMEDS::ListOfFileNames_var aSeq = SALOMEDS_Tool::PutStreamToFiles(theStream,
-                                                                      aTmpDir.ToCString(),
-                                                                      isMultiFile);
-
-  // Prepare a file name to open
-  TCollection_AsciiString aNameWithExt("");
-  if (isMultiFile)
-    aNameWithExt = TCollection_AsciiString((char*)SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL()).c_str());
-  aNameWithExt += TCollection_AsciiString("_GEOM.sgd");
-  TCollection_AsciiString aFullName = aTmpDir + aNameWithExt;
-
-  // Open document
-  if (myOCAFApp->Open(aFullName, myCurrentOCAFDoc) != CDF_RS_OK) return false;
-
-  // Remove the created file and tmp directory
-  if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.ToCString(), aSeq.in(), true);
-
-  SALOMEDS::Study_var Study = theComponent->GetStudy();
-  TCollection_AsciiString name( Study->Name() );
-
-  int StudyID = Study->StudyId();
-  myStudyIDToDoc.Bind( StudyID, myCurrentOCAFDoc );  
-  myStudyID = StudyID;
-    
-  /* We clear all IOR (nameIOR) attributes of all objects before reconstruction */
-  /* This information will be setted when each object is reconstructed          */
-  GEOMDS_Commands GC( myCurrentOCAFDoc->Main() ) ;
-  GC.ClearAllIOR(myCurrentOCAFDoc->Main());
-
-  return true;
-}
-
-CORBA::Boolean GEOM_Gen_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent,
-                                    const SALOMEDS::TMPFile& theStream,
-                                    const char* theURL,
-                                    bool isMultiFile) {
-  return Load(theComponent, theStream, theURL, isMultiFile);
-}
-
-//  //============================================================================
-//  // function : Save()
-//  // purpose  : save OCAF/Geom document
-//  //============================================================================
-//  void GEOM_Gen_i::Save(const char *IORSComponent, const char *aUrlOfFile) 
-//  {
-
-//    TCollection_ExtendedString path((char*)aUrlOfFile);
-//    TCollection_ExtendedString pathWithExt = path + TCollection_ExtendedString(".sgd");
-//    myOCAFApp->SaveAs(myCurrentOCAFDoc,pathWithExt);
-//  }
-
-
-//  //============================================================================
-//  // function : Load()
-//  // purpose  : Load OCAF/Geom document
-//  //============================================================================
-//  void GEOM_Gen_i::Load(const char *IORSComponent, const char *aUrlOfFile) 
-//  {
-
-//    TCollection_ExtendedString path((char*)aUrlOfFile);
-//    TCollection_ExtendedString pathWithExt = path + TCollection_ExtendedString(".sgd");
-
-//    myOCAFApp->Open(pathWithExt,myCurrentOCAFDoc);
-
-//    SALOMEDS::SComponent_var SC = SALOMEDS::SComponent::_narrow(_orb->string_to_object(IORSComponent));
-//    SALOMEDS::Study_var Study = SC->GetStudy();
-//    TCollection_AsciiString name( Study->Name() );
-
-//    int StudyID = Study->StudyId();
-//    myStudyIDToDoc.Bind( StudyID, myCurrentOCAFDoc );  
-//    myStudyID = StudyID;
-
-//    /* We clear all IOR (nameIOR) attributes of all objects before reconstruction */
-//    /* This information will be setted when each object is reconstructed          */
-//    GEOMDS_Commands GC( myCurrentOCAFDoc->Main() ) ;
-//    GC.ClearAllIOR(myCurrentOCAFDoc->Main());
-
-//    return ;
-//  }
-
-
-//============================================================================
-// function : Close()
-// purpose  :
-//============================================================================
-void GEOM_Gen_i::Close(SALOMEDS::SComponent_ptr theComponent)
-{
-  int anID = theComponent->GetStudy()->StudyId();
-  if (anID == myStudyID) GetCurrentStudy(0); // set default value of current study ID, if current is deleted
-  if (myStudyIDToDoc.IsBound(anID)) {
-    // close document in the application
-//      Handle(TDocStd_Owner) anOwner;
-    Handle(TDocStd_Document) aDoc = Handle(TDocStd_Document)::DownCast(myStudyIDToDoc.Find(anID));
-//      Handle(TDocStd_Document) anEmptyDoc;
-//      if (aDoc->Main().Root().FindAttribute(TDocStd_Owner::GetID(), anOwner)) {
-//        anOwner->SetDocument(anEmptyDoc);
-//        MESSAGE("********** Nullify owner of document");
-//      }
-    myOCAFApp->Close(aDoc);
-    myStudyIDToDoc.UnBind(anID); // remove document from GEOM documents data map
-    }
-}
-
-//============================================================================
-// function : CanCopy()
-// purpose  :
-//============================================================================
-CORBA::Boolean GEOM_Gen_i::CanCopy(SALOMEDS::SObject_ptr theObject) {
-  // Try to retrieve known by Geometry component GEOM_shape by given IOR
-  SALOMEDS::GenericAttribute_var anAttr;
-  if (!theObject->FindAttribute(anAttr, "AttributeIOR")) return false;
-  GEOM::GEOM_Shape_var aShape = GetIORFromString(SALOMEDS::AttributeIOR::_narrow(anAttr)->Value());
-  // If the object is null one it can't be copied: return false
-  if (aShape->_is_nil()) return false;
-  return true;
-}
-
-//============================================================================
-// function : CopyFrom()
-// purpose  :
-//============================================================================
-SALOMEDS::TMPFile* GEOM_Gen_i::CopyFrom(SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID) {
-  // Declare a sequence of the byte to store the copied object
-  SALOMEDS::TMPFile_var aStreamFile = new SALOMEDS::TMPFile;
-
-  // Try to get GEOM_Shape object by given SObject
-  SALOMEDS::GenericAttribute_var anAttr;
-  if (!theObject->FindAttribute(anAttr, "AttributeIOR")) return false;
-  GEOM::GEOM_Shape_var aShape = GetIORFromString(SALOMEDS::AttributeIOR::_narrow(anAttr)->Value());
-  // If the object is null one it can't be copied: return false
-  if (aShape->_is_nil()) return aStreamFile._retn();
-  GetCurrentStudy(theObject->GetStudy()->StudyId());
-
-  // Convert a TopoDS_Shape to a stream of bytes
-  TopoDS_Shape aTopology = GetTopoShape(aShape);
-  if (aTopology.IsNull()) return aStreamFile._retn();
-  ostrstream aStreamedShape;
-  BRepTools::Write(aTopology, aStreamedShape);
-  int aSize = aStreamedShape.pcount();
-  char* aBuffer = new char[aSize];
-  memcpy(aBuffer, aStreamedShape.str(), aSize);
-  aStreamedShape.rdbuf()->freeze(0);
-
-  aStreamFile = new SALOMEDS::TMPFile(aSize, aSize, (CORBA::Octet*)aBuffer, 1);
-  
-  // Assign an ID = 1 the the type GEOM_Shape
-  theObjectID = 1;
-
-  // Return created TMPFile
-  return aStreamFile._retn();
-}
-
-//============================================================================
-// function : CanPaste()
-// purpose  :
-//============================================================================
-CORBA::Boolean GEOM_Gen_i::CanPaste(const char* theComponentName, CORBA::Long theObjectID) {
-  // The Geometry component can paste only objects copied by Geometry component
-  // and with the object type = 1
-//    MESSAGE("********** GEOM_Gen_i::CanPaste ("<<theComponentName<<","<<theObjectID<<")");
-  if (strcmp(theComponentName, ComponentDataType()) != 0 || theObjectID != 1) return false;
-  return true;
-}
-
-//============================================================================
-// function : PasteInto()
-// purpose  :
-//============================================================================
-SALOMEDS::SObject_ptr GEOM_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream,
-                                           CORBA::Long theObjectID,
-                                           SALOMEDS::SObject_ptr theObject) {
-  // Find the current Study and StudyBuilder
-  SALOMEDS::Study_var aStudy = theObject->GetStudy();
-  SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
-
-  // Retrieve a TopoDS_Shape from byte stream
-  TopoDS_Shape aTopology;
-  istrstream aStreamedBrep((char*) &theStream[0], theStream.length());
-  BRep_Builder aBuilder;
-  try {
-    BRepTools::Read(aTopology, aStreamedBrep, aBuilder);
-  } catch (Standard_Failure) {
-    MESSAGE("GEOM_Gen_i::PasteInto exception");
-    return false;
-  }
-  
-  // Create new object in Geometry component using retrieved topology
-  GEOM::GEOM_Shape_var aShape = CreateObject(aTopology);
-  GetCurrentStudy(aStudy->StudyId());
-  const char *anEntry = InsertInLabel(aTopology, aShape->Name(), myCurrentOCAFDoc) ;
-  aShape->ShapeId(anEntry) ;
-
-  // SObject of the created shape is theObject or new Child of Component if theObject == geom component
-  SALOMEDS::SObject_var aNewSO;
-  if (strcmp(theObject->GetFatherComponent()->GetID(),theObject->GetID()) == 0) {
-    aNewSO = aStudyBuilder->NewObject(theObject);
-  } else aNewSO = SALOMEDS::SObject::_duplicate(theObject);
-  // Add IORAttribute to the Study and set IOR of the created GEOM_Shape to it
-  SALOMEDS::GenericAttribute_var anAttr = aStudyBuilder->FindOrCreateAttribute(aNewSO, "AttributeIOR");
-  SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
-  anIOR->SetValue(aShape->Name());
-
-  // Return the created in the Study SObject
-  return aNewSO._retn();
-}
-
-//============================================================================
-// function : ComponentDataType()
-// purpose  :
-//============================================================================
-char* GEOM_Gen_i::ComponentDataType()
-{
-  return CORBA::string_dup("GEOM");
-}
-
-//============================================================================
-// function : register() 
-// purpose  : register 'name' in 'name_service'
-//============================================================================
-void GEOM_Gen_i::register_name(char * name)
-{
-  GEOM::GEOM_Gen_ptr g = GEOM::GEOM_Gen::_narrow(POA_GEOM::GEOM_Gen::_this());
-  name_service->Register(g, name); 
-}
-
-
-
-//================================================================================
-// function : SequenceOfShapeFromListOfGeomShape()
-// purpose  : Define a sequence of shapes from 'listShapes' and return its length.
-//          : No control is made on shapes !
-//================================================================================
-int GEOM_Gen_i::SequenceOfShapeFromListOfGeomShape( const GEOM::GEOM_Gen::ListOfGeomShapes& listShapes,
-                                                   TopTools_SequenceOfShape& SS )
-{
-  int nbShapes = listShapes.length() ;
-  if( nbShapes < 1)
-    return 0 ;
-  
-  for(int i=0; i<nbShapes; i++) {
-    GEOM::GEOM_Shape_var aGeomShape = listShapes[i] ;
-    TopoDS_Shape aShape = GetTopoShape(aGeomShape) ;
-    SS.Append(aShape) ;
-  }
-  return nbShapes ;
-}
-
-
-
-
-//=================================================================================
-// function : GetTopoShape()
-// purpose  : Returns a TopoDS_Shape from a GEOM::GEOM_Shape_ptr in 'myCurrentOCAFDoc'
-//          : A null shape is returned if not possible
-//=================================================================================
-TopoDS_Shape GEOM_Gen_i::GetTopoShape(GEOM::GEOM_Shape_ptr shape_ptr)
-{ 
-  TopoDS_Shape tds ;
-
-  TDF_Label lab ;
-  Handle(TDF_Data) D = myCurrentOCAFDoc->GetData() ;
-  TDF_Tool::Label( D, shape_ptr->ShapeId(), lab, true ) ;
-  Handle(TNaming_NamedShape) NamedShape ;  
-  bool res = lab.FindAttribute(TNaming_NamedShape::GetID(), NamedShape) ;
-
-  if( !res ) {
-    return tds ; /* a null shape is returned */
-  }
-  else {
-    return TNaming_Tool::GetShape(NamedShape) ;
-  }
-}
-
-
-
-//=================================================================================
-// function : GetStringFromIOR()
-// purpose  : returns a string that represents  a 'GEOM::GEOM_Shape_var'
-//=================================================================================
-const char* GEOM_Gen_i::GetStringFromIOR(GEOM::GEOM_Shape_var shapeIOR) {
-  const char * ret = _orb->object_to_string(shapeIOR) ;
-  return ret ;
-}
-
-
-
-//=================================================================================
-// function : GetIORFromString()
-// purpose  : returns a 'GEOM::GEOM_Shape_var' from a string representing it
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::GetIORFromString(const char* stringIOR) {
-  GEOM::GEOM_Shape_var shapeIOR;
-  if(strcmp(stringIOR,"") != 0){
-    CORBA::Object_var anObject = _orb->string_to_object(stringIOR);
-    if(!CORBA::is_nil(anObject))
-      shapeIOR =  GEOM::GEOM_Shape::_narrow(anObject.in()) ;
-  }
-  return shapeIOR._retn() ;
-}
-
-
-
-//==================================================================================
-// function : InsertInLabel()
-// purpose  : Insert S = Shape and mystr = name in a new Label of Geom/OCAF document
-//          : and returns the corresponding OCAF entry
-//==================================================================================
-const char * GEOM_Gen_i::InsertInLabel(TopoDS_Shape S, const char *mystr, Handle(TDocStd_Document) OCAFDoc)
-{
-  GEOMDS_Commands GC(OCAFDoc->Main());
-  /* add attributs S and mystr in a new label */
-  TDF_Label Lab = GC.AddShape (S, (char*)mystr);
-
-  TCollection_AsciiString entry;
-  TDF_Tool::Entry(Lab,entry);
-  const char *ent = entry.ToCString() ;
-  return ent ;
-}
-
-
-//==================================================================================
-// function : InsertInLabelDependentShape()
-// purpose  : Insert S = Shape and its nameIor in a new Label of Geom/OCAF document
-//          : insert also a reference attribute (a label) to the main shape 'mainshap_ptr'.
-//          : and returns the corresponding OCAF entry of the new label.
-//==================================================================================
-const char * GEOM_Gen_i::InsertInLabelDependentShape( TopoDS_Shape S,
-                                                     const char *nameIor,
-                                                     GEOM::GEOM_Shape_ptr mainshape_ptr,
-                                                     Handle(TDocStd_Document) OCAFDoc )
-{
-  GEOMDS_Commands GC(OCAFDoc->Main());
-  /* add attributs S and nameIor in a new label */
-
-  /* retrieve the label of the main shape in the document */
-  TDF_Label mainRefLab;
-  TDF_Tool::Label(OCAFDoc->GetData(), mainshape_ptr->ShapeId(), mainRefLab);
-
-  /* add attributs : S, nameIor and ref to main */
-  TDF_Label Lab = GC.AddDependentShape(S, (char*)nameIor, mainRefLab);
-
-  TCollection_AsciiString entry;
-  TDF_Tool::Entry(Lab, entry);
-  const char *ent = entry.ToCString() ;
-  return ent ;
-}
-
-
-//=================================================================================
-// function : InsertInLabelOneArgument()
-// purpose  :
-//=================================================================================
-void GEOM_Gen_i::InsertInLabelOneArgument(TopoDS_Shape main_topo,
-                                         GEOM::GEOM_Shape_ptr shape_ptr,
-                                         TopoDS_Shape result_topo,     
-                                         GEOM::GEOM_Shape_ptr result,  
-                                         Handle(TDocStd_Document) OCAFDoc)
-{
-  /* Put shape and name into geom/OCAF doc */
-  GEOMDS_Commands GC(OCAFDoc->Main());
-  /* Add attributs 'shape' and 'name_ior' in a new label */
-  TDF_Label Lab = GC.Generated( main_topo, result_topo, result->Name() );
-  TCollection_AsciiString entry;
-  TDF_Tool::Entry(Lab, entry);
-  result->ShapeId( entry.ToCString() ) ;
-  
-  /* Create a new label */
-  TDF_Label NewLab = Lab.NewChild();
-  TCollection_ExtendedString Value("Arguments");
-  TDataStd_Name::Set(NewLab,Value);
-  
-  TDF_Label NewLab1 = NewLab.NewChild();
-  TDF_Label RefLab;
-  TDF_Tool::Label(OCAFDoc->GetData(), shape_ptr->ShapeId(), RefLab);
-  TDF_Reference::Set(NewLab1, RefLab);
-}
-
-
-//=================================================================================
-// function : InsertInLabelMoreArguments()
-// purpose  :
-//=================================================================================
-void GEOM_Gen_i::InsertInLabelMoreArguments(TopoDS_Shape main_topo,
-                                           GEOM::GEOM_Shape_ptr result,
-                                           const GEOM::GEOM_Gen::ListOfIOR& ListShapes,                                
-                                           Handle(TDocStd_Document) OCAFDoc)
-{
-  /* Put shape and name into geom/OCAF doc */
-  GEOMDS_Commands GC(OCAFDoc->Main());
-  /* Add attributs TopoDS and name_ior in a new label */
-  TDF_Label Lab = GC.AddShape(main_topo, result->Name() );
-  TCollection_AsciiString entry;
-  TDF_Tool::Entry(Lab, entry);
-  
-  /* Create a new label */
-  TDF_Label NewLab = Lab.NewChild();
-  TCollection_ExtendedString Value("Arguments");
-  TDataStd_Name::Set(NewLab, Value);
-
-  for (unsigned int ind = 0; ind < ListShapes.length(); ind++) {
-    
-    TDF_Label NewLab1 = NewLab.NewChild();    
-    GEOM::GEOM_Shape_var aShape = GetIORFromString( ListShapes[ind] );
-    
-    TDF_Label RefLab;
-    TDF_Tool::Label(OCAFDoc->GetData(), aShape->ShapeId(), RefLab);
-    TDF_Reference::Set(NewLab1, RefLab);
-  }
-  result->ShapeId(entry.ToCString());
-}
-
-
-
-//=================================================================================
-// function: NbLabels()
-// purpose : 
-//=================================================================================
-CORBA::Short GEOM_Gen_i::NbLabels()
-{
-  TDF_ChildIterator ChildIterator(myCurrentOCAFDoc->Main());
-  unsigned int i = 1;
-  
-  while (ChildIterator.More()) {
-    i++;
-    ChildIterator.Next();
-  }
-  return i;
-  //  return TDF_Tool::NbLabels( myCurrentOCAFDoc->Main() );
-}
-
-
-
-//=================================================================================
-// function: GetCurrentStudy()
-// purpose : Finds or creates the geom/OCAF document corresponding to the index
-// 'StudyID'
-//=================================================================================
-void GEOM_Gen_i::GetCurrentStudy(CORBA::Long StudyID)
-{
-  /* If StudyID is known we link myCurrentOCAFDoc to it */
-  if (myStudyIDToDoc.IsBound(StudyID)) {
-    myCurrentOCAFDoc =  Handle(TDocStd_Document)::DownCast(myStudyIDToDoc(StudyID));
-  }
-  /* Create a new OCAFDoc and link it to 'StudyID' argument */
-  else { 
-    myOCAFApp->NewDocument("SALOME_GEOM",myCurrentOCAFDoc);
-    myStudyIDToDoc.Bind(StudyID,myCurrentOCAFDoc);
-  } 
-  myStudyID = StudyID;
-}
-
-
-//================================================================================
-// function : CreateObject() 
-// purpose  : private function to create a complete CORBA object and return it
-//================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::CreateObject(TopoDS_Shape& tds)
-{
-//   if ( tds.ShapeType() == TopAbs_COMPOUND ) {
-//     TopoDS_Iterator itr(tds);
-//     TopoDS_Shape res;
-//     int i = 0;
-//     while (itr.More()) {
-//       i++;
-//       res = itr.Value();
-//       itr.Next();
-//     }
-    
-//     if ( i == 1 )
-//       tds = res;
-//   }
-
-  GEOM::shape_type st = GEOM::shape_type(tds.ShapeType()) ; /* casting */
-  
-  /* Create the CORBA servant holding the TopoDS_Shape */
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this();
-  GEOM::GEOM_Shape::ListOfSubShapeID_var index = new GEOM::GEOM_Shape::ListOfSubShapeID;
-  index->length(0);  
-  GEOM_Shape_i * shape_servant = new GEOM_Shape_i(tds, _orb, engine, index, st, true);
-  GEOM::GEOM_Shape_var shape = GEOM::GEOM_Shape::_narrow(shape_servant->_this()); 
-  
-  /* Create and set the name (IOR of shape converted into a string) */
-  string name_ior = _orb->object_to_string(shape) ;
-  shape->Name( name_ior.c_str() );  
-  shape->NameType( "" );
-  return shape;
-}
-
-//=======================================================================
-//function : CreateSubObject
-//purpose  : 
-//=======================================================================
-
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::CreateSubObject(const TopoDS_Shape& SubShape,
-                                                const GEOM::GEOM_Shape_ptr MainShape,
-                                                const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID)
-{
-  GEOM::shape_type st = GEOM::shape_type(SubShape.ShapeType()) ; /* casting */
-  
-  /* Create the CORBA servant holding the TopoDS_Shape */
-  GEOM::GEOM_Gen_ptr engine = POA_GEOM::GEOM_Gen::_this();
-  GEOM_Shape_i * shape_servant =
-    new GEOM_Shape_i(SubShape, _orb, engine, ListOfID, st, false);
-  GEOM::GEOM_Shape_var shape = GEOM::GEOM_Shape::_narrow(shape_servant->_this()); 
-  
-    /* Create and set the name (IOR of shape converted into a string) */
-  string name_ior = _orb->object_to_string(shape) ;
-  shape->Name( name_ior.c_str() );
-    /* create and set the mainname (IOR of shape converted into a string) */
-  const char *mainname_ior = _orb->object_to_string(MainShape) ;
-  shape->MainName(mainname_ior);
-    /* precaution : NameType will be set precisely in GUI */    
-  shape->NameType( "" );
-    /* add 'SubShape' its 'nameIOR' and a reference to the main shape thanks to method below  */
-  const char *entry =
-    InsertInLabelDependentShape(SubShape, shape->Name(), MainShape, myCurrentOCAFDoc) ;
-  shape->ShapeId( entry ) ;
-  return shape;
-}
-
-//=======================================================================
-// function : SuppressFacesGlue()
-// purpose  : Define a compound of shells after suppress of mapFaces in the 
-//          : shape S and return the number of shells of the compound.
-//=======================================================================
-int GEOM_Gen_i::SuppressFacesGlue( const TopoDS_Shape& S,
-                                  const TopTools_MapOfShape& mapFaces,
-                                  TopoDS_Shape& aCompoundOfShells )
-  throw (SALOME::SALOME_Exception)
-{  
-  Unexpect aCatch(SALOME_SalomeException);
-  BRepTools_Quilt Glue;
-  aCompoundOfShells.Nullify() ;
-  
-  for ( TopExp_Explorer exp( S, TopAbs_FACE); exp.More(); exp.Next() ) {
-    const TopoDS_Face& F = TopoDS::Face(exp.Current());
-    if ( !mapFaces.Contains(F) ) {
-      /* this face must not to be suppressed */
-      Glue.Add(F);
-    }
-  }
-  
-  /* Use specif method to calculate the compound of shells */
-  aCompoundOfShells = Glue.Shells();
-  
-  if( aCompoundOfShells.ShapeType() != TopAbs_COMPOUND ) {
-    THROW_SALOME_CORBA_EXCEPTION("In GEOM_Gen_i::SuppressFacesGlue() : not a GEOM::COMPOUND", SALOME::BAD_PARAM);
-  }
-
-  /* explore Compound for verification and return the number of shells */
-  int numberOfShell = 0 ;
-  for ( TopExp_Explorer exp1( aCompoundOfShells, TopAbs_SHELL); exp1.More(); exp1.Next() )
-    numberOfShell++ ;
-
-  return numberOfShell ;
-}
-
-
-//=====================================================================================
-// function : GetIndexTopology()
-// purpose  : return the index of a sub shape in a shape (index starts at 1)
-//          : Return -1 if not found
-//=====================================================================================
-int GEOM_Gen_i::GetIndexTopology(const TopoDS_Shape& subshape, const TopoDS_Shape& mainShape) 
-{ 
-  if( mainShape.IsNull() || subshape.IsNull() ) 
-    return -1 ; 
-
-  int index = 1; 
-  if (subshape.ShapeType() == TopAbs_COMPOUND) 
-    { 
-      TopoDS_Iterator it; 
-      TopTools_ListOfShape CL; 
-      CL.Append( mainShape ); 
-      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 ( mainShape,  subshape.ShapeType() ); 
-      TopTools_MapOfShape M; 
-      while ( Exp.More() ) 
-       { 
-         if ( M.Add(Exp.Current()) ) 
-           { 
-             if ( Exp.Current().IsSame(subshape) ) 
-               return index; 
-             index++; 
-           } 
-         Exp.Next(); 
-       } 
-    } 
-  return -1; 
-} 
-
-
-//================================================================================
-// function : IndexOfFacesOfSubShell()
-// purpose  : Return a list of indices corresponding to the faces of a 'subShell'
-//          : in the main shape 'S'
-//================================================================================
-GEOM::GEOM_Shape::ListOfSubShapeID* GEOM_Gen_i::IndexOfFacesOfSubShell( const TopoDS_Shape& S,
-                                                                 const TopoDS_Shape subShell )
-  throw (SALOME::SALOME_Exception)
-{
-
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape::ListOfSubShapeID_var ListOfID = new GEOM::GEOM_Shape::ListOfSubShapeID;
-  ListOfID->length(0) ;
-  if( subShell.IsNull() || subShell.ShapeType() != TopAbs_SHELL ) {
-    THROW_SALOME_CORBA_EXCEPTION("In GEOM_Gen_i::IndexOfFacesOfSubShell() : null shape or not a GEOM::SHELL", SALOME::BAD_PARAM);
-  }
-
-  /* put faces of subShell in a Map of faces */
-  int j = 0 ;
-  TopTools_MapOfShape mapFaces ;
-  for( TopExp_Explorer Exp1( subShell, TopAbs_FACE );  Exp1.More(); Exp1.Next() ) {
-    mapFaces.Add(Exp1.Current() ) ;
-    j++ ;
-  }
-
-  if( j<1 )
-    THROW_SALOME_CORBA_EXCEPTION("In GEOM_Gen_i::IndexOfFacesOfSubShell() : no faces in sub shell", SALOME::BAD_PARAM);
-  
-  /* Find index of each face of subshell in the main topology and put its index in ListOfID */
-  int size = 0 ;
-  for ( TopExp_Explorer Exp2(S, TopAbs_FACE); Exp2.More();  Exp2.Next() ) {
-    
-    const TopoDS_Face& F = TopoDS::Face( Exp2.Current() ) ;
-
-    if( mapFaces.Contains(F) )  {
-      int n = GetIndexTopology( F, S ) ;
-      if( n<=0 ) {
-       THROW_SALOME_CORBA_EXCEPTION("In GEOM_Gen_i::IndexOfFacesOfSubShell() : no index found", SALOME::BAD_PARAM);    
-      }
-      size++;
-      ListOfID->length(size) ;
-      ListOfID[size-1] = n ;
-    }
-  }
-
-  return ListOfID._retn() ;
-}
-
-
-
-//================================================================================
-// function : ListOfIDIntoMapOfShapes()
-// purpose  : Define a MapOfShapes from a main topology 'S' a 'subShapeType'
-//          : and a list of indices 'L'.
-//          : Return true if 'aMap' is not empty
-//================================================================================
-bool GEOM_Gen_i::ListOfIDIntoMapOfShapes( const TopoDS_Shape& S,
-                                         const GEOM::GEOM_Shape::ListOfSubShapeID& L,
-                                         const int subShapeType,
-                                         TopTools_MapOfShape& aMap )
-{
-  if( L.length() < 1 || S.IsNull() ) {
-    return false ;
-  }
-  
-  aMap.Clear() ; 
-  for( int k=0; k<L.length(); k++ ) {
-    /* indices start at 1 in list L */
-    int j = 1 ;
-    TopExp_Explorer exp ;
-    TopTools_MapOfShape M; 
-    for(  exp.Init( S, TopAbs_ShapeEnum(subShapeType) ); exp.More(); exp.Next() ) {
-      if ( M.Add(exp.Current()) ) 
-       { 
-         if( L[k] == j ) {
-           aMap.Add( exp.Current() ) ;
-         }
-         j++ ;
-       }
-    }
-  }
-  return true ;
-}
-
-
-
-//================================================================================
-// function : ListOfIDIntoSequenceOfShapes()
-// purpose  : Define 'aSequenceOfShapes' from a main topology 'S' a 'subShapeType'
-//          : and a list of indices 'L'.
-//          : Return true if 'aSequenceOfShapes' is not empty
-//================================================================================
-bool GEOM_Gen_i::ListOfIDIntoSequenceOfShapes( const TopoDS_Shape& S,
-                                              const GEOM::GEOM_Shape::ListOfSubShapeID& L,
-                                              const int subShapeType,
-                                              TopTools_SequenceOfShape& aSequenceOfShapes )
-{
-  if( L.length() < 1 || S.IsNull() ) {
-    return false ;
-  }
-  
-  aSequenceOfShapes.Clear() ; 
-  for( int k=0; k<L.length(); k++ ) {
-    /* indices start at 1 in list L */
-    int j = 1 ;
-    TopExp_Explorer exp ;
-    for(  exp.Init( S, TopAbs_ShapeEnum(subShapeType) ); exp.More(); exp.Next() ) {
-      if( L[k] == j ) {
-       aSequenceOfShapes.Append( exp.Current() ) ;
-      }
-      j++ ;
-    }
-  }
-  return true ;
-}
-
-
-
-//================================================================================
-// function : SuppressFaces()
-// purpose  : Suppress faces contained in ListOfID from 'shape'.
-//          : Return a list of Geom shapes each one is a main shape GEOM::FACE or GEOM::SHELL
-//================================================================================
-GEOM::GEOM_Gen::ListOfGeomShapes* GEOM_Gen_i::SuppressFaces( GEOM::GEOM_Shape_ptr shape,
-                                                               const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID ) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Gen::ListOfGeomShapes_var listOfGeomShapes = new GEOM::GEOM_Gen::ListOfGeomShapes;
-  listOfGeomShapes->length(0) ;
-
-  TopoDS_Shape mainShape = GetTopoShape(shape);
-  if( mainShape.IsNull() )
-    THROW_SALOME_CORBA_EXCEPTION("In GEOM_Gen_i::SuppressFaces() : null argument shape", SALOME::BAD_PARAM);
-  
-  if( ListOfID.length() < 1 )
-    THROW_SALOME_CORBA_EXCEPTION("In GEOM_Gen_i::SuppressFaces() : empty ListOfID", SALOME::BAD_PARAM);
-  
-  /* Define 'mapFaces' a map of faces to be suppressed in mainShape */
-  TopTools_MapOfShape mapFaces ;
-  if( !ListOfIDIntoMapOfShapes(mainShape, ListOfID, TopAbs_FACE, mapFaces ) ) {
-    return listOfGeomShapes._retn();
-  }
-    
-  /* Call algorithm to calculate a compound of shells resulting of face suppression */
-  int numberOfShells = 0 ;
-  TopoDS_Shape aCompoundOfShells ;
-  numberOfShells = SuppressFacesGlue(mainShape, mapFaces, aCompoundOfShells) ;
-  if(numberOfShells < 1) {
-    THROW_SALOME_CORBA_EXCEPTION("In GEOM_Gen_i::Suppressfaces() : no shells", SALOME::BAD_PARAM);
-  }
-  /* Create a shell for each shell contained in 'aCompoundOfShells' and             */ 
-  /* put it in the list of GeomShapes to be returned.                               */
-  /* But if the shell is composed of only a face we create a face and not a shell   */
-  int i = 0 ;
-  for( TopExp_Explorer exp(aCompoundOfShells, TopAbs_SHELL); exp.More(); exp.Next() ) {
-
-    const TopoDS_Shell& aShell = TopoDS::Shell( exp.Current() );    
-    if( aShell.IsNull() ) {
-      THROW_SALOME_CORBA_EXCEPTION("In GEOM_Gen_i::Suppressfaces() : null shell", SALOME::BAD_PARAM);
-    }
-    
-    GEOM::GEOM_Shape::ListOfSubShapeID_var aList = new GEOM::GEOM_Shape::ListOfSubShapeID;
-    aList = IndexOfFacesOfSubShell(mainShape, aShell) ;
-
-     if( aList->length() < 1 ) {
-      THROW_SALOME_CORBA_EXCEPTION("In GEOM_Gen_i::SuppressFaces() : aList is empty", SALOME::BAD_PARAM);
-    }
-
-    TopoDS_Shape aShellOrFace ;
-    /* Only a face into the shell : we create a single face instead of a shell : 'aList' is unchanged  */
-    if( aList->length() == 1 ) {
-      TopExp_Explorer exp ;
-      exp.Init( aShell, TopAbs_FACE ) ;
-      exp.More() ;
-      aShellOrFace = exp.Current() ;
-    }
-    else {
-      aShellOrFace = aShell ;
-    }
-    
-    /* Create CORBA object */
-    GEOM::GEOM_Shape_var result = CreateObject(aShellOrFace) ;
-    if( CORBA::is_nil(result) ) {
-      THROW_SALOME_CORBA_EXCEPTION("Suppress Faces aborted : null result", SALOME::BAD_PARAM);
-    }
-
-    InsertInLabelOneArgument(mainShape, shape, aShellOrFace, result, myCurrentOCAFDoc) ;
-    i++ ;
-    listOfGeomShapes->length(i) ;
-    listOfGeomShapes[i-1] = result ;
-  }
-
-  return listOfGeomShapes._retn() ;
-}
-
-
-
-//================================================================================
-// function : IsShapeInSequence()
-// purpose  : return true is aShape is in SS. The test method is 'IsSame()'
-//================================================================================
-bool GEOM_Gen_i::IsShapeInSequence(const TopTools_SequenceOfShape& SS, const TopoDS_Shape& aShape)
-{
-  if( aShape.IsNull() || SS.IsEmpty() ) 
-    return false ;  
-  for( int i=1; i<=SS.Length(); i++) {
-    if( SS.Value(i).IsSame(aShape) )
-      return true ;
-  }
-  return false ;
-}
-
-
-//================================================================================
-// function : FreeEdgesFromMapOfFace()
-// purpose  : Define MS a map of all edges of faces of 'MSfaces'
-//          : All multiple edges are removed !
-//================================================================================
-void GEOM_Gen_i::FreeEdgesFromMapOfFace( const TopTools_MapOfShape& MSfaces,
-                                        TopTools_MapOfShape& MS )
-{
-  MS.Clear() ;
-  TopTools_MapOfShape Multiple ;
-  TopTools_MapIteratorOfMapOfShape it ;
-  for( it.Initialize(MSfaces); it.More(); it.Next() ) {
-    TopoDS_Shape aFace = it.Key() ;
-    TopExp_Explorer exp ;
-    for( exp.Init( aFace, TopAbs_EDGE); exp.More(); exp.Next() ) {
-      if( !Multiple.Contains( exp.Current() ) && !MS.Add( exp.Current() ) ) {
-       MS.Remove( exp.Current() ) ;
-       Multiple.Add( exp.Current() ) ;
-      }
-    }
-  }
-  return ;
-}
-
-
-//================================================================================
-// function : MapRemoveSequence()
-// purpose  : In term of shapes ST = MS - SSRemove
-//          :
-//================================================================================
-void GEOM_Gen_i::MapRemoveSequence( const TopTools_MapOfShape& MS,
-                                   const TopTools_SequenceOfShape& SSRemove,
-                                   TopTools_SequenceOfShape& ST ) 
-{
-  ST.Clear() ;
-  TopTools_MapIteratorOfMapOfShape it ;
-  for( it.Initialize(MS); it.More(); it.Next() ) {
-    TopoDS_Shape aShape = it.Key() ;
-    if( !IsShapeInSequence( SSRemove, aShape ) )
-      ST.Append( aShape ) ;
-  }
-  return ;
-}
-
-
-
-//================================================================================
-// function : SuppressHoleSubRoutine()
-// purpose  : Define recursively 'MSfacesSuppress' a list of faces to suppress in a hole
-//================================================================================
-void GEOM_Gen_i::SuppressHoleSubRoutine( const TopoDS_Shape& mainShape,
-                                        const TopoDS_Face& aFace,
-                                        const TopTools_SequenceOfShape& SSedgesOfWire, 
-                                        const TopTools_IndexedDataMapOfShapeListOfShape& aMapEdgesFaces,
-                                        const TopTools_MapOfShape& MSfaces,                                     
-                                        TopTools_MapOfShape& MSfacesSuppress,
-                                        const Standard_Boolean withEndFace,
-                                        const TopoDS_Face& endFace,
-                                        TopTools_MapOfShape& MSwireEndEdges )
-  throw (SALOME::SALOME_Exception)
-{  
-  Unexpect aCatch(SALOME_SalomeException);
-  TopTools_MapOfShape MS ;
-  TopTools_SequenceOfShape SU ;
-  FreeEdgesFromMapOfFace(MSfaces, MS) ;        /* MS = free edges of MSfaces */
-  MapRemoveSequence(MS, SSedgesOfWire, SU) ;   /* SU = MS - SSedgesOfWire    */
-
-  if( SU.IsEmpty() ) {
-    return ;
-  }
-
-  /* Here SU contains new edges to find new faces to suppress                                          */
-  /* Define the list of faces of SU edges that aren't in faces of MSfacesSuppress in order to add into */
-  /* For each edge we have a map of all its faces : it's in 'aMapEdgesFaces'                           */
-  TopTools_MapOfShape MSfacesTmp ;
-  for( int v=1; v<=SU.Length(); v++ ) {
-    TopoDS_Shape E = SU.Value(v) ;
-    TopoDS_Shape F ;
-    TopTools_ListOfShape LF ;
-    int ind = aMapEdgesFaces.FindIndex(E) ;
-    
-    /* LF is the list of faces for an edge of SU : may be empty no matter */
-    LF = aMapEdgesFaces.FindFromIndex(ind) ;
-    
-    TopTools_ListIteratorOfListOfShape it ;
-    for( it.Initialize(LF); it.More(); it.Next() ) {
-      F = it.Value() ;
-      if( withEndFace == false ) {
-       if( F.IsSame(aFace) )
-         THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHoleSubRoutine() : hole traversing or ?", SALOME::BAD_PARAM);
-       if( !MSfacesSuppress.Contains(F) ) {
-         MSfacesSuppress.Add(F) ;
-         MSfacesTmp.Add(F) ; // Dont remove the 'if' !
-       }
-      }
-      else { /* withEndFace == true */
-       if( F.IsSame(aFace) && !F.IsSame(endFace) )
-         THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHoleSubRoutine() : hole traversing incoherent ?", SALOME::BAD_PARAM);
-       
-       if( F.IsSame(endFace) ) {
-         /* We have reached endFace if selection was correct so we add  */
-         /* edge in a map to find later the corresponding endWire (hole */
-         MSwireEndEdges.Add(E) ;
-       }
-       else {
-         if( !MSfacesSuppress.Contains(F) ) {
-           MSfacesSuppress.Add(F) ;
-           MSfacesTmp.Add(F) ;
-         }
-       }
-      }
-    }
-  }
-  /* Call recursively this routine */
-  SuppressHoleSubRoutine( mainShape, aFace, SSedgesOfWire, aMapEdgesFaces, MSfacesTmp, MSfacesSuppress, withEndFace, endFace, MSwireEndEdges ) ; 
-}
-
-
-
-//================================================================================
-// function : GetShapeFromIndex()
-// purpose  : Find 'tds' a sub shape of 'aShape' according to 'aList' that contains
-//          : a unique index !
-//          : Warning : index must be setted with the same exploration logic !
-//          : So 'index' is calculated with no shape doublons !
-//================================================================================
-bool GEOM_Gen_i::GetShapeFromIndex( const TopoDS_Shape& aShape,
-                                   const TopAbs_ShapeEnum aType, 
-                                   const int index,
-                                   TopoDS_Shape& tds )
-
-{
-  if (aShape.IsNull() || index < 1) 
-    return false ;
-  /* Indices start at 1 */
-  int j = 1 ;
-  bool found = false ;
-  TopExp_Explorer exp ;
-  TopTools_MapOfShape M;
-  for( exp.Init( aShape, aType ); exp.More(); exp.Next() ) {
-    if( M.Add(exp.Current()) ) { /* if not a doublon : we compare */
-      if( index == j ) {
-       tds =  exp.Current() ;
-       return true ;
-      }
-      j++ ;
-    }
-  }
-  return false ;
-}
-
-
-
-//================================================================================
-// function : SuppressHolesInFaceOrShell()  Main method.
-// purpose  : Suppress holes identified by wires in a single face or shell
-//
-//================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::SuppressHolesInFaceOrShell( GEOM::GEOM_Shape_ptr shapeFaceShell,
-                                                      const GEOM::GEOM_Shape::ListOfSubShapeID& ListIdWires )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-
-  if( ListIdWires.length() < 1 )
-    THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHolesInFace : no holes selected", SALOME::BAD_PARAM);
-  
-  const TopoDS_Shape tds = GetTopoShape(shapeFaceShell) ;
-  if( tds.IsNull() || !IsValid(tds) )
-    THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHolesInFace() : non valid main argument", SALOME::BAD_PARAM);
-  
-  /* Create a map of wires/holes to suppress */
-  TopTools_MapOfShape MapHoles ;
-  for ( int i = 0; i < ListIdWires.length(); i++ ) {
-    TopoDS_Shape W ;    
-    if( !GetShapeFromIndex( tds, TopAbs_WIRE, ListIdWires[i], W ) )
-      THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHolesInFace() : bad index ?", SALOME::BAD_PARAM);
-    MapHoles.Add( W ) ;
-  }
-
-  /* Test if argument is a face or shell */
-  bool isFace ;
-  if( tds.ShapeType() == TopAbs_FACE )
-    isFace = true ;
-  else if ( tds.ShapeType() == TopAbs_SHELL )
-    isFace = false ;
-  else
-    THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHolesInFace() : not a face or a shell", SALOME::BAD_PARAM); 
-
-  /* Define two maps : all faces and faces to that will be modified */
-  TopTools_MapOfShape MapFacesToModify ;
-  TopTools_MapOfShape MapFacesAll ;
-  TopExp_Explorer expF ;
-  for( expF.Init( tds, TopAbs_FACE);  expF.More(); expF.Next() ) {
-    TopoDS_Face F = TopoDS::Face( expF.Current() ) ;
-    MapFacesAll.Add(F) ;
-    TopExp_Explorer expW ;
-    for( expW.Init( F, TopAbs_WIRE);  expW.More(); expW.Next() ) {
-      TopoDS_Wire W = TopoDS::Wire( expW.Current() ) ;
-      if( MapHoles.Contains(W) ) {
-       MapFacesToModify.Add(F) ;
-      }
-    }
-  }
-
-  /* Define faces not modified */
-  TopTools_MapOfShape MapFacesNotModified ;
-  TopTools_MapIteratorOfMapOfShape it ;
-  for( it.Initialize(MapFacesAll); it.More(); it.Next() ) {
-    TopoDS_Face FF = TopoDS::Face( it.Key() ) ;
-    if( !MapFacesToModify.Contains(FF) )
-      MapFacesNotModified.Add(FF) ;
-  }
-
-  if( MapFacesToModify.IsEmpty() )
-    THROW_SALOME_CORBA_EXCEPTION("Error : empty map of faces", SALOME::BAD_PARAM); 
-  
-  if( isFace && MapFacesToModify.Extent() != 1 )
-    THROW_SALOME_CORBA_EXCEPTION("Incoherent", SALOME::BAD_PARAM);
-  
-  /* Main argument is a face */
-  if( isFace && MapFacesToModify.Extent() == 1 ) {
-    TopoDS_Face resultFace ;
-    if( !RebuildFaceRemovingHoles( TopoDS::Face(tds), MapHoles, resultFace ) )
-      THROW_SALOME_CORBA_EXCEPTION(" Problem : !RebuildFaceRemovingHoles()", SALOME::BAD_PARAM);
-    /* Creation of CORBA object : face topology */
-    result = CreateObject(resultFace);
-    InsertInLabelOneArgument(tds, shapeFaceShell, resultFace, result, myCurrentOCAFDoc) ;
-    return result ;
-  }
-
-  /* Main argument is a shell : rebuild faces modified */
-  TopTools_MapOfShape MapFacesModified ;
-  for( it.Initialize(MapFacesToModify); it.More(); it.Next() ) {
-    TopoDS_Face FF = TopoDS::Face( it.Key() ) ;
-    TopoDS_Face resF ;
-    if( !RebuildFaceRemovingHoles( FF, MapHoles, resF ) )
-      THROW_SALOME_CORBA_EXCEPTION(" Problem shell : !RebuildFaceRemovingHoles()", SALOME::BAD_PARAM);
-    MapFacesModified.Add(resF) ;
-  }
-
-  /* Rebuild the shell with faces modified and non modified */
-  TopoDS_Shell resultShell ;
-  BRepPrim_Builder B;
-  B.MakeShell(resultShell) ;
-  TopTools_MapIteratorOfMapOfShape it1 ;
-  for( it1.Initialize(MapFacesModified); it1.More(); it1.Next() )
-    B.AddShellFace( resultShell,TopoDS::Face( it1.Key() ) ) ;
-  for( it1.Initialize(MapFacesNotModified); it1.More(); it1.Next() )
-    B.AddShellFace( resultShell,TopoDS::Face( it1.Key() ) ) ;
-  
-  B.CompleteShell(resultShell) ;
-  
-  if( resultShell.IsNull() )
-    THROW_SALOME_CORBA_EXCEPTION("Null or not valid result Shell", SALOME::BAD_PARAM) ;
-  
-  /* Creation of CORBA object : shell topology */
-  result = CreateObject(resultShell);
-  InsertInLabelOneArgument(tds, shapeFaceShell, resultShell, result, myCurrentOCAFDoc) ;
-  return result ;
-}
-
-
-//================================================================================
-// function : RebuildFaceRemovingHoles()
-// purpose  : Rebuild a face removing holes that are in 'mapHoles'.
-//          : NB : 'mapHoles' may content more holes than necessary
-//================================================================================
-bool GEOM_Gen_i::RebuildFaceRemovingHoles( const TopoDS_Face& aFace,
-                                          const TopTools_MapOfShape& mapHoles,
-                                          TopoDS_Shape& resultFace )
-{
-  /* Get the outer wire of the face 'aFace' */
-  TopoDS_Wire outW = BRepTools::OuterWire( aFace ) ;
-  if( outW.IsNull() || !IsValid(outW) )
-    THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHolesInFace : bad outer wire of 'aFace'", SALOME::BAD_PARAM);
-  
-  /* Rebuild a face avoiding holes in the map 'mapHoles' */  
-  Handle(Geom_Surface) Surface = BRep_Tool::Surface(aFace) ;
-  TopoDS_Face F2 = BRepBuilderAPI_MakeFace( Surface, outW, true ) ;
-  
-  if( F2.Orientation() != aFace.Orientation() )
-    F2.Orientation( aFace.Orientation() ) ;
-  
-  BRepBuilderAPI_MakeFace aBuilder( F2 ) ;
-  bool foundAndKeepHoles = false ;
-  TopExp_Explorer exp ;
-  
-  for( exp.Init( aFace, TopAbs_WIRE);  exp.More(); exp.Next() ) {
-    TopoDS_Wire hole = TopoDS::Wire( exp.Current() ) ;
-    if( !mapHoles.Contains(hole) && !exp.Current().IsEqual(outW) ) {
-      aBuilder.Add( hole) ;      
-      if( !aBuilder.IsDone() )
-       THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHolesInFace : builder problem !", SALOME::BAD_PARAM);      
-      
-      resultFace = TopoDS::Face(aBuilder) ;
-      foundAndKeepHoles = true ;
-    }
-  }
-  
-  if( !foundAndKeepHoles )
-    resultFace = F2 ;
-  else
-    resultFace = TopoDS::Face(aBuilder) ;
-  
-  return true ;
-}
-
-
-
-
-//================================================================================
-// function : SuppressHole() Main method.
-// purpose  : Suppress an hole identified by a wire in a face of shape
-//          : ListIdFace contains a unique index of face in shape
-//          : ListIdWire contains a unique index of wire in face !!!
-//          : ListIdEndFace is used only when hole traverse.
-//================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::SuppressHole( GEOM::GEOM_Shape_ptr shape,
-                                        const GEOM::GEOM_Shape::ListOfSubShapeID& ListIdFace,
-                                        const GEOM::GEOM_Shape::ListOfSubShapeID& ListIdWire,
-                                        const GEOM::GEOM_Shape::ListOfSubShapeID& ListIdEndFace )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Face aFace ;
-  TopoDS_Wire aWire ;  
-  TopoDS_Face endFace ;
-  bool withEndFace ;
-  TopoDS_Shape tmp ;
-  
-  /* Retrieve 'aShape' the initial main shape selection */
-  const TopoDS_Shape aShape = GetTopoShape(shape);
-  
-  if( !IsValid(aShape) )
-    THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHole() : non valid main shape", SALOME::BAD_PARAM);
-  
-  if( ListIdFace.length() != 1 || ListIdWire.length() != 1 )
-    THROW_SALOME_CORBA_EXCEPTION("bad list", SALOME::BAD_PARAM);  
-  
-  /* Retrieve 'aFace' selection */
-  if( !GetShapeFromIndex( aShape, TopAbs_FACE, ListIdFace[0], tmp ) ) {
-    THROW_SALOME_CORBA_EXCEPTION("face not found", SALOME::BAD_PARAM);
-  }
-  else {
-    aFace = TopoDS::Face(tmp) ;
-  }
-  if( !IsValid(aFace) )
-    THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHole() : face shape not valid", SALOME::BAD_PARAM);  
-  
-   /* Retrieve 'aWire' selection : Warning : index of wire refers to the face ! */
-  TopoDS_Shape aTmp ;
-  if( !GetShapeFromIndex( aFace, TopAbs_WIRE, ListIdWire[0], aTmp ) ) {
-    THROW_SALOME_CORBA_EXCEPTION("wire not found", SALOME::BAD_PARAM);
-  }
-  else {
-    aWire = TopoDS::Wire(aTmp) ;
-  }
-  if( !IsValid(aWire) )
-    THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHole() : bad wire" , SALOME::BAD_PARAM);
-
-  /* Get the outer wire of aFace */
-  TopoDS_Wire outerW = BRepTools::OuterWire( aFace ) ;
-  if( outerW.IsNull() || !IsValid(outerW) ) 
-    THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHole() : bad outer wire", SALOME::BAD_PARAM);
-  
-  /* Test bad user selection aWire */
-  if( aWire.IsSame(outerW) )
-    THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHole() : outerW = aWire", SALOME::BAD_PARAM);
-   
-  /* Test if 'endFace' is used  as argument and seems to be a valid one          */
-  /* NB : 'endFace' is optional and used when hole to suppress traverse 'aShape' */
-  if( ListIdEndFace.length() == 0 ) {
-    withEndFace = false ;
-  }
-  else {
-    TopoDS_Shape aTemp ;
-    if( !GetShapeFromIndex( aShape, TopAbs_FACE, ListIdEndFace[0], aTemp ) || tmp.IsNull() || !IsValid(aTemp) )
-      THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHole() : non valid endFace", SALOME::BAD_PARAM);
-
-    /* Test if 'endFace' as at least one hole */    
-    endFace = TopoDS::Face(aTemp) ;  
-
-    TopExp_Explorer fExp ;
-    int nbWires = 0 ;
-    for( fExp.Init(endFace, TopAbs_WIRE);  fExp.More(); fExp.Next() ) {
-      TopoDS_Wire W = TopoDS::Wire( fExp.Current() ) ;
-      if( !W.IsNull() && IsValid(W) )
-       nbWires++ ;
-    }
-    if(nbWires > 1)
-      withEndFace = true ; /* at least 2 wires : outer wire plus an hole or more */
-    else
-      THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SuppressHole() : end face selection ?", SALOME::BAD_PARAM);
-  }
-  
-  /* Find edges of aWire and test if degenerated */
-  TopTools_SequenceOfShape SSedgesOfWire ;
-  TopExp_Explorer wireExp ;  
-  for( wireExp.Init(aWire, TopAbs_EDGE);  wireExp.More(); wireExp.Next() ) {
-    TopoDS_Edge E = TopoDS::Edge( wireExp.Current() ) ;
-    if( E.IsNull() || BRep_Tool::Degenerated(E) ) {
-      THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SupressHole() : found bad edge", SALOME::BAD_PARAM);
-    }
-    else {
-      SSedgesOfWire.Append( wireExp.Current() ) ;
-    }
-  }
-  if( SSedgesOfWire.Length() < 1 )
-    THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SupressHole() : no edge(s) for aWire", SALOME::BAD_PARAM); 
-  
-  /* Retrieve face ancestors of all edges of 'aWire' but avoiding 'aFace' */ 
-  
-  TopTools_IndexedDataMapOfShapeListOfShape aMapEdgesFaces;
-  TopTools_MapIteratorOfMapOfShape anIt ;
-  TopTools_MapOfShape MFSuppress ;
-  TopTools_MapOfShape MFSuppressTmp ;
-  bool wireOnFace = false ;
-  TopExp::MapShapesAndAncestors(aShape, TopAbs_EDGE, TopAbs_FACE, aMapEdgesFaces) ;  
-  for( int h=1; h<=SSedgesOfWire.Length(); h++ ) {
-    
-    TopoDS_Shape anEdgeOfWire = SSedgesOfWire.Value(h) ;
-    int ind = aMapEdgesFaces.FindIndex(anEdgeOfWire) ;
-    if(ind < 1)
-      THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SupressHole() : index of edge", SALOME::BAD_PARAM);
-    
-    TopTools_ListOfShape LF;
-    LF = aMapEdgesFaces.FindFromIndex(ind) ; /* Contains all faces ancestors of an edge of wire */
-    if( LF.IsEmpty() )
-      THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SupressHole() : no face for an edge", SALOME::BAD_PARAM);
-    
-    /* Filter faces avoiding 'aFace' */
-    TopTools_ListIteratorOfListOfShape it ;
-    for( it.Initialize(LF); it.More(); it.Next() ) {
-      TopoDS_Face F = TopoDS::Face( it.Value() ) ;
-      if( !F.IsSame(aFace) ) { 
-       MFSuppressTmp.Add(F) ;
-       MFSuppress.Add(F) ;
-      }
-      else {
-       wireOnFace = true ;
-      }
-    }
-  }
-  
-  if( !wireOnFace ) {
-    THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SupressHole() : wire not on selected face", SALOME::BAD_PARAM);  
-  }
-
-  /* Call routine to define faces to suppress and and optional endWire on endFace */
-  TopTools_MapOfShape MSwireEndEdges ; /* will contain edges of final wire (hole) */
-  SuppressHoleSubRoutine( aShape, aFace, SSedgesOfWire, aMapEdgesFaces, MFSuppressTmp, MFSuppress, withEndFace, endFace, MSwireEndEdges ) ;
-
-  TopoDS_Wire endWire ;
-  if( withEndFace ) {
-    
-    if( MSwireEndEdges.Extent() < 1 )
-      THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SupressHole() : MSwireEndEdges.Extent() < 1", SALOME::BAD_PARAM);
-
-    if( !FindCompareWireHoleOnFace( endFace, MSwireEndEdges, endWire ) )           
-      THROW_SALOME_CORBA_EXCEPTION("in GEOM_Gen_i::SupressHole() : no endWire found", SALOME::BAD_PARAM);    
-   }
-   
-  /* Build 'resTds' : a shape containing a compound of faces */
-  TopoDS_Shape resTds;
-  if( !withEndFace && !BuildShapeHoleNotTraversing( aShape, aFace, aWire, MFSuppress, resTds ) )
-    THROW_SALOME_CORBA_EXCEPTION("Rebuild result shape has aborted", SALOME::BAD_PARAM);
-  
-  if( withEndFace && !BuildShapeHoleTraversing( aShape, aFace, aWire, MFSuppress, endFace, endWire, resTds ) )
-    THROW_SALOME_CORBA_EXCEPTION("Rebuild result shape has aborted (end hole)", SALOME::BAD_PARAM); 
-  
-  /* Reconstruction of final shape with 'resTds' : a compound of faces after hole suppressing */
-  /* Actual limitation is : 'aShape' must not contain more than a solid or a shell !          */
-  TopoDS_Shape finalShape ;
-  TopExp_Explorer exp ;
-  unsigned int nbSolid = 0 ;
-  TopoDS_Solid aSolid ;
-  for( exp.Init(aShape, TopAbs_SOLID); exp.More(); exp.Next() ) {
-    aSolid = TopoDS::Solid( exp.Current() ) ;
-    nbSolid++ ;
-    if( nbSolid > 1 )
-      THROW_SALOME_CORBA_EXCEPTION("Limitation : main shape contents more than one solid", SALOME::BAD_PARAM);  
-  }
-   
-  unsigned int nbShell = 0 ;
-  TopoDS_Shell aShell ;
-  for( exp.Init(aShape, TopAbs_SHELL); exp.More(); exp.Next() ) {
-    aShell = TopoDS::Shell( exp.Current() ) ;
-    nbShell++ ;
-    if( nbShell > 1 )
-      THROW_SALOME_CORBA_EXCEPTION("Limitation : main shape contents more than one shell", SALOME::BAD_PARAM);
-  }
-  
-  /* No shells and no solids : can send a compound even for a single face, see GUI ! */
-  if( nbShell == 0 ) {
-    finalShape = resTds ;
-  }
-  
-  /* a shell */
-  TopoDS_Shell shellResult ;
-  if( nbShell == 1 ) {
-    if ( !BuildShellWithFaceCompound( TopoDS::Compound(resTds), shellResult ) ) 
-      THROW_SALOME_CORBA_EXCEPTION("Error after BuildShellWithFaceCompound()", SALOME::BAD_PARAM);
-    finalShape = shellResult ;
-  }
-  
-  /* a solid with a shell */
-  if( nbSolid == 1 && nbShell == 1) {
-    BRepBuilderAPI_MakeSolid B;
-    B.Add(shellResult) ;
-    if( !B.IsDone() )
-      THROW_SALOME_CORBA_EXCEPTION("Error : !B.IsDone()", SALOME::BAD_PARAM);  
-    finalShape = B.Solid() ;
-  }
-
-  result = CreateObject(finalShape);
-  InsertInLabelOneArgument(aShape, shape, finalShape, result, myCurrentOCAFDoc) ;
-  return result ;
-}
-
-
-
-//================================================================================
-// function : BuildShellWithFaceCompound()
-// purpose  : Build a shell with a compound of faces.
-//================================================================================
-bool GEOM_Gen_i::BuildShellWithFaceCompound( const TopoDS_Compound Comp,
-                                            TopoDS_Shell& resultShell )
-{
-  resultShell.Nullify() ;
-  BRepPrim_Builder B ;
-  B.MakeShell(resultShell) ;  
-  TopExp_Explorer ex ;
-  int i = 0 ;
-  for( ex.Init( Comp, TopAbs_FACE); ex.More(); ex.Next() ) {
-    TopoDS_Face F = TopoDS::Face( ex.Current() ) ;
-    if( !IsValid(F) ) {
-      return false ;
-    }
-    B.AddShellFace( resultShell, F ) ;
-  }
-  B.CompleteShell(resultShell) ;
-  if( resultShell.IsNull() ) {
-    return false ;
-  }  
-  return true ;
-}
-
-
-//================================================================================
-// function : FindCompareWireHoleOnFace()
-// purpose  : Try to find a wire on 'aFace' which edges are same than those
-//          : into 'MSwireEdges' map. 'aFoundWire' is defined and 'true' returned.
-//          : 'MSwireEdges' represents generally an hole an 'aFace'.
-//          : The outer wire of 'aFace' is avoided !
-//================================================================================
-bool GEOM_Gen_i::FindCompareWireHoleOnFace( const TopoDS_Face& F,
-                                           const TopTools_MapOfShape& MSwireEdges,
-                                           TopoDS_Wire& aFoundWire )
-{
-  aFoundWire.Nullify() ;
-  
-  if( F.IsNull() )
-    return false ;
-  
-  /* Get the outer wire of aFace */
-  TopoDS_Wire outerW = BRepTools::OuterWire(F) ;
-  if( outerW.IsNull() || !IsValid(outerW) ) {
-    return false ;
-  }
-  
-  int nbEdges = MSwireEdges.Extent() ;
-  if( nbEdges < 1 ) {
-    return false ;
-  }
-  
-  TopExp_Explorer exp1 ;
-  TopExp_Explorer exp2 ;
-  for ( exp1.Init(F, TopAbs_WIRE) ; exp1.More(); exp1.Next() ) {
-    TopoDS_Wire W = TopoDS::Wire( exp1.Current() ) ;
-    int i = 0 ;
-    if( !W.IsSame(outerW) ) {
-      for ( exp2.Init( W, TopAbs_EDGE) ; exp2.More(); exp2.Next() ) {
-       TopoDS_Edge E = TopoDS::Edge( exp2.Current() ) ;
-       if( MSwireEdges.Contains(E) ) {
-         i++ ;
-         if( i == nbEdges ) {
-           aFoundWire = W ;
-           return true ;
-         }
-       }
-      }
-    }
-  }
-  return false ;
-}
-
-
-//================================================================================
-// function : BuildShapeHoleNotTraversing()
-// purpose  : Define 'resultTds' a reconstruction of 'aShape' after modification
-//          : on 'aFace' where 'aWire is removed' and suppression of faces 'MFSuppress'
-//          : ( Used as a sub routine of SuppressHole() )
-//================================================================================
-bool GEOM_Gen_i::BuildShapeHoleNotTraversing( const TopoDS_Shape& aShape,
-                                             const TopoDS_Face& aFace,
-                                             const TopoDS_Wire& aWire,
-                                             const TopTools_MapOfShape& MFSuppress,
-                                             TopoDS_Shape& resultTds )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  BRep_Builder B;
-  TopExp_Explorer exp ;
-  TopoDS_Face newFace ;
-  
-  resultTds.Nullify() ;
-  TopoDS_Compound Comp ;
-  B.MakeCompound (Comp);
-  
-  try  {
-    
-    /* Explore all faces of 'aShape' to rebuild a compound */
-    for ( exp.Init(aShape, TopAbs_FACE) ; exp.More(); exp.Next() ) {
-      
-      TopoDS_Face F1 = TopoDS::Face( exp.Current() );
-      /* Rebuild face(s) not suppressed */
-      if( !MFSuppress.Contains(F1) ) {
-       
-       if( F1.IsEqual( aFace ) ) {
-         TopTools_MapOfShape MSwire ;
-         MSwire.Add(aWire) ;
-         if( !RebuildFaceRemovingHoles(aFace, MSwire, newFace) ) {
-           return false ;
-         }
-         B.Add( Comp, newFace ) ;
-       }
-       else {
-         /* For any other face not suppressed */
-         B.Add( Comp, F1 ) ;
-       }
-      }
-    }
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("in BuildShapeHoleNotTraversing() : Exception catched", SALOME::BAD_PARAM);
-  }  
-  resultTds = Comp ;
-  return true ;
-}
-
-
-
-//================================================================================
-// function : BuildShapeHoleTraversing()
-// purpose  : Define 'resultTds' a reconstruction of 'aShape' after modifications.
-//          : On 'aFace'    'aWire    is removed'
-//          : On 'endFace'  'endWire' is removed.
-//          : Faces of 'MFSuppress' are removed.
-//          : ( Used as a sub routine of SuppressHole() )
-//================================================================================
-bool GEOM_Gen_i::BuildShapeHoleTraversing( const TopoDS_Shape& aShape,
-                                          const TopoDS_Face& aFace,
-                                          const TopoDS_Wire& aWire,
-                                          const TopTools_MapOfShape& MFSuppress,
-                                          const TopoDS_Face& endFace,
-                                          const TopoDS_Wire& endWire,
-                                          TopoDS_Shape& resultTds )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  BRep_Builder B;
-  TopExp_Explorer exp ;
-  TopoDS_Face newFace ;
-
-  resultTds.Nullify() ;
-  TopoDS_Compound Comp ;
-  B.MakeCompound (Comp);
-  
-  /* Necessary to use general method */
-  TopTools_MapOfShape MSwire1  ;
-  MSwire1.Add(aWire) ; 
-  TopTools_MapOfShape MSwire2 ;
-  MSwire2.Add(endWire) ;
-
-  try  {    
-    
-    /* Explore all faces of 'aShape' to rebuild a compound */
-    for ( exp.Init(aShape, TopAbs_FACE) ; exp.More(); exp.Next() ) {
-      TopoDS_Face F1 = TopoDS::Face( exp.Current() );      
-      
-      /* Rebuild face(s) not suppressed */
-      if( !MFSuppress.Contains(F1) ) {
-       
-       /* Rebuild 'aFace' */
-       if( F1.IsEqual( aFace ) && !F1.IsEqual( endFace ) ) {
-         if( !RebuildFaceRemovingHoles(aFace, MSwire1, newFace) ) {
-           return false ;
-         }
-         B.Add(Comp, newFace) ;
-       }       
-       
-       /* Rebuild 'endFace' */
-       if( !F1.IsEqual( aFace ) && F1.IsEqual( endFace ) ) {
-         if( !RebuildFaceRemovingHoles(endFace, MSwire2, newFace) ) {
-           return false ;
-         }
-         B.Add(Comp, newFace) ;
-       }
-       
-       /* Hole in the same face : aFace = endFace */
-       if( F1.IsEqual( aFace ) && F1.IsEqual( endFace ) ) {
-         TopoDS_Face FF ;
-         if( !RebuildFaceRemovingHoles(aFace, MSwire1, newFace) || !RebuildFaceRemovingHoles(newFace, MSwire2, FF) ) {
-           return false ;
-         }
-         B.Add( Comp, FF ) ;
-       }
-       
-       /* For any other face not suppressed */
-       if( !F1.IsEqual(aFace) && !F1.IsEqual( endFace ) ) {      
-         B.Add( Comp, F1 ) ;
-       }
-       
-      }
-    }
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("in BuildShapeHoleTraversing() : Exception catched", SALOME::BAD_PARAM);
-  }  
-  resultTds = Comp ;
-  return true ;
-}
-
-//=======================================================================
-//function : SortShapes
-//purpose  : 
-//=======================================================================
-
-static void SortShapes(TopTools_ListOfShape& SL)
-{
-  Standard_Integer MaxShapes = SL.Extent();
-  TopTools_Array1OfShape  aShapes (1,MaxShapes);
-  TColStd_Array1OfInteger OrderInd(1,MaxShapes);
-  TColStd_Array1OfReal    MidXYZ  (1,MaxShapes); //X,Y,Z;
-  TColStd_Array1OfReal    Length  (1,MaxShapes); //X,Y,Z;
-  
-  // Computing of CentreOfMass
-  Standard_Integer Index;
-  GProp_GProps GPr;
-  gp_Pnt GPoint;
-  TopTools_ListIteratorOfListOfShape it(SL);
-  for (Index=1;  it.More();  Index++)
-  {
-    TopoDS_Shape S = it.Value();
-    SL.Remove( it ); // == it.Next()
-    aShapes(Index) = S;
-    OrderInd.SetValue (Index, Index);
-    if (S.ShapeType() == TopAbs_VERTEX)
-    {
-      GPoint = BRep_Tool::Pnt( TopoDS::Vertex( S ));
-      Length.SetValue( Index, (Standard_Real) S.Orientation());
-    }
-    else
-    {
-      BRepGProp::LinearProperties (S, GPr);
-      GPoint = GPr.CentreOfMass();
-      Length.SetValue( Index, GPr.Mass() );
-    }
-    MidXYZ.SetValue(Index,
-                   GPoint.X()*999 + GPoint.Y()*99 + GPoint.Z()*0.9);
-  }
-  // Sorting
-  Standard_Integer aTemp;
-  Standard_Boolean exchange, Sort = Standard_True;
-  while (Sort)
-  {
-    Sort = Standard_False;
-    for (Index=1; Index < MaxShapes; Index++)
-    {
-      if (MidXYZ(OrderInd(Index)) > MidXYZ(OrderInd(Index+1)))
-       exchange = Standard_True;
-      else if (MidXYZ(OrderInd(Index)) == MidXYZ(OrderInd(Index+1)) &&
-              Length(OrderInd(Index)) >  Length(OrderInd(Index+1)) )
-       exchange = Standard_True;
-      else
-       exchange = Standard_False;
-      if (exchange)
-      {
-        aTemp = OrderInd(Index);
-        OrderInd(Index) = OrderInd(Index+1);
-        OrderInd(Index+1) = aTemp;
-        Sort = Standard_True;
-      }
-    }
-  }
-  for (Index=1; Index <= MaxShapes; Index++)
-    SL.Append( aShapes( OrderInd(Index) ));
-}
-
-//================================================================================
-// function : SubShape()
-// purpose  : Method for GUI or TUI
-//================================================================================
-
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::SubShape(GEOM::GEOM_Shape_ptr shape,
-                                         CORBA::Short ShapeType, 
-                                         const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID)
-     throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  return SubShapesOne(shape, (TopAbs_ShapeEnum) ShapeType, ListOfID);
-}
-
-//================================================================================
-// function : SubShapeSorted()
-// purpose  : Method for GUI or TUI
-//================================================================================
-
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::SubShapeSorted(GEOM::GEOM_Shape_ptr shape,
-                                               CORBA::Short ShapeType, 
-                                               const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID)
-     throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  return SubShapesOne(shape, (TopAbs_ShapeEnum) ShapeType, ListOfID, Standard_True);
-}
-
-//================================================================================
-// function : SubShapesOne()
-// purpose  :
-//================================================================================
-
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::SubShapesOne( GEOM::GEOM_Shape_ptr shape,
-                                             const TopAbs_ShapeEnum ShapeType, 
-                                             const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID,
-                                             const Standard_Boolean Sort)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Shape mainShape;
-  TopoDS_Shape mainTopo = GetTopoShape(shape);
-
-  bool main = false;
-  while ( !main ) {
-    if ( shape->IsMainShape() ) {
-      mainShape = GetTopoShape(shape);
-      main = true;
-    } else
-      shape = GetIORFromString( shape->MainName() );
-  }
-  
-  if(ListOfID.length() < 1) {
-    THROW_SALOME_CORBA_EXCEPTION("In GEOM_Gen_i::SubShape() : bad list of shapes",
-                                SALOME::BAD_PARAM);
-  }
-  
-  /* Create a sequence of all sub shapes */
-  TopTools_ListOfShape listShape;
-
-  TopTools_MapOfShape mapShape;
-  TopExp_Explorer exp ;
-  for ( exp.Init( mainShape, TopAbs_ShapeEnum(ShapeType)) ; exp.More(); exp.Next() ) {
-    if ( mapShape.Add( exp.Current() ) )
-      listShape.Append ( exp.Current() );
-  }
-
-  if (listShape.IsEmpty()) return shape;
-
-  if (Sort)
-    SortShapes(listShape);
-
-  TopTools_SequenceOfShape SS;
-  TopTools_ListIteratorOfListOfShape it (listShape);
-  for (; it.More(); it.Next())
-    SS.Append( it.Value() );
-
-  TopoDS_Shape SubShape;
-  if (ListOfID.length() == 1)
-    SubShape = SS.Value(ListOfID[0]);
-  else
-  {
-    BRep_Builder B;
-    TopoDS_Compound Comp;
-    B.MakeCompound (Comp);
-    unsigned int ind;
-    for ( ind = 0; ind < ListOfID.length(); ind++ )
-      B.Add( Comp, SS.Value(ListOfID[ind]) );
-    SubShape = Comp;
-  }
-
-  if ( !TNaming_Tool::HasLabel( myCurrentOCAFDoc->Main(), SubShape ) ) 
-    result = CreateSubObject( SubShape, shape, ListOfID);
-  else {
-    int TransDef;
-    TDF_Label Lab = TNaming_Tool::Label( myCurrentOCAFDoc->Main(), SubShape, TransDef );
-    Handle(TDataStd_Name) Att;
-    if ( Lab.FindAttribute( TDataStd_Name::GetID(), Att ) ) {
-      TCollection_AsciiString nameIOR( Att->Get() );
-      result = GEOM::GEOM_Shape::_narrow(_orb->string_to_object( nameIOR.ToCString() ));
-      if ( strcmp( result->MainName(), _orb->object_to_string(shape) ) != 0 ) {
-       result = CreateSubObject( SubShape, shape, ListOfID);
-      }
-    }
-  }
-
-  return result;
-}
-
-
-//================================================================================
-// function : SubShapeAll()
-// purpose  : Explode a shape in all sub shapes with a type (Method for TUI or GUI)
-//================================================================================
-
-GEOM::GEOM_Gen::ListOfGeomShapes* GEOM_Gen_i::SubShapeAll(GEOM::GEOM_Shape_ptr shape,
-                                                         CORBA::Short ShapeType)
-     throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  return SubShapesAll(shape, (TopAbs_ShapeEnum) ShapeType);
-}
-
-//================================================================================
-// function : SubShapeAllSorted()
-// purpose  : Explode a shape in all sub shapes with a type (Method for TUI or GUI)
-//================================================================================
-
-GEOM::GEOM_Gen::ListOfGeomShapes* GEOM_Gen_i::SubShapeAllSorted(GEOM::GEOM_Shape_ptr shape,
-                                                               CORBA::Short ShapeType)
-     throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  return SubShapesAll(shape, (TopAbs_ShapeEnum) ShapeType, Standard_True);
-}
-
-//================================================================================
-// function : SubShapeAllSorted()
-// purpose  :
-//================================================================================
-
-GEOM::GEOM_Gen::ListOfGeomShapes* GEOM_Gen_i::SubShapesAll(GEOM::GEOM_Shape_ptr shape,
-                                                          const TopAbs_ShapeEnum ShapeType,
-                                                          const Standard_Boolean Sort)
-  throw (SALOME::SALOME_Exception)
-{
-  /* List of sub shapes returned */
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Gen::ListOfGeomShapes_var listOfGeomShapes = new GEOM::GEOM_Gen::ListOfGeomShapes;
-  listOfGeomShapes->length(0) ;
-  
-  TopoDS_Shape mainTopo = GetTopoShape(shape);
-  TopoDS_Shape mainShape;
-  bool main = false;
-  while ( !main ) {
-    if ( shape->IsMainShape() ) {
-      mainShape = GetTopoShape(shape);
-      main = true;
-    } else
-      shape = GetIORFromString( shape->MainName() );
-  }
-
-  if( mainTopo.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("In GEOM_Gen_i::SubShapeAll() : null main shape",
-                                SALOME::BAD_PARAM);
-  }
-  
-  /* List/index : field set for any sub shape */
-  GEOM::GEOM_Shape::ListOfSubShapeID_var ListOfID = new GEOM::GEOM_Shape::ListOfSubShapeID;
-  ListOfID->length(1) ;
-
-    // retrieve all subshapes
-  TopTools_MapOfShape mapShape;
-  TopTools_ListOfShape listShape;
-    
-  if (mainTopo.ShapeType()==TopAbs_COMPOUND  &&  ShapeType==TopAbs_SHAPE)
-  {
-    TopoDS_Iterator It(mainTopo,Standard_True,Standard_True );  
-    for ( ; It.More(); It.Next() ) 
-      if (mapShape.Add( It.Value() ))
-       listShape.Append( It.Value() );
-  }
-  else
-  {
-    TopExp_Explorer exp ( mainTopo, ShapeType);
-    for ( ; exp.More(); exp.Next() ) 
-      if (mapShape.Add( exp.Current() ))
-       listShape.Append( exp.Current() );
-  }
-
-  if (Sort)
-    SortShapes(listShape);
-    
-  /* Create all sub shapes */
-  int index;
-  GEOM::GEOM_Shape_var result;
-    
-  TopTools_ListIteratorOfListOfShape itSub (listShape);
-  for (index = 1; itSub.More(); itSub.Next(), ++index)
-  {
-    const TopoDS_Shape& SubShape = itSub.Value();
-    // check if SubShape is already in OCAFDS and ...
-    if ( TNaming_Tool::HasLabel( myCurrentOCAFDoc->Main(), SubShape ) )
-    {
-      int TransDef;
-      TDF_Label Lab = TNaming_Tool::Label( myCurrentOCAFDoc->Main(), SubShape, TransDef );
-      Handle(TDataStd_Name) Att;
-      if ( Lab.FindAttribute( TDataStd_Name::GetID(), Att ) )
-      {
-        TCollection_AsciiString nameIOR( Att->Get() );
-        result = GEOM::GEOM_Shape::_narrow(_orb->string_to_object( nameIOR.ToCString() ));
-       // ... it is subshape of <shape>
-        if ( strcmp( result->MainName(), _orb->object_to_string(shape) ) == 0 ) 
-        {
-          listOfGeomShapes->length(index) ;
-          listOfGeomShapes[index-1] = result ;
-         continue;
-        }
-      }
-    }
-
-//      if (Sort)
-//        ListOfID[0] = index;
-//      else
-    ListOfID[0] = GetIndexTopology( SubShape, mainShape ) ;
-    result = CreateSubObject( SubShape, shape, ListOfID);
-    /* Add each sub shape in the list returned */
-    listOfGeomShapes->length(index) ;
-    listOfGeomShapes[index-1] = result ;      
-  }
-
-  return listOfGeomShapes._retn() ;
-}
-
-//=================================================================================
-// function : MakeBoolean()
-// purpose  : Boolean operation according to the type 'operation'
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeBoolean(GEOM::GEOM_Shape_ptr shape1,
-                                            GEOM::GEOM_Shape_ptr shape2,
-                                            CORBA::Long operation) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Shape shape ;
-  TopoDS_Shape aShape1  ;
-  TopoDS_Shape aShape2  ;
-
-  try {
-    aShape1 = GetTopoShape(shape1) ;
-    aShape2 = GetTopoShape(shape2) ;
-    
-    if( aShape1.IsNull() || aShape2.IsNull() ) {
-      THROW_SALOME_CORBA_EXCEPTION("Boolean aborted : argument shape is null", SALOME::BAD_PARAM);
-    }
-    
-    switch (operation)
-      {
-      case 1 :   /* Common */
-       shape = BRepAlgoAPI_Common(aShape1, aShape2).Shape();
-       break ;
-      case 2 :   /* Cut */
-       shape = BRepAlgoAPI_Cut(aShape1, aShape2).Shape();
-       break ;
-      case 3 :   /* Fuse */
-       shape = BRepAlgoAPI_Fuse(aShape1, aShape2).Shape();
-       break ;
-      case 4 :   /* Section */
-       shape = BRepAlgoAPI_Section(aShape1, aShape2).Shape();
-       break ;
-      default :
-       MESSAGE("Boolean operation not known : " << operation ) ;
-       return result ;
-      }
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in boolean operation", SALOME::BAD_PARAM);
-  }
-    
-  /* We test the validity of resulting shape */
-  if( !IsValid(shape) ) {
-    THROW_SALOME_CORBA_EXCEPTION("Boolean aborted : non valid shape result", SALOME::BAD_PARAM);
-  }
-       
-  result = CreateObject(shape) ;
-      
-  /* put shape and name into geom/OCAF doc */
-  GEOMDS_Commands GC(myCurrentOCAFDoc->Main());
-  /* add attributs 'shape' and' name_io'r in a new label */
-  TDF_Label Lab = GC.Generated(aShape1, shape, result->Name() );
-  TCollection_AsciiString entry;
-  TDF_Tool::Entry(Lab, entry);
-  result->ShapeId( entry.ToCString() ) ;
-      
-  /* Create a new label */
-  TDF_Label NewLab = Lab.NewChild();
-  TCollection_ExtendedString Value("Arguments");
-  TDataStd_Name::Set(NewLab,Value);
-  
-  TDF_Label NewLab1 = NewLab.NewChild();
-  TDF_Label RefLab;
-  TDF_Tool::Label(myCurrentOCAFDoc->GetData(), shape1->ShapeId(), RefLab);
-  TDF_Reference::Set(NewLab1, RefLab);
-  
-  TDF_Label NewLab2 = NewLab.NewChild();
-  TDF_Tool::Label(myCurrentOCAFDoc->GetData(), shape2->ShapeId(), RefLab);
-  TDF_Reference::Set(NewLab2, RefLab);
-  return result ;
-}
-
-
-//=================================================================================
-// function : MakeFuse()
-// purpose  : Special purpose !
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFuse(GEOM::GEOM_Shape_ptr shape1,
-                                   GEOM::GEOM_Shape_ptr shape2)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Shape aShape1 = GetTopoShape(shape1) ;
-  TopoDS_Shape aShape2 = GetTopoShape(shape2) ;
-  if( aShape1.IsNull() || aShape2.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Fuse aborted : shape in argument is null", SALOME::BAD_PARAM);
-  }
-  TopoDS_Shape shape;
-  try {
-    shape  = BRepAlgoAPI_Fuse(aShape1, aShape2).Shape();
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in Fuse operation", SALOME::BAD_PARAM);
-  }
-
-  /* We test the validity of resulting shape */
-  if( !IsValid(shape) ) {
-    THROW_SALOME_CORBA_EXCEPTION("Fuse aborted : non valid shape result", SALOME::BAD_PARAM);
-  }
-
-  result = CreateObject(shape) ;
-
-  /* put shape and name into geom/OCAF doc */
-  GEOMDS_Commands GC(myCurrentOCAFDoc->Main());
-  /* add attributs 'shape' and' name_io'r in a new label */
-  TDF_Label Lab = GC.Generated(aShape1, shape, result->Name() );
-  TCollection_AsciiString entry;
-  TDF_Tool::Entry(Lab, entry);
-  result->ShapeId( entry.ToCString() ) ;
-
-  /* Create a new label */
-  TDF_Label NewLab = Lab.NewChild();
-  TCollection_ExtendedString Value("Arguments");
-  TDataStd_Name::Set(NewLab,Value);
-
-  TDF_Label NewLab1 = NewLab.NewChild();
-  TDF_Label RefLab;
-  TDF_Tool::Label(myCurrentOCAFDoc->GetData(), shape1->ShapeId(), RefLab);
-  TDF_Reference::Set(NewLab1, RefLab);
-
-  TDF_Label NewLab2 = NewLab.NewChild();
-  TDF_Tool::Label(myCurrentOCAFDoc->GetData(), shape2->ShapeId(), RefLab);
-  TDF_Reference::Set(NewLab2, RefLab);
-  return result ;
-}
-
-
-//================================================================================
-// function : MakeAxisStruct()
-// purpose  : Create a structure GEOM::AxisStruct (see IDL file)
-//================================================================================
-GEOM::AxisStruct GEOM_Gen_i::MakeAxisStruct(CORBA::Double x,
-                                     CORBA::Double y,
-                                     CORBA::Double z,
-                                     CORBA::Double vx,
-                                     CORBA::Double vy,
-                                     CORBA::Double vz) 
-{
-  GEOM::AxisStruct A ;
-  A.x  = x ;   A.y  = y ;   A.z  = z ;
-  A.vx = vx ;  A.vy = vy ;  A.vz = vz ;
-  return A ;
-}
-
-
-//================================================================================
-// function : MakePointStruct()
-// purpose  : Create a structure GEOM::PointStruct (see IDL file)
-//================================================================================
-GEOM::PointStruct GEOM_Gen_i::MakePointStruct(CORBA::Double x,
-                                       CORBA::Double y,
-                                       CORBA::Double z)
-{
-  beginService( "GEOM_Gen_i::MakePointStruct" );
-  GEOM::PointStruct p ;
-  p.x = x ;   p.y = y ;   p.z = z ;
-  endService( "GEOM_Gen_i::MakePointStruct" );
-  return p ;
-}
-
-//================================================================================
-// function : MakeDirection()
-// purpose  : Create a structure GEOM::DirStruct (see IDL file)
-//================================================================================
-GEOM::DirStruct GEOM_Gen_i::MakeDirection(const GEOM::PointStruct& p)
-{ 
-  GEOM::DirStruct d ;
-  d.PS.x = p.x ;  d.PS.y = p.y ;  d.PS.z = p.z ;
-  return d ;
-}
-
-//=================================================================================
-// function : MakeBox()
-// purpose  : Create a box topology.
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeBox(CORBA::Double x1,
-                                        CORBA::Double y1,
-                                        CORBA::Double z1,
-                                         CORBA::Double x2,
-                                         CORBA::Double y2,
-                                        CORBA::Double z2) 
-     throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  gp_Pnt P1(x1,y1,z1);
-  gp_Pnt P2(x2,y2,z2);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  try {
-    tds = BRepPrimAPI_MakeBox(P1,P2).Shape();
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeBox", SALOME::BAD_PARAM);
-  }
-
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Box aborted : null shape", SALOME::BAD_PARAM);
-  } 
-
-  result = CreateObject(tds);
-  const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-  result->ShapeId(entry) ;
-  return result;  
-}
-
-
-//================================================================================
-// function : MakeCylinder
-// purpose  : Create a cylinder topology
-//================================================================================
-GEOM::GEOM_Shape_ptr  GEOM_Gen_i::MakeCylinder(const GEOM::PointStruct& pstruct,
-                                              const GEOM::DirStruct& dstruct,
-                                              CORBA::Double radius,
-                                              CORBA::Double height) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Shape tds ;
-  gp_Pnt p(pstruct.x, pstruct.y, pstruct.z) ;
-  gp_Dir d(dstruct.PS.x, dstruct.PS.y, dstruct.PS.z) ;
-  gp_Ax2 axis(p, d) ;
-
-  try {
-    tds = BRepPrimAPI_MakeCylinder(axis, radius, height).Shape();
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeCylinder", SALOME::BAD_PARAM);
-  }
-  
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Cylinder aborted", SALOME::BAD_PARAM);
-  } 
-  result = CreateObject(tds);
-  const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-  result->ShapeId(entry);
-  return result ;  
-}
-
-//================================================================================
-// function : MakeSphere()
-// purpose  : Make a sphere topology
-//================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeSphere(CORBA::Double x1,
-                                     CORBA::Double y1,
-                                     CORBA::Double z1,
-                                     CORBA::Double radius) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  try {
-    tds = BRepPrimAPI_MakeSphere(gp_Pnt(x1,y1,z1), radius).Shape();
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeSphere", SALOME::BAD_PARAM);
-  }
-  
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Sphere aborted", SALOME::BAD_PARAM);
-  } 
-  result = CreateObject(tds) ;  
-  const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-  result->ShapeId(entry);
-  return result;  
-}
-
-//================================================================================
-// function : MakeTorus()
-// purpose  : Create a torus topology
-//================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeTorus( const GEOM::PointStruct& pstruct,
-                                     const GEOM::DirStruct& dstruct,
-                                     CORBA::Double major_radius,
-                                     CORBA::Double minor_radius )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Shape tds ;
-  gp_Pnt p(pstruct.x, pstruct.y, pstruct.z) ;
-  gp_Dir d(dstruct.PS.x, dstruct.PS.y, dstruct.PS.z) ;
-  gp_Ax2 axis(p, d) ;
-
-  try {
-  tds = BRepPrimAPI_MakeTorus(axis, major_radius, minor_radius).Shape();
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeTorus", SALOME::BAD_PARAM);
-  }
-
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make torus aborted", SALOME::BAD_PARAM);
-  }
-  result = CreateObject(tds);
-  const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-  result->ShapeId(entry);
-  return result ;
-}
-
-
-//================================================================================
-// function : MakeCone()
-// purpose  : Create a cone topology
-//================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeCone(const GEOM::PointStruct& pstruct,
-                                   const GEOM::DirStruct& dstruct,
-                                   CORBA::Double radius1,
-                                   CORBA::Double radius2,
-                                   CORBA::Double height)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Shape tds ;
-  gp_Pnt p(pstruct.x, pstruct.y, pstruct.z) ;
-  gp_Dir d(dstruct.PS.x, dstruct.PS.y, dstruct.PS.z) ;
-  gp_Ax2 axis(p, d) ;
-  
-  try {
-    /* Cone doesn't work if same radius */
-    if( fabs(radius1-radius2) <= Precision::Confusion() ) {
-      tds = BRepPrimAPI_MakeCylinder(axis, (radius1+radius2)/2.0, height).Shape();
-    }
-    else {
-      tds = BRepPrimAPI_MakeCone(axis, radius1, radius2, height).Shape();
-    }
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeCone", SALOME::BAD_PARAM);
-  }
-
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Cone aborted", SALOME::BAD_PARAM);
-  }
-  result = CreateObject(tds);
-  const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-  result->ShapeId(entry);
-  return result ;
-}
-
-
-
-//==================================================================================
-// function : ImportIGES()
-// purpose  : Import shape from an IGES (IGS) file
-//          : LPN modified 7 mai 2002
-//==================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::ImportIGES(const char* filename)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  //VRV: OCC 4.0 migration
-  IGESControl_Reader aReader;  
-  //VRV: OCC 4.0 migration
-  try {
-    IFSelect_ReturnStatus stat = aReader.ReadFile((char*)filename);
-    if ( stat != IFSelect_RetDone ) {
-      THROW_SALOME_CORBA_EXCEPTION("Error in reading import file", SALOME::BAD_PARAM);    }
-    
-    MESSAGE("ImportIGES : all Geometry Transfer" << endl ) ;
-#if OCC_VERSION_MAJOR >= 5
-    aReader.ClearShapes();
-    aReader.TransferRoots();
-#else
-    aReader.Clear();
-    aReader.TransferRoots(false);
-#endif
-    MESSAGE("ImportIGES : count of shapes produced = " << aReader.NbShapes() << endl );    
-    TopoDS_Shape shape = aReader.OneShape();
-
-    if ( !shape.IsNull() ) {      
-      /* Final CORBA object creation */
-      result = CreateObject(shape) ;
-      const char *entry = InsertInLabel( shape, result->Name(), myCurrentOCAFDoc ) ;
-      result->ShapeId(entry);
-      return result ;
-    }
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::ImportIGES()", SALOME::BAD_PARAM);
-  } 
-  
-  THROW_SALOME_CORBA_EXCEPTION("Import IGES aborted : internal error", SALOME::BAD_PARAM);
-}
-
-
-
-//==================================================================================
-// function : ImportSTEP()
-// purpose  : Import shape from an STEP (stp) file
-//          : 'result' is a compound of shapes if file contains more entities.
-//==================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::ImportSTEP(const char* filename)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  //VRV: OCC 4.0 migration
-  STEPControl_Reader aReader;
-  //VRV: OCC 4.0 migration
-
-  TopoDS_Compound compound;
-  BRep_Builder B;
-  B.MakeCompound( compound );
-  
-  try {
-    IFSelect_ReturnStatus status = aReader.ReadFile((char*)filename);
-    
-    if (status == IFSelect_RetDone) {
-      Standard_Boolean failsonly = Standard_False ;
-      aReader.PrintCheckLoad (failsonly, IFSelect_ItemsByEntity);
-      /* Root transfers */
-      Standard_Integer nbr = aReader.NbRootsForTransfer();
-      aReader.PrintCheckTransfer (failsonly, IFSelect_ItemsByEntity);
-      
-      for ( Standard_Integer n=1; n <= nbr; n++) {
-       
-       Standard_Boolean ok = aReader.TransferRoot(n);
-       /* Collecting resulting entities */
-       Standard_Integer nbs = aReader.NbShapes();
-       if (nbs == 0)
-         THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::ImportStep", SALOME::BAD_PARAM) ;      
-       
-       for ( Standard_Integer i=1; i<=nbs; i++ ) {       
-         TopoDS_Shape aShape = aReader.Shape(i);
-         if ( aShape.IsNull() )
-           THROW_SALOME_CORBA_EXCEPTION("Null shape in GEOM_Gen_i::ImportStep", SALOME::BAD_PARAM) ;   
-         
-         /* For a single entity */
-         if(nbr == 1 && nbs == 1) {      
-           result = CreateObject(aShape) ;
-           const char *entry = InsertInLabel(aShape, result->Name(), myCurrentOCAFDoc) ;
-           result->ShapeId(entry);
-           return result ;
-         }
-         else {
-           B.Add( compound, aShape ) ;
-         }
-       }
-      }
-
-     TopoDS_Shape tds = compound ; 
-     result = CreateObject(tds) ;
-     if( CORBA::is_nil(result) )
-       THROW_SALOME_CORBA_EXCEPTION("Translation aborted : null result", SALOME::BAD_PARAM);
-     const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-     result->ShapeId(entry);
-     return result ;
-    }
-    
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::ImportStep", SALOME::BAD_PARAM);
-  }  
-  return result ;
-}
-
-
-//==================================================================================
-// function : Partition()
-// purpose  :
-//==================================================================================
-
-GEOM::GEOM_Shape_ptr
-  GEOM_Gen_i::Partition(const GEOM::GEOM_Gen::ListOfIOR& ListShapes, 
-                        const GEOM::GEOM_Gen::ListOfIOR& ListTools,
-                        const GEOM::GEOM_Gen::ListOfIOR& ListKeepInside,
-                        const GEOM::GEOM_Gen::ListOfIOR& ListRemoveInside,
-                        const CORBA::Short               Limit)
-throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var aResult;  
-  TopoDS_Shape tds ;
-  //MESSAGE ("In Partition");
-  try {
-
-    unsigned int ind, nbshapes = 0;
-    nbshapes += ListShapes.length() + ListTools.length();
-    nbshapes += ListKeepInside.length() + ListRemoveInside.length();
-    
-    Partition_Spliter PS;
-    TopTools_MapOfShape ShapesMap(nbshapes), ToolsMap(nbshapes);
-    
-    // add object shapes that are in ListShapes;
-    for ( ind = 0; ind < ListShapes.length(); ind++) {
-      
-      GEOM::GEOM_Shape_var aShape = GetIORFromString( ListShapes[ind] );
-      TopoDS_Shape Shape = GetTopoShape(aShape);
-      if(Shape.IsNull() ) {
-        //MESSAGE ( "In Partition a shape is null" );
-       THROW_SALOME_CORBA_EXCEPTION("In Partition a shape is null", SALOME::BAD_PARAM);
-      }
-      if ( ShapesMap.Add( Shape ))
-        PS.AddShape(Shape);
-    }
-    
-    // add tool shapes that are in ListTools and not in ListShapes;
-    for (ind = 0; ind < ListTools.length(); ind++) {
-      
-      GEOM::GEOM_Shape_var aShape = GetIORFromString( ListTools[ind] );
-      TopoDS_Shape Shape = GetTopoShape(aShape);
-      if(Shape.IsNull() ) {
-       THROW_SALOME_CORBA_EXCEPTION("In Partition a shape is null", SALOME::BAD_PARAM);
-      }
-      if ( !ShapesMap.Contains( Shape ) && ToolsMap.Add( Shape ))
-        PS.AddTool(Shape);
-    }
-    
-    // add shapes that are in ListKeepInside, as object shapes;
-    for (ind = 0; ind < ListKeepInside.length(); ind++) {
-      
-      GEOM::GEOM_Shape_var aShape = GetIORFromString( ListKeepInside[ind] );
-      TopoDS_Shape Shape = GetTopoShape(aShape);
-      if(Shape.IsNull() ) {
-        //MESSAGE ( "In Partition a Keep Inside shape is null" );
-       THROW_SALOME_CORBA_EXCEPTION("In Partition a shape is null", SALOME::BAD_PARAM);
-      }
-      if (!ToolsMap.Contains( Shape ) &&
-          ShapesMap.Add( Shape ))
-        PS.AddShape(Shape);
-    }
-    
-    // add shapes that are in ListRemoveInside, as object shapes;
-    for (ind = 0; ind < ListRemoveInside.length(); ind++) {
-      
-      GEOM::GEOM_Shape_var aShape = GetIORFromString( ListRemoveInside[ind] );
-      TopoDS_Shape Shape = GetTopoShape(aShape);
-      if(Shape.IsNull() ) {
-        //MESSAGE ( "In Partition a Remove Inside shape is null" );
-       THROW_SALOME_CORBA_EXCEPTION("In Partition a shape is null", SALOME::BAD_PARAM);
-      }
-      if (!ToolsMap.Contains( Shape ) &&
-          ShapesMap.Add( Shape ) )
-        PS.AddShape(Shape);
-    }
-    
-    //MESSAGE ( "Partition::Compute() " );
-    PS.Compute ((TopAbs_ShapeEnum) Limit);
-    //MESSAGE ( "Partition::Compute() - END" );
-
-    // suppress result outside of shapes in KInsideMap
-    for (ind = 0; ind < ListKeepInside.length(); ind++) {
-      GEOM::GEOM_Shape_var aShape = GetIORFromString( ListKeepInside[ind] );
-      TopoDS_Shape Shape = GetTopoShape(aShape);
-      PS.KeepShapesInside( Shape );
-    }
-    
-    // suppress result inside of shapes in RInsideMap
-    for (ind = 0; ind < ListRemoveInside.length(); ind++) {
-      
-      GEOM::GEOM_Shape_var aShape = GetIORFromString( ListRemoveInside[ind] );
-      TopoDS_Shape Shape = GetTopoShape(aShape);
-      PS.RemoveShapesInside( Shape );
-    }
-    
-    tds = PS.Shape();
-    
-    if( !IsValid(tds) ) {
-      //MESSAGE ( "In Partition: non valid shape result" );
-      THROW_SALOME_CORBA_EXCEPTION("Partition aborted : non valid shape result", SALOME::BAD_PARAM);
-    }
-  }
-  catch (Standard_Failure) {
-    //MESSAGE ( "In Partition: Exception catched in GEOM_Gen_i::Partition()" );
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::Partition", SALOME::BAD_PARAM);
-  }
-  
-  aResult = CreateObject(tds) ;
-
-  /* add attributs S and mystr in a new label */
-  GEOMDS_Commands GC(myCurrentOCAFDoc->Main());
-  TDF_Label Lab = GC.AddShape(tds, aResult->Name() );
-  TCollection_AsciiString entry;
-  TDF_Tool::Entry(Lab,entry);
-  aResult->ShapeId( entry.ToCString() ) ;
-  
-  // add arguments
-  
-  /* Create a new label */
-  TDF_Label NewLab = Lab.NewChild();
-  TCollection_ExtendedString Value("Arguments");
-  TDataStd_Name::Set(NewLab,Value);
-
-  // object shapes
-  for (unsigned int ind = 0; ind < ListShapes.length(); ind++) {
-    TDF_Label NewLab1 = NewLab.NewChild();
-    
-    GEOM::GEOM_Shape_var aShape = GetIORFromString( ListShapes[ind] );
-    Standard_CString anEntry = aShape->ShapeId();
-    TDF_Label RefLab;
-    TDF_Tool::Label(myCurrentOCAFDoc->GetData(), anEntry, RefLab);
-    TDF_Reference::Set(NewLab1,RefLab);
-  }
-  // tool shapes
-  for (unsigned int ind = 0; ind < ListTools.length(); ind++) {
-    TDF_Label NewLab1 = NewLab.NewChild();
-    
-    GEOM::GEOM_Shape_var aShape = GetIORFromString( ListTools[ind] );
-    Standard_CString anEntry = aShape->ShapeId();
-    TDF_Label RefLab;
-    TDF_Tool::Label(myCurrentOCAFDoc->GetData(), anEntry, RefLab);
-    TDF_Reference::Set(NewLab1,RefLab);
-  }
-  // limit shapes 1
-  for (unsigned int ind = 0; ind < ListKeepInside.length(); ind++) {
-    TDF_Label NewLab1 = NewLab.NewChild();
-    
-    GEOM::GEOM_Shape_var aShape = GetIORFromString( ListKeepInside[ind] );
-    Standard_CString anEntry = aShape->ShapeId();
-    TDF_Label RefLab;
-    TDF_Tool::Label(myCurrentOCAFDoc->GetData(), anEntry, RefLab);
-    TDF_Reference::Set(NewLab1,RefLab);
-  }
-  // limit shapes 2
-  for (unsigned int ind = 0; ind < ListRemoveInside.length(); ind++) {
-    TDF_Label NewLab1 = NewLab.NewChild();
-    
-    GEOM::GEOM_Shape_var aShape = GetIORFromString( ListRemoveInside[ind] );
-    Standard_CString anEntry = aShape->ShapeId();
-    TDF_Label RefLab;
-    TDF_Tool::Label(myCurrentOCAFDoc->GetData(), anEntry, RefLab);
-    TDF_Reference::Set(NewLab1,RefLab);
-  }
-  
-  return aResult;    
-}
-
-
-
-//==================================================================================
-// function : MakeFilling()
-// purpose  : Create a surface from section curves filling
-//==================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFilling(GEOM::GEOM_Shape_ptr myShape,
-                                      CORBA::Short mindeg,
-                                      CORBA::Short maxdeg,
-                                      CORBA::Double tol3d,
-                                      CORBA::Double tol2d,
-                                      CORBA::Short nbiter,
-                                      CORBA::Boolean theApprox)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Face tds ;
-  TopoDS_Shape aShape = GetTopoShape(myShape) ;
-  if( aShape.IsNull() || aShape.ShapeType() != TopAbs_COMPOUND ) {
-    THROW_SALOME_CORBA_EXCEPTION("MakeFilling aborted : null shape or not a compound", SALOME::BAD_PARAM);
-  } 
-
-  try {
-    /* we verify the contents of the shape */
-    TopExp_Explorer Ex ;
-    TopoDS_Shape Scurrent ;    
-    Standard_Real First, Last ;
-    Handle(Geom_Curve) C ;
-    GeomFill_SectionGenerator Section ;
-    
-    Standard_Integer i = 0 ;
-    for(Ex.Init(aShape, TopAbs_EDGE); Ex.More(); Ex.Next()) {
-      Scurrent = Ex.Current() ;
-      if( Scurrent.IsNull() || Scurrent.ShapeType() != TopAbs_EDGE)  {
-       THROW_SALOME_CORBA_EXCEPTION("Initial shape doesn't contain only edges !", SALOME::BAD_PARAM);
-      }
-      C = BRep_Tool::Curve(TopoDS::Edge(Scurrent), First, Last);
-      if (C.IsNull()) continue;
-      C = new Geom_TrimmedCurve(C, First, Last);
-      Section.AddCurve(C) ;
-      i++ ;
-    }
-    
-    /* a 'tolerance' is used to compare 2 knots : see GeomFill_Generator.cdl */
-    /* We set 'tolerance' = tol3d                                            */
-    // Section.Perform( tol3d ) ; NRI */
-    Section.Perform( Precision::Confusion() ) ;
-    Handle(GeomFill_Line) Line = new GeomFill_Line(i) ;
-    
-    GeomFill_AppSurf App(mindeg, maxdeg, tol3d, tol2d, nbiter) ; /* user parameters */
-    App.Perform(Line, Section, theApprox) ;
-    
-    if (!App.IsDone()) {
-      THROW_SALOME_CORBA_EXCEPTION("Filling aborted : non valid shape result", SALOME::BAD_PARAM);
-    }
-    Standard_Integer UDegree, VDegree, NbUPoles, NbVPoles, NbUKnots, NbVKnots;
-    App.SurfShape(UDegree, VDegree, NbUPoles, NbVPoles, NbUKnots, NbVKnots);   
-    Handle(Geom_BSplineSurface) GBS = new Geom_BSplineSurface(App.SurfPoles(),
-                                                             App.SurfWeights(),
-                                                             App.SurfUKnots(),
-                                                             App.SurfVKnots(),
-                                                             App.SurfUMults(),
-                                                             App.SurfVMults(),
-                                                             App.UDegree(),
-                                                             App.VDegree());
-    
-    if( GBS.IsNull() )  {
-      THROW_SALOME_CORBA_EXCEPTION("Make Filling aborted", SALOME::BAD_PARAM);
-    }
-    tds  = BRepBuilderAPI_MakeFace(GBS) ;    
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeFilling", SALOME::BAD_PARAM);
-  } 
-  
-  /* We test the validity of resulting shape */
-  if( !IsValid(tds) ) {
-    THROW_SALOME_CORBA_EXCEPTION("Filling aborted : non valid shape result", SALOME::BAD_PARAM);
-  } 
-  else {
-    result = CreateObject(tds) ;
-    InsertInLabelOneArgument(aShape, myShape, tds, result, myCurrentOCAFDoc) ;
-  }
-  return result ;
-}
-
-
-//=================================================================================
-// function : MakeGlueFaces()
-// purpose  :
-//=================================================================================
-
-TopoDS_Face GEOM_Gen_i::FindSameFace(const TopoDS_Shape& aShape, 
-                                    const TopoDS_Face& F,
-                                    double tol3d)
-{
-  TopoDS_Face aFace;
-  bool isSame = false;
-  for (TopExp_Explorer exf(aShape,TopAbs_FACE); exf.More(); exf.Next())
-    {
-      //MESSAGE("--- test a face");
-      int nbFound = 0;
-      aFace = TopoDS::Face(exf.Current());
-      TopTools_ListOfShape liste1;
-      TopTools_ListOfShape liste2;
-      for (TopExp_Explorer exp(aFace,TopAbs_VERTEX); exp.More(); exp.Next())
-       {
-         const TopoDS_Vertex& V = TopoDS::Vertex(exp.Current());
-         liste1.Append(V);
-       }
-      for (TopExp_Explorer exp(F,TopAbs_VERTEX); exp.More(); exp.Next())
-       {
-         const TopoDS_Vertex& V = TopoDS::Vertex(exp.Current());
-         liste2.Append(V);
-       }
-      isSame = false;
-      if (liste1.Extent() == liste2.Extent())
-       {
-         TopTools_ListIteratorOfListOfShape it1(liste1);
-         isSame = true;
-         for (; it1.More(); it1.Next())
-           {
-             bool foundSamePoint = false;
-             gp_Pnt P1 = BRep_Tool::Pnt(TopoDS::Vertex(it1.Value()));
-             TopTools_ListIteratorOfListOfShape it2(liste2);
-             for (it2; it2.More(); it2.Next())
-               {
-                 gp_Pnt P2 = BRep_Tool::Pnt(TopoDS::Vertex(it2.Value()));
-                 double d = P1.Distance(P2);
-                 if (d < tol3d)
-                   {
-                     nbFound++;
-                     //MESSAGE("    found Same Point : "<<nbFound<<" - "<<P1.X()<<" "<<P1.Y()<<" "<<P1.Z());
-                     foundSamePoint = true;
-                     break;
-                   }
-               }
-             isSame = isSame && foundSamePoint;
-             if (! isSame) break; // a vertex does not correspond : not same face
-           }
-       }
-      if (isSame)
-       {
-         //MESSAGE("    --- Found Same Face");
-         break; // a face corresponding to F is found
-       }
-    }
-  if (! isSame) aFace.Nullify(); // return null face
-  return aFace;
-}
-
-TopoDS_Edge GEOM_Gen_i::FindSameEdge(const TopoDS_Face& nf, 
-                                    TopoDS_Edge& Eold,
-                                    double tol3d)
-{
-  TopoDS_Face newFace = TopoDS::Face(nf.Oriented(TopAbs_REVERSED));
-  TopoDS_Vertex VFirst, VLast;
-  TopExp::Vertices(Eold, VFirst, VLast);
-  gp_Pnt Pf = BRep_Tool::Pnt(VFirst);
-  gp_Pnt Pl = BRep_Tool::Pnt(VLast);
-  TopoDS_Edge Enew;
-  for (TopExp_Explorer ee(newFace,TopAbs_EDGE); ee.More(); ee.Next())
-    {
-      const TopoDS_Edge& E = TopoDS::Edge(ee.Current());
-      TopoDS_Vertex VFn, VLn;
-      TopExp::Vertices(E, VFn, VLn);
-      gp_Pnt Pfn = BRep_Tool::Pnt(VFn);
-      gp_Pnt Pln = BRep_Tool::Pnt(VLn);
-      double dff = Pf.Distance(Pfn);
-      double dfl = Pf.Distance(Pln);
-      double dlf = Pl.Distance(Pfn);
-      double dll = Pl.Distance(Pln);
-      if ((dff < tol3d) && (dll <tol3d))
-       {
-         //MESSAGE("--- edge forward " <<Pf.X()<<" "<<Pf.Y()<<" "<<Pf.Z()<<" "<<Pl.X()<<" "<<Pl.Y()<<" "<<Pl.Z());
-         Enew = TopoDS::Edge(E.Oriented(TopAbs_FORWARD));
-         Eold = TopoDS::Edge(Eold.Oriented(TopAbs_FORWARD));
-         break;
-       } 
-      if ((dfl < tol3d) && (dlf <tol3d))
-       {
-         //MESSAGE("--- edge reversed " <<Pf.X()<<" "<<Pf.Y()<<" "<<Pf.Z()<<" "<<Pl.X()<<" "<<Pl.Y()<<" "<<Pl.Z());
-         Enew = TopoDS::Edge(E.Oriented(TopAbs_REVERSED));
-         Eold = TopoDS::Edge(Eold.Oriented(TopAbs_FORWARD));
-         break;
-       } 
-    }
-  return Enew;
-}
-
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeGlueFaces(GEOM::GEOM_Shape_ptr myShape,
-                                              double tol3d)
-  throw (SALOME::SALOME_Exception)
-{
-
-  // prendre un premier shell dans la liste des shells
-  // initialiser un compshell avec ce shell
-  // tant qu'il reste des shells dans la liste
-  //   chercher un shell qui a des faces en  commun avec le compshell
-  //   creer un BRepTools_Quilt
-  //   recenser les faces communes issues du compshell, les ajouter au quilt 
-  //   recenser les faces restantes du shell a inclure, les ajouter au quilt
-  //   recenser les edges en double, a remplacer
-  //   pour chaque paire d'edge
-  //     tester l'orientation relative des aretes
-  //     bind dans le quilt de Eold.Forward et Enew.Forward (ou reverse)
-  //   recuperer le nouveau shell
-  // l'incorporer dans le compshell
-  // appliquer BRepTools_SameParameter au compshell
-  // (rendre parametres 2D des edges identiques aux parametres 3D)
-
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  TopoDS_Shape aShape = GetTopoShape(myShape) ;
-  TopoDS_Compound C;
-  BRep_Builder bu;
-  bu.MakeCompound(C); // empty compound;
-  TopTools_ListOfShape shellList;
-  for (TopExp_Explorer exp(aShape,TopAbs_SHELL); exp.More(); exp.Next())
-    {
-      const TopoDS_Shell& S = TopoDS::Shell(exp.Current());
-      shellList.Append(S);
-    }
-  TopTools_ListIteratorOfListOfShape its(shellList);
-  if ( ! its.More())
-    {
-      THROW_SALOME_CORBA_EXCEPTION("glue aborted : no shell in shape", SALOME::BAD_PARAM);
-    }
-  TopoDS_Shell S = TopoDS::Shell(its.Value());
-  bu.Add(C, S); // add first shell to compound
-  shellList.Remove(its);
-  its.Initialize(shellList);
-  bool shellAdded = true;
-  while ((shellList.Extent() > 0) && shellAdded)
-    {
-      //MESSAGE("more shells : "<< shellList.Extent());
-      shellAdded = false;
-      its.Initialize(shellList);
-      for(; its.More(); its.Next())
-       {
-         //MESSAGE("one more shell to try");
-         TopTools_ListOfShape newFaces; // common faces from new compound
-         TopTools_ListOfShape oldFaces; // common faces from shell to add
-         TopTools_ListOfShape addFaces; // not common faces from shell to add
-         TopTools_ListOfShape newEdges; // common edges from new compound
-         TopTools_ListOfShape oldEdges; // common edges from face to add
-         TopoDS_Compound CFN;
-         TopoDS_Compound CFO;
-         bu.MakeCompound(CFN);       // empty compound for new faces
-         bu.MakeCompound(CFO);       // empty compound for old faces
-         S = TopoDS::Shell(its.Value());
-         for (TopExp_Explorer exp(S,TopAbs_FACE); exp.More(); exp.Next())
-           {
-             //MESSAGE("--- try to find corresponding face in new compound");
-             TopoDS_Face F = TopoDS::Face(exp.Current());
-             TopoDS_Face newFace = FindSameFace(C,F,tol3d);
-             if (! newFace.IsNull())
-               {
-                 //MESSAGE("--- face found");
-                 newFaces.Append(newFace); 
-                 bu.Add(CFN, newFace); // common faces from new compound
-                 oldFaces.Append(F);
-                 for (TopExp_Explorer ee(F,TopAbs_EDGE);ee.More();ee.Next())
-                   {
-                     //MESSAGE("--- find edge pair");
-                     TopoDS_Edge Eold = TopoDS::Edge(ee.Current());
-                     const TopoDS_Edge& Enew = FindSameEdge(newFace, Eold, tol3d);
-                     oldEdges.Append(Eold);
-                     newEdges.Append(Enew);
-                   }
-               }
-             else
-               {
-                 //MESSAGE("---");
-                 addFaces.Append(F);
-                 bu.Add(CFO, F); // not common faces from shell to add
-               }
-           }
-         if ( !newFaces.IsEmpty())
-           {
-             //MESSAGE("--- some faces found ---");
-             shellAdded = true;
-             BRepTools_Quilt glue;
-             glue.Add(CFN);
-             TopTools_ListIteratorOfListOfShape ito(oldEdges);
-             TopTools_ListIteratorOfListOfShape itn(newEdges);
-             for (; ito.More(); ito.Next())
-               {                 
-                 //MESSAGE("--- bind");
-                 glue.Bind(TopoDS::Edge(ito.Value()), TopoDS::Edge(itn.Value()));
-                 itn.Next();
-               }
-             glue.Add(CFO);
-             TopoDS_Compound newc = TopoDS::Compound(glue.Shells());
-             for (TopExp_Explorer exs(newc,TopAbs_SHELL); exs.More(); exs.Next())
-               {
-                 TopoDS_Shell NS = TopoDS::Shell(exs.Current());
-                 bu.Add(C, NS);
-               }
-             shellList.Remove(its);
-             //MESSAGE("--- remove shell from list");
-             break;
-           }
-       }
-    }
-  //MESSAGE("---" << shellList.Extent() << " " << shellAdded);
-
-  TopExp_Explorer  exp(C,TopAbs_SHELL);
-  Standard_Integer ish=0;
-  TopoDS_Compound  Res;
-  TopoDS_Solid     Sol;
-  BRep_Builder     B;
-  B.MakeCompound(Res);
-  TopoDS_Shape theShape;
-
-  for (; exp.More(); exp.Next())
-    {
-      TopoDS_Shape Sh = exp.Current();
-      B.MakeSolid(Sol);
-      B.Add(Sol,Sh);
-      BRepClass3d_SolidClassifier SC(Sol);
-      SC.PerformInfinitePoint(1.E-6); // cf. BRepFill_Confusion() - BRepFill_Evolved.cxx
-      if (SC.State() == TopAbs_IN)
-       {
-         B.MakeSolid(Sol);
-         B.Add(Sol,Sh.Reversed());
-       }
-      B.Add(Res,Sol);
-      ish++;
-    }
-  if (ish == 1) { theShape = Sol;}
-  else          { theShape = Res;}
-
-  BRepLib::SameParameter(theShape, 1.E-5, Standard_True);
-  tds = theShape;
-  result = CreateObject(tds);    
-  InsertInLabelOneArgument(aShape, myShape, tds, result, myCurrentOCAFDoc) ;
-  //MESSAGE("---");
-  return result;
-}
-
-//=================================================================================
-// function : MakeSewing()
-// purpose  :
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeSewing( const GEOM::GEOM_Gen::ListOfIOR& ListShapes,
-                                      CORBA::Double precision )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  BRepOffsetAPI_Sewing aMethod ;
-
-  try {
-    /* default OCC is 1.0e-06 */
-    aMethod.Init(precision, Standard_False);  
-    for ( unsigned int i = 0; i < ListShapes.length(); i++) {
-      GEOM::GEOM_Shape_var aShape = GetIORFromString( ListShapes[i] ); 
-      TopoDS_Shape Shape = GetTopoShape(aShape) ;
-      if( Shape.IsNull() ) {
-       THROW_SALOME_CORBA_EXCEPTION("MakeSewing aborted : null shape during operation", SALOME::BAD_PARAM);
-      } 
-      aMethod.Add(Shape) ;  
-    }  
-    
-    aMethod.Perform() ;
-    tds = aMethod.SewedShape() ;
-    if( !IsValid(tds) ) {
-      THROW_SALOME_CORBA_EXCEPTION("Make Sewing aborted : non valid shape", SALOME::BAD_PARAM);
-    }
-    if( tds.IsNull() ) {
-      THROW_SALOME_CORBA_EXCEPTION("Make Sewing aborted : null shape", SALOME::BAD_PARAM);
-    }
-  }
-  catch (Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeSewing", SALOME::BAD_PARAM);
-  }
-  
-  result = CreateObject(tds);
-  InsertInLabelMoreArguments(tds, result, ListShapes, myCurrentOCAFDoc) ;
-  return result;
-}
-
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeSewingShape( GEOM::GEOM_Shape_ptr aShape,
-                                           CORBA::Double precision )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds, S ;
-  BRepOffsetAPI_Sewing aMethod ;
-
-  try {
-    S = GetTopoShape(aShape) ;
-    if(S.IsNull() ) {
-      THROW_SALOME_CORBA_EXCEPTION("In Sewing a Shape is null", SALOME::BAD_PARAM);
-    }
-
-    /* default OCC is 1.0e-06 */
-    aMethod.Init(precision, Standard_False);  
-    for ( TopExp_Explorer exp( S, TopAbs_FACE); exp.More(); exp.Next() ) {
-      const TopoDS_Face& F = TopoDS::Face(exp.Current());
-      aMethod.Add(F) ;  
-    }  
-    
-    aMethod.Perform() ;
-    tds = aMethod.SewedShape() ;
-    if( !IsValid(tds) ) {
-      THROW_SALOME_CORBA_EXCEPTION("Make Sewing aborted : non valid shape", SALOME::BAD_PARAM);
-    }
-  }
-  catch (Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeSewing", SALOME::BAD_PARAM);
-  }
-  
-  result = CreateObject(tds);
-  const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-  result->ShapeId(entry) ;
-  return result;
-}
-
-//==================================================================================
-// function : OrientationChange()
-// purpose  : Change the orientation of a new shape
-//          : TopAbs_FORWARD < -- > TopAbs_REVERSED
-//
-//          : WARNING : for the moment we make a new shape !
-//==================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::OrientationChange(GEOM::GEOM_Shape_ptr aShape)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;  
-  BRep_Builder aBuilder;  
-
-  TopoDS_Shape shape = GetTopoShape(aShape) ;
-  if( shape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Shape is null", SALOME::BAD_PARAM);
-  }
-
-  BRepBuilderAPI_Copy Copy(shape);
-  if( Copy.IsDone() ) {
-    TopoDS_Shape tds = Copy.Shape();
-    if( tds.IsNull() ) {
-      THROW_SALOME_CORBA_EXCEPTION("Orientation aborted : null shape", SALOME::BAD_PARAM);
-    } 
-  
-    if( tds.Orientation() == TopAbs_FORWARD)
-      tds.Orientation(TopAbs_REVERSED) ;
-    else
-      tds.Orientation(TopAbs_FORWARD) ;
-    
-    result = CreateObject(tds); 
-    InsertInLabelOneArgument(shape, aShape, tds, result, myCurrentOCAFDoc) ;
-  }
-  return result ;
-}
-
-
-//==================================================================================
-// function : GetReferencedObjects()
-// purpose  :
-//==================================================================================
-GEOM::GEOM_Gen::ListOfIOR* GEOM_Gen_i::GetReferencedObjects(GEOM::GEOM_Shape_ptr shape)
-{
-  GEOM::GEOM_Gen::ListOfIOR_var aList = new GEOM::GEOM_Gen::ListOfIOR;
-  aList->length(0);
-
-  if (shape->_is_nil()) return aList._retn();
-
-  Standard_CString entry = shape->ShapeId();
-  TDF_Label Lab;
-  TDF_Tool::Label(myCurrentOCAFDoc->GetData(), entry, Lab);
-
-  Handle(TDataStd_Name) Att;
-  Lab.FindAttribute(TDataStd_Name::GetID(),Att);
-
-  TDF_ChildIterator ChildIterator(Lab);
-  if (ChildIterator.More()) {
-    TDF_Label L = ChildIterator.Value();
-    Handle(TDataStd_Name) Att;
-    L.FindAttribute(TDataStd_Name::GetID(),Att);
-    if (Att->Get().IsEqual(TCollection_ExtendedString("Arguments")) ) {
-
-      TDF_ChildIterator ChildIterator1(L);
-      unsigned int i = 0;
-
-      while (ChildIterator1.More()) {
-       TDF_Label L = ChildIterator1.Value();
-
-       Handle(TDF_Reference) Ref;
-       if (L.FindAttribute(TDF_Reference::GetID(),Ref)) {
-         i++;
-       }
-       ChildIterator1.Next();
-      }
-      aList->length(i);
-      i = 0;
-      TDF_ChildIterator ChildIterator2(L);
-      while (ChildIterator2.More()) {    
-       TDF_Label L = ChildIterator2.Value();
-       Handle(TDF_Reference) Ref;
-       if (L.FindAttribute(TDF_Reference::GetID(),Ref)) {
-         TDF_Label L = Ref->Get();
-         
-         Handle(TDataStd_Name) Att;
-         L.FindAttribute(TDataStd_Name::GetID(),Att);
-         TCollection_AsciiString nameIOR (Att->Get()) ;
-         aList[i] = CORBA::string_dup( nameIOR.ToCString() );
-         i++;
-       }
-   
-       ChildIterator2.Next();
-      }
-    }
-  }
-  return aList._retn();
-}
-
-//==================================================================================
-// function : GetObjects()
-// purpose  :
-//==================================================================================
-GEOM::GEOM_Gen::ListOfIOR* GEOM_Gen_i::GetObjects(GEOM::GEOM_Shape_ptr shape)
-{
-  GEOM::GEOM_Gen::ListOfIOR_var aList = new GEOM::GEOM_Gen::ListOfIOR;
-  aList->length(0);
-  
-  Standard_CString entry = shape->ShapeId();
-  TDF_Label Lab;
-  TDF_Tool::Label(myCurrentOCAFDoc->GetData(), entry, Lab);
-  
-  Handle(TDataStd_Name) Att;
-  Lab.FindAttribute(TDataStd_Name::GetID(),Att);
-
-  TDF_ChildIterator ChildIterator(Lab);
-  unsigned int i = 0;
-  while (ChildIterator.More()) {
-    TDF_Label L = ChildIterator.Value();
-    Handle(TDataStd_Name) Att;
-    L.FindAttribute(TDataStd_Name::GetID(),Att);
-
-    if (!Att->Get().IsEqual(TCollection_ExtendedString("Arguments")) ) {
-      i++;
-    }
-    ChildIterator.Next();
-  }
-
-  aList->length(i);
-  i = 0;
-  TDF_ChildIterator ChildIterator1(Lab);
-  while (ChildIterator1.More()) {
-    TDF_Label L = ChildIterator1.Value();
-    Handle(TDataStd_Name) Att;
-    L.FindAttribute(TDataStd_Name::GetID(),Att);
-
-    if (!Att->Get().IsEqual(TCollection_ExtendedString("Arguments")) ) {
-      TCollection_AsciiString nameIOR (Att->Get());
-      aList[i] = CORBA::string_dup( nameIOR.ToCString() );
-      i++;
-    }
-    ChildIterator1.Next();
-  }
-  return aList._retn();
-}
-
-
-//==================================================================================
-// function : Import
-// purpose  : Import shape from a BREP file
-//==================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::ImportBREP(const char* filename)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  TopoDS_Shape tds ;
-  GEOM::GEOM_Shape_var result ;
-  
-  try {
-    BRep_Builder aBuilder;
-    char* aCopyfilename = strdup(filename);
-    BRepTools::Read(tds, aCopyfilename, aBuilder) ;
-    free(aCopyfilename);
-    if (tds.IsNull()) {
-      THROW_SALOME_CORBA_EXCEPTION("Import BRep aborted", SALOME::BAD_PARAM);
-    } 
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::ImportBREP", SALOME::BAD_PARAM);
-  }
-
-  result = CreateObject(tds) ;
-  const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-  result->ShapeId(entry);
-  return result; 
-}
-
-
-//================================================================================
-// function : MakePlane()
-// purpose  : Make a plane topology (non infinite)
-//================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakePlane(const GEOM::PointStruct& pstruct,
-                                    const GEOM::DirStruct& dstruct,
-                                    CORBA::Double trimsize) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-
-  try {
-    gp_Pnt aPoint(pstruct.x, pstruct.y, pstruct.z) ;
-    gp_Dir aDirection(dstruct.PS.x, dstruct.PS.y, dstruct.PS.z) ;
-    /*  we make a trimmed plane */
-    gp_Pln gplane(aPoint, aDirection) ;    
-    tds = BRepBuilderAPI_MakeFace(gplane, -trimsize, +trimsize, -trimsize, +trimsize) ;
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakePlane", SALOME::BAD_PARAM);
-  }
-
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Plane aborted : null shape", SALOME::BAD_PARAM);
-   } 
-  
-  result = CreateObject(tds) ;
-  const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-  result->ShapeId(entry);
-  return result ;
-}
-
-//=================================================================================
-// function : MakeVertex()
-// purpose  : Create a Vertex topology.
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeVertex(CORBA::Double x,
-                                     CORBA::Double y,
-                                     CORBA::Double z) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ; 
-  gp_Pnt P(x,y,z);
-  TopoDS_Shape tds = BRepBuilderAPI_MakeVertex(P).Shape();
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Vertex/Point aborted", SALOME::BAD_PARAM);
-  }
-  tds.Infinite(true);
-  result = CreateObject(tds) ;
-  const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-  result->ShapeId(entry);
-  return result ;
-}
-
-
-//=================================================================================
-// function : MakeFace()
-// purpose  : 
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFace( GEOM::GEOM_Shape_ptr wire,
-                                    CORBA::Boolean wantplanarface ) 
-  throw (SALOME::SALOME_Exception) 
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape aShape;
-  TopoDS_Shape tds;
-
-  try {
-    aShape = GetTopoShape(wire) ;
-    if( aShape.IsNull() || aShape.ShapeType() != TopAbs_WIRE ) {
-      THROW_SALOME_CORBA_EXCEPTION("MakeFace aborted : null or inappropriate shape", SALOME::BAD_PARAM);
-    }
-    TopoDS_Wire W = TopoDS::Wire(aShape) ;
-    tds = BRepBuilderAPI_MakeFace(W, wantplanarface).Shape() ;
-    if( !tds.IsNull() ) {
-      result = CreateObject(tds) ;
-      InsertInLabelOneArgument(aShape, wire, tds, result, myCurrentOCAFDoc) ;
-    }
-    else {
-      THROW_SALOME_CORBA_EXCEPTION("Null result in GEOM_Gen_i::MakeFace", SALOME::BAD_PARAM);
-    }
-  }
-  catch (Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeFace", SALOME::BAD_PARAM);
-  }  
-  return result ;
-}
-
-
-//=================================================================================
-// function : MakeFaces()
-// purpose  : 
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFaces(const GEOM::GEOM_Gen::ListOfIOR& ListShapes,
-                                         CORBA::Boolean wantplanarface) 
-  throw (SALOME::SALOME_Exception) 
-{
-  GEOM::GEOM_Shape_var result;
-
-  try {
-    GEOM::GEOM_Shape_var aShape = GetIORFromString(ListShapes[0]);    
-    TopoDS_Shape Shape = GetTopoShape(aShape);
-    if(Shape.IsNull() || Shape.ShapeType() != TopAbs_WIRE) {
-      THROW_SALOME_CORBA_EXCEPTION("Shell aborted : null shape during operation", SALOME::BAD_PARAM);
-    }
-    TopoDS_Wire W = TopoDS::Wire(Shape);
-    TopoDS_Shape FFace = BRepBuilderAPI_MakeFace(W, wantplanarface).Shape();
-    if(!FFace.IsNull()) {
-      if(ListShapes.length() == 1) {
-       result = CreateObject(FFace);
-       InsertInLabelMoreArguments(FFace, result, ListShapes, myCurrentOCAFDoc);
-      }
-      else if(ListShapes.length() >= 2) {
-       TopoDS_Compound C;
-       BRep_Builder aBuilder;
-       aBuilder.MakeCompound(C);
-       BRepAlgo_FaceRestrictor FR;
-
-       TopAbs_Orientation OriF = FFace.Orientation();
-       TopoDS_Shape aLocalS = FFace.Oriented(TopAbs_FORWARD);
-       FR.Init(TopoDS::Face(aLocalS), Standard_False, Standard_True);
-
-       for(unsigned int i = 0; i < ListShapes.length(); i++) {
-         GEOM::GEOM_Shape_var aShape = GetIORFromString(ListShapes[i]);    
-         TopoDS_Shape Shape = GetTopoShape(aShape);
-         if(Shape.IsNull()) {
-           THROW_SALOME_CORBA_EXCEPTION("Shell aborted : null shape during operation", SALOME::BAD_PARAM);
-         }
-         FR.Add(TopoDS::Wire(Shape));
-       }
-
-       FR.Perform();
-    
-       if(FR.IsDone()) {
-         int k = 0;
-         TopoDS_Shape aFace;
-         for(; FR.More(); FR.Next()) {
-           aFace = FR.Current().Oriented(OriF);
-           aBuilder.Add(C, aFace);
-           k++;
-         }
-         if(k == 1) {
-           result = CreateObject(aFace);
-           InsertInLabelMoreArguments(aFace, result, ListShapes, myCurrentOCAFDoc);
-         }
-         else {
-           result = CreateObject(C);
-           InsertInLabelMoreArguments(C, result, ListShapes, myCurrentOCAFDoc);
-         }
-       }
-      }
-    }
-    else {
-      THROW_SALOME_CORBA_EXCEPTION("Null result in GEOM_Gen_i::MakeFace", SALOME::BAD_PARAM);
-    }
-  }
-  catch (Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeFace", SALOME::BAD_PARAM);
-  }
-  return result;
-}
-
-
-//=================================================================================
-// function : MakeShell()
-// purpose  : Make a compound from a list containing one or more shapes
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeShell( const GEOM::GEOM_Gen::ListOfIOR& ListShapes )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  BRepTools_Quilt Glue;
-  TopoDS_Shape C;
-
-  for ( unsigned int i = 0; i < ListShapes.length(); i++) {
-    GEOM::GEOM_Shape_var aShape = GetIORFromString( ListShapes[i] );    
-    TopoDS_Shape Shape = GetTopoShape(aShape) ;
-    if( Shape.IsNull() ) {
-       THROW_SALOME_CORBA_EXCEPTION("Shell aborted : null shape during operation", SALOME::BAD_PARAM);
-    }
-    Glue.Add(Shape) ;
-  }
-
-  TopExp_Explorer exp(Glue.Shells(), TopAbs_SHELL);
-  Standard_Integer ish = 0; 
-  for (; exp.More(); exp.Next()) {
-    C = exp.Current(); 
-    ish++;
-  }
-
-  if (ish != 1)
-    C = Glue.Shells();
-  
-  if ( C.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Null result : Shell operation aborted", SALOME::BAD_PARAM);
-  }
-  else {
-    result = CreateObject(C) ;
-    InsertInLabelMoreArguments(C, result, ListShapes, myCurrentOCAFDoc) ;
-  }
-  return result;
-}
-
-
-//=================================================================================
-// function : MakeSolid()
-// purpose  : Make a compound from a list containing one or more shapes
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeSolid( const GEOM::GEOM_Gen::ListOfIOR& ListShapes )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  Standard_Integer ish = 0;
-  TopoDS_Compound  Res;
-  TopoDS_Solid     Sol;
-  BRep_Builder     B;
-  TopoDS_Shape     Shape;
-
-  B.MakeCompound(Res);
-
-  for ( unsigned int i = 0; i < ListShapes.length(); i++) {
-    GEOM::GEOM_Shape_var aShape = GetIORFromString( ListShapes[i] );    
-    TopoDS_Shape Sh = GetTopoShape(aShape) ;
-    if( Sh.IsNull() ) {
-       THROW_SALOME_CORBA_EXCEPTION("Solid aborted : null shape during operation", SALOME::BAD_PARAM);
-    }
-    B.MakeSolid(Sol);
-    B.Add(Sol,Sh);
-    BRepClass3d_SolidClassifier SC(Sol);
-    SC.PerformInfinitePoint(Precision::Confusion());
-    if (SC.State() == TopAbs_IN) {
-      B.MakeSolid(Sol);
-      B.Add(Sol,Sh.Reversed());
-    }
-    B.Add(Res,Sol);
-    ish++;
-  }
-  if (ish == 1) { Shape = Sol;}
-  else          { Shape = Res;} 
-  
-  if ( Shape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Null result : Solid operation aborted", SALOME::BAD_PARAM);
-  }
-  else {
-    result = CreateObject(Shape) ;
-    InsertInLabelMoreArguments(Shape, result, ListShapes, myCurrentOCAFDoc) ;
-  }
-  return result;
-}
-
-
-//================================================================================
-// function : MakeLine
-// purpose  : Make a Line topology
-//================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeLine(const GEOM::PointStruct& pstruct,
-                                   const GEOM::DirStruct& dstruct)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result  ;
-  gp_Pnt P1(pstruct.x, pstruct.y, pstruct.z);
-  gp_Pnt P2(dstruct.PS.x, dstruct.PS.y, dstruct.PS.z) ;  
-  TopoDS_Shape tds ;
-  
-  try {
-    tds = BRepBuilderAPI_MakeEdge(P1, P2).Shape();
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeLine", SALOME::BAD_PARAM);
-  }
-
-  if ( tds.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Line aborted : null shape", SALOME::BAD_PARAM);
-  }
-  else {
-    tds.Infinite(true);
-    result = CreateObject(tds) ;
-    const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-    result->ShapeId(entry);
-  }
-  return result ;  
-}
-
-
-//================================================================================
-// function : MakeVector()
-// purpose  : Make a vector
-//================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeVector(const GEOM::PointStruct& pstruct1,
-                                     const GEOM::PointStruct& pstruct2)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result  ;
-  TopoDS_Shape tds ;
-  
-  try {
-    gp_Pnt P1(pstruct1.x, pstruct1.y, pstruct1.z);
-    gp_Pnt P2(pstruct2.x, pstruct2.y, pstruct2.z) ;
-    tds = BRepBuilderAPI_MakeEdge(P1, P2).Shape();
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeVector", SALOME::BAD_PARAM);
-  }
-
-  if ( tds.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Vector aborted : null shape", SALOME::BAD_PARAM);
-  }
-  else {
-    result = CreateObject(tds) ;
-    const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-    result->ShapeId(entry);
-  }
-  return result ;  
-}
-
-
-//================================================================================
-// function : MakeCircle()
-// purpose  : 
-//================================================================================
-GEOM::GEOM_Shape_ptr  GEOM_Gen_i::MakeCircle(const GEOM::PointStruct& pstruct,
-                                      const GEOM::DirStruct& dstruct,
-                                      CORBA::Double radius)
-  throw (SALOME::SALOME_Exception) 
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Shape tds ;
-
-  try {
-    gp_Pnt p(pstruct.x, pstruct.y, pstruct.z) ;
-    gp_Dir d(dstruct.PS.x, dstruct.PS.y, dstruct.PS.z) ;
-    gp_Ax2 axis(p, d) ;
-    gp_Circ circ( axis, radius);    
-    BRepBuilderAPI_MakeEdge MakeEdge( circ );
-    tds = MakeEdge.Edge();
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeCircle", SALOME::BAD_PARAM);
-  }
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Circle aborted", SALOME::BAD_PARAM);
-  } 
-  result = CreateObject(tds);
-  const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-  result->ShapeId(entry);
-  return result ;  
-}
-
-//================================================================================
-// function : MakeEllipse()
-// purpose  : 
-//================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeEllipse( const GEOM::PointStruct& pstruct,
-                                             const GEOM::DirStruct& dstruct,
-                                             CORBA::Double radius_major,
-                                             CORBA::Double radius_minor )
-  throw (SALOME::SALOME_Exception) 
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Shape tds ;
-  
-  try {
-    gp_Pnt p(pstruct.x, pstruct.y, pstruct.z) ;
-    gp_Dir d(dstruct.PS.x, dstruct.PS.y, dstruct.PS.z) ;
-
-    const gp_Ax2 axis(p, d) ;
-    gp_Elips anEllipse( axis, radius_major, radius_minor ) ;
-    BRepBuilderAPI_MakeEdge MakeEdge( anEllipse );
-    tds = MakeEdge.Edge();
-
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeEllipse", SALOME::BAD_PARAM);
-  }
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Ellipse aborted", SALOME::BAD_PARAM);
-  } 
-  result = CreateObject(tds);
-  const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-  result->ShapeId(entry);
-  return result ;  
-}
-
-//================================================================================
-// function : MakeArc()
-// purpose  : make an arc of circle from pInit to pEnd and passing on pCircle
-//================================================================================
-GEOM::GEOM_Shape_ptr  GEOM_Gen_i::MakeArc(const GEOM::PointStruct& pInit,
-                                   const GEOM::PointStruct& pCircle,
-                                   const GEOM::PointStruct& pEnd)
-  throw (SALOME::SALOME_Exception) 
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-  try {
-    gp_Pnt pI(pInit.x, pInit.y, pInit.z) ;
-    gp_Pnt pC(pCircle.x, pCircle.y, pCircle.z) ;
-    gp_Pnt pE(pEnd.x, pEnd.y, pEnd.z) ;
-    
-    GC_MakeArcOfCircle arc( pI, pC, pE ) ;
-    if( !arc.IsDone() ) {
-      THROW_SALOME_CORBA_EXCEPTION("Arc not done", SALOME::BAD_PARAM);
-    }
-    BRepBuilderAPI_MakeEdge MakeEdge( arc );
-    TopoDS_Shape tds = MakeEdge.Edge();
-    if (tds.IsNull()) {
-      THROW_SALOME_CORBA_EXCEPTION("Null result : arc not done", SALOME::BAD_PARAM);
-    } 
-    else {
-      result = CreateObject(tds);
-      const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-      result->ShapeId(entry);
-    }
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeArc", SALOME::BAD_PARAM);
-  }
-  return result ;
-}
-
-//=================================================================================
-// function : MakeSketcher()
-// purpose  : Make a wire from a list containing many points
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeSketcher( const char *Cmd )
-  throw (SALOME::SALOME_Exception)
-{
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  try {
-    Sketcher_Profile aProfile (Cmd);
-    if(aProfile.IsDone())
-      tds = aProfile.GetShape();
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeSketcher", SALOME::BAD_PARAM);
-  }
-
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("MakeSketcher aborted : null shape", SALOME::BAD_PARAM);
-  } 
-  else {
-    result = CreateObject(tds);
-    const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-    result->ShapeId(entry) ;
-  }
-  return result;
-}
-
-
-
-//=================================================================================
-// function : MakeBezier()
-// purpose  : Make a wire from a list containing many points
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeBezier( const GEOM::GEOM_Gen::ListOfIOR& ListShapes )
-  throw (SALOME::SALOME_Exception)
-{
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Shape tds, Shape;
-  TColgp_Array1OfPnt CurvePoints(1, ListShapes.length());
-  
-  try {
-    for(unsigned int i = 0; i < ListShapes.length(); i++) {
-      GEOM::GEOM_Shape_var aShape = GetIORFromString(ListShapes[i]);    
-      Shape = GetTopoShape(aShape);
-      if(Shape.IsNull()) {
-       THROW_SALOME_CORBA_EXCEPTION("MakeBezier aborted : null shape during operation", SALOME::BAD_PARAM);
-      }
-      if(Shape.ShapeType() == TopAbs_VERTEX) {
-       const gp_Pnt& P = BRep_Tool::Pnt(TopoDS::Vertex(Shape));
-       CurvePoints.SetValue(i + 1, P);
-      }
-    }
-    Handle(Geom_BezierCurve) GBC = new Geom_BezierCurve(CurvePoints);
-    tds = BRepBuilderAPI_MakeEdge(GBC);
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeBezier", SALOME::BAD_PARAM);
-  }
-  
-  if( tds.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Bezier operation aborted : null result", SALOME::BAD_PARAM);
-  }
-  else {
-    result = CreateObject(tds);
-    InsertInLabelMoreArguments(tds, result, ListShapes, myCurrentOCAFDoc);   
-  }
-  return result;
-}
-
-
-//=================================================================================
-// function : MakeInterpol()
-// purpose  : Make a wire from a list containing many points
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeInterpol( const GEOM::GEOM_Gen::ListOfIOR& ListShapes )
-  throw (SALOME::SALOME_Exception)
-{
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Shape tds, Shape;
-  TColgp_Array1OfPnt CurvePoints(1, ListShapes.length());
-  
-  try {
-    for(unsigned int i = 0; i < ListShapes.length(); i++) {
-      GEOM::GEOM_Shape_var aShape = GetIORFromString(ListShapes[i]);    
-      Shape = GetTopoShape(aShape);
-      if(Shape.IsNull()) {
-       THROW_SALOME_CORBA_EXCEPTION("MakeBSpline aborted : null shape during operation", SALOME::BAD_PARAM);
-      }
-      if(Shape.ShapeType() == TopAbs_VERTEX) {
-       const gp_Pnt& P = BRep_Tool::Pnt(TopoDS::Vertex(Shape));
-       CurvePoints.SetValue(i + 1, P);
-      }
-    }
-    GeomAPI_PointsToBSpline GBC(CurvePoints);
-    tds = BRepBuilderAPI_MakeEdge(GBC);
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeBSpline", SALOME::BAD_PARAM);
-  }
-  
-  if( tds.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Make BSpline operation aborted : null result", SALOME::BAD_PARAM);
-  }
-  else {
-    result = CreateObject(tds) ;
-    InsertInLabelMoreArguments(tds, result, ListShapes, myCurrentOCAFDoc) ;   
-  }
-  return result;
-}
-
-//=================================================================================
-// function : MakeTranslation()
-// purpose  : Translate a 3D shape
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeTranslation( GEOM::GEOM_Shape_ptr myShape,
-                                           CORBA::Double x,
-                                           CORBA::Double y,
-                                           CORBA::Double z)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape aShape = GetTopoShape(myShape) ;
-  if( aShape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Translation aborted : null shape", SALOME::BAD_PARAM);
-  }
-  gp_Vec theVector(x,y,z) ;
-  gp_Trsf theTransformation ;
-  theTransformation.SetTranslation(theVector) ;
-  BRepBuilderAPI_Transform myBRepTransformation(aShape, theTransformation, Standard_False) ;
-  TopoDS_Shape tds = myBRepTransformation.Shape() ;
-
-  result = CreateObject(tds) ;
-  if( CORBA::is_nil(result) ) {
-    THROW_SALOME_CORBA_EXCEPTION("Translation aborted : null result", SALOME::BAD_PARAM);
-  }
-  InsertInLabelOneArgument(aShape, myShape, tds, result, myCurrentOCAFDoc) ;
-  return result;
-}
-
-
-//=================================================================================
-// function : MakeMultiTranslation1D()
-// purpose  : Multi-Translate a 3D shape
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeMultiTranslation1D( GEOM::GEOM_Shape_ptr myShape,
-                                                  const GEOM::DirStruct& dir,
-                                                  CORBA::Double step,
-                                                  CORBA::Short nbtimes )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-
-  TopoDS_Shape aShape = GetTopoShape(myShape) ;
-  if( aShape.IsNull() )
-    THROW_SALOME_CORBA_EXCEPTION("MakeMultiTranslation1D aborted : null shape", SALOME::BAD_PARAM);
-  
-  try {
-    int i ;
-    double DX, DY, DZ ;
-    gp_Trsf theTransformation ;
-    gp_Vec myVec ;
-    gp_Vec Vec( dir.PS.x, dir.PS.y, dir.PS.z ) ;
-    Vec.Normalize();
-    TopoDS_Compound compound;
-    BRep_Builder B;
-    B.MakeCompound( compound );
-    
-    for ( i = 0; i < nbtimes; i++ ) {
-      DX = i * step * Vec.X() ;
-      DY = i * step * Vec.Y() ;
-      DZ = i * step * Vec.Z() ;
-      myVec.SetCoord( DX, DY, DZ ) ;
-      theTransformation.SetTranslation(myVec) ;
-      BRepBuilderAPI_Transform myBRepTransformation(aShape, theTransformation, Standard_False) ;
-      B.Add( compound, myBRepTransformation.Shape() );
-    }
-    tds = compound ;
-    result = CreateObject(tds) ;
-  }
-  catch (Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeMultiTranslation1D", SALOME::BAD_PARAM);
-  }
-    
-  if( CORBA::is_nil(result) ) {
-    THROW_SALOME_CORBA_EXCEPTION("MakeMultiTranslation1D aborted : null result", SALOME::BAD_PARAM);
-  }
-  InsertInLabelOneArgument(aShape, myShape, tds, result, myCurrentOCAFDoc) ;
-  return result;
-}
-
-
-//=================================================================================
-// function : MakeMultiTranslation2D()
-// purpose  : Multi-Translate a 3D shape
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeMultiTranslation2D( GEOM::GEOM_Shape_ptr myShape,
-                                                  const GEOM::DirStruct& dir1,
-                                                  CORBA::Double step1,
-                                                  CORBA::Short nbtimes1,
-                                                  const GEOM::DirStruct& dir2,
-                                                  CORBA::Double step2,
-                                                  CORBA::Short nbtimes2 )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  
-  TopoDS_Shape aShape = GetTopoShape(myShape) ;
-  if( aShape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("MakeMultiTranslation2D aborted : null shape", SALOME::BAD_PARAM);
-  }
-  
-  try {
-    int i, j ;
-    double DX, DY, DZ ;
-    gp_Trsf theTransformation ;
-    gp_Vec myVec ;
-    gp_Vec Vec1( dir1.PS.x, dir1.PS.y, dir1.PS.z ) ;
-    Vec1.Normalize();
-    gp_Vec Vec2( dir2.PS.x, dir2.PS.y, dir2.PS.z ) ;
-    Vec2.Normalize();
-    TopoDS_Compound compound;
-    BRep_Builder B;
-    B.MakeCompound( compound );
-    
-    for ( i = 0; i < nbtimes1; i++ ) {
-      for ( j = 0; j < nbtimes2; j++ ) {
-       DX = i * step1 * Vec1.X() + j * step2 * Vec2.X() ;
-       DY = i * step1 * Vec1.Y() + j * step2 * Vec2.Y() ;
-       DZ = i * step1 * Vec1.Z() + j * step2 * Vec2.Z() ;
-       myVec.SetCoord( DX, DY, DZ ) ;
-       theTransformation.SetTranslation(myVec) ;
-       BRepBuilderAPI_Transform myBRepTransformation(aShape, theTransformation, Standard_False) ;
-       B.Add( compound, myBRepTransformation.Shape() );
-      }
-    }
-    tds = compound ;
-    result = CreateObject(tds) ;
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeMultiTranslation2D", SALOME::BAD_PARAM);
-  }
-   
-  if( CORBA::is_nil(result) ) {
-    THROW_SALOME_CORBA_EXCEPTION("MakeMultiTranslation2D aborted : null result", SALOME::BAD_PARAM);
-  }
-  InsertInLabelOneArgument(aShape, myShape, tds, result, myCurrentOCAFDoc) ;
-  return result;
-}
-
-
-//=================================================================================
-// function : MakeMultiRotation1D()
-// purpose  : Multi-Rotate a 3D shape
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeMultiRotation1D( GEOM::GEOM_Shape_ptr myShape,
-                                               const GEOM::DirStruct& dir,
-                                               const GEOM::PointStruct& loc,
-                                               CORBA::Short nbtimes)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  TopoDS_Shape aShape = GetTopoShape(myShape) ;
-  if( aShape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("MakeMultiRotation1D aborted : null shape", SALOME::BAD_PARAM);
-  }
-  try {
-
-    int i ;
-    gp_Pnt P(loc.x, loc.y, loc.z) ;
-    gp_Dir D(dir.PS.x, dir.PS.y, dir.PS.z) ;
-    gp_Ax1 AX1(P, D) ;
-    
-    double angle = 360.0/nbtimes ;
-    gp_Trsf theTransformation ;
-    TopoDS_Compound compound;
-    BRep_Builder B;
-    B.MakeCompound( compound );
-    
-    for ( i = 0; i < nbtimes; i++ ) {
-      theTransformation.SetRotation(AX1, i*angle*PI180) ;
-      BRepBuilderAPI_Transform myBRepTransformation(aShape, theTransformation, Standard_False) ;
-      B.Add( compound, myBRepTransformation.Shape() );
-    }
-    tds = compound ;
-    result = CreateObject(tds) ;
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeMultiRotation1D", SALOME::BAD_PARAM);
-  }
-  
-  if( CORBA::is_nil(result) ) {
-    THROW_SALOME_CORBA_EXCEPTION("MakeMultiRotation1D aborted : null result", SALOME::BAD_PARAM);
-  }
-  InsertInLabelOneArgument(aShape, myShape, tds, result, myCurrentOCAFDoc) ;
-  return result;
-}
-
-
-//=================================================================================
-// function : MakeMultiRotation2D()
-// purpose  : Multi-Rotate a 3D shape
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeMultiRotation2D( GEOM::GEOM_Shape_ptr myShape,
-                                               const GEOM::DirStruct& dir,
-                                               const GEOM::PointStruct& loc,
-                                               CORBA::Double ang,
-                                               CORBA::Short nbtimes1,
-                                               CORBA::Double step,
-                                               CORBA::Short nbtimes2 )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  TopoDS_Shape aShape = GetTopoShape(myShape) ;
-  if( aShape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("MakeMultiRotation2D aborted : null shape", SALOME::BAD_PARAM);
-  }
-
-  try {
-   
-    int i, j ;
-    double DX, DY, DZ ;
-    gp_Pnt P(loc.x, loc.y, loc.z) ;
-    gp_Dir D(dir.PS.x, dir.PS.y, dir.PS.z) ;
-    gp_Ax1 AX1(P, D) ;
-    gp_Trsf theTransformation1 ;
-    gp_Trsf theTransformation2 ;
-    gp_Pnt P1 ;
-    GProp_GProps System ;
-    
-    if ( aShape.ShapeType() == TopAbs_VERTEX) {
-      P1 = BRep_Tool::Pnt(TopoDS::Vertex( aShape ));
-    } 
-    else if ( aShape.ShapeType() == TopAbs_EDGE || aShape.ShapeType() == TopAbs_WIRE ) {
-      BRepGProp::LinearProperties(aShape, System);
-      P1 = System.CentreOfMass() ;
-    }
-    else if ( aShape.ShapeType() == TopAbs_FACE || aShape.ShapeType() == TopAbs_SHELL ) {
-      BRepGProp::SurfaceProperties(aShape, System);
-      P1 = System.CentreOfMass() ;
-    }
-    else {
-      BRepGProp::VolumeProperties(aShape, System);
-      P1 = System.CentreOfMass() ;
-    }
-    
-    Handle(Geom_Line) Line = new Geom_Line(AX1);
-    gp_Pnt P2 = GeomAPI_ProjectPointOnCurve( P1, Line ) ;
-    
-    if ( P1.IsEqual(P2, Precision::Confusion() ) )
-      THROW_SALOME_CORBA_EXCEPTION("Points are confused", SALOME::BAD_PARAM);
-    
-    gp_Vec Vec(P1.X()-P2.X(), P1.Y()-P2.Y(), P1.Z()-P2.Z()) ;
-    Vec.Normalize();
-    
-    gp_Vec myVec ;
-    TopoDS_Compound compound;
-    BRep_Builder B;
-    B.MakeCompound( compound );
-    
-    for ( i = 0; i < nbtimes2; i++ ) {
-      for ( j = 0; j < nbtimes1; j++ ) {
-       DX = i * step * Vec.X() ;
-       DY = i * step * Vec.Y() ;
-       DZ = i * step * Vec.Z() ;
-       myVec.SetCoord( DX, DY, DZ ) ;
-       theTransformation1.SetTranslation(myVec) ;
-       theTransformation2.SetRotation(AX1, j*ang*PI180) ;
-       BRepBuilderAPI_Transform myBRepTransformation1(aShape, theTransformation1, Standard_False) ;
-       BRepBuilderAPI_Transform myBRepTransformation2(myBRepTransformation1.Shape(), theTransformation2, Standard_False) ;
-       B.Add( compound, myBRepTransformation2.Shape() );
-      }
-    }
-    tds = compound ;
-    result = CreateObject(tds) ;  
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeMultiRotation2D", SALOME::BAD_PARAM);
-  }
-  
-  if( CORBA::is_nil(result) ) {
-    THROW_SALOME_CORBA_EXCEPTION("MakeMultiRotation2D aborted : null result", SALOME::BAD_PARAM);
-  }
-  InsertInLabelOneArgument(aShape, myShape, tds, result, myCurrentOCAFDoc) ;
-  return result;
-}
-
-
-//=================================================================================
-// function : MakeCopy()
-// purpose  : Copy a 3D shape
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeCopy( GEOM::GEOM_Shape_ptr Shape)
-  throw (SALOME::SALOME_Exception) 
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  TopoDS_Shape aShape = GetTopoShape(Shape) ;
-  if(aShape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Copy aborted : null shape during operation", SALOME::BAD_PARAM);
-  }  
-  BRepBuilderAPI_Copy Copy(aShape);
-  if( Copy.IsDone() ) {   
-    tds = Copy.Shape();
-    result = CreateObject(tds);    
-    InsertInLabelOneArgument(aShape, Shape, tds, result, myCurrentOCAFDoc) ;
-  }
-
-  return result;
-}
-
-
-//=================================================================================
-// function : MakeMirrorByPlane()
-// purpose  : build a shape by symmetry of 'myShape' with 'shapePlane' in argument
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeMirrorByPlane(GEOM::GEOM_Shape_ptr myShape,
-                                            GEOM::GEOM_Shape_ptr shapePlane) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ; 
-  TopoDS_Shape tds ;
-  TopoDS_Shape aShape      = GetTopoShape(myShape) ;
-  TopoDS_Shape aShapePlane = GetTopoShape(shapePlane) ;
-  if( aShape.IsNull()  || aShapePlane.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Mirror aborted : null shape argument", SALOME::BAD_PARAM);
-  }  
-  
-  try {
-    Handle(Geom_Surface) surf = BRep_Tool::Surface(TopoDS::Face(aShapePlane)) ;        
-    Handle(Geom_Plane) myPlane = Handle(Geom_Plane)::DownCast(surf) ;
-    const gp_Ax3 pos = myPlane->Position() ;
-    const gp_Pnt loc = pos.Location() ;  /* location of the plane */
-    const gp_Dir dir = pos.Direction() ; /* Main direction of the plane (Z axis) */  
-    
-    /* plane used for mirroring */
-    gp_Ax2 pln(loc, dir) ;
-    gp_Trsf theTransformation ;
-    theTransformation.SetMirror(pln) ;
-    BRepBuilderAPI_Transform myBRepTransformation(aShape, theTransformation, Standard_False) ;
-
-    tds = myBRepTransformation.Shape() ;
-    if(tds.IsNull() ) {
-      THROW_SALOME_CORBA_EXCEPTION("Mirror aborted", SALOME::BAD_PARAM);
-    }
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeMirrorByPlane", SALOME::BAD_PARAM);    
-  }
-  
-  result = CreateObject(tds) ;
-
-  /* Insert arguments in ocaf */
-  GEOM::GEOM_Gen::ListOfIOR_var ListShapes = new GEOM::GEOM_Gen::ListOfIOR;
-  ListShapes->length(2);
-  ListShapes[0] = GetStringFromIOR(GEOM::GEOM_Shape::_duplicate(myShape)) ;
-  ListShapes[1] = GetStringFromIOR(GEOM::GEOM_Shape::_duplicate(shapePlane)) ;
-  InsertInLabelMoreArguments(tds, result, ListShapes, myCurrentOCAFDoc) ;
-  return result ;
-}
-
-
-
-//=================================================================================
-// function : MakeRotation()
-// purpose  : Rotation of a 3D shape around an axis
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeRotation( GEOM::GEOM_Shape_ptr myShape,
-                                        const GEOM::AxisStruct& axis,
-                                        CORBA::Double angle)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  TopoDS_Shape aShape = GetTopoShape(myShape) ;
-  if( aShape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Rotation aborted : null shape during operation", SALOME::BAD_PARAM);
-  }
-  
-  try {
-    gp_Pnt P(axis.x, axis.y, axis.z) ;
-    gp_Dir D(axis.vx, axis.vy, axis.vz) ;
-    gp_Ax1 AX(P, D) ;
-    
-    gp_Trsf theTransformation ;
-    theTransformation.SetRotation(AX, angle) ;
-    BRepBuilderAPI_Transform myBRepTransformation(aShape, theTransformation, Standard_False) ;
-    tds = myBRepTransformation.Shape() ;
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeRotation", SALOME::BAD_PARAM);
-  }
-  
-  if ( !tds.IsNull() ) {
-    result = CreateObject(tds) ;
-    InsertInLabelOneArgument(aShape, myShape, tds, result, myCurrentOCAFDoc) ;
-  }
-  return result ;
-}
-
-
-//=================================================================================
-// function : MakeScaleTransform()
-// purpose  : Make a shape multipling another by a scale factor
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeScaleTransform(GEOM::GEOM_Shape_ptr myShape,
-                                             const GEOM::PointStruct& theCenterOfScale,
-                                             CORBA::Double factor)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  TopoDS_Shape aShape = GetTopoShape(myShape) ;
-  if( aShape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Scale aborted : null shape during operation", SALOME::BAD_PARAM);
-  }
-  
-  try {
-    gp_Pnt Pcenter(theCenterOfScale.x, theCenterOfScale.y, theCenterOfScale.z) ;
-    gp_Trsf theTransformation ;  
-    theTransformation.SetScale(Pcenter, factor) ;
-    BRepBuilderAPI_Transform myBRepTransformation(aShape, theTransformation, Standard_False) ;
-    tds = myBRepTransformation.Shape() ;
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeScaleTransform", SALOME::BAD_PARAM);
-  }
-  
-  if ( !tds.IsNull() ) {
-    result = CreateObject(tds) ; 
-    InsertInLabelOneArgument(aShape, myShape, tds, result, myCurrentOCAFDoc) ;
-  }
-  return result ;
-}
-
-
-//=================================================================================
-// function : MakeCompound()
-// purpose  : Make a compound from a list containing one or more shapes
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeCompound( const GEOM::GEOM_Gen::ListOfIOR& ListShapes )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Compound C;
-  BRep_Builder aBuilder;
-  aBuilder.MakeCompound(C) ;
-
-  for ( unsigned int i = 0; i < ListShapes.length(); i++) {
-    GEOM::GEOM_Shape_var aShape = GetIORFromString( ListShapes[i] );    
-    TopoDS_Shape Shape = GetTopoShape(aShape) ;
-    if( Shape.IsNull() ) {
-       THROW_SALOME_CORBA_EXCEPTION("Compound aborted : null shape during operation", SALOME::BAD_PARAM);
-    }
-    aBuilder.Add(C, Shape) ;
-  }
-  
-  if ( C.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Null result : Compound operation aborted", SALOME::BAD_PARAM);
-  }
-  else {
-    result = CreateObject(C) ;
-    InsertInLabelMoreArguments(C, result, ListShapes, myCurrentOCAFDoc) ;
-  }
-  return result;
-}
-
-
-//================================================================================
-// function : MakeEdge()
-// purpose  : Make a linear edge with 2 points
-//================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeEdge(const GEOM::PointStruct& pstruct1,
-                                   const GEOM::PointStruct& pstruct2)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result  ;
-  TopoDS_Shape tds ;
-  
-  try {
-    gp_Pnt P1(pstruct1.x, pstruct1.y, pstruct1.z);
-    gp_Pnt P2(pstruct2.x, pstruct2.y, pstruct2.z) ;  
-    tds = BRepBuilderAPI_MakeEdge(P1, P2).Shape();
-    if ( tds.IsNull() )
-      THROW_SALOME_CORBA_EXCEPTION("MakeEdge aborted : null result", SALOME::BAD_PARAM);
-  }
-  catch (Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in MakeEdge", SALOME::BAD_PARAM);
-  }
-  
-  result = CreateObject(tds) ;
-  const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-  result->ShapeId(entry);
-  return result ;  
-}
-
-
-
-//=================================================================================
-// function : MakeWire()
-// purpose  : Make a wire from a list containing one or more edges or wires that can
-// be connected
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeWire( const GEOM::GEOM_Gen::ListOfIOR& ListShapes )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  BRepBuilderAPI_MakeWire MW ;
-  TopoDS_Shape tds, Shape ; 
-  
-  try {
-    for ( unsigned int i = 0; i < ListShapes.length(); i++) {
-      GEOM::GEOM_Shape_var aShape = GetIORFromString( ListShapes[i] );    
-      Shape = GetTopoShape(aShape) ;
-      if( Shape.IsNull() ) {
-       THROW_SALOME_CORBA_EXCEPTION("MakeWire aborted : null shape during operation", SALOME::BAD_PARAM);
-      }
-      if( Shape.ShapeType() == TopAbs_EDGE )
-       MW.Add( TopoDS::Edge(Shape) ) ;
-      if (Shape.ShapeType() == TopAbs_WIRE ) 
-       MW.Add( TopoDS::Wire(Shape) ) ;
-    }    
-    tds = MW  ;
-
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeWire", SALOME::BAD_PARAM);
-  }
-  
-  if( tds.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Wire operation aborted : null result", SALOME::BAD_PARAM);
-  }
-  else {
-    result = CreateObject(tds) ;
-    InsertInLabelMoreArguments(tds, result, ListShapes, myCurrentOCAFDoc) ;   
-  }
-  return result;
-}
-
-
-//=================================================================================
-// function : MakeRevolution()
-// purpose  : 
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeRevolution(GEOM::GEOM_Shape_ptr myShape,
-                                         const GEOM::AxisStruct& axis,
-                                         double angle)
-  throw (SALOME::SALOME_Exception)
-{ 
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  TopoDS_Shape aShape = GetTopoShape(myShape) ;
-  if( aShape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Revolution aborted : null shape", SALOME::BAD_PARAM);
-  }
-  try {
-    gp_Pnt P(axis.x, axis.y, axis.z) ;
-    gp_Dir D(axis.vx, axis.vy, axis.vz);
-    gp_Ax1 AX(P,D);
-    tds = BRepPrimAPI_MakeRevol(aShape, AX, angle);
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeRevolution", SALOME::BAD_PARAM);
-  }
-  
-  if( tds.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Revolution aborted", SALOME::BAD_PARAM);
-  }
-  result = CreateObject(tds) ;
-  InsertInLabelOneArgument(aShape, myShape, tds, result, myCurrentOCAFDoc) ;
-  return result ;     
-}
-
-
-//=================================================================================
-// function : MakePipe()
-// purpose  : Create a shape by sweeping a baseShape along a pathShape
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakePipe( GEOM::GEOM_Shape_ptr pathShape,
-                                    GEOM::GEOM_Shape_ptr baseShape )
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  TopoDS_Wire aWire ;
-  TopoDS_Shape pathTds = GetTopoShape(pathShape) ;
-  TopoDS_Shape baseTds = GetTopoShape(baseShape) ;
-
-  if( baseTds.IsNull() || pathTds.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("MakePipe aborted : null shape argument", SALOME::BAD_PARAM);
-  }
-
-  if( pathTds.ShapeType() == TopAbs_WIRE ) {
-    aWire = TopoDS::Wire(pathTds) ;
-  }
-  else {
-    if ( pathTds.ShapeType() == TopAbs_EDGE ) {
-      TopoDS_Edge aEdge = TopoDS::Edge(pathTds) ;
-      aWire = BRepBuilderAPI_MakeWire(aEdge);
-    }
-    else {
-      THROW_SALOME_CORBA_EXCEPTION("MakePipe aborted : bad shape type", SALOME::BAD_PARAM);
-    }
-  }
-
-  try {
-    tds = BRepOffsetAPI_MakePipe(aWire, baseTds) ;
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakePipe", SALOME::BAD_PARAM);
-  }
-  
-  if (  !IsValid(tds) ) {
-    THROW_SALOME_CORBA_EXCEPTION("MakePipe aborted : non valid shape result", SALOME::BAD_PARAM);
-  }
-  else {
-    result = CreateObject(tds) ;
-
-    /* Insert arguments in ocaf */
-    GEOM::GEOM_Gen::ListOfIOR_var ListShapes = new GEOM::GEOM_Gen::ListOfIOR;
-    ListShapes->length(2);
-    ListShapes[0] = GetStringFromIOR(GEOM::GEOM_Shape::_duplicate(pathShape)) ;
-    ListShapes[1] = GetStringFromIOR(GEOM::GEOM_Shape::_duplicate(baseShape)) ;    
-    InsertInLabelMoreArguments(tds, result, ListShapes, myCurrentOCAFDoc) ;
-  }
-  return result ;
-}
-
-
-//=================================================================================
-// function : MakePrism()
-// purpose  : uses myShape as base and the vector P1 to P2
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakePrism( GEOM::GEOM_Shape_ptr myShape,
-                                          const GEOM::PointStruct& P1,
-                                          const GEOM::PointStruct& P2 )
-  throw (SALOME::SALOME_Exception)
-{              
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  TopoDS_Shape aShape = GetTopoShape(myShape) ;
-  if( aShape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Prism aborted : null shape operation", SALOME::BAD_PARAM);
-  }
-  
-  try {
-    gp_Vec Vector (P2.x - P1.x, P2.y - P1.y, P2.z - P1.z) ;
-    tds = BRepPrimAPI_MakePrism(aShape, Vector, Standard_False).Shape() ;
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakePipe", SALOME::BAD_PARAM);
-  }
-  
-  if ( tds.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Prism aborted", SALOME::BAD_PARAM);
-  }
-  else {
-    result = CreateObject(tds) ;     
-    InsertInLabelOneArgument(aShape, myShape, tds, result, myCurrentOCAFDoc) ;
-  }
-  return result ;
-}
-
-
-//=================================================================================
-// function : MakeCDG()
-// purpose  : Create a CDG topology.
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeCDG(GEOM::GEOM_Shape_ptr aShape) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  TopoDS_Shape shape = GetTopoShape(aShape) ;
-  GProp_GProps System;
-  gp_Pnt myCenterMass ;
-
-  if( shape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("MakeCDG aborted : null shape argument", SALOME::BAD_PARAM);
-  }
-  
-  try {
-    if ( shape.ShapeType() == TopAbs_VERTEX) {
-      myCenterMass = BRep_Tool::Pnt(TopoDS::Vertex( shape ));
-    } 
-    else if ( shape.ShapeType() == TopAbs_EDGE || shape.ShapeType() == TopAbs_WIRE ) {
-      BRepGProp::LinearProperties(shape, System);
-      myCenterMass = System.CentreOfMass() ;
-    }
-    else if ( shape.ShapeType() == TopAbs_FACE || shape.ShapeType() == TopAbs_SHELL ) {
-      BRepGProp::SurfaceProperties(shape, System);
-      myCenterMass = System.CentreOfMass() ;
-    }
-    else {
-      BRepGProp::VolumeProperties(shape, System);
-      myCenterMass = System.CentreOfMass() ;
-    }
-
-    tds = BRepBuilderAPI_MakeVertex(myCenterMass).Shape() ;
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeCDG", SALOME::BAD_PARAM);
-  }
-  
-  if ( tds.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Make CDG aborted : null shape result", SALOME::BAD_PARAM);
-  }
-  else {
-    result = CreateObject(tds) ;     
-    InsertInLabelOneArgument(shape, aShape, tds, result, myCurrentOCAFDoc) ;
-  }
-  return result ; 
-}
-
-
-//=================================================================================
-// function : Archimede()
-// purpose  :
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::Archimede(GEOM::GEOM_Shape_ptr aShape,
-                                    CORBA::Double aWeight,
-                                    CORBA::Double aWaterDensity,
-                                    CORBA::Double aMeshingDeflection)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-
-  double cste = -1;
-  if (aWaterDensity != 0.)
-    cste = aWeight/aWaterDensity;
-  else
-    THROW_SALOME_CORBA_EXCEPTION("Water density is null", SALOME::BAD_PARAM);
-
-  TopoDS_Shape shape = GetTopoShape(aShape) ;
-  if( shape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Shape is null", SALOME::BAD_PARAM);
-  }
-
-  gp_Dir direct(0.0,0.0,1.0);
-  gp_Pnt PosPlan(0.0,0.0,0.0);
-  Geom_Plane PP (PosPlan,direct);
-  Handle(Geom_Geometry) G = PP.Copy();
-  Handle(Geom_Plane) P = Handle(Geom_Plane)::DownCast(G);
-
-  gp_Dir Zdirection(0.0,0.0,1.0);
-  VolumeSection VOL( shape, aMeshingDeflection);
-  VOL.SetPlane(P);
-  Handle (Geom_RectangularTrimmedSurface) SurfaceTrimmee;
-  
-  if(Zdirection.IsEqual(direct,Precision::Angular()) == Standard_False) { 
-    VOL.MakeRotation(direct);
-  }
-  
-  VOL.CenterOfGravity();
-  SurfaceTrimmee = VOL.TrimSurf();
-  Standard_Real Cote = VOL.Archimede( cste, aMeshingDeflection );
-  
-  if ( Cote == -1 ) {
-    double Zmin,Zmax;
-    VOL.getZ(Zmin,Zmax);
-    double volume = VOL.CalculateVolume( Zmax ) * aWaterDensity;
-
-    char msg[100]="";  
-    sprintf(msg, "shape sinks to the bottom : Weigth max = %.1f", volume);
-
-    THROW_SALOME_CORBA_EXCEPTION(msg, SALOME::BAD_PARAM);
-  }
-  
-  SurfaceTrimmee=VOL.AjustePlan(SurfaceTrimmee,Cote,PosPlan);
-  if(Zdirection.IsEqual(direct,Precision::Angular()) == Standard_False) { 
-    SurfaceTrimmee=VOL.InvMakeRotation(direct,SurfaceTrimmee);
-  }
-  
-  Standard_Real u1,u2,v1,v2;
-  SurfaceTrimmee->Bounds(u1,u2,v1,v2);
-  TopoDS_Face tirant = BRepBuilderAPI_MakeFace(SurfaceTrimmee, u1, u2, v1, v2);
-  
-  if (tirant.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Result is null", SALOME::BAD_PARAM);
-  }
-
-  result = CreateObject(tirant);
-  InsertInLabelOneArgument(shape, aShape, tirant, result, myCurrentOCAFDoc) ;
-
-  return result;  
-}
-
-
-//================================================================================
-// function : MakeFillet()
-// purpose  : Create a cylinder topology
-//================================================================================
-GEOM::GEOM_Shape_ptr  GEOM_Gen_i::MakeFillet( GEOM::GEOM_Shape_ptr shape,
-                                             CORBA::Double radius,
-                                             CORBA::Short ShapeType,
-                                             const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID ) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Shape tds ;
-
-  const TopoDS_Shape aShape = GetTopoShape(shape) ;
-  if( aShape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Shape is null", SALOME::BAD_PARAM);
-  }
-
-  BRepFilletAPI_MakeFillet fill(aShape);
-
-  try {
-    /* case all */
-    if(ListOfID.length() == 0) {
-      TopExp_Explorer Exp ( aShape, TopAbs_EDGE );
-      for (Exp; Exp.More(); Exp.Next()) {
-       TopoDS_Edge E =TopoDS::Edge(Exp.Current());
-       fill.Add(E);
-      }
-      for (int i = 1;i<=fill.NbContours();i++) {
-#if OCC_VERSION_MAJOR >= 5
-       fill.SetRadius(radius,i,i);
-#else
-       fill.SetRadius(radius,i);
-#endif
-      }
-      tds = fill.Shape();
-      
-    } else {
-
-      /* case selection */               
-      for ( unsigned int ind = 0; ind < ListOfID.length(); ind++ ) {
-       TopoDS_Shape ss ;
-       if( GetShapeFromIndex( aShape, (TopAbs_ShapeEnum)ShapeType, ListOfID[ind], ss ) ) {
-         TopoDS_Edge E = TopoDS::Edge(ss) ;
-         fill.Add( E );
-       }
-      }
-      for (int i = 1;i<=fill.NbContours();i++) {
-#if OCC_VERSION_MAJOR >= 5
-       fill.SetRadius(radius,i,i);
-#else
-       fill.SetRadius(radius,i);
-#endif
-      }
-      tds = fill.Shape();
-    }
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeFillet", SALOME::BAD_PARAM);
-  }
-  
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Fillet aborted", SALOME::BAD_PARAM);
-  } 
-  result = CreateObject(tds);
-  InsertInLabelOneArgument(aShape, shape, tds, result, myCurrentOCAFDoc) ;
-
-  return result ;  
-}
-
-//================================================================================
-// function : MakeFilletR1R2()
-// purpose  : Create a cylinder topology
-//================================================================================
-GEOM::GEOM_Shape_ptr  GEOM_Gen_i::MakeFilletR1R2( GEOM::GEOM_Shape_ptr shape,
-                                                 CORBA::Double radius1,
-                                                 CORBA::Double radius2,
-                                                 CORBA::Short ShapeType,
-                                                 const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID ) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Shape tds ;
-
-  const TopoDS_Shape aShape = GetTopoShape(shape) ;
-  if( aShape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Shape is null", SALOME::BAD_PARAM);
-  }
-
-  BRepFilletAPI_MakeFillet fill(aShape);
-
-  try {
-    /* case all */
-    if(ListOfID.length() == 0) {
-      TopExp_Explorer Exp ( aShape, TopAbs_EDGE );
-      for (Exp; Exp.More(); Exp.Next()) {
-       TopoDS_Edge E =TopoDS::Edge(Exp.Current());
-       fill.Add(E);
-      }
-      for (int i = 1;i<=fill.NbContours();i++) {
-#if OCC_VERSION_MAJOR >= 5
-       fill.SetRadius(radius1,radius2,i,i);
-#else
-       fill.SetRadius(radius1,radius2,i);
-#endif
-      }
-      tds = fill.Shape();
-      
-    } else {
-
-      /* case selection */               
-      for ( unsigned int ind = 0; ind < ListOfID.length(); ind++ ) {
-       TopoDS_Shape ss ;
-       if( GetShapeFromIndex( aShape, (TopAbs_ShapeEnum)ShapeType, ListOfID[ind], ss ) ) {
-         TopoDS_Edge E = TopoDS::Edge(ss) ;
-         fill.Add( E );
-       }
-      }
-      for (int i = 1;i<=fill.NbContours();i++) {
-#if OCC_VERSION_MAJOR >= 5
-       fill.SetRadius(radius1,radius2,i,i);
-#else
-       fill.SetRadius(radius1,radius2,i);
-#endif
-      }
-      tds = fill.Shape();
-    }
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeFilletR1R2", SALOME::BAD_PARAM);
-  }
-  
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Fillet aborted", SALOME::BAD_PARAM);
-  } 
-  result = CreateObject(tds);
-  InsertInLabelOneArgument(aShape, shape, tds, result, myCurrentOCAFDoc) ;
-
-  return result ;  
-}
-
-//================================================================================
-// function : MakeChamfer
-// purpose  : Create a Chamfer topology
-//================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeChamfer( GEOM::GEOM_Shape_ptr shape,
-                                             CORBA::Double d1,
-                                             CORBA::Double d2,
-                                             CORBA::Short ShapeType,
-                                             const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID ) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Shape tds ;
-
-  const TopoDS_Shape aShape = GetTopoShape(shape) ;
-  if( aShape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Shape is null", SALOME::BAD_PARAM);
-  }
-  
-  BRepFilletAPI_MakeChamfer MC(aShape);
-
-  try {
-    /* case all */
-    TopTools_IndexedDataMapOfShapeListOfShape M;
-    TopExp::MapShapesAndAncestors(aShape,TopAbs_EDGE,TopAbs_FACE,M);
-    if(ListOfID.length() == 0) {
-      for (int i = 1;i<=M.Extent();i++) {
-       TopoDS_Edge E = TopoDS::Edge(M.FindKey(i));
-       TopoDS_Face F = TopoDS::Face(M.FindFromIndex(i).First());
-       if (!BRepTools::IsReallyClosed(E, F) && !BRep_Tool::Degenerated(E))
-         MC.Add(d1,d2,E,F);
-      }
-      tds = MC.Shape();
-
-    } else {
-
-      /* case selection */  
-      for ( unsigned int ind = 0; ind < ListOfID.length(); ind++ ) {
-       TopoDS_Shape ss ;
-       if( GetShapeFromIndex( aShape, (TopAbs_ShapeEnum)ShapeType, ListOfID[ind], ss ) ) {
-         TopoDS_Edge E = TopoDS::Edge( ss ) ;
-         TopoDS_Face F = TopoDS::Face(M.FindFromKey(E).First());
-         if (!BRepTools::IsReallyClosed(E, F) && !BRep_Tool::Degenerated(E))
-           MC.Add(d1,d2,E,F);
-       }
-      }
-      tds = MC.Shape();
-    }
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeChamfer", SALOME::BAD_PARAM);
-  }
-  
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Chamfer aborted", SALOME::BAD_PARAM);
-  } 
-  result = CreateObject(tds);
-  InsertInLabelOneArgument(aShape, shape, tds, result, myCurrentOCAFDoc) ;
-
-  return result ;
-}
-
-//================================================================================
-// function : MakeChamferAD
-// purpose  : Create a Chamfer topology by Lenght & Angle
-//================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeChamferAD( GEOM::GEOM_Shape_ptr shape,
-                                               CORBA::Double d,
-                                               CORBA::Double angle,
-                                               CORBA::Short ShapeType,
-                                               const GEOM::GEOM_Shape::ListOfSubShapeID& ListOfID ) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result;
-  TopoDS_Shape tds ;
-
-  const TopoDS_Shape aShape = GetTopoShape(shape) ;
-  if( aShape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Shape is null", SALOME::BAD_PARAM);
-  }
-  
-  BRepFilletAPI_MakeChamfer MC(aShape);
-
-  try {
-    /* case all */
-    TopTools_IndexedDataMapOfShapeListOfShape M;
-    TopExp::MapShapesAndAncestors(aShape,TopAbs_EDGE,TopAbs_FACE,M);
-    if(ListOfID.length() == 0) {
-      for (int i = 1;i<=M.Extent();i++) {
-       TopoDS_Edge E = TopoDS::Edge(M.FindKey(i));
-       TopoDS_Face F = TopoDS::Face(M.FindFromIndex(i).First());
-       if (!BRepTools::IsReallyClosed(E, F) && !BRep_Tool::Degenerated(E))
-         MC.AddDA(d,angle,E,F);
-      }
-      tds = MC.Shape();
-
-    } else {
-
-      /* case selection */  
-      for ( unsigned int ind = 0; ind < ListOfID.length(); ind++ ) {
-       TopoDS_Shape ss ;
-       if( GetShapeFromIndex( aShape, (TopAbs_ShapeEnum)ShapeType, ListOfID[ind], ss ) ) {
-         TopoDS_Edge E = TopoDS::Edge( ss ) ;
-         TopoDS_Face F = TopoDS::Face(M.FindFromKey(E).First());
-         if (!BRepTools::IsReallyClosed(E, F) && !BRep_Tool::Degenerated(E))
-           MC.AddDA(d,angle,E,F);
-       }
-      }
-      tds = MC.Shape();
-    }
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeChamferAD", SALOME::BAD_PARAM);
-  }
-  
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make ChamferAD aborted", SALOME::BAD_PARAM);
-  } 
-  result = CreateObject(tds);
-  InsertInLabelOneArgument(aShape, shape, tds, result, myCurrentOCAFDoc) ;
-  return result ;
-}
-
-//=================================================================================
-// function : CheckShape()
-// purpose  :
-//=================================================================================
-CORBA::Boolean GEOM_Gen_i::CheckShape(GEOM::GEOM_Shape_ptr shape) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  TopoDS_Shape S = GetTopoShape(shape) ;
-  if( S.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("Shape is null", SALOME::BAD_PARAM);
-  }
-
-  BRepCheck_Analyzer ana(S,false);
-  if (ana.IsValid()) 
-    return 1;
-
-  return 0;
-}
-
-//=================================================================================
-// function : MakePlacedBox()
-// purpose  :
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakePlacedBox(CORBA::Double x1,  CORBA::Double y1,  CORBA::Double z1,
-                                        CORBA::Double delta1, CORBA::Double delta2, CORBA::Double delta3)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-
-  CORBA::Double x2, y2, z2 ;
-
-  try {
-    x2 = x1 + delta1 ;
-    y2 = y1 + delta2 ;
-    z2 = z1 + delta3 ;
-    
-    gp_Pnt P1(x1,y1,z1);
-    gp_Pnt P2(x2,y2,z2);
-    
-    tds = BRepPrimAPI_MakeBox(P1,P2).Shape();
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakeBox", SALOME::BAD_PARAM);
-  }
-  
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make Box aborted : null shape", SALOME::BAD_PARAM);
-  } 
-  
-  result = CreateObject(tds);
-  const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-  result->ShapeId(entry) ;
-
-  return result;  
-}
-
-//=================================================================================
-// function : MakePanel()
-// purpose  :
-//=================================================================================
-GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakePanel(GEOM::GEOM_Shape_ptr shape,
-                                    CORBA::Short directiontype,
-                                    CORBA::Double delta)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  GEOM::GEOM_Shape_var result ;
-  TopoDS_Shape tds ;
-  TopoDS_Shape aShape = GetTopoShape(shape) ;
-  Bnd_Box B ;
-  Standard_Real axmin,aymin,azmin,axmax,aymax,azmax ;
-  GEOM::PointStruct pstruct1, pstruct2, pstruct3, pstruct4 ;
-
-  if(aShape.IsNull() ) {
-    THROW_SALOME_CORBA_EXCEPTION("MakePanel aborted : null shape during operation", SALOME::BAD_PARAM);
-  }  
-
-  try {
-    BRepBndLib::Add(aShape,B);
-    B.Enlarge(10.);
-    B.Get(axmin,aymin,azmin,axmax,aymax,azmax);
-    
-    switch (directiontype)
-      {
-      case 1 :   /* X */
-       pstruct1 = MakePointStruct( delta, aymin, azmin ) ;
-       pstruct2 = MakePointStruct( delta, aymin, azmax ) ;
-       pstruct3 = MakePointStruct( delta, aymax, azmax ) ;
-       pstruct4 = MakePointStruct( delta, aymax, azmin ) ;
-       break ;
-      case 2 :   /* Y */
-       pstruct1 = MakePointStruct( axmin, delta, azmin ) ;
-       pstruct2 = MakePointStruct( axmin, delta, azmax ) ;
-       pstruct3 = MakePointStruct( axmax, delta, azmax ) ;
-       pstruct4 = MakePointStruct( axmax, delta, azmin ) ;
-       break ;
-      case 3 :   /* Z */
-       pstruct1 = MakePointStruct( axmin, aymin, delta ) ;
-       pstruct2 = MakePointStruct( axmin, aymax, delta ) ;
-       pstruct3 = MakePointStruct( axmax, aymax, delta ) ;
-       pstruct4 = MakePointStruct( axmax, aymin, delta ) ;
-       break ;
-      default :
-       return result ;
-      }
-    
-    GEOM::GEOM_Shape_ptr Edge1 = MakeEdge(pstruct1, pstruct2);
-    GEOM::GEOM_Shape_ptr Edge2 = MakeEdge(pstruct2, pstruct3);
-    GEOM::GEOM_Shape_ptr Edge3 = MakeEdge(pstruct3, pstruct4);
-    GEOM::GEOM_Shape_ptr Edge4 = MakeEdge(pstruct4, pstruct1);
-    
-    GEOM::GEOM_Gen::ListOfIOR_var aList = new GEOM::GEOM_Gen::ListOfIOR;
-    aList->length(4);
-    aList[0]=CORBA::string_dup(Edge1->Name());
-    aList[1]=CORBA::string_dup(Edge2->Name());
-    aList[2]=CORBA::string_dup(Edge3->Name());
-    aList[3]=CORBA::string_dup(Edge4->Name());
-    
-    GEOM::GEOM_Shape_ptr aWire = MakeWire( aList );
-    GEOM::GEOM_Shape_ptr aFace = MakeFace( aWire, true ) ;
-    tds = GetTopoShape(aFace);
-    
-  }
-  catch(Standard_Failure) {
-    THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::MakePanel", SALOME::BAD_PARAM);
-  }
-  
-  if (tds.IsNull()) {
-    THROW_SALOME_CORBA_EXCEPTION("Make PanelsPartition aborted : null shape", SALOME::BAD_PARAM);
-  } 
-  
-  result = CreateObject(tds); 
-  const char *entry = InsertInLabel(tds, result->Name(), myCurrentOCAFDoc) ;
-  result->ShapeId(entry) ;
-  
-  return result;
-}
-
-
-void GEOM_Gen_i::ExportIGES(const char* filename,GEOM::GEOM_Shape_ptr theShape) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  if (theShape->_is_nil()) 
-    {
-      THROW_SALOME_CORBA_EXCEPTION("Export IGES aborted", SALOME::BAD_PARAM);
-    } 
-  TopoDS_Shape tds = GetTopoShape(theShape);
-  if (tds.IsNull()) 
-    {
-      THROW_SALOME_CORBA_EXCEPTION("Export IGES aborted", SALOME::BAD_PARAM);
-    } 
-  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 (tds);
-      ICW.ComputeModel();
-      char * aname = strdup(filename);
-      Standard_Boolean result = ICW.Write( aname );
-      free(aname);
-    }
-  catch(Standard_Failure) 
-    {
-      THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::ExportIGES", SALOME::BAD_PARAM);
-    }
-}
-
-void GEOM_Gen_i::ExportBREP(const char* filename,GEOM::GEOM_Shape_ptr theShape)
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  if (theShape->_is_nil()) 
-    {
-      THROW_SALOME_CORBA_EXCEPTION("Export BRep aborted", SALOME::BAD_PARAM);
-    } 
-  TopoDS_Shape tds = GetTopoShape(theShape);
-  if (tds.IsNull()) 
-    {
-      THROW_SALOME_CORBA_EXCEPTION("Export BRep aborted", SALOME::BAD_PARAM);
-    } 
-  try 
-    {
-      char * aname = strdup(filename);
-      Standard_Boolean result = BRepTools::Write(tds,aname);
-      free(aname);
-    }
-  catch(Standard_Failure) 
-    {
-      THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::ExportBREP", SALOME::BAD_PARAM);
-    }
-}
-
-void GEOM_Gen_i::ExportSTEP(const char* filename,GEOM::GEOM_Shape_ptr theShape) 
-  throw (SALOME::SALOME_Exception)
-{
-  Unexpect aCatch(SALOME_SalomeException);
-  if (theShape->_is_nil()) 
-    {
-      THROW_SALOME_CORBA_EXCEPTION("Export STEP aborted", SALOME::BAD_PARAM);
-    } 
-  TopoDS_Shape tds = GetTopoShape(theShape);
-  if (tds.IsNull()) 
-    {
-      THROW_SALOME_CORBA_EXCEPTION("Export STEP aborted", SALOME::BAD_PARAM);
-    } 
-  try 
-    {
-      IFSelect_ReturnStatus status ;
-      //VRV: OCC 4.0 migration
-      STEPControl_Writer aWriter;
-      status = aWriter.Transfer( tds, STEPControl_ManifoldSolidBrep ) ;
-      //VRV: OCC 4.0 migration
-      if ( status == IFSelect_RetDone ) 
-       {
-         char * aname = strdup(filename);
-         status = aWriter.Write( aname ) ;
-         free(aname);
-       }
-    }
-  catch(Standard_Failure) 
-    {
-      THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::ExportBREP", SALOME::BAD_PARAM);
-    }
-}
-
-
-//=====================================================================================
-// EXPORTED METHODS
-//=====================================================================================
-extern "C"
-{
-  PortableServer::ObjectId * GEOMEngine_factory(CORBA::ORB_ptr orb,
-                                               PortableServer::POA_ptr poa, 
-                                               PortableServer::ObjectId * contId,
-                                               const char *instanceName, 
-                                               const char * interfaceName)
-  {
-   GEOM_Gen_i * myGEOM_Gen_i = new GEOM_Gen_i(orb, poa, contId, instanceName, interfaceName);
-   myGEOM_Gen_i->register_name("/myGEOM_Gen"); // NRI : 11/07/2002 : Add for Supervision example 
-   return myGEOM_Gen_i->getId() ;
-  }
-}
-
index 0e4a71296ff81e74fa4e16b3b2f5686d9de2949a..699a7b8f307714e5c9022a07f0146445b82b81cd 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
index 67781992d1609c1e08380024a64ce0f5f62b09c7..824cb60ed179bce3a680aed281d8e8cb98cfbd3d 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_IOperations_HXX_
 #define _GEOM_IOperations_HXX_
 
@@ -62,7 +63,7 @@ class GEOM_IOperations
  
   //Returns an error code of the last operatioin
   Standard_EXPORT char* GetErrorCode() {
-    return _errorCode.ToCString();    
+    return (char*) _errorCode.ToCString();    
   }
   
   //Returns a pointer to  GEOM_Engine which this operation interface is associated
index 8b3f1430b18f90f9bc8cdc58a5c2d85c628d97b5..492b96f56c565d763a7ed092a83686dbc5632968 100644 (file)
@@ -1,26 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 // NOTE: This is an intreface to a function for the Shapes
 // (Wire, Face, Shell, Solid and Compound) creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #include "TColStd_HSequenceOfTransient.hxx"
index 6d5174d4d1245b31f7d14f888cbc973e8e103e26..672ce783575ebcf7c3af21383e8c4e80accca73e 100644 (file)
@@ -1,21 +1,23 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #include <Standard_Stream.hxx>
 
@@ -88,7 +90,9 @@ Handle(GEOM_Object) GEOM_Object::GetObject(TDF_Label& theLabel)
 
   GEOM_Engine* anEngine=  GEOM_Engine::GetEngine();
   if(anEngine == NULL) return NULL;
-  return anEngine->GetObject(anID->Get(), anEntry.ToCString());
+  return anEngine->GetObject(anID->Get(), (char*) anEntry.ToCString());
+
+
 }
 
 //=============================================================================
@@ -378,6 +382,31 @@ TCollection_AsciiString GEOM_Object::GetAuxData()
   return aData;
 }
 
+//=============================================================================
+/*!
+ *  SetParameters
+ */
+//=============================================================================
+void GEOM_Object::SetParameters(const TCollection_AsciiString& theParameters)
+{
+  if( _parameters.IsEmpty() )
+    _parameters = theParameters;
+  else {
+    _parameters += "|";
+    _parameters += theParameters;
+  }
+}
+
+//=============================================================================
+/*!
+ *  GetParameters
+ */
+//=============================================================================
+TCollection_AsciiString GEOM_Object::GetParameters() const
+{
+  return _parameters;
+}
+
 
 //=============================================================================
 /*!
index 7d8eda71bdde9c29a32249209cf8b876428419ad..67f309bb0f5b2ce45b51fcebbc0ee946f9c87805 100644 (file)
@@ -1,21 +1,23 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _GEOM_Object_HeaderFile
 #define _GEOM_Object_HeaderFile
@@ -219,6 +221,12 @@ class GEOM_Object : public MMgt_TShared
   //Returns an auxiliary data
   Standard_EXPORT TCollection_AsciiString GetAuxData();
 
+  //Set a notebook variables used for object creation
+  Standard_EXPORT void SetParameters(const TCollection_AsciiString& theParameters);
+
+  //Get a notebook variables used for object creation
+  Standard_EXPORT TCollection_AsciiString GetParameters() const;
+
   //###########################################################
   // Sub shape methods
   //###########################################################
@@ -270,6 +278,7 @@ class GEOM_Object : public MMgt_TShared
   Handle(TDataStd_TreeNode) _root;
   TDF_Label                 _label;
   TCollection_AsciiString   _ior;
+  TCollection_AsciiString   _parameters;
 };
 
 #endif
index 41b9c184f84e1e9acb5ecbcb57e3fbd92cfd20b6..8f41434040417df82c8bbaa67760ca988c1177a9 100644 (file)
@@ -1,22 +1,24 @@
-//  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
-
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 "GEOM_PythonDump.hxx"
 
 #include <TDF_Tool.hxx>
@@ -117,7 +119,7 @@ namespace GEOM
     TDF_Tool::TagList(theObj1->GetEntry(), aTags1);
     TDF_Tool::TagList(theObj2->GetEntry(), aTags2);
     TColStd_ListIteratorOfListOfInteger aListIter1(aTags1), aListIter2(aTags2);
-    for (; aListIter1.More(); aListIter1.Next()) {
+    for (; aListIter1.More(); aListIter1.Next(), aListIter2.Next()) {
       if (!aListIter2.More())
         return theObj1; // anObj1 is stored under anObj2
 
index 4e87df1508fb0607c1b6b727c971f5f08b995351..43c63133e5c7995c7eb0ae583332c31264a86287 100644 (file)
@@ -1,22 +1,24 @@
-//  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
-
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 _GEOM_PYTHONDUMP_HXX_
 #define _GEOM_PYTHONDUMP_HXX_
 
index 0414a123ba70a6a77a44390356a9030c758fb4db..4967c088b67db1b19c77c65d9b9111bd019069c5 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 "GEOM_Solver.hxx"
 #include <TDF_Label.hxx>
 #include <TFunction_Function.hxx>
index 03dc0c5d22f344f18382a90a354ad6a7805be99b..acc4e11943df6ea4b763d3bb4ff70ab49797ae05 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_Solver_HXX_
 #define _GEOM_Solver_HXX_
 
index b756d570eac128ae4f4acbc87b50f47b97eb159e..12d62e5a1cf5e0e25f0e33d2c58e3b69eb0fbe18 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOM_SubShapeDriver.hxx>
index bfe80e8474b94ade6aa5d8a68feb8e79831f74be..fde1c6b16c5d835223e9df018f5503a30ec82ce1 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_ShapeDriver.ixx
 //  Module : GEOM
-
+//
 #ifndef _GEOM_SubShapeDriver_HeaderFile
 #define _GEOM_SubShapeDriver_HeaderFile
 
index f8e3b285d683ee5d623c097f0c0728cfd44a1fa9..f7f21d156aed3e0122ec7f94a228b3b231ec9c0d 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : Handle_GEOM_Application.hxx
 //  Module : GEOM
-
+//
 #ifndef _Handle_GEOM_Application_HeaderFile
 #define _Handle_GEOM_Application_HeaderFile
 
index f0800cdff0677f25f3ed17e02280062951ff8045..9458f5db485415496cd9e1819aaa5616deaa1d7c 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
 //  Module : GEOM
-
+//
 #ifndef _Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
 #define _Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
 
index 9eea77f170145c3879ce0cc90020158ed67e3be4..4ab7a8b7c3b2f5e7964a761bc9f6288a0e001f44 100644 (file)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-
 #  File   : Makefile.in
 #  Author : Damien COQUERET (OCC)
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header: 
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
 
 lib_LTLIBRARIES = libGEOMbasic.la
 
-dist_libGEOMbasic_la_SOURCES = \
-       GEOM_Application.cxx \
-       GEOM_Engine.cxx \
-       GEOM_Function.cxx \
-       GEOM_Object.cxx \
-       GEOM_IOperations.cxx \
-       GEOM_Solver.cxx \
-       GEOM_SubShapeDriver.cxx \
-       GEOM_PythonDump.cxx \
-       GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx \
-       GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx \
+dist_libGEOMbasic_la_SOURCES =         \
+       GEOM_Application.cxx            \
+       GEOM_Engine.cxx                 \
+       GEOM_Function.cxx               \
+       GEOM_Object.cxx                 \
+       GEOM_IOperations.cxx            \
+       GEOM_Solver.cxx                 \
+       GEOM_SubShapeDriver.cxx         \
+       GEOM_PythonDump.cxx             \
+       GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx           \
+       GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx       \
        GEOM_DataMapOfAsciiStringTransient_0.cxx
 
-#LIB_CLIENT_IDL = 
-#LIB_SERVER_IDL = 
-
-# Executables targets
-#BIN =
-#BIN_SRC =
-#BIN_CLIENT_IDL = 
-#BIN_SERVER_IDL = 
-
 # header files 
-salomeinclude_HEADERS = \
-       GEOM_Application.hxx \
-       Handle_GEOM_Application.hxx \
-       GEOM_Engine.hxx \
-       GEOM_Function.hxx \
-       GEOM_Object.hxx \
-       GEOM_IOperations.hxx \
-       GEOM_ISubShape.hxx \
-       GEOM_Solver.hxx \
-       GEOM_PythonDump.hxx \
-       GEOM_DataMapOfAsciiStringTransient.hxx \
+salomeinclude_HEADERS =                        \
+       GEOM_Application.hxx            \
+       GEOM_Application.ixx            \
+       GEOM_Application.jxx            \
+       Handle_GEOM_Application.hxx     \
+       GEOM_Engine.hxx                 \
+       GEOM_Function.hxx               \
+       GEOM_Object.hxx                 \
+       GEOM_SubShapeDriver.hxx         \
+       GEOM_IOperations.hxx            \
+       GEOM_ISubShape.hxx              \
+       GEOM_Solver.hxx                 \
+       GEOM_PythonDump.hxx             \
+       GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx         \
+       GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx             \
+       GEOM_DataMapOfAsciiStringTransient.hxx                          \
        Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
 
-# additionnal information to compil and link file
-libGEOMbasic_la_CPPFLAGS = \
-       $(CORBA_CXXFLAGS) \
-        $(CORBA_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(BOOST_CPPFLAGS) \
-       -I$(top_builddir)/idl \
+# additional information to compile and link file
+
+libGEOMbasic_la_CPPFLAGS =     \
+       $(CORBA_CXXFLAGS)       \
+        $(CORBA_INCLUDES)      \
+       $(CAS_CPPFLAGS)         \
+       $(KERNEL_CXXFLAGS)      \
+       $(BOOST_CPPFLAGS)       \
+       -I$(top_builddir)/idl   \
        -I$(top_builddir)/salome_adm/unix
 
-libGEOMbasic_la_LDFLAGS  = \
-       $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
-       $(STDLIB) \
-       $(CAS_LDPATH) -lTKXSBase \
-       $(CAS_OCAF) \
+libGEOMbasic_la_LDFLAGS  =                     \
+       $(KERNEL_LDFLAGS) -lSALOMELocalTrace    \
+       $(STDLIB)                               \
+       $(CAS_LDPATH) -lTKXSBase                \
+       $(CAS_OCAF)                             \
        $(CAS_OCAFVIS) 
diff --git a/src/GEOM/geom.cxx b/src/GEOM/geom.cxx
deleted file mode 100644 (file)
index 8ac0deb..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-//  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
-//
-//
-//
-//  File   : geom.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
-#include <Standard_Stream.hxx>
-
-#include <CORBA.h>
-#include <GEOM_Gen_i.hh>
-#include <SALOME_NamingService.hxx>
-
-//==================================================================================
-// function : main()                      MAIN 
-// purpose  :
-//==================================================================================
-int main(int argc, char** argv)
-{
-  try {
-    // Create and initialise the ORB.
-    //    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "omniORB4");
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "omniORB3");
-    
-    // Obtain a reference to the root POA.
-    CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
-    PortableServer::POA_var poa = PortableServer::POA::_narrow(obj);
-
-    // We allocate the objects on the heap.  Since these are reference
-    // counted objects, they will be deleted by the POA when they are no
-    // longer needed.    
-#ifdef WNT
-    GEOM_Gen_i * myGEOM_Gen_i = new GEOM_Gen_i((CORBA::ORB_ptr)orb, poa, 0, 0, 0 );
-#else
-    GEOM_Gen_i * myGEOM_Gen_i = new GEOM_Gen_i(orb);
-#endif
-
-    // Activate the objects.  This tells the POA that the objects are
-    // ready to accept requests.
-    PortableServer::ObjectId_var myGEOM_Gen_iid = poa->activate_object(myGEOM_Gen_i);
-    myGEOM_Gen_i->register_name("/myGEOM_Gen");
-    // Obtain a POAManager, and tell the POA to start accepting
-    // requests on its objects.
-    PortableServer::POAManager_var pman = poa->the_POAManager();
-    pman->activate();
-
-    orb->run();
-    orb->destroy();
-  }
-  catch(CORBA::SystemException&) {
-    cerr << "Caught CORBA::SystemException." << endl;
-  }
-  catch(CORBA::Exception&) {
-    cerr << "Caught CORBA::Exception." << endl;
-  }
-  catch(omniORB::fatalException& fe) {
-    cerr << "Caught omniORB::fatalException:" << endl;
-    cerr << "  file: " << fe.file() << endl;
-    cerr << "  line: " << fe.line() << endl;
-    cerr << "  msg: " << fe.errmsg() << endl;
-  }
-  catch(...) {
-    cerr << "Caught unknown exception." << endl;
-  }
-  return 0;
-}
index 7825011c63ff0af0d4f19410152410e11883fc65..3edbd6ad5abf71cb64c3cb8ae10ceee141e3e739 100644 (file)
@@ -1,27 +1,27 @@
-// 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:       BlockFix.cdl
--- Created:    Tue Dec  7 11:59:05 2004
--- Author:     Pavel Durandin
---             <det@doomox>
----Copyright:  Open CASCADE SA 2004
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:      BlockFix.cdl
+--  Created:   Tue Dec  7 11:59:05 2004
+--  Author:    Pavel Durandin
 
 
 
index eacbd40272b2a6f7a26726e8d068ce0533cf0354..a8c47b09d3a386de8c568ffa037b15383425bfc4 100644 (file)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       BlockFix.cxx
 // Created:    Tue Dec  7 11:59:05 2004
 // Author:     Pavel DURANDIN
-
-
+//
 #include <BlockFix.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
index a6007a7dd44a48251046e3befec854e8bf4d7232..80b04142946658fe151ea59ebd5c3efc775c4d77 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _BlockFix_HeaderFile
 #define _BlockFix_HeaderFile
 
index 9912dd405da872c613ad7b25fcd287a5bc4aa2af..700a7f37a214454227acc23b7205c7ee19f3bf17 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <BlockFix.jxx>
 
  
index 552f4806705c59173ecdcb36d550d7c62200e145..3c9000120953cde12f4a62f74439d3ffb56d9676 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
index 7b415e7cb57c4501cc13b64464e629aabb58039b..6682c18816d08cc2d6c1cbcd5148511ecb034edd 100644 (file)
@@ -1,27 +1,27 @@
-// 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:       BlockFix_BlockFixAPI.cdl
--- Created:    Tue Dec  7 17:56:09 2004
--- Author:     Pavel Durandin
---             <det@doomox>
----Copyright:  Open CASCADE SA 2004
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:      BlockFix_BlockFixAPI.cdl
+--  Created:   Tue Dec  7 17:56:09 2004
+--  Author:    Pavel Durandin
 
 class BlockFixAPI from BlockFix inherits TShared from MMgt
 
index c87b2e60dba6bd3d25c022467e63f0dc5b5ffe1f..62e33fd4ed737cd0e51979d9c0366a469ae19557 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       BlockFix_BlockFixAPI.cxx
 // Created:    Tue Dec  7 11:59:05 2004
 // Author:     Pavel DURANDIN
-// Copyright:  Open CASCADE SA 2004
-
-
+//
 #include <BlockFix_BlockFixAPI.ixx>
 #include <BlockFix.hxx>
 #include <BlockFix_UnionFaces.hxx>
index fd699a0deeb522f78ddbbe6c3fd8b7d9db063287..9bece72c49aefc45d0ef3f44ac8c7f314c972f0e 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _BlockFix_BlockFixAPI_HeaderFile
 #define _BlockFix_BlockFixAPI_HeaderFile
 
index d70496dc096a337fb210427e7ce4267a299e5578..1b68aba321464d8230678ffc31c15690a41706a5 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <BlockFix_BlockFixAPI.jxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 7e28c943d2bbf38dab065216b1b3ebf8761a7f0f..6dee401ac6c22ffa5bedb90692abde606ffeb45a 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _ShapeBuild_ReShape_HeaderFile
 #include <ShapeBuild_ReShape.hxx>
index 7926785d83443b70833acd7b923ba18f67b7be66..883e4fec61f0ea397267dccf427d811db4b33f72 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <BlockFix_BlockFixAPI.hxx>
 
index aa85c32e834e3ef9d38aba02083f1afb7bc1d1cd..3af730581bc7d88a3df5883d88ae7b64ccdae84e 100644 (file)
@@ -1,27 +1,27 @@
-// 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:       BlockFix_CheckTool.cdl
--- Created:    Fri Dec 17 10:36:58 2004
--- Author:     Sergey KUUL
---             <skl@strelox.nnov.matra-dtv.fr>
----Copyright:  Open CASCADE SA 2004
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:      BlockFix_CheckTool.cdl
+--  Created:   Fri Dec 17 10:36:58 2004
+--  Author:    Sergey KUUL
 
 class CheckTool from BlockFix
 
index 94269ef7531e50125f7db17459214dbbeb1871bc..a5d8252559d816fc607f574a6625d94e294f81b4 100644 (file)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      BlockFix_CheckTool.cxx
 // Created:   17.12.04 11:15:25
 // Author:    Sergey KUUL
-// Copyright: Open CASCADE SA 2004
-
+//
 #include <BlockFix_CheckTool.ixx>
 
 #include <BRep_Tool.hxx>
index 605174576c4bec529620d900311ea97d644f6828..89c32a9fc58c47d268b9d2cdb48e25b581a5f669 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _BlockFix_CheckTool_HeaderFile
 #define _BlockFix_CheckTool_HeaderFile
 
index c7e4949ab685a8d5a2a179d4df1656759b6693d9..a0af6be717f4394f57f458efb8f4cbe9794ed32c 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <BlockFix_CheckTool.jxx>
 
  
index b9ba94f328d02dfdcd7eabbdccb1029a1bced85c..017d344bace43189b5982f38f63c3f5efd36e535 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
index 23551c0cb116ab9f22eaaddeae159b4a4359b781..06eedfc9f6e3951c82676270d7124c7f3f2846a5 100644 (file)
@@ -1,27 +1,26 @@
-// 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:       BlockFix_PeriodicSurfaceModifier.cdl
--- Created:    Wed Dec 15 10:03:50 2004
--- Author:     Sergey KUUL
---             <skl@strelox.nnov.matra-dtv.fr>
----Copyright:  Open CASCADE SA 2004
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:      BlockFix_PeriodicSurfaceModifier.cdl
+--  Created:   Wed Dec 15 10:03:50 2004
+--  Author:    Sergey KUUL
 
 class PeriodicSurfaceModifier from BlockFix inherits Modification from BRepTools 
 
index 97590046adfc01b8aa7bc8347d2017f373fa2432..5e523b68aada0d304d7e58abc308044a9419c093 100644 (file)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      BlockFix_PeriodicSurfaceModifier.cxx
 // Created:   15.12.04 10:08:50
 // Author:    Sergey KUUL
-// Copyright: Open CASCADE SA 2004
-
+//
 #include <BlockFix_PeriodicSurfaceModifier.ixx>
 
 #include <BRep_Builder.hxx>
index 1230e3e6f8bef6cec31567b1871c80b82e8273a5..24872304626df0d2f92990b4a4f37d8109cc3209 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _BlockFix_PeriodicSurfaceModifier_HeaderFile
 #define _BlockFix_PeriodicSurfaceModifier_HeaderFile
 
index 49daa3c1fb4364ddcde70c21c2cd4246672fd547..5ab8be7b81bf9df1c3f56f5512d46aee6bd41e5a 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <BlockFix_PeriodicSurfaceModifier.jxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index b30f00602fbee192d1197789088634981cc0f001..72b3e96848a0c62484a16cb9883105e0cacbda58 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _TopoDS_Face_HeaderFile
 #include <TopoDS_Face.hxx>
index b67d9d56971b210ece990d09ca382124817fdc37..157ee2e1e6ad221698efe5a53c3b19516b66f223 100644 (file)
@@ -1,27 +1,27 @@
-// 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:       BlockFix_SphereSpaceModifier.cdl
--- Created:    Tue Dec  7 12:01:49 2004
--- Author:     Pavel Durandin
---             <det@doomox>
----Copyright:  Open CASCADE SA 2004
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:      BlockFix_SphereSpaceModifier.cdl
+--  Created:   Tue Dec  7 12:01:49 2004
+--  Author:    Pavel Durandin
 
 
 class SphereSpaceModifier from BlockFix inherits Modification from BRepTools 
index e61b4a53b39b942b41b59e5351790f533f081ea3..a66e7b24227bdfba38753803382d4748319e2cc6 100644 (file)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       BlockFix.cxx
 // Created:    Tue Dec  7 11:59:05 2004
 // Author:     Pavel DURANDIN
-// Copyright:  Open CASCADE SA 2004
-
+//
 #include <BlockFix_SphereSpaceModifier.ixx>
 
 #include <TopLoc_Location.hxx>
index 80a600920de8e3165809636d7c691b3ee08c0bc5..acdb3bda82e1770a435cbd4a7559fe766ad3b94d 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _BlockFix_SphereSpaceModifier_HeaderFile
 #define _BlockFix_SphereSpaceModifier_HeaderFile
 
index 651423466face9790cc036bc61961aca6040452a..31ea8a25834f2cc6949319f306f3c29b17a87abf 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <BlockFix_SphereSpaceModifier.jxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 61deba225861a8c025240bf40fad60f8442048b4..1b3792c56f3a2b5c4aef6a06f8b328563f212ebd 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _TopoDS_Face_HeaderFile
 #include <TopoDS_Face.hxx>
index ff806baf6c201e5958725008f17e67d62add5dbf..c943a6cfc5f4c1deb423354af49e6dc7f76a62da 100644 (file)
@@ -1,26 +1,27 @@
-// 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:       BlockFix_UnionEdges.cdl
--- Created:    Tue Dec  7 15:24:51 2004
--- Author:     Sergey KUUL
---             <skl@novgorox.nnov.matra-dtv.fr>
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:      BlockFix_UnionEdges.cdl
+--  Created:   Tue Dec  7 15:24:51 2004
+--  Author:    Sergey KUUL
 
 class UnionEdges from BlockFix
 
index 667375123b1ff775b2aa560fbe9445d926f622ea..4ac917101bab090ee3e36b9d9e6012b8a642072c 100644 (file)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      BlockFix_UnionEdges.cxx
 // Created:   07.12.04 15:27:30
 // Author:    Sergey KUUL
-
-
+//
 #include <BlockFix_UnionEdges.ixx>
 
 #include <Approx_Curve3d.hxx>
@@ -56,6 +57,7 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Iterator.hxx>
 
+#include "utilities.h"
 
 //=======================================================================
 //function : BlockFix_UnionEdges()
@@ -109,7 +111,7 @@ static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges,
     }
   }
   if(aChain.Length()<SeqEdges.Length()) {
-    cout<<"can not create correct chain..."<<endl;
+    MESSAGE ("can not create correct chain...");
     return Standard_False;
   }
   // union edges in chain
@@ -197,26 +199,49 @@ static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges,
     }
   }
   if(j<aChain.Length()) {
-    cout<<"null curve3d in edge..."<<endl;
+    MESSAGE ("null curve3d in edge...");
     return Standard_False;
   }
   if(aChain.Length()>1) {
     // second step: union edges with various curves
-    cout<<"can not make analitical union => make approximation"<<endl;
-    TopoDS_Wire W;
-    B.MakeWire(W);
+    // skl for bug 0020052 from Mantis: perform such unions
+    // only if curves are bspline or bezier
+    bool NeedUnion = true;
     for(j=1; j<=aChain.Length(); j++) {
       TopoDS_Edge edge = TopoDS::Edge(aChain.Value(j));
-      B.Add(W,edge);
+      Handle(Geom_Curve) c3d = BRep_Tool::Curve(edge,Loc,fp1,lp1);
+      if(c3d.IsNull()) continue;
+      while(c3d->IsKind(STANDARD_TYPE(Geom_TrimmedCurve))) {
+        Handle(Geom_TrimmedCurve) tc =
+          Handle(Geom_TrimmedCurve)::DownCast(c3d);
+        c3d = tc->BasisCurve();
+      }
+      if( ( c3d->IsKind(STANDARD_TYPE(Geom_BSplineCurve)) ||
+            c3d->IsKind(STANDARD_TYPE(Geom_BezierCurve)) ) ) continue;
+      NeedUnion = false;
+      break;
+    }
+    if(NeedUnion) {
+      MESSAGE ("can not make analitical union => make approximation");
+      TopoDS_Wire W;
+      B.MakeWire(W);
+      for(j=1; j<=aChain.Length(); j++) {
+        TopoDS_Edge edge = TopoDS::Edge(aChain.Value(j));
+        B.Add(W,edge);
+      }
+      Handle(BRepAdaptor_HCompCurve) Adapt = new BRepAdaptor_HCompCurve(W);
+      Approx_Curve3d Conv(Adapt,Tol,GeomAbs_C1,9,1000);
+      Handle(Geom_BSplineCurve) bc = Conv.Curve();
+      TopoDS_Edge E;
+      B.MakeEdge (E,bc,Precision::Confusion());
+      B.Add (E,VF);
+      B.Add (E,VL);
+      aChain.SetValue(1,E);
+    }
+    else {
+      MESSAGE ("can not make approximation for such types of curves");
+      return Standard_False;
     }
-    Handle(BRepAdaptor_HCompCurve) Adapt = new BRepAdaptor_HCompCurve(W);
-    Approx_Curve3d Conv(Adapt,Tol,GeomAbs_C1,9,1000);
-    Handle(Geom_BSplineCurve) bc = Conv.Curve();
-    TopoDS_Edge E;
-    B.MakeEdge (E,bc,Precision::Confusion());
-    B.Add (E,VF);
-    B.Add (E,VL);
-    aChain.SetValue(1,E);
   }
 
   anEdge = TopoDS::Edge(aChain.Value(1));
index 0f5baf48e15928978108bcc4458ead870b914730..0c0bb19dd0a430e10d6a5ec9a79f5efb6f57c307 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _BlockFix_UnionEdges_HeaderFile
 #define _BlockFix_UnionEdges_HeaderFile
 
index ffbdfbc39cd6c9c813b0fca983fcf1cb8a3eb518..03646c839f7c0e1b77be46b0b0b73aa2f6cfa06f 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <BlockFix_UnionEdges.jxx>
 
  
index bb3b12f68be9572d06653a8ef978cb685d32c5d1..4b4c3b635fe5ef83b7f66c85e3f23a43df420551 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _ShapeBuild_ReShape_HeaderFile
 #include <ShapeBuild_ReShape.hxx>
index 2251c6b45225438fe896cdd15f1c7a55086b6132..14b0b02ae80738b77f076c444e19648dedeb6a28 100644 (file)
@@ -1,27 +1,27 @@
-// 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:       BlockFix_UnionFaces.cdl
--- Created:    Tue Dec  7 17:15:42 2004
--- Author:     Pavel Durandin
---             <det@doomox>
----Copyright:  Open CASCADE SA 2004
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:      BlockFix_UnionFaces.cdl
+--  Created:   Tue Dec  7 17:15:42 2004
+--  Author:    Pavel Durandin
 
 
 class UnionFaces from BlockFix
index ee4398aeb0ff6db88247570d19c1dfaa2e934ed1..e513cbe59dfadf8f2515e8bcd04e85ef61021ffa 100644 (file)
@@ -1,76 +1,84 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       BlockFix_UnionFaces.cxx
 // Created:    Tue Dec  7 17:15:42 2004
 // Author:     Pavel DURANDIN
-//             Open CASCADE SA 2004
+//
 
 #include <BlockFix_UnionFaces.ixx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopExp.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <ShapeBuild_ReShape.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Face.hxx>  
-#include <TopoDS_Solid.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopTools_SequenceOfShape.hxx>
-#include <Geom_Surface.hxx>
-#include <BRep_Tool.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <BRep_Builder.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <ShapeFix_Face.hxx>
-#include <BRep_Tool.hxx>
-#include <ShapeExtend_WireData.hxx>
+
 #include <ShapeAnalysis_WireOrder.hxx>
 #include <ShapeAnalysis_Edge.hxx>
-#include <Geom2d_Line.hxx>
-#include <gp_XY.hxx>
-#include <gp_Pnt2d.hxx>
+
 #include <ShapeBuild_Edge.hxx>
-#include <Geom_Curve.hxx>
-#include <TopoDS_Vertex.hxx>
+#include <ShapeBuild_ReShape.hxx>
+
+#include <ShapeExtend_WireData.hxx>
+#include <ShapeExtend_CompositeSurface.hxx>
 
+#include <ShapeFix_Face.hxx>
+#include <ShapeFix_ComposeShell.hxx>
+#include <ShapeFix_SequenceOfWireSegment.hxx>
+#include <ShapeFix_WireSegment.hxx>
 #include <ShapeFix_Wire.hxx>
 #include <ShapeFix_Edge.hxx>
 
-#include <Geom_RectangularTrimmedSurface.hxx>
+#include <BRep_Tool.hxx>
+#include <BRep_Builder.hxx>
 #include <BRepTools.hxx>
 
-#include <TColGeom_HArray2OfSurface.hxx>
-#include <ShapeExtend_CompositeSurface.hxx>
-#include <ShapeFix_ComposeShell.hxx>
+#include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
+
 #include <TopTools_SequenceOfShape.hxx>
-#include <ShapeFix_SequenceOfWireSegment.hxx>
-#include <ShapeFix_WireSegment.hxx>
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_MapOfShape.hxx>
+#include <TopTools_MapIteratorOfMapOfShape.hxx>
+
+#include <TopoDS.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Wire.hxx>
+#include <TopoDS_Face.hxx>  
+#include <TopoDS_Solid.hxx>
+#include <TopoDS_Vertex.hxx>
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Iterator.hxx>
 
+#include <TColGeom_HArray2OfSurface.hxx>
+
+#include <Geom_Plane.hxx>
+#include <Geom_OffsetSurface.hxx>
 #include <Geom_CylindricalSurface.hxx>
 #include <Geom_SphericalSurface.hxx>
+#include <Geom_Surface.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom_RectangularTrimmedSurface.hxx>
+
+#include <Geom2d_Line.hxx>
 
+#include <gp_XY.hxx>
+#include <gp_Pnt2d.hxx>
   
 //=======================================================================
 //function : BlockFix_UnionFaces
@@ -291,7 +299,7 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
             }
           } while (isNewFound);
         
-          // sorting eny type of edges
+          // sorting any type of edges
           aWire = TopoDS::Wire(aContext->Apply(aWire));
                 
           TopoDS_Face tmpF = TopoDS::Face(aContext->Apply(faces(1).Oriented(TopAbs_FORWARD)));
@@ -488,7 +496,91 @@ Standard_Boolean BlockFix_UnionFaces::IsSameDomain(const TopoDS_Face& aFace,
   S1 = BRep_Tool::Surface(aFace,L1);
   S2 = BRep_Tool::Surface(aCheckedFace,L2);
   
-  return (S1 == S2 && L1 == L2);
+  if (S1 == S2 && L1 == L2)
+    return true;
+
+  // begin: planar case (improvement 20052)
+  S1 = BRep_Tool::Surface(aFace);
+  S2 = BRep_Tool::Surface(aCheckedFace);
+
+  Handle(Geom_Plane) aGP1, aGP2;
+  Handle(Geom_RectangularTrimmedSurface) aGRTS1, aGRTS2;
+  Handle(Geom_OffsetSurface) aGOFS1, aGOFS2;
+
+  aGRTS1 = Handle(Geom_RectangularTrimmedSurface)::DownCast(S1);
+  aGRTS2 = Handle(Geom_RectangularTrimmedSurface)::DownCast(S2);
+
+  aGOFS1 = Handle(Geom_OffsetSurface)::DownCast(S1);
+  aGOFS2 = Handle(Geom_OffsetSurface)::DownCast(S2);
+
+  if (!aGOFS1.IsNull()) {
+    aGP1 = Handle(Geom_Plane)::DownCast(aGOFS1->BasisSurface());
+  }
+  else if (!aGRTS1.IsNull()) {
+    aGP1 = Handle(Geom_Plane)::DownCast(aGRTS1->BasisSurface());
+  }
+  else {
+    aGP1 = Handle(Geom_Plane)::DownCast(S1);
+  }
+
+  if (!aGOFS2.IsNull()) {
+    aGP2 = Handle(Geom_Plane)::DownCast(aGOFS2->BasisSurface());
+  }
+  else if (!aGRTS2.IsNull()) {
+    aGP2 = Handle(Geom_Plane)::DownCast(aGRTS2->BasisSurface());
+  }
+  else {
+    aGP2 = Handle(Geom_Plane)::DownCast(S2);
+  }
+
+  if (!aGP1.IsNull() && !aGP2.IsNull()) {
+    // both surfaces are planar, check equality
+    Standard_Real A1, B1, C1, D1;
+    Standard_Real A2, B2, C2, D2;
+    aGP1->Coefficients(A1, B1, C1, D1);
+    aGP2->Coefficients(A2, B2, C2, D2);
+
+    if (fabs(A1) > Precision::Confusion()) {
+      A1 = 1.0;
+      B1 /= A1;
+      C1 /= A1;
+      D1 /= A1;
+    }
+    else if (fabs(B1) > Precision::Confusion()) {
+      B1 = 1.0;
+      C1 /= B1;
+      D1 /= B1;
+    }
+    else {
+      C1 = 1.0;
+      D1 /= C1;
+    }
+
+    if (fabs(A2) > Precision::Confusion()) {
+      A2 = 1.0;
+      B2 /= A2;
+      C2 /= A2;
+      D2 /= A2;
+    }
+    else if (fabs(B2) > Precision::Confusion()) {
+      B2 = 1.0;
+      C2 /= B2;
+      D2 /= B2;
+    }
+    else {
+      C2 = 1.0;
+      D2 /= C2;
+    }
+
+    if (fabs(A1 - A2) < Precision::Confusion() &&
+        fabs(B1 - B2) < Precision::Confusion() &&
+        fabs(C1 - C2) < Precision::Confusion() &&
+        fabs(D1 - D2) < Precision::Confusion())
+      return true;
+  }
+  // end: planar case (improvement 20052)
+
+  return false;
 }
 
 
@@ -528,4 +620,3 @@ void BlockFix_UnionFaces::MovePCurves(TopoDS_Face& aTarget,
     B.Add(aTarget,ResWire);
   }
 }
-     
index 2618008b0e33d839b4fb856594d8fa9b644205d8..9cf0578d8f420329bc556f4ae7bfea04a67ce70a 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _BlockFix_UnionFaces_HeaderFile
 #define _BlockFix_UnionFaces_HeaderFile
 
index eda22330b6bcdb9d61f4589c7ae8aedb5c10b1ef..155eca0f5298e353cf2df9322b119521b2ec6b3e 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <BlockFix_UnionFaces.jxx>
 
  
index 1a919c24a84ed7ea1be6c8f4d53dcf9123195b04..7a735aac6d9ab0977d6a278304d34873b4256544 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
index 1e1e88f79fef30f3eb364f8cd85067db207b73e0..aa7e939821fd89340d43ac1e14008ec382a3a8e6 100755 (executable)
@@ -1,27 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:       GEOMAlgo.cdl
 -- Created:    Sat Dec 04 12:36:22 2004
 -- Author:     Peter KURNEV
 --             <peter@PREFEX>
-
+--
 package GEOMAlgo 
 
        ---Purpose: 
diff --git a/src/GEOMAlgo/GEOMAlgo.pro b/src/GEOMAlgo/GEOMAlgo.pro
new file mode 100644 (file)
index 0000000..8d8f696
--- /dev/null
@@ -0,0 +1,249 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = GEOMAlgo
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+STDLIB = -lstdc++
+
+CAS_LDPATH = -L$$(CASROOT)/Linux/lib 
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS} ../NMTDS ../NMTTools
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lNMTTools $${STDLIB} $${CAS_LDPATH} -lTKBO -lTKShHealing -lTKBool -lTKMesh 
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+HEADERS  = BlockFix_BlockFixAPI.hxx
+HEADERS += BlockFix_BlockFixAPI.lxx
+HEADERS += BlockFix_CheckTool.hxx
+HEADERS += Handle_BlockFix_BlockFixAPI.hxx
+HEADERS += GEOMAlgo_Algo.hxx
+HEADERS += GEOMAlgo_BuilderArea.hxx
+HEADERS += GEOMAlgo_BuilderFace.hxx
+HEADERS += GEOMAlgo_Builder.hxx
+HEADERS += GEOMAlgo_BuilderShape.hxx
+HEADERS += GEOMAlgo_BuilderSolid.hxx
+HEADERS += GEOMAlgo_BuilderTools.hxx
+HEADERS += GEOMAlgo_ClsfBox.hxx
+HEADERS += GEOMAlgo_Clsf.hxx
+HEADERS += GEOMAlgo_ClsfSurf.hxx
+HEADERS += GEOMAlgo_CoupleOfShapes.hxx
+HEADERS += GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx
+HEADERS += GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx
+HEADERS += GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx
+HEADERS += GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
+HEADERS += GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx
+HEADERS += GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx
+HEADERS += GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx
+HEADERS += GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx
+HEADERS += GEOMAlgo_DataMapOfPassKeyInteger.hxx
+HEADERS += GEOMAlgo_DataMapOfRealListOfShape.hxx
+HEADERS += GEOMAlgo_DataMapOfShapeReal.hxx
+HEADERS += GEOMAlgo_DataMapOfShapeShapeSet.hxx
+HEADERS += GEOMAlgo_FinderShapeOn1.hxx
+HEADERS += GEOMAlgo_FinderShapeOn2.hxx
+HEADERS += GEOMAlgo_FinderShapeOn.hxx
+HEADERS += GEOMAlgo_FinderShapeOnQuad.hxx
+HEADERS += GEOMAlgo_GlueAnalyser.hxx
+HEADERS += GEOMAlgo_Gluer.hxx
+HEADERS += GEOMAlgo_HAlgo.hxx
+HEADERS += GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
+HEADERS += GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx
+HEADERS += GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx
+HEADERS += GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
+HEADERS += GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx
+HEADERS += GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
+HEADERS += GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx
+HEADERS += GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
+HEADERS += GEOMAlgo_IndexedDataMapOfShapeBox.hxx
+HEADERS += GEOMAlgo_IndexedDataMapOfShapeState.hxx
+HEADERS += GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx
+HEADERS += GEOMAlgo_ListIteratorOfListOfPnt.hxx
+HEADERS += GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx
+HEADERS += GEOMAlgo_ListNodeOfListOfPnt.hxx
+HEADERS += GEOMAlgo_ListOfCoupleOfShapes.hxx
+HEADERS += GEOMAlgo_ListOfPnt.hxx
+HEADERS += GEOMAlgo_PassKey.hxx
+HEADERS += GEOMAlgo_PassKeyMapHasher.hxx
+HEADERS += GEOMAlgo_PassKeyShape.hxx
+HEADERS += GEOMAlgo_PassKeyShapeMapHasher.hxx
+HEADERS += GEOMAlgo_PWireEdgeSet.hxx
+HEADERS += GEOMAlgo_ShapeAlgo.hxx
+HEADERS += GEOMAlgo_ShapeSet.hxx
+HEADERS += GEOMAlgo_ShapeSolid.hxx
+HEADERS += GEOMAlgo_ShellSolid.hxx
+HEADERS += GEOMAlgo_SolidSolid.hxx
+HEADERS += GEOMAlgo_Splitter.hxx
+HEADERS += GEOMAlgo_StateCollector.hxx
+HEADERS += GEOMAlgo_State.hxx
+HEADERS += GEOMAlgo_SurfaceTools.hxx
+HEADERS += GEOMAlgo_Tools3D.hxx
+HEADERS += GEOMAlgo_Tools.hxx
+HEADERS += GEOMAlgo_VertexSolid.hxx
+HEADERS += GEOMAlgo_WESCorrector.hxx
+HEADERS += GEOMAlgo_WireEdgeSet.hxx
+HEADERS += GEOMAlgo_WireSolid.hxx
+HEADERS += GEOMAlgo_WireSplitter.hxx
+HEADERS += Handle_GEOMAlgo_ClsfBox.hxx
+HEADERS += Handle_GEOMAlgo_Clsf.hxx
+HEADERS += Handle_GEOMAlgo_ClsfSurf.hxx
+HEADERS += Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx
+HEADERS += Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx
+HEADERS += Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx
+HEADERS += Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx
+HEADERS += Handle_GEOMAlgo_HAlgo.hxx
+HEADERS += Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
+HEADERS += Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx
+HEADERS += Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx
+HEADERS += Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
+HEADERS += Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx
+HEADERS += Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx
+HEADERS += Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx
+HEADERS += GEOMAlgo_ClsfSolid.hxx
+HEADERS += GEOMAlgo_ClsfSolid.ixx
+HEADERS += GEOMAlgo_ClsfSolid.jxx
+HEADERS += GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx
+HEADERS += GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx
+HEADERS += GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
+HEADERS += GEOMAlgo_Gluer1.cxx
+HEADERS += GEOMAlgo_Gluer1.hxx
+HEADERS += GEOMAlgo_Gluer1.ixx
+HEADERS += GEOMAlgo_Gluer1.jxx
+HEADERS += GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
+HEADERS += GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
+HEADERS += GEOMAlgo_KindOfBounds.hxx
+HEADERS += GEOMAlgo_KindOfClosed.hxx
+HEADERS += GEOMAlgo_KindOfName.hxx
+HEADERS += GEOMAlgo_KindOfShape.hxx
+HEADERS += GEOMAlgo_ShapeInfo.hxx
+HEADERS += GEOMAlgo_ShapeInfo.ixx
+HEADERS += GEOMAlgo_ShapeInfo.jxx
+HEADERS += GEOMAlgo_ShapeInfoFiller.hxx
+HEADERS += GEOMAlgo_ShapeInfoFiller.ixx
+HEADERS += GEOMAlgo_ShapeInfoFiller.jxx
+HEADERS += Handle_GEOMAlgo_ClsfSolid.hxx
+HEADERS += Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx
+HEADERS += Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
+
+SOURCES  = BlockFix.cxx
+SOURCES += BlockFix_BlockFixAPI.cxx
+SOURCES += BlockFix_CheckTool.cxx
+SOURCES += BlockFix_PeriodicSurfaceModifier.cxx
+SOURCES += BlockFix_SphereSpaceModifier.cxx
+SOURCES += BlockFix_UnionEdges.cxx
+SOURCES += BlockFix_UnionFaces.cxx
+SOURCES += GEOMAlgo_Algo.cxx
+SOURCES += GEOMAlgo_Builder_0.cxx
+SOURCES += GEOMAlgo_Builder_1.cxx
+SOURCES += GEOMAlgo_Builder_2.cxx
+SOURCES += GEOMAlgo_Builder_3.cxx
+SOURCES += GEOMAlgo_Builder_4.cxx
+SOURCES += GEOMAlgo_BuilderArea.cxx
+SOURCES += GEOMAlgo_Builder.cxx
+SOURCES += GEOMAlgo_BuilderFace.cxx
+SOURCES += GEOMAlgo_BuilderShape.cxx
+SOURCES += GEOMAlgo_BuilderSolid.cxx
+SOURCES += GEOMAlgo_BuilderTools.cxx
+SOURCES += GEOMAlgo_ClsfBox.cxx
+SOURCES += GEOMAlgo_Clsf.cxx
+SOURCES += GEOMAlgo_ClsfSurf.cxx
+SOURCES += GEOMAlgo_CoupleOfShapes.cxx
+SOURCES += GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx
+SOURCES += GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_0.cxx
+SOURCES += GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_0.cxx
+SOURCES += GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_0.cxx
+SOURCES += GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx
+SOURCES += GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx
+SOURCES += GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx
+SOURCES += GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx
+SOURCES += GEOMAlgo_DataMapOfPassKeyInteger_0.cxx
+SOURCES += GEOMAlgo_DataMapOfRealListOfShape_0.cxx
+SOURCES += GEOMAlgo_DataMapOfShapeReal_0.cxx
+SOURCES += GEOMAlgo_DataMapOfShapeShapeSet_0.cxx
+SOURCES += GEOMAlgo_FinderShapeOn1.cxx
+SOURCES += GEOMAlgo_FinderShapeOn2.cxx
+SOURCES += GEOMAlgo_FinderShapeOn.cxx
+SOURCES += GEOMAlgo_FinderShapeOnQuad.cxx
+SOURCES += GEOMAlgo_GlueAnalyser.cxx
+SOURCES += GEOMAlgo_Gluer.cxx
+SOURCES += GEOMAlgo_HAlgo.cxx
+SOURCES += GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx
+SOURCES += GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx
+SOURCES += GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx
+SOURCES += GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx
+SOURCES += GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx
+SOURCES += GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx
+SOURCES += GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx
+SOURCES += GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx
+SOURCES += GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx
+SOURCES += GEOMAlgo_IndexedDataMapOfShapeState_0.cxx
+SOURCES += GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx
+SOURCES += GEOMAlgo_ListIteratorOfListOfPnt_0.cxx
+SOURCES += GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx
+SOURCES += GEOMAlgo_ListNodeOfListOfPnt_0.cxx
+SOURCES += GEOMAlgo_ListOfCoupleOfShapes_0.cxx
+SOURCES += GEOMAlgo_ListOfPnt_0.cxx
+SOURCES += GEOMAlgo_PassKey.cxx
+SOURCES += GEOMAlgo_PassKeyMapHasher.cxx
+SOURCES += GEOMAlgo_PassKeyShape.cxx
+SOURCES += GEOMAlgo_PassKeyShapeMapHasher.cxx
+SOURCES += GEOMAlgo_ShapeAlgo.cxx
+SOURCES += GEOMAlgo_ShapeSet.cxx
+SOURCES += GEOMAlgo_ShapeSolid.cxx
+SOURCES += GEOMAlgo_ShellSolid.cxx
+SOURCES += GEOMAlgo_SolidSolid.cxx
+SOURCES += GEOMAlgo_Splitter.cxx
+SOURCES += GEOMAlgo_StateCollector.cxx
+SOURCES += GEOMAlgo_SurfaceTools.cxx
+SOURCES += GEOMAlgo_Tools3D.cxx
+SOURCES += GEOMAlgo_Tools.cxx
+SOURCES += GEOMAlgo_VertexSolid.cxx
+SOURCES += GEOMAlgo_WESCorrector.cxx
+SOURCES += GEOMAlgo_WireEdgeSet.cxx
+SOURCES += GEOMAlgo_WireSolid.cxx
+SOURCES += GEOMAlgo_WireSplitter.cxx
+SOURCES += GEOMAlgo_ClsfSolid.cxx
+SOURCES += GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx
+SOURCES += GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_0.cxx
+SOURCES += GEOMAlgo_DataMapOfPassKeyShapeShape_0.cxx
+SOURCES += GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_0.cxx
+SOURCES += GEOMAlgo_ShapeInfoFiller_1.cxx
+SOURCES += GEOMAlgo_IndexedDataMapOfShapeShapeInfo_0.cxx
+SOURCES += GEOMAlgo_ShapeInfo.cxx
+SOURCES += GEOMAlgo_ShapeInfoFiller.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index 1b56ef46905048a4e1a57bc5b3e65f69b7971707..32f3a1b330f352f54ef3ef8dc81e996ecce5bed3 100755 (executable)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:       GEOMAlgo_Algo.cdl
 -- Created:    Sat Dec 04 12:37:56 2004
 -- Author:     Peter KURNEV
 --             <peter@PREFEX>
-
-
+--
 deferred  class Algo from GEOMAlgo 
 
        ---Purpose: 
index 221cf1de70d01892c72dc3ab0c6ede7b6fc77ba7..a3426fffe24c1f8d05fcd9035069dfdc0bf90482 100755 (executable)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_Algo.cxx
 // Created:    Sat Dec 04 12:39:47 2004
 // Author:     Peter KURNEV
 //             <peter@PREFEX>
-
-
+//
 #include <GEOMAlgo_Algo.ixx>
 
 //=======================================================================
index 028e7fbce1fb06b69d5b4f5c52600229da2344fb..a0df056ba3cd77e19877e06c2da9e52309a883ec 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_Algo_HeaderFile
 #define _GEOMAlgo_Algo_HeaderFile
 
index 5b8348358be6efe6fab56db0b5c4bfb312b6204d..c45fc54ca211085f8d6ac399f88b73a0f0f11747 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_Algo.jxx>
 
  
index 65f9ef05a4cb862efa8ac364af1378e792a7d4d0..5dcdb780c67ed2fd7fb4e782a8f28a6c0b363871 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_Algo_HeaderFile
 #include <GEOMAlgo_Algo.hxx>
 #endif
index a6f4ca4065fd8d81d3d6b1df022fb02ef9627068..8bdcd4935f8617f8c19aea9ec306623289b1438d 100755 (executable)
@@ -1,27 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
---  
 -- File:       GEOMAlgo_Builder.cdl
 -- Created:    
 -- Author:     Peter KURNEV
-
-
+--
 class Builder from GEOMAlgo 
        inherits BuilderShape from GEOMAlgo 
        
index ebb87589366b35f7173943f151da6ea3bc2f09b3..8631ecd42912957dfe7d64b2a3ef259a2619c14f 100755 (executable)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:       GEOMAlgo_Builder.cxx
 // Created:    
 // Author:     Peter KURNEV 
-
-
+//
 #include <GEOMAlgo_Builder.ixx>
 
 #include <TopAbs_ShapeEnum.hxx>
index 930b3edf0a6744bf0b6e3a244a0d870fbf592201..c5aa8f23d4e08a89fc3609950cc12a6d87fd1819 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_Builder_HeaderFile
 #define _GEOMAlgo_Builder_HeaderFile
 
index 510e49dd666854e43bafbaf90f1c87b486c51af1..7926e82e8bd8dbc25d1c7bac108c80bc253048e5 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_Builder.jxx>
 
  
index 4cc8d4a529bc38c5a5b37354884a8d3bdf2caa0a..2b50611b6c463e86e4b73f415217f592d4d24dfb 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_PaveFiller_HeaderFile
 #include <NMTTools_PaveFiller.hxx>
 #endif
index 48ef49f20206678488d6208d121382db4bc811b2..beed084dd30662c2b551f90e5ef6d59e03b5e248 100755 (executable)
@@ -1,26 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       ModGlue_BuilderArea.cdl
 -- Created:    
 -- Author:     Peter KURNEV  
-
+--
 deferred class BuilderArea from GEOMAlgo 
        inherits Algo from GEOMAlgo 
         
index 98a63c1695ab1da9cfedc52ed092d54075dd7aab..dbc4f51fb927d5d5e9134c273801b6edc4216f6b 100755 (executable)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_BuilderArea.cxx
 // Created:    
 // Author:     Peter KURNEV 
-
-
+//
 #include <GEOMAlgo_BuilderArea.ixx>
 
 #include <TopTools_ListIteratorOfListOfShape.hxx>
index 0a3af4928fa30f3947a39525fff493bcab81062c..91df688659ca2937cfcfc26b1d7ed584239db9cd 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_BuilderArea_HeaderFile
 #define _GEOMAlgo_BuilderArea_HeaderFile
 
index 0ec206278d6b0c47917fd12ec32093c5095ff860..3b0db2c03e2c61dbce7e9370b1f238b31b7d99fc 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_BuilderArea.jxx>
 
  
index df13a88bff35197edb90668c63b15b7772a1a6eb..a33ada31e83be2bcd20dce5f1c1ed89a6a8a4c45 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _IntTools_Context_HeaderFile
 #include <IntTools_Context.hxx>
 #endif
index 542a828f31dbf6df0b977668f4ad858d01735aef..3c994ff20b1f5138eaaba2b34cfa3adfef6e1cc8 100755 (executable)
@@ -1,28 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       GEOMAlgo_BuilderFace.cdl
 -- Created:    
 -- Author:     Peter KURNEV 
-
-
-
+--
 class BuilderFace from GEOMAlgo 
        inherits BuilderArea from GEOMAlgo 
         
index 724e9c77fb5c8f9c11a36e01f0a449823eff03d4..c6b7d4bf51ecdec38061dfb2e6c7be24e0e74964 100755 (executable)
@@ -1,26 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_BuilderFace.cxx
 // Created:    
 // Author:     Peter KURNEV
-
+//
 #include <GEOMAlgo_BuilderFace.ixx>
 
 #include <gp_Pnt2d.hxx>
@@ -251,6 +253,7 @@ static
   TopTools_MapIteratorOfMapOfOrientedShape aItM;
   TopTools_IndexedDataMapOfShapeListOfShape aVEMap;
   TopTools_MapOfOrientedShape aMAdded;
+  TopoDS_Iterator aItW;
   BRep_Builder aBB; 
   GEOMAlgo_WireEdgeSet aWES;
   GEOMAlgo_WESCorrector aWESCor;
@@ -278,6 +281,37 @@ static
     const TopoDS_Shape& aW=aIt.Value();
     myLoops.Append(aW);
   }
+  //modified by NIZNHY-PKV Tue Aug  5 15:09:29 2008f
+  // Post Treatment
+  TopTools_MapOfOrientedShape aMEP;
+  // 
+  // a. collect all edges that are in loops
+  aIt.Initialize (myLoops);
+  for (; aIt.More(); aIt.Next()) {
+    const TopoDS_Shape& aW=aIt.Value();
+    aItW.Initialize(aW);
+    for (; aItW.More(); aItW.Next()) {
+      const TopoDS_Shape& aE=aItW.Value();
+      aMEP.Add(aE);
+    }
+  }
+  // 
+  // b. collect all edges that are to avoid
+  aItM.Initialize(myShapesToAvoid);
+  for (; aItM.More(); aItM.Next()) {
+    const TopoDS_Shape& aE=aItM.Key();
+    aMEP.Add(aE);
+  }
+  //
+  // c. add all edges that are not processed to myShapesToAvoid
+  aIt.Initialize (myShapes);
+  for (; aIt.More(); aIt.Next()) {
+    const TopoDS_Shape& aE=aIt.Value();
+    if (!aMEP.Contains(aE)) {
+      myShapesToAvoid.Add(aE);
+    }
+  }
+  //modified by NIZNHY-PKV Tue Aug  5 15:09:35 2008t
   //
   // 2. Internal Wires
   myLoopsInternal.Clear();
@@ -302,7 +336,7 @@ static
     aBB.MakeWire(aW);
     aBB.Add(aW, aEE);
     //
-    TopoDS_Iterator aItW (aW);
+    aItW.Initialize(aW);
     for (; aItW.More()&&bFlag; aItW.Next()) {
       const TopoDS_Edge& aE=TopoDS::Edge(aItW.Value());
       //
index 758cc7072b168aed4703effb8ff7543f447e14ac..08cefeb9df097371b7ada8d2a5b965add89dd7fb 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_BuilderFace_HeaderFile
 #define _GEOMAlgo_BuilderFace_HeaderFile
 
index 66adde68ba5dbdbb48d49688bb5de622ebc4eb91..c3630db7bfd6842f293660b6377d37223d708935 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_BuilderFace.jxx>
 
  
index 8e533eed8fb1725ad7fa2dd65df3c20fa0b81e59..97dee30324017580ddbfc5c576e12306964bf303 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Face_HeaderFile
 #include <TopoDS_Face.hxx>
 #endif
index b699831c7703f07b16fee8a45f8413c5026fe806..f1c1c22f193c5033a091310d6dc6276f56e5dd3e 100755 (executable)
@@ -1,28 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       GEOMAlgo_BuilderShape.cdl
 -- Created:    
 -- Author:     Peter KURNEV 
-
-
-
+--
 deferred class BuilderShape from GEOMAlgo 
        inherits Algo from GEOMAlgo  
 
index 9f7cdd501afab6b5e303ea05f5faba5f653eccc7..5d09fde72c4139272462698207eba9463a5055ca 100755 (executable)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_BuilderShape.cxx
 // Created:    
 // Author:     Peter KURNEV 
-
-
+//
 #include <GEOMAlgo_BuilderShape.ixx>
 //=======================================================================
 //function : 
index 8639f22a8bace9b57834fb2b710e1d91536c1cf2..bf760dd9712ef288cff1ac4f2c3ac348e69bc750 100644 (file)
@@ -1,24 +1,24 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+//  Copyright (C) 2003-2007  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 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.
-
 #ifndef _GEOMAlgo_BuilderShape_HeaderFile
 #define _GEOMAlgo_BuilderShape_HeaderFile
 
index b8d037aa151cd145108631a1a9f2baaa234d3eef..754725182bc45be6d76649f1694c773397b756c6 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_BuilderShape.jxx>
 
  
index 516c355b2fe8a3d85371abaa32483e8787fd8bae..4470c403486b22968542574b36f4ecd54b82af3c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index 7cbebaf80e8ae771ff0a62894f0f609b77621221..8773aee80684592933f49c8bde5d30b26bf69db7 100755 (executable)
@@ -1,26 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       GEOMAlgo_BuilderSolid.cdl
 -- Created:    
 -- Author:     Peter KURNEV  
-
+--
 class BuilderSolid from GEOMAlgo 
        inherits BuilderArea from GEOMAlgo 
         
index 1701f3e38a70d43e1e32731cd6d491fddc52e9c5..6ea231c3ecb7ab2837908e77bb848d42d1d7e78e 100755 (executable)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_BuilderSolid.cxx
 // Created:    
 // Author:     Peter KURNEV 
-
-
+//
 #include <GEOMAlgo_BuilderSolid.ixx>
 
 #include <gp_Pnt2d.hxx>
@@ -93,7 +94,10 @@ static
   void MakeInternalShells(const TopTools_MapOfShape& ,
                          TopTools_ListOfShape& );
 
-
+//modified by NIZNHY-PKV Tue Aug  5 15:06:50 2008f
+static
+  Standard_Boolean IsClosedShell(const TopoDS_Shell& theShell);
+//modified by NIZNHY-PKV Tue Aug  5 15:06:57 2008t
 
 //=======================================================================
 //function : 
@@ -228,6 +232,17 @@ static
          myShapesToAvoid.Add(aF2);
        }
       }
+      //DEB
+      else {
+       TopTools_ListIteratorOfListOfShape aItLF;
+       //
+       aItLF.Initialize (aLF);
+       for (; aItLF.More(); aItLF.Next()) {
+         const TopoDS_Shape& aFx=aItLF.Value();
+         int a=0;
+       }
+      }
+      //DEB
     }// for (i=1; i<=aNbE; ++i) {
     //
     if (!bFound) {
@@ -246,14 +261,16 @@ static
   //
   myLoops.Clear();
   //
-  Standard_Integer aNbLF, aNbOff, aNbFP;
+  Standard_Integer aNbLF, aNbOff, aNbFP, aNbFA;
   TopAbs_Orientation anOr;
   TopoDS_Edge aEL;
   BRep_Builder aBB;
   NMTTools_CoupleOfShape aCSOff;
-  TopTools_MapOfOrientedShape AddedFacesMap;
+  TopTools_MapOfOrientedShape AddedFacesMap;//, aMFP;
   TopTools_IndexedDataMapOfShapeListOfShape aEFMap, aMEFP;
-  TopTools_ListIteratorOfListOfShape aItF;
+  TopTools_ListIteratorOfListOfShape aItF, aIt;
+  TopTools_MapIteratorOfMapOfOrientedShape aItM;
+  TopoDS_Iterator aItS;
   //
   //=================================================
   //
@@ -366,17 +383,61 @@ static
        }
       } // for (; aEdgeExp.More(); aEdgeExp.Next()) { 
     } //for (; aItAddedF.More(); aItAddedF.Next()) {
-    myLoops.Append(aShell);
+    //modified by NIZNHY-PKV Tue Aug  5 15:07:08 2008f
+    //myLoops.Append(aShell);
+    if (IsClosedShell(aShell)) {
+      myLoops.Append(aShell);
+    }
+    /*
+    else {
+      TopoDS_Iterator aItS;
+      aItS.Initialize(aShell);
+      for (; aItS.More(); aItS.Next()) {
+       const TopoDS_Shape& aFs=aItS.Value();
+       aMFP.Add(aFs);
+      }
+    }
+    */
+    //modified by NIZNHY-PKV Tue Aug  5 15:07:30 2008t
   } // for (; aItF.More(); aItF.Next()) {
+  //modified by NIZNHY-PKV Tue Aug  5 15:07:35 2008f
+  //
+  // Post Treatment
+  TopTools_MapOfOrientedShape aMP;
+  // 
+  // a. collect all edges that are in loops
+  aIt.Initialize (myLoops);
+  for (; aIt.More(); aIt.Next()) {
+    const TopoDS_Shape& aS=aIt.Value();
+    aItS.Initialize(aS);
+    for (; aItS.More(); aItS.Next()) {
+      const TopoDS_Shape& aF=aItS.Value();
+      aMP.Add(aF);
+    }
+  }
+  // 
+  // b. collect all edges that are to avoid
+  aItM.Initialize(myShapesToAvoid);
+  for (; aItM.More(); aItM.Next()) {
+    const TopoDS_Shape& aF=aItM.Key();
+    aMP.Add(aF);
+  }
+  //
+  // c. add all edges that are not processed to myShapesToAvoid
+  aIt.Initialize (myShapes);
+  for (; aIt.More(); aIt.Next()) {
+    const TopoDS_Shape& aF=aIt.Value();
+    if (!aMP.Contains(aF)) {
+      myShapesToAvoid.Add(aF);
+    }
+  }
+  //modified by NIZNHY-PKV Tue Aug  5 15:07:44 2008t
   //=================================================
   //
   // 2.Internal Shells
   //
   myLoopsInternal.Clear();
   //
-  Standard_Integer aNbFA;
-  TopTools_MapIteratorOfMapOfOrientedShape aItM;
-  //
   aEFMap.Clear();
   AddedFacesMap.Clear();
   //
@@ -730,7 +791,50 @@ Standard_Boolean IsGrowthShell(const TopoDS_Shape& theShell,
   }
   return bRet;
 }
-
+//modified by NIZNHY-PKV Tue Aug  5 15:07:50 2008f
+//=======================================================================
+//function : IsClosedShell
+//purpose  : 
+//=======================================================================
+Standard_Boolean IsClosedShell(const TopoDS_Shell& theShell)
+{
+  Standard_Integer aNbE;
+  Standard_Boolean bRet;
+  TopoDS_Iterator aIt;
+  TopExp_Explorer aExp;
+  TopTools_MapOfShape aM;
+  // 
+  bRet=Standard_False;
+  aIt.Initialize(theShell);
+  for(; aIt.More(); aIt.Next()) {
+    const TopoDS_Face& aF=TopoDS::Face(aIt.Value());
+    aExp.Init(aF, TopAbs_EDGE);
+    for (; aExp.More(); aExp.Next()) {
+      const TopoDS_Edge& aE=TopoDS::Edge(aExp.Current());
+      if (BRep_Tool::Degenerated(aE)) {
+       continue;
+      }
+      /*
+      if (BRep_Tool::IsClosed(aE, aF)) {
+       continue;
+      }
+      */
+      if (aE.Orientation()==TopAbs_INTERNAL) {
+       continue;
+      }
+      if (!aM.Add(aE)) {
+       aM.Remove(aE);
+      }
+    }
+  }
+  //
+  aNbE=aM.Extent();
+  if (!aNbE) {
+    bRet=!bRet;
+  }
+  return bRet;
+}
+//modified by NIZNHY-PKV Tue Aug  5 15:08:07 2008t
 //BRepTools::Write(aFF, "ff");
 //
 //  ErrorStatus :
index d317a5cdccc437752b4ac6e1e02c98b3471c4b16..be21d28b23a37659ed55371a318035e67bb1e3f7 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_BuilderSolid_HeaderFile
 #define _GEOMAlgo_BuilderSolid_HeaderFile
 
index 1d54ca3cef6754c73476220673084a9ade24ed05..c4209997cf7181341dcfbf20154131331f294bc4 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_BuilderSolid.jxx>
 
  
index db2175f6cea0fb028f4736b2220eab92b272d908..7660e31d6362302b5423ad7b85bfc60edf280dcf 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_BuilderSolid_HeaderFile
 #include <GEOMAlgo_BuilderSolid.hxx>
 #endif
index 949e81d5a353b611b5beac73dcd704e0cf0ef231..5a3c3e162260a8d7f3e485a34dd3c86017e17b35 100755 (executable)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       GEOMAlgo_BuilderTools.cdl
 -- Created:    
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class BuilderTools from GEOMAlgo 
 
        ---Purpose: 
index 0d537dff2a8b3f27cd19dc4f3997ef867034fb9e..1ecab1312c7b7c0d8599f9c55708af0bde8fdffc 100755 (executable)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_BuilderTools.cxx
 // Created:    
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_BuilderTools.ixx>
 
 #include <TColStd_Array1OfReal.hxx>
index 43bd9486f1d4cfc184a4dae5db9812702560b3af..fcadbf4a862364bce7379bda28e480f7ac941484 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_BuilderTools_HeaderFile
 #define _GEOMAlgo_BuilderTools_HeaderFile
 
index 352fdb0686ee45998ef4aca7cb753a9422447ae3..daa0bae982c644c3bc16f61817e2823dae669a2a 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_BuilderTools.jxx>
 
  
index fc205018984f453852d51ce00d6417f15eae21e9..5b843c4a33e82859f50dce0e5c8fa47121a7dd8b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index 728c8404def797d881fb0b68fc5a50d4003e0b11..57fb373fd38170a8690c26f4ecc0b06dae3a6a36 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_Builder.hxx>
 
 #include <NMTDS_ShapesDataStructure.hxx>
index 5ee7ddaf48a7913238d268e72965cfb304f7bed7..b84058616c4b39c764657ceb32001c5aa1d73dde 100755 (executable)
@@ -1,26 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_Builder_1.cxx
 // Created:    
 // Author:     Peter KURNEV 
-
+//
 #include <GEOMAlgo_Builder.hxx>
 //
 #include <TColStd_ListOfInteger.hxx>
index 92e9e2cc87734acf270ca6e312b812cd4d74cf41..45e7543b4cd17e5312c91f78cee4e3f6510e8857 100755 (executable)
@@ -1,26 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_Builder_2.cxx
 // Created:    
 // Author:     Peter KURNEV 
-
+//
 #include <GEOMAlgo_Builder.hxx>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
@@ -360,6 +362,26 @@ static
     aBF.SetFace(aFF);
     aBF.SetContext(aCtx);
     const TopTools_ListOfShape& aSE=aWES.StartElements();
+    //
+    //DEB f
+    /*
+    {
+      TopoDS_Compound aCx;
+      BRep_Builder aBBx;
+      TopTools_ListIteratorOfListOfShape aItx;
+      //
+      aBBx.MakeCompound(aCx);
+      aBBx.Add(aCx, aFF);
+      aItx.Initialize(aSE);
+      for (; aItx.More(); aItx.Next()) {
+       TopoDS_Shape& aEx=aItx.Value();
+       aBBx.Add(aCx, aEx);
+      }
+      int a=0;
+    }
+    */
+    //DEB t
+    //
     aBF.SetShapes(aSE);
     //
     aBF.Perform();
index 649c603703bc1cbce11a026c28c5b85d98fb8c39..1a3b5b566b4a2582e0cec9d3001e5d159437ad3a 100755 (executable)
@@ -1,26 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_Builder_3.cxx
 // Created:    
 // Author:     Peter KURNEV
-
+//
 #include <GEOMAlgo_Builder.hxx>
 
 #include <TopAbs_State.hxx>
index 8465cebbaf5f6a920a7ae61bca0737cb0d96e31e..bc755e492066a5addaf2d05be22b7d984d1c7e28 100755 (executable)
@@ -1,26 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_Builder_4.cxx
 // Created:    
 // Author:     Peter KURNEV 
-
+//
 #include <GEOMAlgo_Builder.hxx>
 
 #include <TopoDS_Iterator.hxx>
index d32329d18c6dcfa08611aa50744a1cb7e646ccd1..75149cf28bbe92b2507d479b566cddfebfd767ee 100644 (file)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:       GEOMAlgo_Clsf.cdl
 -- Created:    Wed Nov 22 10:19:29 2006
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 deferred class Clsf from GEOMAlgo 
     inherits HAlgo from GEOMAlgo 
      
index 91b1b2a071ea58e72e408b4f8ced4e3170642749..01d2733277e0ead8ff002030f7dd17974bad3c0a 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_Classifier.cxx
 // Created:    Wed Nov 22 10:23:04 2006
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_Clsf.ixx>
 
 //=======================================================================
index 3b2c43abb8b6f3d5b20a0e6fa9de991781ed014a..70fbc60c907687e858540dee10969fe0e5690d78 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_Clsf_HeaderFile
 #define _GEOMAlgo_Clsf_HeaderFile
 
index bb7371ff2cfa4993e95e23859f0635f288b7cc32..ed35cae59534d7206ddc53e2f9c5e53624eeea73 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_Clsf.jxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 775a6380919dc62f12eca22458a94083e136f3c0..df2281b675fdce9daa8225097f4b47b9332a6dd6 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _gp_Pnt_HeaderFile
 #include <gp_Pnt.hxx>
 #endif
index 21c385de77956282a592b8590d0661c25dcf2833..deb9a6c8685784172455d118dc08870df29593ab 100644 (file)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       GEOMAlgo_ClsfBox.cdl
 -- Created:    Wed Nov 22 10:19:29 2006
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class ClsfBox from GEOMAlgo 
     inherits Clsf from GEOMAlgo 
      
index 1abad5406da577cb6984d1e2739f1f327228db88..b74c54e3ec17f0f275acbaae2118fb453ee53cbb 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_ClsfSurf.cxx
 // Created:    Wed Nov 22 10:41:47 2006
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_ClsfBox.ixx>
 #include <GeomAbs_SurfaceType.hxx>
 #include <GEOMAlgo_SurfaceTools.hxx>
index 2a0dc75d497efd7d9deb9c200a50ef6ef4c46798..03fd2b12393c337f35e398aef76316b0487bf228 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ClsfBox_HeaderFile
 #define _GEOMAlgo_ClsfBox_HeaderFile
 
index 8406273be713c2f9321924242dcd9b548324648c..5cc2da30c376cae086d29631e68e4c45519a5f31 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_ClsfBox.jxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index dfcc22957f397cef153113610900e41fa2e46603..90fc5e97a7e5bd11bdf546c7ed4566a861acc1d8 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index ed6093c584af253438c6bded355e67cef207387d..0f4df15641fff1ddbb98944a1d573fb90ed5064b 100755 (executable)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
---  
 -- File:       GEOMAlgo_ClsfSolid.cdl
 -- Created:    Mon Jan 29 10:28:07 2007
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class ClsfSolid from GEOMAlgo  
     inherits Clsf from GEOMAlgo 
 
index 0e779c996d2cfcdf1daaaeba8f48a35c2ddbb1d9..f05fbaf92f25d438967b74e583a212179d6063c3 100755 (executable)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_ClsfSolid.cxx
 // Created:    Mon Jan 29 10:35:46 2007
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_ClsfSolid.ixx>
 
 #include <TopAbs_ShapeEnum.hxx>
index 8feb5337e6c7fa8b42c1e2e10f4a69317d7e81be..5012fed2fc963eeb8230ae2f169c1a0ff9588159 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ClsfSolid_HeaderFile
 #define _GEOMAlgo_ClsfSolid_HeaderFile
 
index c3a9f9b2d6ab3ab1cb4a0e18bbf486d4535975b7..b777f32a44421e88fa599c7c122757d6167b68ef 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_ClsfSolid.jxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 3d84d02105c9e8d63f6dbda751a0536c37a4cefe..0c1f5add0685b72a06c2461f948a4699e973945e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index 15c0b69d4ae341cc596a74aa09c96f85acb91db6..d2b191cd31ea6e3000983334e8672dd6115acf7e 100644 (file)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       GEOMAlgo_ClsfSurf.cdl
 -- Created:    Wed Nov 22 10:19:29 2006
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class ClsfSurf from GEOMAlgo 
     inherits Clsf from GEOMAlgo 
      
index a7b05096f29c5ec3059ee9b39932c751ccc95485..2d32d4448d058e769824fa68be71ffe51c142fc2 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_ClsfSurf.cxx
 // Created:    Wed Nov 22 10:41:47 2006
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_ClsfSurf.ixx>
 #include <GeomAbs_SurfaceType.hxx>
 #include <GEOMAlgo_SurfaceTools.hxx>
index f356295629e914a615756a00ce104dfc1579d5a6..54925be608874848af56c19781fed39e6ea0baf3 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ClsfSurf_HeaderFile
 #define _GEOMAlgo_ClsfSurf_HeaderFile
 
index dadf131a00b6316a463221a3956e7ca09643589e..2ffee719fdc03a13e407a1595b82c5fc5eccd5e5 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_ClsfSurf.jxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 6d8048bd8b3465b716a06050f5f42676b366bc4b..c0a70f3dc191c67cbe5de5695bb8f189c03fda08 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Geom_Surface_HeaderFile
 #include <Geom_Surface.hxx>
 #endif
index 9314a0888a5716f8b2e107ee37e78bc15b78cb26..54ff2d959d087673d738110b94a918e00bcb2350 100644 (file)
@@ -1,29 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:      GEOMAlgo_CoupleOfShapes.cdl
+--  Created:   Wed Dec 15 13:00:10 2004
+--  Author:    Peter KURNEV
 --
--- File:       GEOMAlgo_CoupleOfShapes.cdl
--- Created:    Wed Dec 15 13:00:10 2004
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2004
-
-
 class CoupleOfShapes from GEOMAlgo 
 
        ---Purpose: 
index cdc6bbbd702e858b74b5f979124f425e33df5b47..1047c2ba5ff49c0e8c35931c3f15699077c696eb 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_CoupleOfShapes.cxx
 // Created:    Wed Dec 15 13:03:52 2004
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_CoupleOfShapes.ixx>
 //=======================================================================
 //function : GEOMAlgo_CoupleOfShapes
index 2505f8049bbb73ed955316e815187b9ace241227..46a62f75496de954586a02913b36f70f328ed259 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_CoupleOfShapes_HeaderFile
 #define _GEOMAlgo_CoupleOfShapes_HeaderFile
 
index 7d793c83861fdb8e63096c94d1e4aef9512c9f7d..4567f905fac10425bef98c6fc273a9edc90f9a24 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_CoupleOfShapes.jxx>
 
  
index 9caff71ab2db127679879dedb9a9b784da76caa1..cd50cfedb5f4964a16a0424ea47d9eff73f7077c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index cd9006ab148477afc5c84425cca182524547fa80..854f60c7ebaaa4f2f947dfdae50ccf4eb262e41b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_HeaderFile
 #define _GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_HeaderFile
 
index fea43de7024686db37eba1c84d412a10a5068351..9cbe4e5a05d40120f4f6d7f0e4559d5becb7e54c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index 8c046bf60b29a26fa3154c6341796c8456c0cee5..19064241d44bab4432c0f126fd4cc921ddcf16cf 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_HeaderFile
 #define _GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_HeaderFile
 
index 36e1955f054326efbd0a92baa4eeb53886e75697..587e9edaa3168db814aa2aaa53b5ec2d5f4ce815 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index 0864e681cd7152a12c431c4a41d36310fdde76c7..d2aaa68a507b5b39036435ea36f782a3cdf6ab55 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_HeaderFile
 #define _GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_HeaderFile
 
index 6ad2f18602d2d0090013a3a95150d67b2be91430..eae315c2caf7fda02c1104ec8b6d48e9a0ba0086 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index bea5ce80fd4bda300dbd61ed9ccc4984f4a47fac..15bb79e4d41e3e305abc1d7d3c34d7fb17ea7c27 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_HeaderFile
 #define _GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_HeaderFile
 
index 0e1748b67d0de1c6153218e89cf81643a16f9e66..60b2fd9d2185d055cffacde779b56f535f5e5239 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index 67260a8a1a938d644d260ca6c5e64f6691bfcb58..77720cdb5dee757d337a96331c9f018c08161163 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile
 #define _GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile
 
index 56f780149fb5659c91979a96f57f1a84c6ccacd3..cdd9b3ebc7fa6f750620a4f76d3e5adcce642783 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index eda806e2b19d57f0dfbd3b9458c6355943acb467..a16e26ba8c73df5dd7eeba51854fe1e38e5409c5 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
 
index 6dd49b86c15d3b4f8e38620f53c72a7a61464b77..c1457e733c16e09def25fa5adb5c9db2c7f15456 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 8561646221d379d82ba7e3efb9ed4530eeb4535d..e88ed19e0c165abf94eb8c4df24471b06c5f36e7 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
 
index 424e7470131786bcb41f40f3d104627faf6e516a..f4e15a42604ed6db01abcc05da9b5150667d9c56 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 3d61106deaf639ddcba2a8fda552f5654fd96850..1ba3c8bc202ec8f4c3f7db1f8756145364d651c9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
 
index 39f3ac1dd565d4e0628871c4e91afc55d39b6997..9bcbe1201240e0458883ba0182fbed0adfaba472 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index d2ac36be9191c51a163e5df197efb6170b925b80..5b418a03412ba621bdbdb84d6f33d3f39d4508a9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
 
index f44a0c52023ec316fa4ab71496f67a17b8baa5b5..729f0996b4a46732864d3a01f5e98920eb14e778 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index fdcdfb4bc3ed35508ff8ffec6fc6c9487263b727..b354f97197bf3f08449646f3577eeeeec807357d 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
 
index 6d4e37236e6990ca09c312d12123ade1e4176627..b0e5fee23075c2d4ac07615e0cd28b3689c56577 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index b847a73450887bd1a5a86311884e6fcbea6c96e9..4a48fe10890cd630bdb67ce3d8e0ad78f97ada95 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile
 #define _GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile
 
index 0a831e442b760a7bc6b2806032ffe837c0d5238a..2b3a535cdce81924e244adc754c14c584e6f3fd7 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapOfPassKeyInteger.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index 4e209557f12db222a7255eb4fba226ee133315ab..28693baeaa969bfb6b26c00525b9bf3fc78a809f 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile
 #define _GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile
 
index 77755174531d3c9e7842ee672bf89f75894847de..3ffd3976911dc7ba37c29eeff0cea4318e15ca0d 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapOfPassKeyShapeShape.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index 601edc17c3c795430c1e5e26b55f4276ddddd0a7..108370ac14d51a4c991908d39e273561cf1a17ce 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapOfRealListOfShape_HeaderFile
 #define _GEOMAlgo_DataMapOfRealListOfShape_HeaderFile
 
index e1d5ca6e81330d08919d208f2f1e31d4ca8d857b..7edbd031f4a0f1e3850229c57b13ce5928c69dad 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapOfRealListOfShape.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index 94be38772a5a89215e5c393884a3cc3a5864bb4d..7e121ac240f107b2e60c689ba28f0d4ab2d02f89 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapOfShapeReal_HeaderFile
 #define _GEOMAlgo_DataMapOfShapeReal_HeaderFile
 
index 06abae33239206bd0e2c3ebe52f4cac2ddb05d60..66ae1a35dbf8eae898f566fcbab2705137f370dc 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapOfShapeReal.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index f7947802b46879b90733443eceaa761a4ca8fdb7..8c372df0afa8feb748621a82e54c031bb0d8d6de 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_DataMapOfShapeShapeSet_HeaderFile
 #define _GEOMAlgo_DataMapOfShapeShapeSet_HeaderFile
 
index 96d931bf2aaa4d70e260eb4c04b7b3ba23890822..c583d68a4deeb7196edd3b9c94d2053fd8319b6c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_DataMapOfShapeShapeSet.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index 9f30dab59fa1dfdc4d75df27b27cabda481aa335..44be83e18cba8b61c7710ff379491bc28bb7a002 100644 (file)
@@ -1,29 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:      GEOMAlgo_FinderShapeOn.cdl
+--  Created:   Tue Jan 11 14:35:52 2005
+--  Author:    Peter KURNEV
 --
--- File:       GEOMAlgo_FinderShapeOn.cdl
--- Created:    Tue Jan 11 14:35:52 2005
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2005
-
-
 class FinderShapeOn from GEOMAlgo 
     inherits ShapeAlgo from GEOMAlgo 
     
index 237e81ef4775d21e29b041eea9ffdf7d8e7120b0..372edf65330672f77c9eb8d8986337c05dcbe3ee 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_FinderShapeOn.cxx
 // Created:    Tue Jan 11 14:44:31 2005
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_FinderShapeOn.ixx>
 
 #include <gp_Pnt.hxx>
index 6053ad654cacced8ef1029a8084bbf5a1874d482..632ad722f5e13db0c0f3b81a35c499c3dbbde51f 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_FinderShapeOn_HeaderFile
 #define _GEOMAlgo_FinderShapeOn_HeaderFile
 
index 514a8fe3b9d9576925623b27f8d2bfc47e27119e..2dfc0be175512ecd636df384de6d6d143d971d6f 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_FinderShapeOn.jxx>
 
  
index 6b45d4c1f6c0eb1bceb870360b5d40a3d3a4c00d..f7161c60739311a74d2977e306e345d9cf664ed9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Geom_Surface_HeaderFile
 #include <Geom_Surface.hxx>
 #endif
index 6a0b72e5b94548b09f801be152292bee88141b2c..cb9be924f3464de7a5526a19cb82621eaab6aa35 100644 (file)
@@ -1,29 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:      GEOMAlgo_FinderShapeOn1.cdl
+--  Created:   Fri Mar  4 10:26:54 2005
+--  Author:    Peter KURNEV
 --
--- File:       GEOMAlgo_FinderShapeOn1.cdl
--- Created:    Fri Mar  4 10:26:54 2005
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2005
-
-
 class FinderShapeOn1 from GEOMAlgo  
     inherits ShapeAlgo from GEOMAlgo 
 
index 6f9f6a0b45277d8fb301c663d30d7db19a375557..24f5ed55e73a0ebdfbdad54df5c94ed5df2d4f0c 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_FinderShapeOn1.cxx
 // Created:    Fri Mar  4 10:31:06 2005
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_FinderShapeOn1.ixx>
 #include <math.h>
 
@@ -545,7 +546,7 @@ void GEOMAlgo_FinderShapeOn1::InnerPoints(const TopoDS_Face& aF,
   aTRF=BRep_Tool::Triangulation(aF, aLoc);
   if (aTRF.IsNull()) {
     if (!GEOMAlgo_FinderShapeOn::BuildTriangulation(aF)) {
-      myErrorStatus=20; // no triangulation found
+      myWarningStatus=20; // no triangulation found
       return;
     }
     aTRF=BRep_Tool::Triangulation(aF, aLoc);
index d07cda45cc30068e62981a77b7bf3d2356bb6b79..f3860edb0dcc6e660f49aa6160238c4fd8c234f5 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_FinderShapeOn1_HeaderFile
 #define _GEOMAlgo_FinderShapeOn1_HeaderFile
 
index da80e4d18af8febc57de46dd29692509b9b54477..9b9caa61c30aef16ed311a4f58c507ee79aeb0de 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_FinderShapeOn1.jxx>
 
  
index db9c4b7f7e62921ad2e9467097e175eb0619de22..196f0e7061e96eda1c21520c68194774d5c6b1b6 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Geom_Surface_HeaderFile
 #include <Geom_Surface.hxx>
 #endif
index c0a1b92530502f562e0c7c667f92ce2e552f4bd2..72d79265d53765bdaac490995a3b4f4463fd278c 100644 (file)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:       GEOMAlgo_FinderShapeOn1.cdl
 -- Created:    Fri Mar  4 10:26:54 2005
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class FinderShapeOn2 from GEOMAlgo  
     inherits ShapeAlgo from GEOMAlgo 
 
index ebc34e718699979dff1a592ba4c0fc66760ad69b..b7f70f544ed4b07fec46b0e3595793abd1cc4dcd 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_FinderShapeOn1.cxx
 // Created:    Fri Mar  4 10:31:06 2005
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_FinderShapeOn2.ixx>
 #include <math.h>
 
   aTRF=BRep_Tool::Triangulation(aF, aLoc);
   if (aTRF.IsNull()) {
     if (!GEOMAlgo_FinderShapeOn::BuildTriangulation(aF)) {
-      myErrorStatus=20; // no triangulation found
+      myWarningStatus=20; // no triangulation found
       return;
     }
     aTRF=BRep_Tool::Triangulation(aF, aLoc);
index 1d467a51ed04d0426921fe6013475447441747bb..7eaa024a8a5f3f2776a9070cc00db98351ee70df 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_FinderShapeOn2_HeaderFile
 #define _GEOMAlgo_FinderShapeOn2_HeaderFile
 
index 9e17577cf7f49a2b216e45b30216ec830dac0389..d9cef81ac788fc5cad04f793f49fa8dab4b31b36 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_FinderShapeOn2.jxx>
 
  
index 62172c4607d4055904b8c03923ef002a6a6f4df9..4482091293b58cbdd00ae11b3f47c356a3aca8fd 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_Clsf_HeaderFile
 #include <GEOMAlgo_Clsf.hxx>
 #endif
index c6d98798bb62ec0cd62746e00a13dfef0a41f0fa..3d32d628b6ce4bce7c2276cf242bf68a645b55cd 100644 (file)
@@ -1,4 +1,6 @@
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
-//
-//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File      : GEOMAlgo_FinderShapeOnQuad.cxx
 // Created   : Mon Oct 17 17:31:45 2005
 // Author    : Edward AGAPOV (eap)
-
+//
 #include "GEOMAlgo_FinderShapeOnQuad.hxx"
 #include "GEOMAlgo_SurfaceTools.hxx"
 
index 6b15851b1b79fc27c9adc938e9caf463db460261..18fca9a53f94040e14822facc6923307e372b78d 100644 (file)
@@ -1,4 +1,6 @@
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
-//
-//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File      : GEOMAlgo_FinderShapeOnQuad.hxx
 // Created   : Mon Oct 17 17:15:59 2005
 // Author    : Edward AGAPOV (eap)
-
+//
 #ifndef GEOMAlgo_FinderShapeOnQuad_HeaderFile
 #define GEOMAlgo_FinderShapeOnQuad_HeaderFile
 
@@ -51,10 +51,10 @@ protected:
 
 private:
 
-  bool                         myConcaveQuad;
+  bool                              myConcaveQuad;
   std::vector<bool>                 myConcaveSide;
   std::vector<gp_Pnt>               myPoints;
   std::vector<GeomAdaptor_Surface>  myPlanes;
-  gp_Vec                       myQuadNormal;
+  gp_Vec                            myQuadNormal;
 };
 #endif
index 97dd6f476e6d21dae33f1a727e62686c9ac26244..925d094c59a935c2793744142f0e50807b78edcf 100644 (file)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:       GEOMAlgo_GlueAnalyser.cdl
 -- Created:    Wed Dec 15 11:03:03 2004
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class GlueAnalyser from GEOMAlgo 
     inherits Gluer from GEOMAlgo  
        ---Purpose: 
index e38911f5beb2fda9240df57693695a66d4bc831a..8a7124c3196b52d812008e9c66f1abb456f12bf6 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_GlueDetector.cxx
 // Created:    Wed Dec 15 11:08:09 2004
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_GlueAnalyser.ixx>
 
 #include <TopoDS.hxx>
index 8b815072fb68733ca98a9faba0a93170036f5eec..45d174918b0042a9d0923437b606dce6888a9eb0 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_GlueAnalyser_HeaderFile
 #define _GEOMAlgo_GlueAnalyser_HeaderFile
 
index d7456f0609f0dd55523e9fe2b81cad28b4f7c7d0..6a279b7ef24805af55e02801f05ed7194a17737a 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_GlueAnalyser.jxx>
 
  
index f89777323d7cdbcfd9e42b3368c9771c90acd54c..bc6388ba691a7817dd0cfa9df02bc9140a998050 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
 #include <GEOMAlgo_ListOfCoupleOfShapes.hxx>
 #endif
index fe629e68b6cbff1682bc94adf85ed152a7f896ca..76631ff57d42c1da06366012662772bd18518573 100755 (executable)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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.
 --
--- You should have received a copy of the GNU Lesser General Public  
--- 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
+--
+--  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 --
 -- File:       GEOMAlgo_Gluer.cdl
 -- Created:    Sat Dec 04 12:41:32 2004
 -- Author:     Peter KURNEV
 --             <peter@PREFEX>
-
-
+--
 class Gluer from GEOMAlgo  
     inherits ShapeAlgo from GEOMAlgo
 
index e2f2c9a6953713998e7f77d31f634332fc4b2494..a147c90b0f82a11080a583740d067cb136cb0681 100755 (executable)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_Gluer.cxx
 // Created:    Sat Dec 04 12:45:53 2004
 // Author:     Peter KURNEV
 //             <peter@PREFEX>
-
-
+//
 #include <GEOMAlgo_Gluer.ixx>
 
 #include <NMTDS_BoxBndTree.hxx>
index 5ca326149aa9b810af5f3a0e47d7f5d4e6fba339..980424de03c26d290faefd4b0db5abc0b7dace56 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_Gluer_HeaderFile
 #define _GEOMAlgo_Gluer_HeaderFile
 
index 8fe0fabdf9e76e1b624dc82127c8f5f87f3775b6..574d72d817bd2d39f7101b3c75ca16412871c703 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_Gluer.jxx>
 
  
index 254e050e86a0df8a5fb192243bf56de07a524cc0..86f3f36ab883016078b43e00718a398af78ba16b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopTools_ListOfShape_HeaderFile
 #include <TopTools_ListOfShape.hxx>
 #endif
index d226781a7d738cfbf1cb8a73ca302b189ec737a4..de00fbc0b591b6eb5c0bb54aecf51ff05115ef56 100755 (executable)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       GEOMAlgo_Gluer1.cdl
 -- Created:    Wed Jan 24 11:37:31 2007
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class Gluer1 from GEOMAlgo  
     inherits  Gluer from GEOMAlgo
 
index d1636fea501173aa4131975b91520c35a87913ad..fbcec0512b419ae7b64639703505e7e2668ef87b 100755 (executable)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_Gluer1.cxx
 // Created:    Wed Jan 24 11:52:27 2007
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_Gluer1.ixx>
 
 #include <Geom_Surface.hxx>
index 0939c3ef4a228a824f22e3bfec989cc7b997f0eb..ed68594be466d41131e9d888f337d2a5bc4dd6de 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_Gluer1_HeaderFile
 #define _GEOMAlgo_Gluer1_HeaderFile
 
index 9198a8dbb3cf113e0837b57d81aec536455dcfdf..8081a3d039e6d7ebb0141ea688b23dc21efe8e0a 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_Gluer1.jxx>
 
  
index bb63320eb23c1ca0d87ae6fcef64cef9e08dd730..307f27e7f8f702f230a4b4d53ec5d4aacd5e67e9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
 #include <GEOMAlgo_ListOfCoupleOfShapes.hxx>
 #endif
index 0da63488960b3f9796dcd51ae3a6120acc9ebe48..b9e77ab42f1156726788efd46d071dc872c53b41 100644 (file)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:       GEOMAlgo_Algo.cdl
 -- Created:    Sat Dec 04 12:37:56 2004
 -- Author:     Peter KURNEV
 --             <peter@PREFEX>
-
-
+--
 deferred  class HAlgo from GEOMAlgo 
     inherits TShared from MMgt   
        ---Purpose: 
index 807929c73057c9ca0cddf1a85dd91878d49bc202..69dfa4ac675559c94ccba5e9d7a0a7903d1958b5 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_Algo.cxx
 // Created:    Sat Dec 04 12:39:47 2004
 // Author:     Peter KURNEV
 //             <peter@PREFEX>
-
-
+//
 #include <GEOMAlgo_HAlgo.ixx>
 
 //=======================================================================
index 0f25b53de2f4584f1188aad9e31b2683060f58f2..c7002b5da4d825dfdeaaec56157a1d918c48aa1f 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_HAlgo_HeaderFile
 #define _GEOMAlgo_HAlgo_HeaderFile
 
index 96a32edb8bc0556e69ed81a6fba079529477b344..810ccc9e2da9a9cd2c2e6f1e895e6d44a444056d 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_HAlgo.jxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index e6d20409d619091c0e0e3e5ae751a1adb6d37a22..6be6b1b6750e93fc3ecd07a6b0a8725aa42146b9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_HAlgo_HeaderFile
 #include <GEOMAlgo_HAlgo.hxx>
 #endif
index bb87ad0a19a353e56db9b24d6ba6c9eec96be8b6..965ff0a273bcb75e13d4b8e21178bee12a0c5b09 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile
 #define _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile
 
index 42561ece418510521a62a7b5970d138da20f3fc1..300973d78461874e5e1767c96d7e622cd38c7ffe 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index cd79d0b02d4b8b76a3787f229a24808f057bd00b..c4f5752fc09d5907c2573275bce96b8c5fbc6db1 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_HeaderFile
 #define _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_HeaderFile
 
index d29cf0f216037bdfabca825c1e4f7c5936c58151..3703fb54abd99b7a37d5caae12931cc93d8b0a3d 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index ce1a5003a3151c19715503d099c6cb0aeef3abcc..71466b81289566aecb4acc82c283514a61135e90 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
 #define _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
 
index ddacd87621a1c7037e7ad1c32106d3af33c7cc55..fa5437fc83b334c437e6b7d44b7e0a2c757fa27c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index b88bbcd3d1172209a02e1b2ae769191a42ee9f5d..d01bc565db61e4aa1be2d21325123312eb381541 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile
 #define _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile
 
index e2efeae43eef0ac2c49ba360d61d24af5aac1244..06f91398df48314023b4d24f0884d6b8829b8243 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 2c37056e200727549173c5ffb3ea2ade81867596..e974bb3c63f170e20eb0afb3d7ef5323af5de455 100644 (file)
@@ -1,25 +1,24 @@
-// File generated by CPPExt (Transient)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// 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
+//
+//  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.
-
 #ifndef _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_HeaderFile
 #define _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_HeaderFile
 
index 6afae119419bdc598071c1ec9ad061e320697001..799e63395683830bc0f070e107d84aa97b558fa6 100644 (file)
@@ -1,24 +1,24 @@
-// File generated by CPPExt (Transient)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+//  Copyright (C) 2003-2007  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 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 <GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index b7f8701e1876e9ea98a70f83b06ea6d7071370e9..ab44e2fe29d50fff0d1fe5a92405b624304afb6d 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_HeaderFile
 #define _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_HeaderFile
 
index fec6e37ca36a7f34966221d80a618bed0207b65b..eb0fcc7db3ba7ab4373e5a616ef087782c9c86c7 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 513ac78bfbfe3ceee556d04c9ebf5a55427df8ce..a89e0146acddf36b0508430e060e51e2990a9d65 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile
 #define _GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile
 
index 8ec0d0daa2e4863a4db52fcc65e5fbce16772745..232a19d1357899fef388ba438c94bc60f701d7f7 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_IndexedDataMapOfIntegerShape.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index 59bd0bab54ef8bf77832868a7a329f9ad51bba20..de91f020f0fa63857a81f6a9e42a33dcfce61878 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_HeaderFile
 #define _GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_HeaderFile
 
index a493ac29ca529a4170158845cff0ba6372144dd4..ff15283044d920fcb77e573156eced85eac98223 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index b27ee9a81640fdb38b1e9b5e97a5805055f4954f..7bf5b4b4e376c2c1b384c08246c30505b8f29e0d 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
 #define _GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
 
index ccd40ac2834e9ee5b439fcd40fabe59c674833a6..89b23d6a185dd3888d3b074130c296334a8fbc5c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index 9b05242dec4538c27f2144630681ed87f6897310..8660ceb8fd24342b5e5785c974f39ef09b8e9ae3 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile
 #define _GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile
 
index c4add993382b4dd204e84bf5d5d9b198c827ee7b..d8b98662400dda7545ea5b75a99241eed9c7d773 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_IndexedDataMapOfShapeBox.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index ef912354ec7e7e7edd69d05ab4f1d5281a879835..3051acc43b8abc23fc284efa216fb410e3632864 100644 (file)
@@ -1,24 +1,24 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+//  Copyright (C) 2003-2007  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 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.
-
 #ifndef _GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile
 #define _GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile
 
index 96604846e3e24bf2a85bb83db5fdf7bee960db71..61e566417109ab5862f49a6dc72653efff112bb1 100644 (file)
@@ -1,24 +1,24 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+//  Copyright (C) 2003-2007  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 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 <GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index d7f988310ca5d2cb9ca22e3cc7b92e95c3bdc463..59fa7a7cb5ad582d54bf04640a5c3833b1baec79 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
 #define _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
 
index 92ab03801c52bd8d26536dc03f32cb441cd58171..26f31af15af759a0d0ef7451c0e4caf1cf7f5b45 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index ba0043ebbe156d8e87db6c162af28edf49fe6f7f..6ae789d88c7a73466d9d0ed411d050679a80ca08 100644 (file)
@@ -1,24 +1,24 @@
-// File generated by CPPExt (Enum)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+//  Copyright (C) 2003-2007  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 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.
-
 #ifndef _GEOMAlgo_KindOfBounds_HeaderFile
 #define _GEOMAlgo_KindOfBounds_HeaderFile
 
index 9854aed369060cbf54e4126ef89e6f2f9a3f7413..d3ac584779b4cd8db947a429ec00ad95df49e552 100644 (file)
@@ -1,24 +1,24 @@
-// File generated by CPPExt (Enum)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+//  Copyright (C) 2003-2007  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 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.
-
 #ifndef _GEOMAlgo_KindOfClosed_HeaderFile
 #define _GEOMAlgo_KindOfClosed_HeaderFile
 
index 74c83eb781f6da6e072a6d18aab51cccff4efe6d..e4a8316bcd7f1872cfcf566c0988a6913672f8a0 100644 (file)
@@ -1,24 +1,24 @@
-// File generated by CPPExt (Enum)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+//  Copyright (C) 2003-2007  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 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.
-
 #ifndef _GEOMAlgo_KindOfName_HeaderFile
 #define _GEOMAlgo_KindOfName_HeaderFile
 
index 1b5ead9f9276531c06f7dc910cf3a8fffebd361b..cf40274d4ee977fb8a917023ae43d6d215a3b9d6 100644 (file)
@@ -1,24 +1,24 @@
-// File generated by CPPExt (Enum)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+//  Copyright (C) 2003-2007  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 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.
-
 #ifndef _GEOMAlgo_KindOfShape_HeaderFile
 #define _GEOMAlgo_KindOfShape_HeaderFile
 
index 73887582820d6a1c1e6d0981e9a8d30c0dbc5ed7..9464a35f336df240762a29720ef7cfcf390657ce 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_HeaderFile
 #define _GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_HeaderFile
 
index ab548e32e452a152a3bb0e9b0abce0425b318ce5..3ded9dfbb44963890bb232f82532f4f53f9c8faf 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx>
 
 #ifndef _Standard_NoMoreObject_HeaderFile
index 43bd2f9d05d4c714a75cc3b382b4f26b47161631..1c1b7ca2c99c5859905e3f196eef693564b7dbee 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ListIteratorOfListOfPnt_HeaderFile
 #define _GEOMAlgo_ListIteratorOfListOfPnt_HeaderFile
 
index 179cdce45df425d76b9d7802e57b2baae21d603b..69d4596554936c1f4b6e31a34d8b8e53854976bf 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_ListIteratorOfListOfPnt.hxx>
 
 #ifndef _Standard_NoMoreObject_HeaderFile
index 8f8dd4b42c8e0206c3d55c08c5434321befcaa4b..04439ff5e135772f6fe3ec1b9688b77608a7cd77 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ListNodeOfListOfCoupleOfShapes_HeaderFile
 #define _GEOMAlgo_ListNodeOfListOfCoupleOfShapes_HeaderFile
 
index 2ce4cb14b5afe1ebca0bab72e982950df06f963f..d8786cc70a9038f5788e2f82194b1bc1762391b3 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 5fb729abda1c2b65127c12c5d7b9639ca3076e9d..908c29be43167b3317f67c32e3704a05700b1840 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ListNodeOfListOfPnt_HeaderFile
 #define _GEOMAlgo_ListNodeOfListOfPnt_HeaderFile
 
index 4514c489877c808778d1222d47461624ad289729..3587b7daa503a19cdb266dbb3f619646fac4ec28 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_ListNodeOfListOfPnt.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index a535c22618a54d67affba428bb63b2e67f203a30..0a4be4cc8d84e2122ad92b27deac88b3c07ec2b6 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
 #define _GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
 
index 838464db18b61c3b73ff85a7a32f018a8401f6a9..82d3fc5e7871a518e184e208f902cb759ad943de 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_ListOfCoupleOfShapes.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index 94a8be445b5f450657ff4242dcd99887a66f037f..5e425bce306b072dc998757fd354a5650f6b2afa 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ListOfPnt_HeaderFile
 #define _GEOMAlgo_ListOfPnt_HeaderFile
 
index 295d9ef595324a01a76010b749dc28c19e52086d..3f3344f5efe1c34067bbb5cc79f5d7316eb3d4f6 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_ListOfPnt.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index 1340244b416353823d4b5b0f1e2218d30f0cca2c..058553ba140c020e9388028d72e798bb0806d49b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_PWireEdgeSet_HeaderFile
 #define _GEOMAlgo_PWireEdgeSet_HeaderFile
 
index 8b84345a40101674cf141a4c77dfd540395ec443..a4b217a34b61981a2b2fb34e47e592b50215d3f1 100755 (executable)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       GEOMAlgo_PassKey.cdl
 -- Created:    Mon Nov 20 12:16:13 2006
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class PassKey from GEOMAlgo 
 
        ---Purpose: 
index 342a116f2e94db2bd3d858c6bcde1230083c1c18..254ca6e595cbb85ce1705849847d61d794197bf8 100755 (executable)
@@ -1,29 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_Algo.cxx
 // Created:    Sat Dec 04 12:39:47 2004
 // Author:     Peter KURNEV
 //             <peter@PREFEX>
-
-
+//
 #include <GEOMAlgo_PassKey.ixx>
 
 #include <stdio.h>
index 930eb1b080cd215015b214aaebf45e7ef7487758..ce79e29d3c62fb4e5e35c766cf9fe7780b9d2657 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_PassKey_HeaderFile
 #define _GEOMAlgo_PassKey_HeaderFile
 
index d935f86eca43b85dd1694b1a8c4afa9ef4a6e5c3..4b098cfdacfec94b78a83afe7076e63d6eccb7cd 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_PassKey.jxx>
 
  
index 6363a879e0159966e23e5f2eb4909673b958c462..4a975175e5470f321da145896100e4ae4cc06456 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TColStd_ListOfInteger_HeaderFile
 #include <TColStd_ListOfInteger.hxx>
 #endif
index a0ba022fc7296a683e07fdb1be1dfddad122d2b4..3bcef243600d46adffead1ed16d09c10385ed9ba 100755 (executable)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:       GEOMAlgo_PassKeyMapHasher.cdl
 -- Created:    
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class PassKeyMapHasher from GEOMAlgo 
 
        ---Purpose: 
index 654278f7ee69724855d3f8b2a8cceacb263e61ee..8db75c81cf799256773f68e278db79d5ec60d8b9 100755 (executable)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_PassKeyMapHasher.cxx
 // Created:    
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_PassKeyMapHasher.ixx>
 
 //=======================================================================
index 2e0287ee6ba2e7e16daeaabb08332221606092e1..82cf8ff3914d6d82e56d71d97deff2d9f8ab845c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_PassKeyMapHasher_HeaderFile
 #define _GEOMAlgo_PassKeyMapHasher_HeaderFile
 
index 331c4d8e9f60ba26a30d9e525706a2d6ee1be829..c21de3f68297abab4853e5a304a236df4ed66af5 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_PassKeyMapHasher.jxx>
 
  
index f1bedbdd8d17ed5b068bffbfb99b6a5d52c35832..7b8138bd13b3e1778f20dc3e2e3a0f21e6c054d2 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_PassKey_HeaderFile
 #include <GEOMAlgo_PassKey.hxx>
 #endif
index 5215a4de47ef26339322b1d0f521d1cd04ee211a..b7a60b138b2eda6fe2a8fc95b1275c204cd3263f 100755 (executable)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:       GEOMAlgo_PassKeyShape.cdl
 -- Created:    
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class PassKeyShape from GEOMAlgo 
    
        ---Purpose: 
index df01791adaa092449b4b135feffe08fd87450dd7..41debf27ee4d42af3c7d7f6f5b25ef3aa134777f 100755 (executable)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_PassKeyShape.cxx
 // Created:    
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_PassKeyShape.ixx>
 
 #include <TopTools_ListOfShape.hxx>
index d54dd3c0b5b0f20d390cb68fc3168fc053742ad5..529fa3ae1cad6927a87d759e498e8cccd99849d2 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_PassKeyShape_HeaderFile
 #define _GEOMAlgo_PassKeyShape_HeaderFile
 
index 9934607fcfeeac851497fa7c33a174d8d26e7299..94c1a74fae1d0ea337a12bd81c55da8bf5ba6505 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_PassKeyShape.jxx>
 
  
index 06b1a9edb2a1b0a2ee28c402ea1b35b3b49ad032..37f591564332684c86dc77227e5658055c58eee1 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index 393b7e78f04b605dd027b9f5bed35a45a2e2937b..becd85f7b4d584377fc8e95cf50ed84124051a02 100644 (file)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:       GEOMAlgo_PassKeyMapHasher.cdl
 -- Created:    
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class PassKeyShapeMapHasher from GEOMAlgo 
 
        ---Purpose: 
index 70478af43dbe8044bd836058bbd9a75b89d02346..036cddde9a68fc90f7dff207bed6c32b36d4133f 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_PassKeyMapHasher.cxx
 // Created:    
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_PassKeyShapeMapHasher.ixx>
 
 //=======================================================================
index 53caf6a708e7e874c55ad7a524e6eb329f002b97..7dcdd4670bbdd58b5d0b97d530105cad5efd4997 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_PassKeyShapeMapHasher_HeaderFile
 #define _GEOMAlgo_PassKeyShapeMapHasher_HeaderFile
 
index ae17ce089e4eb349e225fba2d86c2e158c17e324..3115037aebef0112ca73e0fb64fda248fc6bba5c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_PassKeyShapeMapHasher.jxx>
 
  
index 99130d0ba9aec407891a35c299f4975d6e76638c..df8089e56780d401dc5c4b29ac83f7b951ebcf5a 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_PassKeyShape_HeaderFile
 #include <GEOMAlgo_PassKeyShape.hxx>
 #endif
index 26b5c27a92cc5844ee0336b2eb9179c2767ac73f..36ede43696fd08f4146eb8a87edefd13d75a9341 100644 (file)
@@ -1,29 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:      GEOMAlgo_ShapeAlgo.cdl
+--  Created:   Tue Dec  7 12:05:19 2004
+--  Author:    Peter KURNEV
 --
--- File:       GEOMAlgo_ShapeAlgo.cdl
--- Created:    Tue Dec  7 12:05:19 2004
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2004
-
-
 deferred class ShapeAlgo from GEOMAlgo 
     inherits Algo from GEOMAlgo  
     
index 1c25bb27f82b55ac80645def63e8667c7104c748..9e93ba6ca18caf860f7e00439a3b6d62987c03df 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_ShapeAlgo.cxx
 // Created:    Tue Dec  7 12:06:54 2004
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_ShapeAlgo.ixx>
 
 //=======================================================================
index 7647c9bf2d4290f297d889131cb57a65547700b9..f8a385f34fe59c6ede31bebca26b3581d698eb57 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ShapeAlgo_HeaderFile
 #define _GEOMAlgo_ShapeAlgo_HeaderFile
 
index f1a56c8ff321102ff7dc7a86a2ac29245ad42631..58a281fef406c5a15c4824b4b0f7f668443d09a2 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_ShapeAlgo.jxx>
 
  
index 94b9d0c3094c3a801c4d81d0f94fc27ef1e55dab..b5fda69029b4489b9644696706715bcf6be5391b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index 625638b6718c2e0c31585948657b310edd592251..9115582b48d9b8ab88df739ab6cdeba69344a0f4 100644 (file)
@@ -1,10 +1,28 @@
--- File:       GEOMAlgo_ShapeInfo.cdl
--- Created:    Mon Apr  2 14:04:24 2007
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2007
-
-
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:      GEOMAlgo_ShapeInfo.cdl
+--  Created:   Mon Apr  2 14:04:24 2007
+--  Author:    Peter KURNEV
+--
 class ShapeInfo from GEOMAlgo 
 
        ---Purpose: 
index c126062361408545356a6420e5e5e8488581819d..e34a909fd341791bfa3a05b132462048546bd650 100644 (file)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 <GEOMAlgo_ShapeInfo.ixx>
 
 
index 3cbe05b5ab2d2e1598d1bcf61650eb811290fc15..20dded14d2fbaef3abd7c65daecb709cd9a2e8c3 100644 (file)
@@ -1,24 +1,24 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+//  Copyright (C) 2003-2007  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 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.
-
 #ifndef _GEOMAlgo_ShapeInfo_HeaderFile
 #define _GEOMAlgo_ShapeInfo_HeaderFile
 
index 4d87536e89721a21b53b74e7cc3b41d50c2689b5..e7ae2d9ae66e1574b0e71a1abd41940d8f489839 100644 (file)
@@ -1,24 +1,24 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+//  Copyright (C) 2003-2007  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 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 <GEOMAlgo_ShapeInfo.jxx>
 
  
index 493c1c8a78947127096140859256918abc0eba8d..2ad3d50e71cbc9200219fed3c42248a754aefaf5 100644 (file)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 _gp_Pnt_HeaderFile
 #include <gp_Pnt.hxx>
 #endif
index 599a77d85065374e48a88a714bfccba794e94d3a..df956fd5d6c9ba0ba446dd07bc20728adb6b6c35 100644 (file)
@@ -1,10 +1,28 @@
--- File:       GEOMAlgo_ShapeInfoFiller.cdl
--- Created:    Mon Apr  2 15:05:34 2007
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2007
-
-
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:      GEOMAlgo_ShapeInfoFiller.cdl
+--  Created:   Mon Apr  2 15:05:34 2007
+--  Author:    Peter KURNEV
+--
 class ShapeInfoFiller from GEOMAlgo 
     inherits Algo from GEOMAlgo 
      
index 299fb5b1affd293f46cabde36b8c2bc80c9b6d96..4c5690521a462edd6d5df4b00f148391484e6672 100644 (file)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 <GEOMAlgo_ShapeInfoFiller.ixx>
 
 #include <Precision.hxx>
index 5a52f94dfb934eaf4f4adaf259c0147034d4615c..a25c2e0a4f03e23207248c9f3256b274ff08455d 100644 (file)
@@ -1,24 +1,24 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+//  Copyright (C) 2003-2007  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 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.
-
 #ifndef _GEOMAlgo_ShapeInfoFiller_HeaderFile
 #define _GEOMAlgo_ShapeInfoFiller_HeaderFile
 
index a56973ba82c9a8d07fa6347b36865d2e1db9ff13..99038a856f4266c44b0e9d222bda41a75f3937a3 100644 (file)
@@ -1,24 +1,24 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+//  Copyright (C) 2003-2007  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 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 <GEOMAlgo_ShapeInfoFiller.jxx>
 
  
index f3d77a35be58dc0419e82175e7c7f2ae1e926771..e7edb1ea63e703faecc0af75d18e65a0dae4f37b 100644 (file)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index 891b9c772b682e590f15cc4fccc6f64f0abe3b05..152a4f3ada38594c75075e376a109de3f1ccb997 100644 (file)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 <GEOMAlgo_ShapeInfoFiller.ixx>
 
 #include <Precision.hxx>
index 49ee9295c20438548151907dcd47fd5bb24a8d3b..7695a4a0cb0992d179ed6194b88d75e357bdb9de 100755 (executable)
@@ -1,26 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       GEOMAlgo_ShapeSet.cdl
 -- Created:    
 -- Author:     Peter KURNEV 
-
+--
 class ShapeSet from GEOMAlgo 
 
        ---Purpose: Implementation some formal   
index 800e3eb3ef65e82d3270ddf171c82d70dce47c8d..e48672d62b91c7d5f1769912c5c00a22b4c721d7 100755 (executable)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_ShapeSet.cxx
 // Created:    
 // Author:     Peter KURNEV 
-
-
-
+//
 #include <GEOMAlgo_ShapeSet.ixx>
 
 #include <TopExp_Explorer.hxx>
index 98fb46415f38d92a3156eeb8eb4a39df083d5c2f..72d00d5b13ed67916ec14de444da4bb7c23faf73 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ShapeSet_HeaderFile
 #define _GEOMAlgo_ShapeSet_HeaderFile
 
index 445af6936977356c12a1f7dd259ae32378364a2d..984facf18713e362adfb620d13e921379f702a74 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_ShapeSet.jxx>
 
  
index b76eeb906544f17ba9b4fdd63a592782ab7ffa4a..927257846dbd318577b49995cd40c3828694428c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopTools_ListOfShape_HeaderFile
 #include <TopTools_ListOfShape.hxx>
 #endif
index b26e74093304c146edd38f5d2612d57e7d82e4e4..84fb33d375eeec2fd02c2c3040c9cb12db9d76d6 100644 (file)
@@ -1,29 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:      GEOMAlgo_ShapeSolid.cdl
+--  Created:   Thu Jan 13 12:44:07 2005
+--  Author:    Peter KURNEV
 --
--- File:       GEOMAlgo_ShapeSolid.cdl
--- Created:    Thu Jan 13 12:44:07 2005
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2005
-
-
 deferred class ShapeSolid from GEOMAlgo 
        inherits Algo from GEOMAlgo 
         
index e22ed2e084355b1781fb7797c2f438b97ebf967f..1883de4a06df8ad3d6695d6eed2cac6f1ecc3bf3 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_ShapeSolid.cxx
 // Created:    Thu Jan 13 12:54:48 2005
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_ShapeSolid.ixx>
 
 #include <TopTools_ListIteratorOfListOfShape.hxx>
index fa7d823b78bf1391f4961f0d4624606e523dac58..a913d917c42a558c622eac899d3e91e067a67b43 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ShapeSolid_HeaderFile
 #define _GEOMAlgo_ShapeSolid_HeaderFile
 
index 2ef2ca6efab8ca7cfc3fa9c3e6a7ecea040b79e0..22f64b475f76a4bdb7bd5d6cb0b96cb20a6aaa49 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_ShapeSolid.jxx>
 
  
index 665e84a1a31cb62710a04817dbaec1cbe705132e..e212103481d8760297e157ea6e5f22b35601e10e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _BOPTools_DSFiller_HeaderFile
 #include <BOPTools_DSFiller.hxx>
 #endif
index 15d47e504df4e2b9ef4db93fdcebf808ea8d3f11..43aac10ac298a1aaff378763afb9f671ad8c790a 100644 (file)
@@ -1,29 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:      GEOMAlgo_ShellSolid.cdl
+--  Created:   Wed Jan 12 12:45:20 2005
+--  Author:    Peter KURNEV
 --
--- File:       GEOMAlgo_ShellSolid.cdl
--- Created:    Wed Jan 12 12:45:20 2005
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2005
-
-
 class ShellSolid from GEOMAlgo 
     inherits ShapeSolid from GEOMAlgo
        ---Purpose: 
index f502a8fc2fea58cf5270e1fe9e8bb810578fe77e..c4dca68d028731ee3a3c55c795d5feb89c493a20 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_ShellSolid.cxx
 // Created:    Wed Jan 12 12:49:45 2005
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_ShellSolid.ixx>
 
 #include <Standard_Failure.hxx>
index a074965c8ca970034d965da0c7f92c0bc6e1a880..b00ac92c7f698e4596665f2d154725765ef91681 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ShellSolid_HeaderFile
 #define _GEOMAlgo_ShellSolid_HeaderFile
 
index 2be64c012cf326fb4cffe7823ee76bda27e9bbe1..d34ab8352ef7ef1edd62dfaa763eb808b47c74a7 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_ShellSolid.jxx>
 
  
index c2e95da402ecfab34f3514fa39e62c57177deeb2..587bf30e3e4b5777fa042fd7ed096c4e9f1deb49 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_ShellSolid_HeaderFile
 #include <GEOMAlgo_ShellSolid.hxx>
 #endif
index aef1c1ae647c887e2df30542b298b489af4bbe6b..2722c9a7314ce5019f577edb8f61a8596893812a 100644 (file)
@@ -1,29 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:      GEOMAlgo_SolidSolid.cdl
+--  Created:   Wed Jan 26 12:05:14 2005
+--  Author:    Peter KURNEV
 --
--- File:       GEOMAlgo_SolidSolid.cdl
--- Created:    Wed Jan 26 12:05:14 2005
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2005
-
-
 class SolidSolid from GEOMAlgo 
     inherits ShellSolid from GEOMAlgo 
     
index 132f7825ea33d4b6883ce1496d7c1ac731ba825c..b64df9d55204cd30f6a9e68279664500ed27d747 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_SolidSolid.cxx
 // Created:    Wed Jan 26 12:06:26 2005
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_SolidSolid.ixx>
 
 #include <Standard_Failure.hxx>
index 7dcef534fd4cd78ce8d1b4dc31bcd27a88c46527..8fafb7b71f4e650270ecd166d45159a62d4ffef6 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_SolidSolid_HeaderFile
 #define _GEOMAlgo_SolidSolid_HeaderFile
 
index fae2b95099092c5e63fd070c6810923452ffcc19..a17ae72e2b83e9838ab9fa8a6c5be1e60657623e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_SolidSolid.jxx>
 
  
index 1fa87e7920d0da1318a75cce8a40f818f69d2d0a..41feab2d2cd0997c007a5f5eaaf5f93fbea3c405 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index 19991027d2d72b044d4dbbe285cf04ae3a88ec52..449ab9ace5d4a45c612194e7fe04501a4d1da3b1 100755 (executable)
@@ -1,28 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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:      GEOMAlgo_Splitter.cdl
+--  Created:    
+--  Author:    Peter KURNEV 
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
--- File:       GEOMAlgo_Splitter.cdl
--- Created:     
--- Author:     Peter KURNEV 
---             <pkv@irinox> 
--- Copyright:  
-
 class Splitter from GEOMAlgo 
        inherits Builder from GEOMAlgo 
        
index 431719ab15fe5009ae12bd5f65928172e828712e..34b284b559bed7396a0a004b899653e27065f1eb 100755 (executable)
@@ -1,27 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:       GEOMAlgo_Splitter.cxx
 // Created:    
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
+//
 #include <GEOMAlgo_Splitter.ixx>
 
 #include <TopAbs_ShapeEnum.hxx>
index 7f3b69fb74a037b0cebe40a5c2ee8e1ccb7d8ff9..d5ceaaf8b185b624e73b750d7be8a1d3d4825abc 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_Splitter_HeaderFile
 #define _GEOMAlgo_Splitter_HeaderFile
 
index ed917a680b650fd8f87130788a59919c4a76597b..9837af7dc3770e6f80bc610e505982ca41390dbf 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_Splitter.jxx>
 
  
index a15ed2864b6680ed5bc8a0011472381e58ad4db7..d12cbbdd893483e7ccbc342dc5cdd1c81bb8bb66 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index 1824b18bb65713b55c576d22e77f0420924d04b3..05359bd44204dc31ad91076fc9f3bc23e911d923 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_State_HeaderFile
 #define _GEOMAlgo_State_HeaderFile
 
index 15e89c8d1a79f373c5f993a34489a3aed0b92a0d..ae01b2c5f6160f14218e8970bd24a76f296b314e 100644 (file)
@@ -1,29 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:      GEOMAlgo_StateCollector.cdl
+--  Created:   Thu Mar 10 09:39:25 2005
+--  Author:    Peter KURNEV
 --
--- File:       GEOMAlgo_StateCollector.cdl
--- Created:    Thu Mar 10 09:39:25 2005
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2005
-
-
 class StateCollector from GEOMAlgo 
 
        ---Purpose: 
index 90da89ff5270e55740429f3da360e89870ae9844..5f43ce8d304129c2afe009ca71938ae0a9696c3d 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_StateCollector.cxx
 // Created:    Thu Mar 10 09:42:11 2005
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_StateCollector.ixx>
 
 //=======================================================================
index 0bd3e756f6094c75758165fcf286e0943efe6909..51e6ac87f438790eb7911815dcad47c87edceda0 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_StateCollector_HeaderFile
 #define _GEOMAlgo_StateCollector_HeaderFile
 
index 542bc6eb138ebb08cec9f407690dbaf7e643cdaa..f777e33443258233616d1045a437e5aeaa6499ed 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_StateCollector.jxx>
 
  
index 1a00e015a62b60888513664f0a2bef611c7be507..3bdd7984ca925a0721cb2fa6edda415bf8354c16 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_StateCollector_HeaderFile
 #include <GEOMAlgo_StateCollector.hxx>
 #endif
index d0fa19382704e1e6275dc5e082055e2df59036ca..9478097b47498bb7ac2b978cd5393b339465a6e7 100644 (file)
@@ -1,29 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:      GEOMAlgo_SurfaceTools.cdl
+--  Created:   Thu Jan 27 11:03:49 2005
+--  Author:    Peter KURNEV
 --
--- File:       GEOMAlgo_SurfaceTools.cdl
--- Created:    Thu Jan 27 11:03:49 2005
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2005
-
-
 class SurfaceTools from GEOMAlgo 
 
        ---Purpose: 
index fd2171e632ea8a40a81dceb84c02a0a4bf985d01..9039a1f1842cde6295cc4ad7b9679fba7306e9ef 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_SurfaceTools.cxx
 // Created:    Thu Jan 27 11:05:16 2005
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_SurfaceTools.ixx>
 
 #include <math.h>
index 5703def2661d994e01e81907b6ba8ee66b4570ac..fbcd3ebbe3d945f2239583543ddf0eea2d567890 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_SurfaceTools_HeaderFile
 #define _GEOMAlgo_SurfaceTools_HeaderFile
 
index 520fe97a30613fda92d703318364d58079155e3e..53cb8c9ada054945a654c408f6d250eb1afbb7ec 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_SurfaceTools.jxx>
 
  
index 2837fd50fcca850a9f9c7fbce08e15bf9668fcf0..716140b2dac489d0fb5f707ffb250d849fac6d6a 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Geom_Surface_HeaderFile
 #include <Geom_Surface.hxx>
 #endif
index ece735396de80d574338f3f8bd12d4f98bdb8986..6624245a4f25e910494f6e60e18aba16887512b6 100644 (file)
@@ -1,28 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:       GEOMAlgo_Tools.cdl
 -- Created:    Mon Dec  6 11:26:02 2004
 -- Author:     Peter KURNEV
---             <pkv@irinox>
-
-
+--
 class Tools from GEOMAlgo 
 
        ---Purpose: 
index 65250c36468210ed0e1edaa46aaad7dd5079f197..bad8a3c150eadb738057b169b476a66ee853bb45 100644 (file)
@@ -1,27 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_Tools.cxx
 // Created:    Mon Dec  6 11:35:29 2004
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
+//
 #include <GEOMAlgo_Tools.ixx>
 
 #include <gp_Pnt.hxx>
index 5ca79dd4068ed1628cacd728477a7c61c438f2d6..700972411b4ee46fb9f3d026c546ce0fe142f31e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_Tools_HeaderFile
 #define _GEOMAlgo_Tools_HeaderFile
 
index 1a731d46c8cb72e677401e413d1789cb51b1cfb6..6e05fe29efdfaf37861d73c80b6f2533fbc7f547 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_Tools.jxx>
 
  
index 0fa411d8adf7e9f071ec811d003fefb77ee6fb7b..5ff48c3d3dc637a8776696d03ea841ae2523c97c 100644 (file)
@@ -1,21 +1,23 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
index e781a94398ab1e9aed831c680944f4be92673277..0bbc2fc20c490e1dd4196775aec6d7b4dfc23b76 100755 (executable)
@@ -1,26 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       GEOMAlgo_Tools3D.cdl
 -- Created:    
 -- Author:     Peter KURNEV  
-
+--
 class Tools3D from GEOMAlgo 
 
        ---Purpose:  Auxiliary tools for Algorithms   
index 6d97c6f61acd244594f2e7c536cbd26ae400e37c..f990d80f6ccfa8442a4e44bed4a38d2ed7254061 100755 (executable)
@@ -1,26 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_Tools3D.cxx
 // Created:    
 // Author:     Peter KURNEV
-
+//
 #include <GEOMAlgo_Tools3D.ixx>
 
 #include <Precision.hxx>
index 934cfa4fab43db4709574ed25c4b538ea005efb8..42cd68861f48db015156658230d54af81abf883c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_Tools3D_HeaderFile
 #define _GEOMAlgo_Tools3D_HeaderFile
 
index 52bb882c44dc49df0795a29c277591b6ade7ad6b..76dbf81ede820841ee1eb3cb0d7696ec4d719249 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_Tools3D.jxx>
 
  
index 22ac3268f40c785309fa4c8d19fc63a88d696b21..328d5bb725e51b3a9333d7b991bfa0af50fa9af6 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index 9e83db59a3476b67412fdb097f4cf3f10aad2651..7c2cecf17cf3736c50e886296dcf0a26c059cfd3 100644 (file)
@@ -1,29 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:      GEOMAlgo_VertexSolid.cdl
+--  Created:   Wed Jan 12 16:34:53 2005
+--  Author:    Peter KURNEV
 --
--- File:       GEOMAlgo_VertexSolid.cdl
--- Created:    Wed Jan 12 16:34:53 2005
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2005
-
-
 class VertexSolid from GEOMAlgo  
        inherits ShapeSolid from GEOMAlgo
 
index 716bf0390599f4f1fe37e83f3baf9db07595b5ee..bff0fb1e26f4c862ad4016dd0ae2a1d606b7b560 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_VertexSolid.cxx
 // Created:    Wed Jan 12 16:36:40 2005
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_VertexSolid.ixx>
 
 #include <gp_Pnt.hxx>
index 7c77c2fa954df8e9a9caae536eb937a6fd0061fd..9514f5239fe8455dd9549c5b27242d808f36cd84 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_VertexSolid_HeaderFile
 #define _GEOMAlgo_VertexSolid_HeaderFile
 
index 32c7746f28bf4f56fbb0272e33c2696a2aba8610..0ce6655208f4d008b76a2188ec066c7254b1c9b1 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_VertexSolid.jxx>
 
  
index 8925ddd34a0dbb805ee068c87d19dcacadaa2f7d..9a546c6e59478944c86f6d3b20bda99217f51181 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_VertexSolid_HeaderFile
 #include <GEOMAlgo_VertexSolid.hxx>
 #endif
index d9f19b9d70d487af2275a76f457d5ea2066025b3..7b433dd10dbf2c593b9cb68a3da75c1f9db4fe03 100755 (executable)
@@ -1,27 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       GEOMAlgo_WESCorrector.cdl
 -- Created:    
 -- Author:     Peter KURNEV
-
-
+--
 class WESCorrector from GEOMAlgo  
     inherits Algo from GEOMAlgo
 
index 1b5a04035fe5a665549e73ebd378c8006e788dca..b56d73ced68f7755a22963050c4b7d241781017c 100755 (executable)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTAlgo_WESCorrector.cxx
 // Created:    
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_WESCorrector.ixx>
 
 #include <TopoDS.hxx>
index 42e53af5962a92130372bb35194500524dff744a..4fef49e1ab39768bf80c114d3b988a4fe818b028 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_WESCorrector_HeaderFile
 #define _GEOMAlgo_WESCorrector_HeaderFile
 
index a2b071b1f4e3c12f8f6d3fc14c6dda1bca6df5ef..3e166ac8bc5a6e0f15ec4ae55bf0998cc909edc0 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_WESCorrector.jxx>
 
  
index 236296f9449fcb53d76eeff96120ab73b3b6706b..0b46e1d000ecacb8f7eecd10b70c649f248ec8c1 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_WireEdgeSet_HeaderFile
 #include <GEOMAlgo_WireEdgeSet.hxx>
 #endif
index 1fe60ad75ca358b156c57a1c456b5756655d1f57..89153b277196da90dff53544c6984676532a5c0c 100755 (executable)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       GEOMAlgo_WireEdgeSet.cdl
 -- Created:    
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class WireEdgeSet from GEOMAlgo 
 
        ---Purpose: 
index bcae26b8f4f74ac0d935d82a183c8e79f5d81b35..8e5936281745b0a61aecc66315609ce0390045bc 100755 (executable)
@@ -1,27 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_WireEdgeSet.cxx
 // Created:    
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
+//
 #include <GEOMAlgo_WireEdgeSet.ixx>
 
 //=======================================================================
index 0a0416438e8bd9d7e8effd5dd8471702c2f2a32e..3025b44f56561ac3977bb5b3b82225114426bcc2 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_WireEdgeSet_HeaderFile
 #define _GEOMAlgo_WireEdgeSet_HeaderFile
 
index 70dbac598d7a152394f11383d90bb06a9a97417b..68e64178578009d01497cef29846031433a96a4b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_WireEdgeSet.jxx>
 
  
index 68885c47e3f1ba9849f9c0030a62f0e1cbf3dc6d..1c8f96a172c23ac5450e85e810f73917afe330c6 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Face_HeaderFile
 #include <TopoDS_Face.hxx>
 #endif
index 1fa98cd39f663ce0800125739d82704c8c2903cf..3079bb44af1a7fb3a22302c1c1d62d719070a12a 100644 (file)
@@ -1,28 +1,27 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Lesser General Public
+--  License as published by the Free Software Foundation; either
+--  version 2.1 of the License.
 --
--- File:       GEOMAlgo_WireSolid.cdl
--- Created:    Wed Jan 12 10:17:00 2005
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2005
-
+--  This library is distributed in the hope that it will be useful,
+--  but WITHOUT ANY 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:      GEOMAlgo_WireSolid.cdl
+--  Created:   Wed Jan 12 10:17:00 2005
+--  Author:    Peter KURNEV
 
 class WireSolid from GEOMAlgo 
        inherits ShapeSolid from GEOMAlgo
index 90b7985c2527d7e6fd82ee8f0cc05260779b4894..62c3f4e20452c7095584ac2faae513350da7a217 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_WireSolid.cxx
 // Created:    Wed Jan 12 10:19:31 2005
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_WireSolid.ixx>
 
 #include <Standard_Failure.hxx>
index 867cc561e554c34e63bcc317b274678a8d23b8be..58af52edeb0be695fe477cbe900228374524dd61 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_WireSolid_HeaderFile
 #define _GEOMAlgo_WireSolid_HeaderFile
 
index d4943559c7ec54b89d0a83116be6b340ef4b5453..32aa1fbfd0f61d63394799d6cce6526e614d5d72 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_WireSolid.jxx>
 
  
index 4409553d21c611bead54a055637a2084c7a44c78..cba4ece226da1ad2a976ae1cc09bc97b1ef2ec30 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_WireSolid_HeaderFile
 #include <GEOMAlgo_WireSolid.hxx>
 #endif
index ed3669b254c84f0553b75b2132e47678d71e8e7d..a5da768983560abbfc35660af75fba77b5b5d1ee 100755 (executable)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       GEOMAlgo_WireSplitter.cdl
 -- Created:    
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class WireSplitter from GEOMAlgo   
        inherits Algo from GEOMAlgo  
 
index e4671d3a2c79410a80cc78dd37db604732c3ddbd..ddfe74f806d32d58eff267bac99e89dc5dd570b8 100755 (executable)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       GEOMAlgo_WireSplitter.cxx
 // Created:    
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <GEOMAlgo_WireSplitter.ixx>
 
 #include <TColStd_SequenceOfReal.hxx>
@@ -484,10 +485,10 @@ static
 
   gp_Pnt2d aPb=Coord2d(aVb, aEOuta, myFace);
 
-  const BOP_ListOfEdgeInfo& aLEInfoVb=mySmartMap.FindFromKey(aVb);
+  //const BOP_ListOfEdgeInfo& aLEInfoVb=mySmartMap.FindFromKey(aVb);
   //
   aTol=2.*Tolerance2D(aVb, aGAS);
-  aTol2=aTol*aTol;
+  aTol2=10.*aTol*aTol;
   //
   aNb=aLS.Length();
   if (aNb>0) {
@@ -549,7 +550,7 @@ static
   }
   //
   aTol2D=2.*Tolerance2D(aVb, aGAS);
-  aTol2D2=aTol2D*aTol2D;
+  aTol2D2=100.*aTol2D*aTol2D;
   //
   // anAngleIn in Vb from edge aEOuta
   const BOP_ListOfEdgeInfo& aLEInfo=mySmartMap.FindFromKey(aVb);
@@ -664,9 +665,7 @@ static
   //
   if (aType==GeomAbs_BSplineSurface||
       aType==GeomAbs_Sphere||
-      //modified by NIZNHY-PKV Wed Nov 29 10:18:50 2006f
       GeomAbs_SurfaceOfRevolution) {
-    //modified by NIZNHY-PKV Wed Nov 29 10:18:55 2006t
     if (aTol2D < aTolV3D) {
       aTol2D=aTolV3D;
     }
@@ -790,24 +789,29 @@ static
                         const GeomAdaptor_Surface& aGAS,
                         const Standard_Boolean aFlag)
 {
-  Standard_Real aFirst, aLast, aToler, dt, aTV, aTV1, anAngle;
-  
+  Standard_Real aFirst, aLast, aToler, dt, aTV, aTV1, anAngle, aTX;
+  gp_Pnt2d aPV, aPV1;
+  gp_Vec2d aV2D;
   Handle(Geom2d_Curve) aC2D;
-  
-  BOPTools_Tools2D::CurveOnSurface (anEdge, myFace, aC2D, 
-                                   aFirst, aLast, aToler, Standard_True);
-
+  //
   aTV=BRep_Tool::Parameter (aV, anEdge, myFace);
-  if (Precision::IsInfinite(aTV))
+  if (Precision::IsInfinite(aTV)) {
     return 0.;
-
+  }
+  //
+  BOPTools_Tools2D::CurveOnSurface (anEdge, myFace, aC2D, 
+                                   aFirst, aLast, aToler, Standard_True);
   //dt=1.e-7;
-  dt=Tolerance2D(aV, aGAS);
-  
-  if(dt > (aLast - aFirst) * 0.25) {
+  //modified by NIZNHY-PKV Wed Sep 10 14:06:04 2008f
+  //dt=Tolerance2D(aV, aGAS);
+  dt=2.*Tolerance2D(aV, aGAS);
+  //modified by NIZNHY-PKV Wed Sep 10 14:06:07 2008t
+  //
+  aTX=0.25*(aLast - aFirst);
+  if(dt > aTX) {
     // to save direction of the curve as much as it possible
     // in the case of big tolerances
-    dt = (aLast - aFirst) * 0.25
+    dt = aTX
   }
   //
   if (fabs (aTV-aFirst) < fabs(aTV - aLast)) {
@@ -816,27 +820,22 @@ static
   else {
     aTV1=aTV - dt;
   }
-  
-  gp_Pnt2d aPV, aPV1;
+  //
   aC2D->D0 (aTV, aPV);
   aC2D->D0 (aTV1, aPV1);
-  
-  gp_Vec2d aV2D;
   //
   if (aFlag) {//IN
     gp_Vec2d aV2DIn(aPV1, aPV);
-    //
     aV2D=aV2DIn;
   }
-
   else {
     gp_Vec2d aV2DOut(aPV, aPV1);
     aV2D=aV2DOut;
   }
-
+  //
   gp_Dir2d aDir2D(aV2D);
   anAngle=Angle(aDir2D);
-
+  //
   return anAngle;
 }
 //=======================================================================
index f2bb54361437c2f82d103df31bc5df9450dba264..24c2da7bcc38bd2196ef5c2195a0f6b7ef0ce486 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _GEOMAlgo_WireSplitter_HeaderFile
 #define _GEOMAlgo_WireSplitter_HeaderFile
 
index fa8f559f81292f76c40281f722dd73abe758bf7c..668dcb466368e0a435f828d052020d1350cda33f 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <GEOMAlgo_WireSplitter.jxx>
 
  
index 235db183515a9d69110ed2133be90b417ac55424..4155486569ff3d710e55cb2d1a58296af6fedcec 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Face_HeaderFile
 #include <TopoDS_Face.hxx>
 #endif
index 12d404dce15fa5dad51752014c1922b9de516fe5..9a67a925a710653193ecefae1c2bb3b815458c6d 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_BlockFix_BlockFixAPI_HeaderFile
 #define _Handle_BlockFix_BlockFixAPI_HeaderFile
 
index f0fc8be95ca9e7a7abfe00090e9c34abab7dbb9c..2b0556babda640e665a2719f263596e60b9bc6e3 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_BlockFix_PeriodicSurfaceModifier_HeaderFile
 #define _Handle_BlockFix_PeriodicSurfaceModifier_HeaderFile
 
index 8a84637b798f7cf1fdce43f827efe8b7c386fa0e..784bc139f54c047a53051ab5efbca1d980c55d40 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_BlockFix_SphereSpaceModifier_HeaderFile
 #define _Handle_BlockFix_SphereSpaceModifier_HeaderFile
 
index 8b9bf2d3596575553f072e05adfaf1b3e3fb4c06..7db50df1db2f4362b92f83344d2cca74fddf1d37 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_Clsf_HeaderFile
 #define _Handle_GEOMAlgo_Clsf_HeaderFile
 
index b397bddb893a5581c1a99d677b7c40128fae1d59..82c8df8b578f34ba3fb59319ddf39c0a5b1e4bca 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_ClsfBox_HeaderFile
 #define _Handle_GEOMAlgo_ClsfBox_HeaderFile
 
index 8098ce527a73fab4e7665305c5dcd6aad2a1aab9..ae126bd8422b710f1244aa740a380f9f5b2dc61b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_ClsfSolid_HeaderFile
 #define _Handle_GEOMAlgo_ClsfSolid_HeaderFile
 
index ca42ed91715a991c81f7eabb5630abdcbed9eb3b..0dc562e397f98ba2433ded95d91d53b618e71639 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_ClsfSurf_HeaderFile
 #define _Handle_GEOMAlgo_ClsfSurf_HeaderFile
 
index 738d8abac0fde0f5b55e69ebb737f4d7ea848e68..802db426b50312e6237710001525ef577e537790 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
 
index 8360ec29038fd1e658646384b7f63436bf762682..5bce8fb7b7e81331fc9bbb7b6745db6ab4b7feb6 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
 
index b8439ed912d212bf9e1b16eea14978ac07da97b3..7d6201498fc903c44866add997e20cc3d096e0bf 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
 
index f6956a7c1a54a77e866116a2b437fcb018dbe8eb..3d04a64dd19a24539b443a369570064eef3ac646 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
 
index 3a26aeacee50845d2d78578cf9c32e4d785154cd..4d8ebab5d63fb27a480aad0e917ce2f872e3a287 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
 
index 861c3e3eaac9d231efadb9d21bbe1faf7e1616c4..b267e794e31a8822461d90b6a6143bfacaa9916b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_HAlgo_HeaderFile
 #define _Handle_GEOMAlgo_HAlgo_HeaderFile
 
index d1003aab3bbb3c211c2d26d886dbc4a0a721c0c5..90167a8efaaf90489e430be5a8ad9cdebd4b930f 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile
 #define _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile
 
index 6a5b8a74caeb3f96f005764de692f031d5ccdf1c..02eff4be362bcebfe0b214ae9936af9c9fdcfdcb 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_HeaderFile
 #define _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_HeaderFile
 
index 019555891c00105a0103a1f9878a0817f1cce0f0..e23bce049a71839563950180f06e73d03e30414f 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
 #define _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
 
index 1c53e213a81d65d225170519524825187520acbd..9576d62eb6879f049d4641fbe9546212efc40ae5 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile
 #define _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile
 
index ef425b4c2ebf2d175c5c37d8654c509a3e1bfcb0..f60329b5df57679b0fdabaaa59d7b7966937ff68 100644 (file)
@@ -1,24 +1,24 @@
-// File generated by CPPExt (Transient)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+//  Copyright (C) 2003-2007  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 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.
-
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_HeaderFile
 #define _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_HeaderFile
 
index f218abeae59606f50c92cc2e61f6f956e13be107..fb305154fd65d155070bc2a32a3585fec1427dd6 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_HeaderFile
 #define _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_HeaderFile
 
index 6be59702fec639fc6d525ad24b39512f92196898..974b6fe643c9c7c981ae8e0330cb4b80311a76bf 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes_HeaderFile
 #define _Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes_HeaderFile
 
index de9397fc9a7a26b3666a021d02d579904c8c8400..fc587d37bdb8da08dc5861ecd0454bad4472459a 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_GEOMAlgo_ListNodeOfListOfPnt_HeaderFile
 #define _Handle_GEOMAlgo_ListNodeOfListOfPnt_HeaderFile
 
index b1a0f9609a433224111bc9b2dabdbb2dd65746d1..4f0ddc3716ca7bafbb3591879620a208905f0529 100644 (file)
-#  GEOM GEOMAlgo : tools for Glue Faces algorithm
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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) 2004  CEA
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it 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 library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY 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 GEOMAlgo : tools for Glue Faces algorithm
 #  File   : Makefile.in
 #  Author : Julia DOROVSKIKH
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
-lib_LTLIBRARIES =  libGEOMAlgo.la
+lib_LTLIBRARIES = libGEOMAlgo.la
 
-dist_libGEOMAlgo_la_SOURCES = \
-       BlockFix.cxx \
-       BlockFix_BlockFixAPI.cxx \
-       BlockFix_CheckTool.cxx \
-       BlockFix_PeriodicSurfaceModifier.cxx \
-       BlockFix_SphereSpaceModifier.cxx \
-       BlockFix_UnionEdges.cxx \
-       BlockFix_UnionFaces.cxx \
-       GEOMAlgo_Algo.cxx \
-       GEOMAlgo_Builder_0.cxx \
-       GEOMAlgo_Builder_1.cxx \
-       GEOMAlgo_Builder_2.cxx \
-       GEOMAlgo_Builder_3.cxx \
-       GEOMAlgo_Builder_4.cxx \
-       GEOMAlgo_BuilderArea.cxx \
-       GEOMAlgo_Builder.cxx \
-       GEOMAlgo_BuilderFace.cxx \
-       GEOMAlgo_BuilderShape.cxx \
-       GEOMAlgo_BuilderSolid.cxx \
-       GEOMAlgo_BuilderTools.cxx \
-       GEOMAlgo_ClsfBox.cxx \
-       GEOMAlgo_Clsf.cxx \
-       GEOMAlgo_ClsfSurf.cxx \
-       GEOMAlgo_CoupleOfShapes.cxx \
-       GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx \
-       GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_0.cxx \
-       GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_0.cxx \
-       GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_0.cxx \
-       GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx \
-       GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx \
-       GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx \
-       GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx \
-       GEOMAlgo_DataMapOfPassKeyInteger_0.cxx \
-       GEOMAlgo_DataMapOfRealListOfShape_0.cxx \
-       GEOMAlgo_DataMapOfShapeReal_0.cxx \
-       GEOMAlgo_DataMapOfShapeShapeSet_0.cxx \
-       GEOMAlgo_FinderShapeOn1.cxx \
-       GEOMAlgo_FinderShapeOn2.cxx \
-       GEOMAlgo_FinderShapeOn.cxx \
-       GEOMAlgo_FinderShapeOnQuad.cxx \
-       GEOMAlgo_GlueAnalyser.cxx \
-       GEOMAlgo_Gluer.cxx \
-       GEOMAlgo_Gluer1.cxx \
-       GEOMAlgo_HAlgo.cxx \
-       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx \
-       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx \
-       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx \
-       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx \
-       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx \
-       GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx \
-       GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx \
-       GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx \
-       GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx \
-       GEOMAlgo_IndexedDataMapOfShapeState_0.cxx \
-       GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx \
-       GEOMAlgo_ListIteratorOfListOfPnt_0.cxx \
-       GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx \
-       GEOMAlgo_ListNodeOfListOfPnt_0.cxx \
-       GEOMAlgo_ListOfCoupleOfShapes_0.cxx \
-       GEOMAlgo_ListOfPnt_0.cxx \
-       GEOMAlgo_PassKey.cxx \
-       GEOMAlgo_PassKeyMapHasher.cxx \
-       GEOMAlgo_PassKeyShape.cxx \
-       GEOMAlgo_PassKeyShapeMapHasher.cxx \
-       GEOMAlgo_ShapeAlgo.cxx \
-       GEOMAlgo_ShapeSet.cxx \
-       GEOMAlgo_ShapeSolid.cxx \
-       GEOMAlgo_ShellSolid.cxx \
-       GEOMAlgo_SolidSolid.cxx \
-       GEOMAlgo_Splitter.cxx \
-       GEOMAlgo_StateCollector.cxx \
-       GEOMAlgo_SurfaceTools.cxx \
-       GEOMAlgo_Tools3D.cxx \
-       GEOMAlgo_Tools.cxx \
-       GEOMAlgo_VertexSolid.cxx \
-       GEOMAlgo_WESCorrector.cxx \
-       GEOMAlgo_WireEdgeSet.cxx \
-       GEOMAlgo_WireSolid.cxx \
-       GEOMAlgo_WireSplitter.cxx \
-       GEOMAlgo_ClsfSolid.cxx \
-       GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx \
-       GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_0.cxx \
-       GEOMAlgo_DataMapOfPassKeyShapeShape_0.cxx \
-       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_0.cxx \
-       GEOMAlgo_ShapeInfoFiller_1.cxx \
-       GEOMAlgo_IndexedDataMapOfShapeShapeInfo_0.cxx \
-       GEOMAlgo_ShapeInfo.cxx \
+dist_libGEOMAlgo_la_SOURCES =                  \
+       BlockFix.cxx                            \
+       BlockFix_BlockFixAPI.cxx                \
+       BlockFix_CheckTool.cxx                  \
+       BlockFix_PeriodicSurfaceModifier.cxx    \
+       BlockFix_SphereSpaceModifier.cxx        \
+       BlockFix_UnionEdges.cxx                 \
+       BlockFix_UnionFaces.cxx                 \
+       GEOMAlgo_Algo.cxx                       \
+       GEOMAlgo_Builder_0.cxx                  \
+       GEOMAlgo_Builder_1.cxx                  \
+       GEOMAlgo_Builder_2.cxx                  \
+       GEOMAlgo_Builder_3.cxx                  \
+       GEOMAlgo_Builder_4.cxx                  \
+       GEOMAlgo_BuilderArea.cxx                \
+       GEOMAlgo_Builder.cxx                    \
+       GEOMAlgo_BuilderFace.cxx                \
+       GEOMAlgo_BuilderShape.cxx               \
+       GEOMAlgo_BuilderSolid.cxx               \
+       GEOMAlgo_BuilderTools.cxx               \
+       GEOMAlgo_ClsfBox.cxx                    \
+       GEOMAlgo_Clsf.cxx                       \
+       GEOMAlgo_ClsfSurf.cxx                   \
+       GEOMAlgo_CoupleOfShapes.cxx             \
+       GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx         \
+       GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_0.cxx        \
+       GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_0.cxx              \
+       GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_0.cxx          \
+       GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx             \
+       GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx            \
+       GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx                  \
+       GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx              \
+       GEOMAlgo_DataMapOfPassKeyInteger_0.cxx  \
+       GEOMAlgo_DataMapOfRealListOfShape_0.cxx \
+       GEOMAlgo_DataMapOfShapeReal_0.cxx       \
+       GEOMAlgo_DataMapOfShapeShapeSet_0.cxx   \
+       GEOMAlgo_FinderShapeOn1.cxx             \
+       GEOMAlgo_FinderShapeOn2.cxx             \
+       GEOMAlgo_FinderShapeOn.cxx              \
+       GEOMAlgo_FinderShapeOnQuad.cxx          \
+       GEOMAlgo_GlueAnalyser.cxx               \
+       GEOMAlgo_Gluer.cxx                      \
+       GEOMAlgo_Gluer1.cxx                     \
+       GEOMAlgo_HAlgo.cxx                      \
+       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx                 \
+       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx           \
+       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx      \
+       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx     \
+       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx   \
+       GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx                     \
+       GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx               \
+       GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx          \
+       GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx                         \
+       GEOMAlgo_IndexedDataMapOfShapeState_0.cxx                       \
+       GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx               \
+       GEOMAlgo_ListIteratorOfListOfPnt_0.cxx                          \
+       GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx                   \
+       GEOMAlgo_ListNodeOfListOfPnt_0.cxx      \
+       GEOMAlgo_ListOfCoupleOfShapes_0.cxx     \
+       GEOMAlgo_ListOfPnt_0.cxx                \
+       GEOMAlgo_PassKey.cxx                    \
+       GEOMAlgo_PassKeyMapHasher.cxx           \
+       GEOMAlgo_PassKeyShape.cxx               \
+       GEOMAlgo_PassKeyShapeMapHasher.cxx      \
+       GEOMAlgo_ShapeAlgo.cxx                  \
+       GEOMAlgo_ShapeSet.cxx                   \
+       GEOMAlgo_ShapeSolid.cxx                 \
+       GEOMAlgo_ShellSolid.cxx                 \
+       GEOMAlgo_SolidSolid.cxx                 \
+       GEOMAlgo_Splitter.cxx                   \
+       GEOMAlgo_StateCollector.cxx             \
+       GEOMAlgo_SurfaceTools.cxx               \
+       GEOMAlgo_Tools3D.cxx                    \
+       GEOMAlgo_Tools.cxx                      \
+       GEOMAlgo_VertexSolid.cxx                \
+       GEOMAlgo_WESCorrector.cxx               \
+       GEOMAlgo_WireEdgeSet.cxx                \
+       GEOMAlgo_WireSolid.cxx                  \
+       GEOMAlgo_WireSplitter.cxx               \
+       GEOMAlgo_ClsfSolid.cxx                  \
+       GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx                  \
+       GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_0.cxx              \
+       GEOMAlgo_DataMapOfPassKeyShapeShape_0.cxx                               \
+       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_0.cxx       \
+       GEOMAlgo_ShapeInfoFiller_1.cxx                                          \
+       GEOMAlgo_IndexedDataMapOfShapeShapeInfo_0.cxx                           \
+       GEOMAlgo_ShapeInfo.cxx                                                  \
        GEOMAlgo_ShapeInfoFiller.cxx
 
 # header files
-salomeinclude_HEADERS = \
-       BlockFix_BlockFixAPI.hxx \
-       BlockFix_BlockFixAPI.lxx \
-       BlockFix_CheckTool.hxx \
-       Handle_BlockFix_BlockFixAPI.hxx \
-       GEOMAlgo_Algo.hxx \
-       GEOMAlgo_BuilderArea.hxx \
-       GEOMAlgo_BuilderFace.hxx \
-       GEOMAlgo_Builder.hxx \
-       GEOMAlgo_BuilderShape.hxx \
-       GEOMAlgo_BuilderSolid.hxx \
-       GEOMAlgo_BuilderTools.hxx \
-       GEOMAlgo_ClsfBox.hxx \
-       GEOMAlgo_Clsf.hxx \
-       GEOMAlgo_ClsfSurf.hxx \
-       GEOMAlgo_CoupleOfShapes.hxx \
-       GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx \
-       GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx \
-       GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx \
-       GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx \
-       GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx \
-       GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx \
-       GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx \
-       GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx \
-       GEOMAlgo_DataMapOfPassKeyInteger.hxx \
-       GEOMAlgo_DataMapOfRealListOfShape.hxx \
-       GEOMAlgo_DataMapOfShapeReal.hxx \
-       GEOMAlgo_DataMapOfShapeShapeSet.hxx \
-       GEOMAlgo_FinderShapeOn1.hxx \
-       GEOMAlgo_FinderShapeOn2.hxx \
-       GEOMAlgo_FinderShapeOn.hxx \
-       GEOMAlgo_FinderShapeOnQuad.hxx \
-       GEOMAlgo_GlueAnalyser.hxx \
-       GEOMAlgo_Gluer.hxx \
-       GEOMAlgo_Gluer.ixx \
-       GEOMAlgo_Gluer.jxx \
-       GEOMAlgo_Gluer1.hxx \
-       GEOMAlgo_Gluer1.ixx \
-       GEOMAlgo_Gluer1.jxx \
-       GEOMAlgo_HAlgo.hxx \
-       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx \
-       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx \
-       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx \
-       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx \
-       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx \
-       GEOMAlgo_IndexedDataMapOfIntegerShape.hxx \
-       GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx \
-       GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx \
-       GEOMAlgo_IndexedDataMapOfShapeBox.hxx \
-       GEOMAlgo_IndexedDataMapOfShapeState.hxx \
-       GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx \
-       GEOMAlgo_ListIteratorOfListOfPnt.hxx \
-       GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx \
-       GEOMAlgo_ListNodeOfListOfPnt.hxx \
-       GEOMAlgo_ListOfCoupleOfShapes.hxx \
-       GEOMAlgo_ListOfPnt.hxx \
-       GEOMAlgo_PassKey.hxx \
-       GEOMAlgo_PassKeyMapHasher.hxx \
-       GEOMAlgo_PassKeyShape.hxx \
-       GEOMAlgo_PassKeyShapeMapHasher.hxx \
-       GEOMAlgo_PWireEdgeSet.hxx \
-       GEOMAlgo_ShapeAlgo.hxx \
-       GEOMAlgo_ShapeSet.hxx \
-       GEOMAlgo_ShapeSolid.hxx \
-       GEOMAlgo_ShellSolid.hxx \
-       GEOMAlgo_SolidSolid.hxx \
-       GEOMAlgo_Splitter.hxx \
-       GEOMAlgo_StateCollector.hxx \
-       GEOMAlgo_State.hxx \
-       GEOMAlgo_SurfaceTools.hxx \
-       GEOMAlgo_Tools3D.hxx \
-       GEOMAlgo_Tools.hxx \
-       GEOMAlgo_VertexSolid.hxx \
-       GEOMAlgo_WESCorrector.hxx \
-       GEOMAlgo_WireEdgeSet.hxx \
-       GEOMAlgo_WireSolid.hxx \
-       GEOMAlgo_WireSplitter.hxx \
-       Handle_GEOMAlgo_ClsfBox.hxx \
-       Handle_GEOMAlgo_Clsf.hxx \
-       Handle_GEOMAlgo_ClsfSurf.hxx \
-       Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx \
-       Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx \
-       Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx \
-       Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx \
-       Handle_GEOMAlgo_HAlgo.hxx \
-       Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx \
-       Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx \
-       Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx \
-       Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx \
-       Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx \
-       Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx \
-       Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx
-       GEOMAlgo_ClsfSolid.hxx \
-       GEOMAlgo_ClsfSolid.ixx \
-       GEOMAlgo_ClsfSolid.jxx \
-       GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx \
-       GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx \
-       GEOMAlgo_DataMapOfPassKeyShapeShape.hxx \
-       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx \
-       GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx \
-       GEOMAlgo_KindOfBounds.hxx \
-       GEOMAlgo_KindOfClosed.hxx \
-       GEOMAlgo_KindOfName.hxx \
-       GEOMAlgo_KindOfShape.hxx \
-       GEOMAlgo_ShapeInfo.hxx \
-       GEOMAlgo_ShapeInfo.ixx \
-       GEOMAlgo_ShapeInfo.jxx \
-       GEOMAlgo_ShapeInfoFiller.hxx \
-       GEOMAlgo_ShapeInfoFiller.ixx \
-       GEOMAlgo_ShapeInfoFiller.jxx \
-       Handle_GEOMAlgo_ClsfSolid.hxx \
-       Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx \
+salomeinclude_HEADERS =                                        \
+       BlockFix.hxx                                    \
+       BlockFix.ixx                                    \
+       BlockFix.jxx                                    \
+       BlockFix_BlockFixAPI.hxx                        \
+       BlockFix_BlockFixAPI.ixx                        \
+       BlockFix_BlockFixAPI.jxx                        \
+       BlockFix_BlockFixAPI.lxx                        \
+       BlockFix_CheckTool.hxx                          \
+       BlockFix_CheckTool.ixx                          \
+       BlockFix_CheckTool.jxx                          \
+       BlockFix_PeriodicSurfaceModifier.hxx            \
+       BlockFix_PeriodicSurfaceModifier.ixx            \
+       BlockFix_PeriodicSurfaceModifier.jxx            \
+       BlockFix_SphereSpaceModifier.hxx                \
+       BlockFix_SphereSpaceModifier.ixx                \
+       BlockFix_SphereSpaceModifier.jxx                \
+       BlockFix_UnionEdges.hxx                         \
+       BlockFix_UnionEdges.ixx                         \
+       BlockFix_UnionEdges.jxx                         \
+       BlockFix_UnionFaces.hxx                         \
+       BlockFix_UnionFaces.ixx                         \
+       BlockFix_UnionFaces.jxx                         \
+       Handle_BlockFix_BlockFixAPI.hxx                 \
+       Handle_BlockFix_SphereSpaceModifier.hxx         \
+       Handle_BlockFix_PeriodicSurfaceModifier.hxx     \
+       GEOMAlgo_Algo.hxx                               \
+       GEOMAlgo_Algo.ixx                               \
+       GEOMAlgo_Algo.jxx                               \
+       GEOMAlgo_BuilderArea.hxx                        \
+       GEOMAlgo_BuilderArea.ixx                        \
+       GEOMAlgo_BuilderArea.jxx                        \
+       GEOMAlgo_BuilderFace.hxx                        \
+       GEOMAlgo_BuilderFace.ixx                        \
+       GEOMAlgo_BuilderFace.jxx                        \
+       GEOMAlgo_Builder.hxx                            \
+       GEOMAlgo_Builder.ixx                            \
+       GEOMAlgo_Builder.jxx                            \
+       GEOMAlgo_BuilderShape.hxx                       \
+       GEOMAlgo_BuilderShape.ixx                       \
+       GEOMAlgo_BuilderShape.jxx                       \
+       GEOMAlgo_BuilderSolid.hxx                       \
+       GEOMAlgo_BuilderSolid.ixx                       \
+       GEOMAlgo_BuilderSolid.jxx                       \
+       GEOMAlgo_BuilderTools.hxx                       \
+       GEOMAlgo_BuilderTools.ixx                       \
+       GEOMAlgo_BuilderTools.jxx                       \
+       GEOMAlgo_ClsfBox.hxx                            \
+       GEOMAlgo_ClsfBox.ixx                            \
+       GEOMAlgo_ClsfBox.jxx                            \
+       GEOMAlgo_Clsf.hxx                               \
+       GEOMAlgo_Clsf.ixx                               \
+       GEOMAlgo_Clsf.jxx                               \
+       GEOMAlgo_ClsfSurf.hxx                           \
+       GEOMAlgo_ClsfSurf.ixx                           \
+       GEOMAlgo_ClsfSurf.jxx                           \
+       GEOMAlgo_CoupleOfShapes.hxx                     \
+       GEOMAlgo_CoupleOfShapes.ixx                     \
+       GEOMAlgo_CoupleOfShapes.jxx                     \
+       GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx   \
+       GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx  \
+       GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx        \
+       GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx    \
+       GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx       \
+       GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx      \
+       GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx            \
+       GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx        \
+       GEOMAlgo_DataMapOfPassKeyInteger.hxx    \
+       GEOMAlgo_DataMapOfRealListOfShape.hxx   \
+       GEOMAlgo_DataMapOfShapeReal.hxx         \
+       GEOMAlgo_DataMapOfShapeShapeSet.hxx     \
+       GEOMAlgo_FinderShapeOn1.ixx             \
+       GEOMAlgo_FinderShapeOn1.hxx             \
+       GEOMAlgo_FinderShapeOn1.jxx             \
+       GEOMAlgo_FinderShapeOn2.hxx             \
+       GEOMAlgo_FinderShapeOn2.ixx             \
+       GEOMAlgo_FinderShapeOn2.jxx             \
+       GEOMAlgo_FinderShapeOn.hxx              \
+       GEOMAlgo_FinderShapeOn.ixx              \
+       GEOMAlgo_FinderShapeOn.jxx              \
+       GEOMAlgo_FinderShapeOnQuad.hxx          \
+       GEOMAlgo_GlueAnalyser.hxx               \
+       GEOMAlgo_GlueAnalyser.ixx               \
+       GEOMAlgo_GlueAnalyser.jxx               \
+       GEOMAlgo_Gluer.hxx                      \
+       GEOMAlgo_Gluer.ixx                      \
+       GEOMAlgo_Gluer.jxx                      \
+       GEOMAlgo_Gluer1.hxx                     \
+       GEOMAlgo_Gluer1.ixx                     \
+       GEOMAlgo_Gluer1.jxx                     \
+       GEOMAlgo_HAlgo.hxx                      \
+       GEOMAlgo_HAlgo.ixx                      \
+       GEOMAlgo_HAlgo.jxx                      \
+       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx                   \
+       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx             \
+       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx        \
+       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx                       \
+       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx                     \
+       GEOMAlgo_IndexedDataMapOfIntegerShape.hxx                                       \
+       GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx                                 \
+       GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx                            \
+       GEOMAlgo_IndexedDataMapOfShapeBox.hxx                                           \
+       GEOMAlgo_IndexedDataMapOfShapeState.hxx                                         \
+       GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx                                 \
+       GEOMAlgo_ListIteratorOfListOfPnt.hxx                                            \
+       GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx                                     \
+       GEOMAlgo_ListNodeOfListOfPnt.hxx        \
+       GEOMAlgo_ListOfCoupleOfShapes.hxx       \
+       GEOMAlgo_ListOfPnt.hxx                  \
+       GEOMAlgo_PassKey.hxx                    \
+       GEOMAlgo_PassKey.ixx                    \
+       GEOMAlgo_PassKey.jxx                    \
+       GEOMAlgo_PassKeyMapHasher.hxx           \
+       GEOMAlgo_PassKeyMapHasher.ixx           \
+       GEOMAlgo_PassKeyMapHasher.jxx           \
+       GEOMAlgo_PassKeyShape.hxx               \
+       GEOMAlgo_PassKeyShape.ixx               \
+       GEOMAlgo_PassKeyShape.jxx               \
+       GEOMAlgo_PassKeyShapeMapHasher.hxx      \
+       GEOMAlgo_PassKeyShapeMapHasher.ixx      \
+       GEOMAlgo_PassKeyShapeMapHasher.jxx      \
+       GEOMAlgo_PWireEdgeSet.hxx               \
+       GEOMAlgo_ShapeAlgo.hxx                  \
+       GEOMAlgo_ShapeAlgo.ixx                  \
+       GEOMAlgo_ShapeAlgo.jxx                  \
+       GEOMAlgo_ShapeSet.hxx                   \
+       GEOMAlgo_ShapeSet.ixx                   \
+       GEOMAlgo_ShapeSet.jxx                   \
+       GEOMAlgo_ShapeSolid.hxx                 \
+       GEOMAlgo_ShapeSolid.ixx                 \
+       GEOMAlgo_ShapeSolid.jxx                 \
+       GEOMAlgo_ShellSolid.hxx                 \
+       GEOMAlgo_ShellSolid.ixx                 \
+       GEOMAlgo_ShellSolid.jxx                 \
+       GEOMAlgo_SolidSolid.hxx                 \
+       GEOMAlgo_SolidSolid.ixx                 \
+       GEOMAlgo_SolidSolid.jxx                 \
+       GEOMAlgo_Splitter.hxx                   \
+       GEOMAlgo_Splitter.ixx                   \
+       GEOMAlgo_Splitter.jxx                   \
+       GEOMAlgo_StateCollector.hxx             \
+       GEOMAlgo_StateCollector.ixx             \
+       GEOMAlgo_StateCollector.jxx             \
+       GEOMAlgo_State.hxx                      \
+       GEOMAlgo_SurfaceTools.hxx               \
+       GEOMAlgo_SurfaceTools.ixx               \
+       GEOMAlgo_SurfaceTools.jxx               \
+       GEOMAlgo_Tools3D.hxx                    \
+       GEOMAlgo_Tools3D.ixx                    \
+       GEOMAlgo_Tools3D.jxx                    \
+       GEOMAlgo_Tools.hxx                      \
+       GEOMAlgo_Tools.ixx                      \
+       GEOMAlgo_Tools.jxx                      \
+       GEOMAlgo_VertexSolid.hxx                \
+       GEOMAlgo_VertexSolid.ixx                \
+       GEOMAlgo_VertexSolid.jxx                \
+       GEOMAlgo_WESCorrector.hxx               \
+       GEOMAlgo_WESCorrector.ixx               \
+       GEOMAlgo_WESCorrector.jxx               \
+       GEOMAlgo_WireEdgeSet.hxx                \
+       GEOMAlgo_WireEdgeSet.ixx                \
+       GEOMAlgo_WireEdgeSet.jxx                \
+       GEOMAlgo_WireSolid.hxx                  \
+       GEOMAlgo_WireSolid.ixx                  \
+       GEOMAlgo_WireSolid.jxx                  \
+       GEOMAlgo_WireSplitter.hxx               \
+       GEOMAlgo_WireSplitter.ixx               \
+       GEOMAlgo_WireSplitter.jxx               \
+       Handle_GEOMAlgo_ClsfBox.hxx             \
+       Handle_GEOMAlgo_Clsf.hxx                \
+       Handle_GEOMAlgo_ClsfSurf.hxx            \
+       Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx                        \
+       Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx                       \
+       Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx                             \
+       Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx                         \
+       Handle_GEOMAlgo_HAlgo.hxx                                                       \
+       Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx            \
+       Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx      \
+       Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx \
+       Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx                \
+       Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx              \
+       Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx                              \
+       Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx                                         \
+       GEOMAlgo_ClsfSolid.hxx                                                          \
+       GEOMAlgo_ClsfSolid.ixx                                                          \
+       GEOMAlgo_ClsfSolid.jxx                                                          \
+       GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx                        \
+       GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx                            \
+       GEOMAlgo_DataMapOfPassKeyShapeShape.hxx                                         \
+       GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx                 \
+       GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx                                     \
+       GEOMAlgo_KindOfBounds.hxx               \
+       GEOMAlgo_KindOfClosed.hxx               \
+       GEOMAlgo_KindOfName.hxx                 \
+       GEOMAlgo_KindOfShape.hxx                \
+       GEOMAlgo_ShapeInfo.hxx                  \
+       GEOMAlgo_ShapeInfo.ixx                  \
+       GEOMAlgo_ShapeInfo.jxx                  \
+       GEOMAlgo_ShapeInfoFiller.hxx            \
+       GEOMAlgo_ShapeInfoFiller.ixx            \
+       GEOMAlgo_ShapeInfoFiller.jxx            \
+       Handle_GEOMAlgo_ClsfSolid.hxx           \
+       Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx                     \
        Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
 
-libGEOMAlgo_la_CPPFLAGS = \
-       $(CAS_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       -I$(srcdir)/../NMTDS \
+libGEOMAlgo_la_CPPFLAGS =      \
+       $(CAS_CPPFLAGS)         \
+       $(KERNEL_CXXFLAGS)      \
+       -I$(srcdir)/../NMTDS    \
        -I$(srcdir)/../NMTTools
 
-libGEOMAlgo_la_LDFLAGS  = \
-       ../NMTTools/libNMTTools.la \
-       $(STDLIB) \
+libGEOMAlgo_la_LDFLAGS  =              \
+       ../NMTTools/libNMTTools.la      \
+       $(STDLIB)                       \
        $(CAS_LDPATH) -lTKBO -lTKShHealing -lTKBool -lTKMesh
+
+# extra distributed files
+CDL_FILES =                                    \
+       BlockFix.cdl                            \
+       BlockFix_BlockFixAPI.cdl                \
+       BlockFix_CheckTool.cdl                  \
+       BlockFix_PeriodicSurfaceModifier.cdl    \
+       BlockFix_SphereSpaceModifier.cdl        \
+       BlockFix_UnionEdges.cdl                 \
+       BlockFix_UnionFaces.cdl                 \
+       GEOMAlgo.cdl                            \
+       GEOMAlgo_Algo.cdl                       \
+       GEOMAlgo_Builder.cdl                    \
+       GEOMAlgo_BuilderArea.cdl                \
+       GEOMAlgo_BuilderFace.cdl                \
+       GEOMAlgo_BuilderShape.cdl               \
+       GEOMAlgo_BuilderSolid.cdl               \
+       GEOMAlgo_BuilderTools.cdl               \
+       GEOMAlgo_Clsf.cdl                       \
+       GEOMAlgo_ClsfBox.cdl                    \
+       GEOMAlgo_ClsfSolid.cdl                  \
+       GEOMAlgo_ClsfSurf.cdl                   \
+       GEOMAlgo_CoupleOfShapes.cdl             \
+       GEOMAlgo_FinderShapeOn.cdl              \
+       GEOMAlgo_FinderShapeOn1.cdl             \
+       GEOMAlgo_FinderShapeOn2.cdl             \
+       GEOMAlgo_GlueAnalyser.cdl               \
+       GEOMAlgo_Gluer.cdl                      \
+       GEOMAlgo_Gluer1.cdl                     \
+       GEOMAlgo_HAlgo.cdl                      \
+       GEOMAlgo_PassKey.cdl                    \
+       GEOMAlgo_PassKeyMapHasher.cdl           \
+       GEOMAlgo_PassKeyShape.cdl               \
+       GEOMAlgo_PassKeyShapeMapHasher.cdl      \
+       GEOMAlgo_ShapeAlgo.cdl                  \
+       GEOMAlgo_ShapeInfo.cdl                  \
+       GEOMAlgo_ShapeInfoFiller.cdl            \
+       GEOMAlgo_ShapeSet.cdl                   \
+       GEOMAlgo_ShapeSolid.cdl                 \
+       GEOMAlgo_ShellSolid.cdl                 \
+       GEOMAlgo_SolidSolid.cdl                 \
+       GEOMAlgo_Splitter.cdl                   \
+       GEOMAlgo_StateCollector.cdl             \
+       GEOMAlgo_SurfaceTools.cdl               \
+       GEOMAlgo_Tools.cdl                      \
+       GEOMAlgo_Tools3D.cdl                    \
+       GEOMAlgo_VertexSolid.cdl                \
+       GEOMAlgo_WESCorrector.cdl               \
+       GEOMAlgo_WireEdgeSet.cdl                \
+       GEOMAlgo_WireSolid.cdl                  \
+       GEOMAlgo_WireSplitter.cdl
+
+EXTRA_DIST += $(CDL_FILES)
index 230515df9b16b190cf10eb4b3e4b3131649a6168..e34e4587f83dd8905afff5739ce0f3af2657ba70 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMBase.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//
-//  File   : GEOMBase.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "GEOMBase.h"
-#include "GeometryGUI.h"
-#include "GEOMBase_aParameterDlg.h"
 
-#include "GEOM_Client.hxx"
+#include <GeometryGUI.h>
+#include <GEOM_Client.hxx>
 
 ////  SALOME Includes
-#include "Utils_ORB_INIT.hxx"
-#include "Utils_SINGLETON.hxx"
-
-#include "SALOME_LifeCycleCORBA.hxx"
-
-#include "GEOM_AssemblyBuilder.h"
-#include "GEOM_Actor.h"
-#include "SVTK_RenderWindowInteractor.h"
-#include "SVTK_ViewModel.h"
-#include "SVTK_ViewWindow.h"
-#include "OCCViewer_ViewPort3d.h"
-#include "OCCViewer_ViewModel.h"
-#include "OCCViewer_ViewWindow.h"
-
-#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
-#include "GEOM_AISTrihedron.hxx"
-
-#include "SUIT_Session.h"
-#include "SUIT_ViewWindow.h"
-#include "SUIT_MessageBox.h"
-#include "SalomeApp_Application.h"
-#include "SalomeApp_Study.h"
+#include <GEOM_Actor.h>
+#include <SVTK_ViewModel.h>
+#include <SVTK_ViewWindow.h>
+#include <OCCViewer_ViewPort3d.h>
+#include <OCCViewer_ViewModel.h>
+#include <OCCViewer_ViewWindow.h>
+
+#include <SALOME_ListIO.hxx>
+#include <SALOME_ListIteratorOfListIO.hxx>
+
+#include <SUIT_Desktop.h>
+#include <SUIT_Session.h>
+#include <SUIT_ViewManager.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_MessageBox.h>
+#include <SalomeApp_Application.h>
+#include <SalomeApp_Study.h>
 
 // // Open CASCADE Includes
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepPrimAPI_MakeCone.hxx>
 
-#include <Geom_Circle.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
 #include <AIS_ListOfInteractive.hxx>
 
 #include <TopAbs.hxx>
 #include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
+#include <TopoDS.hxx>
 
 #include <Precision.hxx>
 
 #include <vtkRenderer.h>
-#include <qvaluelist.h>
-#include <qstringlist.h>
 
 #include <set>
 
-#include "GEOMImpl_Types.hxx"
-
-using namespace std;
-
-#include "SALOMEDSClient.hxx"
-
-
 //=====================================================================================
 // function : GetShapeFromIOR()
 // purpose  : exist also as static method !
@@ -98,10 +74,10 @@ using namespace std;
 TopoDS_Shape GEOMBase::GetShapeFromIOR(QString IOR)
 {
   TopoDS_Shape result;
-  if(IOR.stripWhiteSpace().isEmpty())
+  if(IOR.trimmed().isEmpty())
     return result;
 
-  CORBA::Object_var obj = SalomeApp_Application::orb()->string_to_object((char*)(IOR.latin1()));
+  CORBA::Object_var obj = SalomeApp_Application::orb()->string_to_object(IOR.toLatin1().data());
   if(CORBA::is_nil(obj))
     return result;
   GEOM::GEOM_Object_var GeomObject = GEOM::GEOM_Object::_narrow( obj );
@@ -227,55 +203,55 @@ bool GEOMBase::GetShapeTypeString(const TopoDS_Shape& aShape, Standard_CString&
     {
     case TopAbs_COMPOUND:
       {
-       aTypeString = CORBA::string_dup(QObject::tr("GEOM_COMPOUND"));
+       aTypeString = CORBA::string_dup(QObject::tr("GEOM_COMPOUND").toLatin1().constData());
        return true;
       }
     case  TopAbs_COMPSOLID:
       {
-       aTypeString = CORBA::string_dup(QObject::tr("GEOM_COMPOUNDSOLID")) ;
+       aTypeString = CORBA::string_dup(QObject::tr("GEOM_COMPOUNDSOLID").toLatin1().constData()) ;
        return true ;
       }
     case TopAbs_SOLID:
       {
-       aTypeString = CORBA::string_dup(QObject::tr("GEOM_SOLID")) ;
+       aTypeString = CORBA::string_dup(QObject::tr("GEOM_SOLID").toLatin1().constData()) ;
        return true ;
       }
     case TopAbs_SHELL:
       {
-       aTypeString = CORBA::string_dup(QObject::tr("GEOM_SHELL")) ;
+       aTypeString = CORBA::string_dup(QObject::tr("GEOM_SHELL").toLatin1().constData()) ;
        return true ;
       }
     case TopAbs_FACE:
       {
        BRepAdaptor_Surface surf(TopoDS::Face(aShape));
        if(surf.GetType() == GeomAbs_Plane) {
-         aTypeString = CORBA::string_dup(QObject::tr("GEOM_PLANE"));
+         aTypeString = CORBA::string_dup(QObject::tr("GEOM_PLANE").toLatin1().constData());
          return true;
        }
        else if(surf.GetType() == GeomAbs_Cylinder) {
-         aTypeString = CORBA::string_dup(QObject::tr("GEOM_SURFCYLINDER"));
+         aTypeString = CORBA::string_dup(QObject::tr("GEOM_SURFCYLINDER").toLatin1().constData());
          return true;
        }
        else if(surf.GetType() == GeomAbs_Sphere) {
-         aTypeString = CORBA::string_dup(QObject::tr("GEOM_SURFSPHERE"));
+         aTypeString = CORBA::string_dup(QObject::tr("GEOM_SURFSPHERE").toLatin1().constData());
          return true ;
        }
        else if(surf.GetType() == GeomAbs_Torus) {
-         aTypeString = CORBA::string_dup(QObject::tr("GEOM_SURFTORUS"));
+         aTypeString = CORBA::string_dup(QObject::tr("GEOM_SURFTORUS").toLatin1().constData());
          return true ;
        }
        else if(surf.GetType() == GeomAbs_Cone) {
-         aTypeString = CORBA::string_dup(QObject::tr("GEOM_SURFCONE"));
+         aTypeString = CORBA::string_dup(QObject::tr("GEOM_SURFCONE").toLatin1().constData());
          return true ;
        }
        else {
-         aTypeString = CORBA::string_dup(QObject::tr("GEOM_FACE"));
+         aTypeString = CORBA::string_dup(QObject::tr("GEOM_FACE").toLatin1().constData());
          return true;
        }
       }
     case TopAbs_WIRE:
       {
-       aTypeString = CORBA::string_dup(QObject::tr("GEOM_WIRE"));
+       aTypeString = CORBA::string_dup(QObject::tr("GEOM_WIRE").toLatin1().constData());
        return true;
       }
     case TopAbs_EDGE:
@@ -283,31 +259,31 @@ bool GEOMBase::GetShapeTypeString(const TopoDS_Shape& aShape, Standard_CString&
        BRepAdaptor_Curve curv(TopoDS::Edge(aShape));
        if(curv.GetType() == GeomAbs_Line) {
          if((Abs(curv.FirstParameter()) >= 1E6) || (Abs(curv.LastParameter()) >= 1E6))
-           aTypeString = CORBA::string_dup(QObject::tr("GEOM_LINE"));
+           aTypeString = CORBA::string_dup(QObject::tr("GEOM_LINE").toLatin1().constData());
          else
-           aTypeString = CORBA::string_dup(QObject::tr("GEOM_EDGE"));
+           aTypeString = CORBA::string_dup(QObject::tr("GEOM_EDGE").toLatin1().constData());
          return true;
        }
        else if(curv.GetType() == GeomAbs_Circle) {
          if(curv.IsClosed())
-           aTypeString = CORBA::string_dup(QObject::tr("GEOM_CIRCLE"));
+           aTypeString = CORBA::string_dup(QObject::tr("GEOM_CIRCLE").toLatin1().constData());
          else
-           aTypeString = CORBA::string_dup(QObject::tr("GEOM_ARC"));
+           aTypeString = CORBA::string_dup(QObject::tr("GEOM_ARC").toLatin1().constData());
        return true;
       }
        else {
-         aTypeString = CORBA::string_dup(QObject::tr("GEOM_EDGE"));
+         aTypeString = CORBA::string_dup(QObject::tr("GEOM_EDGE").toLatin1().constData());
          return true;
        }
       }
     case TopAbs_VERTEX:
       {
-       aTypeString = CORBA::string_dup(QObject::tr("GEOM_VERTEX"));
+       aTypeString = CORBA::string_dup(QObject::tr("GEOM_VERTEX").toLatin1().constData());
        return true;
       }
     case TopAbs_SHAPE:
       {
-       aTypeString = CORBA::string_dup(QObject::tr("GEOM_SHAPE"));
+       aTypeString = CORBA::string_dup(QObject::tr("GEOM_SHAPE").toLatin1().constData());
        return true;
       }
     }
@@ -332,11 +308,13 @@ Handle(GEOM_AISShape) GEOMBase::ConvertIORinGEOMAISShape(const char * IOR, Stand
   if ( !anObj )
     return resultShape;
 
-  QPtrList<SUIT_ViewWindow> aViewWindowsList = SUIT_Session::session()->activeApplication()->desktop()->windows();
+  QList<SUIT_ViewWindow*> aViewWindowsList = SUIT_Session::session()->activeApplication()->desktop()->windows();
 
-  for ( QPtrListIterator<SUIT_ViewWindow> it( aViewWindowsList ); it.current(); ++it ) {
-    if (it.current()->getViewManager()->getType() == OCCViewer_Viewer::Type()) {
-      Handle (AIS_InteractiveContext) ic = ((OCCViewer_Viewer*)it.current()->getViewManager()->getViewModel())->getAISContext();
+  QListIterator<SUIT_ViewWindow*> it( aViewWindowsList );
+  while ( it.hasNext() ) {
+    SUIT_ViewWindow* aVW = it.next();
+    if (aVW && aVW->getViewManager()->getType() == OCCViewer_Viewer::Type()) {
+      Handle (AIS_InteractiveContext) ic = ((OCCViewer_Viewer*)aVW->getViewManager()->getViewModel())->getAISContext();
 
       AIS_ListOfInteractive List;
       ic->DisplayedObjects(List);
@@ -352,7 +330,7 @@ Handle(GEOM_AISShape) GEOMBase::ConvertIORinGEOMAISShape(const char * IOR, Stand
            Handle(SALOME_InteractiveObject) GIO = Handle(SALOME_InteractiveObject)::DownCast(aSh->getIO());
            if(GIO->hasEntry() && strcmp(GIO->getEntry(), anObj->GetID().c_str()) == 0) {
              if(!onlyInActiveView ||
-                it.current() == SUIT_Session::session()->activeApplication()->desktop()->activeWindow()) {
+                aVW == SUIT_Session::session()->activeApplication()->desktop()->activeWindow()) {
                testResult = true;
                resultShape = aSh;
                return resultShape;
@@ -384,11 +362,13 @@ GEOM_Actor* GEOMBase::ConvertIORinGEOMActor(const char* IOR, Standard_Boolean& t
   if ( !anObj )
     return GEOM_Actor::New();
 
-  QPtrList<SUIT_ViewWindow> aViewWindowsList = SUIT_Session::session()->activeApplication()->desktop()->windows();
+  QList<SUIT_ViewWindow*> aViewWindowsList = SUIT_Session::session()->activeApplication()->desktop()->windows();
 
-  for ( QPtrListIterator<SUIT_ViewWindow> it( aViewWindowsList ); it.current(); ++it ) {
-    if (it.current()->getViewManager()->getType() == SVTK_Viewer::Type()) {
-      SVTK_ViewWindow* aVTKViewWindow = dynamic_cast<SVTK_ViewWindow*>( it.current() );
+  QListIterator<SUIT_ViewWindow*> it( aViewWindowsList );
+  while ( it.hasNext() ) {
+    SUIT_ViewWindow* aVW = it.next();
+    if (aVW && aVW->getViewManager()->getType() == SVTK_Viewer::Type()) {
+      SVTK_ViewWindow* aVTKViewWindow = dynamic_cast<SVTK_ViewWindow*>( aVW );
       if( !aVTKViewWindow )
        continue;
       vtkRenderer* Renderer = aVTKViewWindow->getRenderer();
@@ -402,7 +382,7 @@ GEOM_Actor* GEOMBase::ConvertIORinGEOMActor(const char* IOR, Standard_Boolean& t
            Handle(SALOME_InteractiveObject) GIO = Handle(SALOME_InteractiveObject)::DownCast(anActor->getIO());
            if(GIO->hasEntry() && strcmp(GIO->getEntry(), anObj->GetID().c_str()) == 0) {
              if(!onlyInActiveView ||
-                it.current() == SUIT_Session::session()->activeApplication()->desktop()->activeWindow()) {
+                aVW == SUIT_Session::session()->activeApplication()->desktop()->activeWindow()) {
                testResult = true;
                return anActor;
              }
@@ -427,12 +407,14 @@ Handle(AIS_InteractiveObject) GEOMBase::GetAIS( const Handle(SALOME_InteractiveO
   if ( theIO.IsNull() || !theIO->hasEntry() )
     return Handle(AIS_InteractiveObject)();
 
-  QPtrList<SUIT_ViewWindow> aViewWindowsList = SUIT_Session::session()->activeApplication()->desktop()->windows();
+  QList<SUIT_ViewWindow*> aViewWindowsList = SUIT_Session::session()->activeApplication()->desktop()->windows();
 
-  for ( QPtrListIterator<SUIT_ViewWindow> it( aViewWindowsList ); it.current(); ++it ) {
-    if (it.current()->getViewManager()->getType() != OCCViewer_Viewer::Type())
+  QListIterator<SUIT_ViewWindow*> it( aViewWindowsList );
+  while ( it.hasNext() ) {
+    SUIT_ViewWindow* aVW = it.next();
+    if (!aVW || aVW->getViewManager()->getType() != OCCViewer_Viewer::Type())
       continue;
-    Handle (AIS_InteractiveContext) anIC = ((OCCViewer_Viewer*)it.current()->getViewManager()->getViewModel())->getAISContext();
+    Handle (AIS_InteractiveContext) anIC = ((OCCViewer_Viewer*)aVW->getViewManager()->getViewModel())->getAISContext();
 
     AIS_ListOfInteractive aList;
     anIC->DisplayedObjects( aList );
@@ -448,7 +430,7 @@ Handle(AIS_InteractiveObject) GEOMBase::GetAIS( const Handle(SALOME_InteractiveO
       {
         if( isOnlyInActiveView )
         {
-          if ( it.current() == SUIT_Session::session()->activeApplication()->desktop()->activeWindow() )
+          if ( aVW == SUIT_Session::session()->activeApplication()->desktop()->activeWindow() )
             return anIter.Value();
         }
         else
@@ -475,11 +457,13 @@ Handle(GEOM_AISShape) GEOMBase::ConvertIOinGEOMAISShape(const Handle(SALOME_Inte
     return res;
   }
 
-  QPtrList<SUIT_ViewWindow> aViewWindowsList = SUIT_Session::session()->activeApplication()->desktop()->windows();
+  QList<SUIT_ViewWindow*> aViewWindowsList = SUIT_Session::session()->activeApplication()->desktop()->windows();
 
-  for ( QPtrListIterator<SUIT_ViewWindow> it( aViewWindowsList ); it.current(); ++it ) {
-    if (it.current()->getViewManager()->getType() == OCCViewer_Viewer::Type()) {
-      Handle (AIS_InteractiveContext) ic = ((OCCViewer_Viewer*)it.current()->getViewManager()->getViewModel())->getAISContext();
+  QListIterator<SUIT_ViewWindow*> it( aViewWindowsList );
+  while ( it.hasNext() ) {
+    SUIT_ViewWindow* aVW = it.next();
+    if (aVW && aVW->getViewManager()->getType() == OCCViewer_Viewer::Type()) {
+      Handle (AIS_InteractiveContext) ic = ((OCCViewer_Viewer*)aVW->getViewManager()->getViewModel())->getAISContext();
 
       AIS_ListOfInteractive List;
       ic->DisplayedObjects(List);
@@ -499,7 +483,7 @@ Handle(GEOM_AISShape) GEOMBase::ConvertIOinGEOMAISShape(const Handle(SALOME_Inte
             {
               if(onlyInActiveView)
               {
-                if(it.current() == SUIT_Session::session()->activeApplication()->desktop()->activeWindow())
+                if(aVW == SUIT_Session::session()->activeApplication()->desktop()->activeWindow())
                 {
                   testResult = true;
                   return aSh;
@@ -753,34 +737,6 @@ bool GEOMBase::LinearEdgeExtremities(const TopoDS_Shape& S,  gp_Pnt& P1, gp_Pnt&
 }
 
 
-//=======================================================================
-// function : Parameter()
-// purpose  : return a parameter (float) from a dialog box
-//
-//  avalue1    : is a float or integer used as a default value displayed
-//  aTitle1    : is the title for aValue1
-//  aTitle     : is the main title
-//  bottom     : maximum value to be entered
-//  top               : minimum value to be entered
-//  decimals   : number of decimals
-//=======================================================================
-double GEOMBase::Parameter(Standard_Boolean& res, const char* aValue1, const char* aTitle1, const char* aTitle, const double bottom, const double top, const int decimals)
-{
-  GEOMBase_aParameterDlg * Dialog = new GEOMBase_aParameterDlg(aValue1, aTitle1, SUIT_Session::session()->activeApplication()->desktop(),
-                                                              aTitle, TRUE, 0, bottom, top, decimals);
-  int r = Dialog->exec();
-  float X = 0.0;
-  if(r == QDialog::Accepted) {
-    res = Standard_True;
-    X = Dialog->getValue();
-  }
-  else
-    res = Standard_False;
-  delete Dialog;
-  return X;
-}
-
-
 //=======================================================================
 // function : SelectionByNameInDialogs()
 // purpose  : Called when user has entered a name of object in a LineEdit.
@@ -795,13 +751,13 @@ bool GEOMBase::SelectionByNameInDialogs(QWidget* aWidget, const QString& objectU
   _PTR(Study) ST = appStudy->studyDS();
 
   std::vector<_PTR(SObject)> listSO;
-  listSO = ST->FindObjectByName(objectUserName.latin1(), "GEOM");
+  listSO = ST->FindObjectByName(objectUserName.toStdString(), "GEOM");
 
   if(listSO.size() < 1) {
     const QString caption  = QObject::tr("GEOM_WRN_WARNING");
     const QString text = QObject::tr("GEOM_NAME_INCORRECT");
     const QString button0  = QObject::tr("GEOM_BUT_OK");
-    SUIT_MessageBox::error1(aWidget, caption, text, button0);
+    SUIT_MessageBox::critical(aWidget, caption, text, button0);
     return false;
   }
   /* More than one object with same name */
@@ -809,14 +765,14 @@ bool GEOMBase::SelectionByNameInDialogs(QWidget* aWidget, const QString& objectU
     const QString caption  = QObject::tr("GEOM_WRN_WARNING");
     const QString text = QObject::tr("GEOM_IDENTICAL_NAMES_SELECT_BY_MOUSE");
     const QString button0  = QObject::tr("GEOM_BUT_OK") ;
-    SUIT_MessageBox::error1(aWidget, caption, text, button0) ;
+    SUIT_MessageBox::critical(aWidget, caption, text, button0) ;
     listSO.clear();
     return false;
   }
 
   _PTR(SObject) theObj ( listSO[0] );
   /* Create a SALOME_InteractiveObject with a SALOME::SObject */
-  char* aCopyobjectUserName = CORBA::string_dup(objectUserName);
+  char* aCopyobjectUserName = CORBA::string_dup(objectUserName.toLatin1().constData());
   Handle(SALOME_InteractiveObject) SI = new SALOME_InteractiveObject(theObj->GetID().c_str(), "GEOM", aCopyobjectUserName);
   delete(aCopyobjectUserName);
 
@@ -873,7 +829,7 @@ QString GEOMBase::GetDefaultName(const QString& theOperation)
   bool isUnique = false;
   while (!isUnique) {
     aName = theOperation + "_" + QString::number(++aNumber);
-    isUnique = (aSet.count(aName.latin1()) == 0);
+    isUnique = (aSet.count(aName.toStdString()) == 0);
   }
 
   return aName;
@@ -891,12 +847,12 @@ void GEOMBase::ShowErrorMessage(const char* theErrorCode, const char* theComment
 
   QString aText = "";
   if (!anErrorCode.isEmpty())
-    aText.append("\n" + QObject::tr(anErrorCode));
+    aText.append("\n" + QObject::tr(anErrorCode.toLatin1().constData()));
   if (!aComment.isEmpty())
     aText.append("\n" + QString(theComment));
 
-  SUIT_MessageBox::error1( SUIT_Session::session()->activeApplication()->desktop(), QObject::tr( "GEOM_ERROR" ),
-                          QObject::tr("GEOM_PRP_ABORT") + aText, "OK" );
+  SUIT_MessageBox::critical( SUIT_Session::session()->activeApplication()->desktop(), QObject::tr( "GEOM_ERROR" ),
+                            QObject::tr("GEOM_PRP_ABORT") + aText, "OK" );
 }
 
 
@@ -957,7 +913,7 @@ QString GEOMBase::GetName( GEOM::GEOM_Object_ptr theObj )
     CORBA::String_var anIOR = SalomeApp_Application::orb()->object_to_string( theObj );
     if ( strcmp(anIOR.in(), "") != 0 )
     {
-      _PTR(SObject) aSObj ( appStudy->studyDS()->FindObjectIOR( string( anIOR ) ) );
+      _PTR(SObject) aSObj ( appStudy->studyDS()->FindObjectIOR( std::string( anIOR ) ) );
 
       _PTR(GenericAttribute) anAttr;
 
index ff3feecbbc3e201617425d9e69257307cb793c7f..360fd131821e5ac2603743d00081a6fa32650169 100644 (file)
@@ -1,37 +1,35 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMBase.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : GEOMBase.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
 #ifndef GEOMBASE_H
 #define GEOMBASE_H
 
 #include "GEOM_GEOMBase.hxx"
 
 // SALOME Includes
-#include "GEOM_AISShape.hxx"
+#include <GEOM_AISShape.hxx>
 
 // IDL Headers
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 
 // QT Includes
-#include <qstring.h>
+#include <QString>
 
 class GEOM_Actor;
 class SALOME_ListIO;
-class TColStd_MapOfInteger;
 
 class QWidget;
 
@@ -101,12 +98,6 @@ public :
   static bool LinearEdgeExtremities(const TopoDS_Shape& S, gp_Pnt& P1, gp_Pnt& P2);
   static void GetBipointDxDyDz(gp_Pnt P1, gp_Pnt P2, double& dx, double& dy, double& dz);
 
-  /* 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);
-
   /* Simulation management */
   static bool CreateArrowForLinearEdge(const TopoDS_Shape& tds, TopoDS_Shape& ArrowCone);
 
@@ -127,4 +118,4 @@ public :
   static bool IsShape(GEOM::GEOM_Object_ptr theObj);
 };
 
-#endif
+#endif // GEOMBASE_H
diff --git a/src/GEOMBase/GEOMBase.pro b/src/GEOMBase/GEOMBase.pro
new file mode 100644 (file)
index 0000000..bd3592a
--- /dev/null
@@ -0,0 +1,76 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = GEOMBase
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+GUI_LDFLAGS = -L$$(GUI_ROOT_DIR)/lib/salome
+
+CAS_LDPATH = -L$${CASROOT}/Linux/lib 
+
+INCLUDEPATH += $${QT_INCLUDES} $${VTK_INCLUDES} $${CAS_CPPFLAGS} $${PYTHON_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} $${CORBA_INCLUDES} ../OBJECT ../GEOMClient ../GEOMImpl ../GEOMGUI ../DlgRef $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/idl -lSalomeIDLGEOM -L$$(GEOM_ROOT_DIR)/lib -lGEOM -lDlgRef $${KERNEL_LDFLAGS} -lOpUtil $${GUI_LDFLAGS} -lsuit -lOCCViewer -lVTKViewer -lSVTK -lSalomePrs -lSalomeApp -lCAM $${CAS_LDPATH} -lTKPrim
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += GEOMBASE_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+HEADERS  = GEOMBase.h
+HEADERS += GEOMBase_Skeleton.h
+HEADERS += GEOMBase_Helper.h
+HEADERS += GEOM_Operation.h
+HEADERS += GEOM_GEOMBase.hxx
+
+SOURCES  = GEOMBase.cxx
+SOURCES += GEOMBase_Skeleton.cxx
+SOURCES += GEOMBase_aParameterDlg.cxx
+SOURCES += GEOMBase_Helper.cxx
+SOURCES += GEOM_Operation.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index d62fc63cdc82445a8ecc9ff5f45a44a3965d8b58..326998aed8a2fd7511a803bfc5dfc03aaa4e77ed 100755 (executable)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2004  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMBase_Helper.cxx
+// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
 //
-//
-//  File   : GEOMBase_Helper.cxx
-//  Author : Sergey ANIKIN
-//  Module : GEOM
-//  $Header$
-
-#include <SUIT_ViewModel.h>
-
 #include "GEOMBase_Helper.h"
 #include "GEOMBase.h"
 #include "GEOM_Operation.h"
-#include "GeometryGUI.h"
-#include "GEOM_Displayer.h"
-#include "GEOMImpl_Types.hxx"
 
+#include <GeometryGUI.h>
+
+#include <SUIT_Desktop.h>
 #include <SUIT_Session.h>
+#include <SUIT_ViewManager.h>
 #include <SUIT_ViewWindow.h>
+#include <SUIT_ViewModel.h>
 #include <SUIT_MessageBox.h>
 #include <SUIT_OverrideCursor.h>
 
 #include <LightApp_SelectionMgr.h>
 #include <LightApp_DataOwner.h>
 #include <SalomeApp_Tools.h>
-#include <SalomeApp_DataModel.h>
+
+#include <SALOME_Prs.h>
 
 #include <OCCViewer_ViewModel.h>
 #include <SVTK_ViewModel.h>
 
-#include <OB_Browser.h>
-
 #include <TColStd_MapOfInteger.hxx>
 #include <TCollection_AsciiString.hxx>
 
-using namespace std;
-
-#include <SALOMEDSClient.hxx>
-
-
 //================================================================
 // Function : getActiveView
 // Purpose  : Get active view window, returns 0 if no open study frame
@@ -171,9 +162,9 @@ void GEOMBase_Helper::erase( const ObjectList& objList, const bool updateView )
 void GEOMBase_Helper::erase( GEOM::GEOM_Object_ptr object, const bool updateView )
 {
   if ( !object->_is_nil() ) {
-    string entry = getEntry( object );
+    std::string entry = getEntry( object );
     getDisplayer()->Erase( new SALOME_InteractiveObject(
-      entry.c_str(), "GEOM", strdup( GEOMBase::GetName( object ) ) ), true, updateView );
+      entry.c_str(), "GEOM", strdup( GEOMBase::GetName( object ).toLatin1().constData() ) ), true, updateView );
   }
 }
 
@@ -210,9 +201,9 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
     // Enable activisation of selection
     getDisplayer()->SetToActivate( true );
 
-    string entry = getEntry( object );
+    std::string entry = getEntry( object );
     getDisplayer()->Redisplay(new SALOME_InteractiveObject
-                              (entry.c_str(), "GEOM", strdup(GEOMBase::GetName(object))), false);
+                              (entry.c_str(), "GEOM", strdup(GEOMBase::GetName(object).toLatin1().constData())), false);
   }
 
   if ( withChildren ) {
@@ -220,7 +211,7 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
     if ( aDoc && aDoc->studyDS() ) {
       _PTR(Study) aStudy = aDoc->studyDS();
       CORBA::String_var objStr = SalomeApp_Application::orb()->object_to_string(object);
-      _PTR(SObject) aSObj (aStudy->FindObjectIOR(string(objStr.in())));
+      _PTR(SObject) aSObj (aStudy->FindObjectIOR(std::string(objStr.in())));
       if ( aSObj  ) {
        _PTR(ChildIterator) anIt ( aStudy->NewChildIterator( aSObj ) );
        for ( anIt->InitEx( true ); anIt->More(); anIt->Next() ) {
@@ -228,9 +219,9 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
             (GeometryGUI::ClientSObjectToObject(anIt->Value()));
          if ( !CORBA::is_nil( aChild ) ) {
            if ( !aChild->_is_nil() ) {
-             string entry = getEntry( aChild );
+             std::string entry = getEntry( aChild );
              getDisplayer()->Redisplay( new SALOME_InteractiveObject(
-                entry.c_str(), "GEOM", strdup( GEOMBase::GetName( aChild ) ) ), false );
+                entry.c_str(), "GEOM", strdup( GEOMBase::GetName( aChild ).toLatin1().constData() ) ), false );
            }
          }
        }
@@ -449,10 +440,10 @@ void GEOMBase_Helper::localSelection( const ObjectList& theObjs, const int theMo
     GEOM::GEOM_Object_ptr anObj = *anIter;
     if ( anObj->_is_nil() )
       continue;
-    string aEntry = getEntry( anObj );
+    std::string aEntry = getEntry( anObj );
     if ( aEntry != "" )
       aListOfIO.Append( new SALOME_InteractiveObject(
-        aEntry.c_str(), "GEOM", strdup( GEOMBase::GetName( anObj ) ) ) );
+        aEntry.c_str(), "GEOM", strdup( GEOMBase::GetName( anObj ).toLatin1().constData() ) ) );
   }
 
   getDisplayer()->LocalSelection( aListOfIO, theMode );
@@ -498,6 +489,18 @@ void GEOMBase_Helper::globalSelection( const TColStd_MapOfInteger& theModes,
   getDisplayer()->GlobalSelection( theModes, update );
 }
 
+//================================================================
+// Function : globalSelection
+// Purpose  : Activate selection of subshapes. Set selection filters
+//            in accordance with mode. theMode is from GEOMImpl_Types
+//================================================================
+void GEOMBase_Helper::globalSelection( const TColStd_MapOfInteger& theModes,
+                                       const QList<int>& subShapes,
+                                      const bool update )
+{
+  getDisplayer()->GlobalSelection( theModes, update, &subShapes );
+}
+
 //================================================================
 // Function : addInStudy
 // Purpose  : Add object in study
@@ -511,10 +514,33 @@ void GEOMBase_Helper::addInStudy( GEOM::GEOM_Object_ptr theObj, const char* theN
   if ( !aStudy || theObj->_is_nil() )
     return;
 
+  SALOMEDS::Study_var aStudyDS = GeometryGUI::ClientStudyToStudy(aStudy);
+
   GEOM::GEOM_Object_ptr aFatherObj = getFather( theObj );
 
-  getGeomEngine()->AddInStudy(GeometryGUI::ClientStudyToStudy(aStudy),
-                              theObj, theName, aFatherObj);
+  SALOMEDS::SObject_var aSO =
+    getGeomEngine()->AddInStudy(aStudyDS, theObj, theName, aFatherObj);
+
+  // Each dialog is responsible for this method implementation,
+  // default implementation does nothing
+  restoreSubShapes(aStudyDS, aSO);
+}
+
+//================================================================
+// Function : restoreSubShapes
+// Purpose  : restore tree of argument's sub-shapes under the resulting shape
+//================================================================
+void GEOMBase_Helper::restoreSubShapes (SALOMEDS::Study_ptr   /*theStudy*/,
+                                        SALOMEDS::SObject_ptr /*theSObject*/)
+{
+  // do nothing by default
+
+  // example of implementation in particular dialog:
+  // GEOM::ListOfGO anArgs;
+  // anArgs.length(0); // empty list means that all arguments should be restored
+  // getGeomEngine()->RestoreSubShapesSO(theStudy, theSObject, anArgs,
+  //                                     /*theFindMethod=*/GEOM::FSM_GetInPlace,
+  //                                     /*theInheritFirstArg=*/false);
 }
 
 //================================================================
@@ -565,13 +591,14 @@ SalomeApp_Study* GEOMBase_Helper::getStudy() const
   if (!aDesktop)
     return 0;
 
-  QPtrList<SUIT_Application> anAppList = SUIT_Session::session()->applications();
+  QList<SUIT_Application*> anAppList = SUIT_Session::session()->applications();
 
   SUIT_Application* anApp = 0;
-  for ( QPtrListIterator<SUIT_Application> it( anAppList ); it.current() ; ++it )
+  QListIterator<SUIT_Application*> it( anAppList );
+  while ( it.hasNext() )
     {
-      anApp = it.current();
-      if ( anApp->desktop() == aDesktop )
+      anApp = it.next();
+      if ( anApp && anApp->desktop() == aDesktop )
        break;
     }
 
@@ -587,12 +614,12 @@ char* GEOMBase_Helper::getEntry( GEOM::GEOM_Object_ptr object ) const
   SalomeApp_Study* study = getStudy();
   if ( study )  {
     char * objIOR = GEOMBase::GetIORFromObject( object );
-    string IOR( objIOR );
+    std::string IOR( objIOR );
     free( objIOR );
     if ( IOR != "" ) {
       _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) );
       if ( SO ) {
-             return TCollection_AsciiString((char*)SO->GetID().c_str()).ToCString();
+             return (char*) TCollection_AsciiString((char*)SO->GetID().c_str()).ToCString();
       }
     }
   }
@@ -627,7 +654,7 @@ void GEOMBase_Helper::clearShapeBuffer( GEOM::GEOM_Object_ptr theObj )
     return;
 
   _PTR(Study) aStudy = getStudy()->studyDS();
-  _PTR(SObject) aSObj ( aStudy->FindObjectIOR( string( IOR ) ) );
+  _PTR(SObject) aSObj ( aStudy->FindObjectIOR( std::string( IOR ) ) );
   if ( !aSObj )
     return;
 
@@ -722,10 +749,11 @@ GEOM::GEOM_IOperations_ptr GEOMBase_Helper::getOperation()
 bool GEOMBase_Helper::checkViewWindow()
 {
   if ( myViewWindow ){
-    QPtrList<SUIT_ViewWindow> aViewWindowsList = SUIT_Session::session()->activeApplication()->desktop()->windows();
-    for ( QPtrListIterator<SUIT_ViewWindow> it( aViewWindowsList ); it.current(); ++it )
+    QList<SUIT_ViewWindow*> aViewWindowsList = SUIT_Session::session()->activeApplication()->desktop()->windows();
+    QListIterator<SUIT_ViewWindow*> it( aViewWindowsList );
+    while ( it.hasNext() )
       {
-       if ( myViewWindow == it.current() )
+       if ( myViewWindow == it.next() )
          return true;
       }
   }
@@ -748,10 +776,10 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
   bool aLocked = (_PTR(AttributeStudyProperties) (aStudy->GetProperties()))->IsLocked();
   if ( aLocked ) {
     MESSAGE("GEOMBase_Helper::onAccept - ActiveStudy is locked");
-    SUIT_MessageBox::warn1 ( (QWidget*)SUIT_Session::session()->activeApplication()->desktop(),
-                          QObject::tr("WRN_WARNING"),
-                          QObject::tr("WRN_STUDY_LOCKED"),
-                          QObject::tr("BUT_OK") );
+    SUIT_MessageBox::warning ( (QWidget*)SUIT_Session::session()->activeApplication()->desktop(),
+                              QObject::tr("WRN_WARNING"),
+                              QObject::tr("WRN_STUDY_LOCKED"),
+                              QObject::tr("BUT_OK") );
     return false;
   }
 
@@ -795,7 +823,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
              if ( aName.isEmpty() )
                aName = GEOMBase::GetDefaultName( getPrefix( *it ) );
            }
-           addInStudy( *it, aName.latin1() );
+           addInStudy( *it, aName.toLatin1().constData() );
             // updateView=false
            display( *it, false );
          }
@@ -842,10 +870,10 @@ void GEOMBase_Helper::showError()
   if ( msg.isEmpty() )
     msg = QObject::tr( "GEOM_PRP_ABORT" );
 
-  SUIT_MessageBox::error1( SUIT_Session::session()->activeApplication()->desktop(),
-                          QObject::tr( "GEOM_ERROR_STATUS" ),
-                          msg,
-                          QObject::tr( "BUT_OK" ) );
+  SUIT_MessageBox::critical( SUIT_Session::session()->activeApplication()->desktop(),
+                            QObject::tr( "GEOM_ERROR_STATUS" ),
+                            msg,
+                            QObject::tr( "BUT_OK" ) );
 }
 
 //================================================================
@@ -857,7 +885,7 @@ void GEOMBase_Helper::showError( const QString& msg )
   QString str( QObject::tr( "GEOM_INCORRECT_INPUT" ) );
   if ( !msg.isEmpty() )
     str += "\n" + msg;
-  SUIT_MessageBox::error1(SUIT_Session::session()->activeApplication()->desktop(), QObject::tr( "GEOM_ERROR" ), str, QObject::tr( "BUT_OK" ) );
+  SUIT_MessageBox::critical(SUIT_Session::session()->activeApplication()->desktop(), QObject::tr( "GEOM_ERROR" ), str, QObject::tr( "BUT_OK" ) );
 }
 
 //////////////////////////////////////////////////////////////////
@@ -909,9 +937,9 @@ GEOM::GEOM_Object_ptr GEOMBase_Helper::getFather( GEOM::GEOM_Object_ptr theObj )
 // Function : getNewObjectName
 // Purpose  : Redefine this method to return proper name for a new object
 //================================================================
-const char* GEOMBase_Helper::getNewObjectName() const
+QString GEOMBase_Helper::getNewObjectName() const
 {
-  return "";
+  return QString::null;
 }
 
 //================================================================
@@ -944,56 +972,10 @@ QString GEOMBase_Helper::getPrefix( GEOM::GEOM_Object_ptr theObj ) const
   }
 }
 
-//================================================================
-// Function : selectedIO
-// Purpose  : Return the list of selected SALOME_InteractiveObject's
-//================================================================
-const SALOME_ListIO& GEOMBase_Helper::selectedIO()
-{
-  mySelected.Clear();
-
-  SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
-  if ( app ) {
-    LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
-    if ( aSelMgr )
-      aSelMgr->selectedObjects( mySelected );
-  }
-
-  return mySelected;
-}
-
-//================================================================
-// Function : IObjectCount
-// Purpose  : Return the number of selected objects
-//================================================================
-int GEOMBase_Helper::IObjectCount()
-{
-  return selectedIO().Extent();
-}
-
-//================================================================
-// Function : firstIObject
-// Purpose  :  Return the first selected object in the selected object list
-//================================================================
-Handle(SALOME_InteractiveObject) GEOMBase_Helper::firstIObject()
-{
-  const SALOME_ListIO& aList = selectedIO();
-  return aList.Extent() > 0 ? aList.First() : Handle(SALOME_InteractiveObject)();
-}
-
-//================================================================
-// Function : lastIObject
-// Purpose  : Return the last selected object in the selected object list
-//================================================================
-Handle(SALOME_InteractiveObject) GEOMBase_Helper::lastIObject()
-{
-  const SALOME_ListIO& aList = selectedIO();
-  return aList.Extent() > 0 ? aList.Last() : Handle(SALOME_InteractiveObject)();
-}
-
 //================================================================
 // Function : getDesktop
-// Purpose  : Returns myDesktop field.  Initialized in constructor, usually as dynamic_cast<SUIT_Desktop*>(parentWidget())
+// Purpose  : Returns myDesktop field. Initialized in constructor,
+//            usually as dynamic_cast<SUIT_Desktop*>(parentWidget())
 //================================================================
 SUIT_Desktop* GEOMBase_Helper::getDesktop() const
 {
@@ -1010,7 +992,7 @@ bool GEOMBase_Helper::selectObjects( ObjectList& objects )
   ObjectList::iterator anIter;
   for ( anIter = objects.begin(); anIter != objects.end(); ++anIter )
   {
-    string entry = getEntry( *anIter );
+    std::string entry = getEntry( *anIter );
     QString aEntry( entry.c_str() );
     LightApp_DataOwner* anOwher = new LightApp_DataOwner( aEntry );
     aList.append( anOwher );
@@ -1035,20 +1017,21 @@ bool GEOMBase_Helper::selectObjects( ObjectList& objects )
 // Purpose  : It should return an object if its founded in study or
 //            return Null object if the object is not founded
 //================================================================
-GEOM::GEOM_Object_ptr GEOMBase_Helper::findObjectInFather( GEOM::GEOM_Object_ptr theFather, const char* theName)
+GEOM::GEOM_Object_ptr GEOMBase_Helper::findObjectInFather (GEOM::GEOM_Object_ptr theFather,
+                                                           const QString& theName)
 {
   SalomeApp_Application* app =
     dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
   SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
   _PTR(Study) aDStudy = appStudy->studyDS();
-  string IOR = GEOMBase::GetIORFromObject( theFather );
+  std::string IOR = GEOMBase::GetIORFromObject( theFather );
   _PTR(SObject) SObj ( aDStudy->FindObjectIOR( IOR ) );
 
   bool inStudy = false;
   GEOM::GEOM_Object_var aReturnObject;
   for (_PTR(ChildIterator) iit (aDStudy->NewChildIterator( SObj )); iit->More() && !inStudy; iit->Next()) {
     _PTR(SObject) child (iit->Value());
-    QString aChildName = child->GetName();
+    QString aChildName = child->GetName().c_str();
     if (aChildName == theName) {
       inStudy = true;
       CORBA::Object_var corbaObj = GeometryGUI::ClientSObjectToObject(iit->Value());
@@ -1087,14 +1070,14 @@ void GEOMBase_Helper::addSubshapesToFather( QMap<QString, GEOM::GEOM_Object_var>
   for( QMap<QString, GEOM::GEOM_Object_var>::Iterator it = theMap.begin(); it != theMap.end(); it++ )
     {
       if ( !anOp->_is_nil() ) {
-       GEOM::GEOM_Object_var aFatherObj = anOp->GetMainShape( it.data() );
+       GEOM::GEOM_Object_var aFatherObj = anOp->GetMainShape( it.value() );
        if ( !aFatherObj->_is_nil() ) { 
-       GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aFatherObj, it.key() );
+       GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aFatherObj, it.key().toLatin1().data() );
       
        //Add Object to study if its not exist
        if ( aFindedObject == GEOM::GEOM_Object::_nil() )
          GeometryGUI::GetGeomGen()->AddInStudy(GeometryGUI::ClientStudyToStudy(aDStudy),
-                                             it.data(), it.key(), aFatherObj );
+                                               it.value(), it.key().toLatin1().data(), aFatherObj );
        }
       }
       else {
index 911d6e4436170dc2131bb1887fa348c8cf8cd474..d8bc391d4e2a2861f4a9f43c618a74b712aeeb5c 100755 (executable)
@@ -1,44 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2004  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMBase_Helper.h
+// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
 //
-//  File   : GEOMBase_Helper.h
-//  Author : Sergey ANIKIN
-//  Module : GEOM
-//  $Header$
-
 #ifndef GEOMBASE_HELPER_H
 #define GEOMBASE_HELPER_H
 
 #include "GEOM_GEOMBase.hxx"
 
-#include "GEOM_Displayer.h"
-#include "SALOME_Prs.h"
-#include "SALOME_ListIO.hxx"
+#include <GEOM_Displayer.h>
+#include <SALOME_ListIO.hxx>
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(GEOM_Gen)
 
-#include <qstring.h>
-#include <qmap.h>
+#include <QString>
+#include <QMap>
 
 #include <list>
 
@@ -47,8 +43,8 @@ typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
 class SalomeApp_Study;
 class SUIT_Desktop;
 class SUIT_ViewWindow;
+class SALOME_Prs;
 class GEOM_Operation;
-class TopoDS_Shape;
 class TColStd_MapOfInteger;
 
 //================================================================
@@ -100,6 +96,7 @@ protected:
   void activate( const int );
   void globalSelection( const int = GEOM_ALLOBJECTS, const bool = false  );
   void globalSelection( const TColStd_MapOfInteger&, const bool = false );
+  void globalSelection( const TColStd_MapOfInteger&, const QList<int>& ,const bool = false );
   void updateViewer    ();
 
   void prepareSelection( const ObjectList&, const int );
@@ -134,21 +131,6 @@ protected:
 
   inline void setPrefix( const QString& prefix ) { myPrefix = prefix; }
   QString getPrefix( GEOM::GEOM_Object_ptr = GEOM::GEOM_Object::_nil() ) const;
-
-  const SALOME_ListIO& selectedIO();
-  // Function returns a list of SALOME_InteractiveObject's from
-  // selection manager in GUI
-
-  int   IObjectCount() ;
-  // Function returns the number of selected objects
-  
-  Handle(SALOME_InteractiveObject) firstIObject() ;
-  // Function returns the first selected object in the list
-  // of selected objects
-
-  Handle(SALOME_InteractiveObject) lastIObject() ;
-  // Function returns the last selected object in the list
-  // of selected objects
   
   bool selectObjects( ObjectList& objects );
   // Selects list of objects 
@@ -170,15 +152,18 @@ protected:
   // It should perform the required operation and put all new or modified objects into 
   // <objects> argument.Should return <false> if some error occurs during its execution. 
 
+  virtual void restoreSubShapes( SALOMEDS::Study_ptr theStudy, SALOMEDS::SObject_ptr theSObject );
+  // This method is called by addInStudy().
+
   virtual GEOM::GEOM_Object_ptr getFather( GEOM::GEOM_Object_ptr theObj );
   // This method is called by addInStudy(). It should return a father object
   // for <theObj> or a nil reference if <theObj> should be published
   // as a top-level object.
 
-  virtual const char* getNewObjectName() const; 
+  virtual QString getNewObjectName() const; 
   virtual void addSubshapesToStudy();
 
-  GEOM::GEOM_Object_ptr findObjectInFather( GEOM::GEOM_Object_ptr theFather, const char* theName );
+  GEOM::GEOM_Object_ptr findObjectInFather( GEOM::GEOM_Object_ptr theFather, const QString& theName );
   //This Metod to find SubObject in theFather Object by Name (theName)
 
   void addSubshapesToFather( QMap<QString, GEOM::GEOM_Object_var>& theMap );
@@ -208,4 +193,4 @@ private:
 
 };
 
-#endif
+#endif // GEOMBASE_HELPER_H
index c4e65d0bcfbc741544dd28f899172c37f3f49a3b..ad5d365d01fad75c413fc096e987ed8c309ac706 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMBase_Skeleton.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : GEOMBase_Skeleton.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "GEOMBase_Skeleton.h"
+#include "GEOMBase.h"
 
-#include "GeometryGUI.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
 
-#include "SalomeApp_Application.h"
-#include "LightApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
+#include <SalomeApp_Application.h>
+#include <SalomeApp_DoubleSpinBox.h>
+#include <SalomeApp_Study.h>
+#include <LightApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SUIT_MessageBox.h>
 
-#include <qlabel.h>
-#include <qpushbutton.h>
-
-using namespace std;
+#include <QKeyEvent>
+#include <QSpinBox>
+#include <QDoubleSpinBox>
 
 //=================================================================================
 // class    : GEOMBase_Skeleton()
 // purpose  : Constructs a GEOMBase_Skeleton which is 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.
-//=================================================================================
-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<SUIT_Desktop*>( parent ) ),
-   myGeomGUI( theGeometryGUI )
+//            true to construct a modal dialog.
+//=================================================================================
+GEOMBase_Skeleton::GEOMBase_Skeleton( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                     bool modal, Qt::WindowFlags fl )
+  : QDialog( parent, fl ), 
+    GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
+    myGeomGUI( theGeometryGUI ),
+    myRBGroup( 0 )
 {
-  if (!name)
-    setName("GEOMBase_Skeleton");
+  setAttribute( Qt::WA_DeleteOnClose );
+
+  setModal( modal );
+
+  myMainFrame = new DlgRef_Skeleton( this );
+  QVBoxLayout* topLayout = new QVBoxLayout( this );
+  topLayout->setMargin( 0 ); topLayout->setSpacing( 0 );
+  topLayout->addWidget( myMainFrame );
 
-  GroupBoxName->setTitle(tr("GEOM_RESULT_NAME_GRP"));
-  NameLabel->setText(tr("GEOM_RESULT_NAME_LBL"));
+  myMainFrame->GroupBoxName->setTitle( tr( "GEOM_RESULT_NAME_GRP" ) );
+  myMainFrame->NameLabel->setText( tr( "GEOM_RESULT_NAME_LBL" ) );
 
-  buttonCancel->setText(tr("GEOM_BUT_CLOSE"));
-  buttonOk->setText(tr("GEOM_BUT_OK"));
-  buttonApply->setText(tr("GEOM_BUT_APPLY"));
-  buttonHelp->setText(tr("GEOM_BUT_HELP"));
+  myMainFrame->GroupBoxPublish->setTitle( tr( "GEOM_PUBLISH_RESULT_GRP" ) );
+  myMainFrame->CheckBoxRestoreSS->setText( tr( "GEOM_RESTORE_SUB_SHAPES" ) );
 
-  resize(0, 0);
+  buttonCancel()->setText( tr( "GEOM_BUT_CLOSE" ) );
+  buttonOk()->setText( tr( "GEOM_BUT_APPLY_AND_CLOSE" ) );
+  buttonApply()->setText( tr( "GEOM_BUT_APPLY" ) );
+  buttonHelp()->setText( tr( "GEOM_BUT_HELP" ) );
+
+  myRBGroup = new QButtonGroup( this );
+  myRBGroup->addButton( myMainFrame->RadioButton1, 0 );
+  myRBGroup->addButton( myMainFrame->RadioButton2, 1 );
+  myRBGroup->addButton( myMainFrame->RadioButton3, 2 );
+  myRBGroup->addButton( myMainFrame->RadioButton4, 3 );
+  myRBGroup->addButton( myMainFrame->RadioButton5, 4 );
+
+  connect( myRBGroup, SIGNAL( buttonClicked( int ) ), this, SIGNAL( constructorsClicked( int ) ) );
 
   Init();
 }
 
-
 //=================================================================================
 // function : ~GEOMBase_Skeleton()
 // purpose  : Destroys the object and frees any allocated resources
 //=================================================================================
 GEOMBase_Skeleton::~GEOMBase_Skeleton()
 {
-  if (myGeomGUI)
+  if ( myGeomGUI )
     myGeomGUI->SetActiveDialogBox( 0 );
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void GEOMBase_Skeleton::Init()
 {
-  SalomeApp_Application* app = (SalomeApp_Application*)(SUIT_Session::session()->activeApplication());
-  if (!myGeomGUI && app)
+  SalomeApp_Application* app = (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() );
+  if ( !myGeomGUI && app )
     myGeomGUI = dynamic_cast<GeometryGUI*>( app->module( "Geometry" ) );
 
   /* init variables */
-  myGeomGUI->SetActiveDialogBox(this);
+  if ( myGeomGUI )
+    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()));
+  connect( buttonCancel(), SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) );
+  if ( myGeomGUI ) {
+    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() ) );
+  connect( buttonHelp(), SIGNAL( clicked() ), this, SLOT( ClickOnHelp() ) );
 
   /* displays Dialog */
-  RadioButton1->setChecked(TRUE);
-  RadioButton4->hide();
+  myMainFrame->RadioButton1->setChecked( true );
+  myMainFrame->RadioButton4->hide();
+  myMainFrame->RadioButton5->hide();
 
-  return;
+  myMainFrame->CheckBoxRestoreSS->setChecked( false );
+  myMainFrame->GroupBoxPublish->hide();
 }
 
+//=================================================================================
+// function : initSpinBox()
+// purpose  : 
+//=================================================================================
+void GEOMBase_Skeleton::initSpinBox( QSpinBox* spinBox, 
+                                    int min,  int max, int step )
+{
+  spinBox->setRange( min, max );
+  spinBox->setSingleStep( step );
+}
+
+//=================================================================================
+// function : initSpinBox()
+// purpose  : 
+//=================================================================================
+void GEOMBase_Skeleton::initSpinBox( SalomeApp_DoubleSpinBox* spinBox, 
+                                    double min,  double max, 
+                                    double step, int decimals )
+{
+  spinBox->setPrecision( decimals );
+  spinBox->setDecimals( decimals ); // it's necessary to set decimals before the range setting,
+                                    // by default Qt rounds boundaries to 2 decimals at setRange
+  spinBox->setRange( min, max );
+  spinBox->setSingleStep( step );
+}
+
+//=================================================================================
+// function : updateAttributes()
+// purpose  : Workaround for Translation and Rotation operations with unchecked option "Create a copy".
+//            In this case PublishInStudy isn't called, so we need to update object's attributes manually
+//=================================================================================
+void GEOMBase_Skeleton::updateAttributes( GEOM::GEOM_Object_ptr theObj,
+                                         const QStringList& theParameters)
+{
+  SALOMEDS::Study_var aStudy = GeometryGUI::ClientStudyToStudy(getStudy()->studyDS());
+  SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
+  SALOMEDS::SObject_var aSObject = aStudy->FindObjectID(theObj->GetStudyEntry());
+  SALOMEDS::GenericAttribute_var anAttr = aStudyBuilder->FindOrCreateAttribute(aSObject, "AttributeString");
+  SALOMEDS::AttributeString_var aStringAttrib = SALOMEDS::AttributeString::_narrow(anAttr);
+
+  std::string aValue = aStringAttrib->Value();
+  if( aValue != "" )
+    aValue += "|";
+  for( int i = 0, n = theParameters.count(); i < n; i++ ) {
+    std::string aParameter = theParameters[i].toStdString();
+    if(aStudy->IsVariable(aParameter.c_str()))
+      aValue += aParameter;
+    if(i != n-1)
+      aValue += ":";
+  }
+  aStringAttrib->SetValue(aValue.c_str());
+}
 
 //=================================================================================
 // function : ClickOnCancel()
@@ -124,14 +194,13 @@ void GEOMBase_Skeleton::ClickOnCancel()
   close();
 }
 
-
 //=================================================================================
 // function : LineEditReturnPressed()
 // purpose  :
 //=================================================================================
 void GEOMBase_Skeleton::LineEditReturnPressed()
 {
-  if ( !myEditCurrentArgument )
+  if (!myEditCurrentArgument)
     return;
 
   /* User name of object input management                          */
@@ -139,29 +208,30 @@ void GEOMBase_Skeleton::LineEditReturnPressed()
   /* so SelectionIntoArgument() is automatically called.           */
   const QString objectUserName = myEditCurrentArgument->text();
   QWidget* thisWidget = (QWidget*)this;
-  
-  if(GEOMBase::SelectionByNameInDialogs(thisWidget, objectUserName, selectedIO()))
-     myEditCurrentArgument->setText(objectUserName);
 
-  return;
+  SALOME_ListIO aList;
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  if (aSelMgr)
+    aSelMgr->selectedObjects(aList);
+  if (GEOMBase::SelectionByNameInDialogs(thisWidget, objectUserName, aList))
+    myEditCurrentArgument->setText(objectUserName);
 }
 
-
 //=================================================================================
 // function : DeactivateActiveDialog()
 // purpose  :
 //=================================================================================
 void GEOMBase_Skeleton::DeactivateActiveDialog()
 {
-  this->setEnabled(false);
+  this->setEnabled( false );
   globalSelection();
-  disconnect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0);
-  if (myGeomGUI) myGeomGUI->SetActiveDialogBox(0);
-    
-  return;
+  if ( myGeomGUI ) {
+    myGeomGUI->SetActiveDialogBox( 0 );
+    disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
+  }
+  erasePreview();
 }
 
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -169,23 +239,21 @@ void GEOMBase_Skeleton::DeactivateActiveDialog()
 void GEOMBase_Skeleton::ActivateThisDialog()
 {
   /* Emit a signal to deactivate the active dialog */
-  if (myGeomGUI) myGeomGUI->EmitSignalDeactivateDialog();
-  this->setEnabled(true);
-  if (myGeomGUI) myGeomGUI->SetActiveDialogBox((QDialog*)this);
+  if ( myGeomGUI ) myGeomGUI->EmitSignalDeactivateDialog();
+  this->setEnabled( true );
+  if ( myGeomGUI ) myGeomGUI->SetActiveDialogBox( (QDialog*)this );
   return;
 }
 
-
 //=================================================================================
 // function : closeEvent()
 // purpose  : same than click on cancel button
 //=================================================================================
-void GEOMBase_Skeleton::closeEvent(QCloseEvent* e)
+void GEOMBase_Skeleton::closeEvent( QCloseEvent* e )
 {
-  SalomeApp_Application* app = (SalomeApp_Application*)(SUIT_Session::session()->activeApplication());
-  if(app) {
-    disconnect( app->selectionMgr(), 0, this, 0);
-    app->updateActions();
+  if ( myGeomGUI ) {
+    disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
+    myGeomGUI->getApp()->updateActions();
   }
   QDialog::closeEvent( e );
 }
@@ -194,20 +262,20 @@ void GEOMBase_Skeleton::closeEvent(QCloseEvent* e)
 // function : initName()
 // purpose  : initialize the Name field with a string "thePrefix_X" (Vertex_3)
 //=================================================================================
-void GEOMBase_Skeleton::initName( const char* thePrefix )
+void GEOMBase_Skeleton::initName( const QString& thePrefix )
 {
-  if ( thePrefix )
+  if ( !thePrefix.isNull() )
     setPrefix( thePrefix );
-  ResultName->setText( GEOMBase::GetDefaultName( getPrefix() ) );
+  myMainFrame->ResultName->setText( GEOMBase::GetDefaultName( getPrefix() ) );
 }
 
 //=================================================================================
 // function : getNewObjectName()
 // purpose  : returns contents of Name field
 //=================================================================================
-const char* GEOMBase_Skeleton::getNewObjectName() const
+QString GEOMBase_Skeleton::getNewObjectName() const
 {
-  return ResultName->text();
+  return myMainFrame->ResultName->text();
 }
 
 //=================================================================================
@@ -216,41 +284,77 @@ const char* GEOMBase_Skeleton::getNewObjectName() const
 //=================================================================================
 int GEOMBase_Skeleton::getConstructorId() const
 {
-  if ( GroupConstructors != NULL && GroupConstructors->selected() != NULL )
-    return GroupConstructors->id( GroupConstructors->selected() );
+  if ( myRBGroup )
+    return myRBGroup->checkedId();
   return -1;
 }
 
+void GEOMBase_Skeleton::setConstructorId( const int id )
+{
+  if ( myRBGroup && myRBGroup->button( id ) )
+    myRBGroup->button( id )->setChecked( true );
+}
+
 //=================================================================================
 // 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);
+  LightApp_Application* app = (LightApp_Application*)( SUIT_Session::session()->activeApplication() );
+  if ( app 
+    app->onHelpContextModule( myGeomGUI ? app->moduleName( myGeomGUI->moduleName() ) : QString(""), myHelpFileName );
   else {
-               QString platform;
+    QString platform;
 #ifdef WIN32
-               platform = "winapplication";
+    platform = "winapplication";
 #else
-               platform = "application";
+    platform = "application";
 #endif
-    SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"),
-                          QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
-                          arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName),
-                          QObject::tr("BUT_OK"));
+    SUIT_MessageBox::warning( 0, QObject::tr( "WRN_WARNING" ),
+                             QObject::tr( "EXTERNAL_BROWSER_CANNOT_SHOW_PAGE" ).
+                             arg( app->resourceMgr()->stringValue( "ExternalBrowser", platform ) ).arg( myHelpFileName ),
+                             QObject::tr( "BUT_OK" ) );
   }
 }
+
 //=================================================================================
 //  function : setHelpFileName()
 //  purpose  : set name for help file html
 //=================================================================================
+void GEOMBase_Skeleton::setHelpFileName( const QString& theName )
+{
+  myHelpFileName = theName;
+}
 
-void GEOMBase_Skeleton::setHelpFileName(const QString& theName)
+DlgRef_Skeleton* GEOMBase_Skeleton::mainFrame()
 {
-    myHelpFileName = theName;
+  return myMainFrame;
+}
+
+QWidget* GEOMBase_Skeleton::centralWidget()
+{
+  return myMainFrame->GroupMedium;
+}
+
+QPushButton* GEOMBase_Skeleton::buttonCancel() const
+{
+  return myMainFrame->buttonCancel;
+}
+
+QPushButton* GEOMBase_Skeleton::buttonOk() const
+{
+  return myMainFrame->buttonOk;
+}
+
+QPushButton* GEOMBase_Skeleton::buttonApply() const
+{
+  return myMainFrame->buttonApply;
+}
+
+QPushButton* GEOMBase_Skeleton::buttonHelp() const
+{
+  return myMainFrame->buttonHelp;
 }
 
 //=================================================================================
@@ -263,9 +367,8 @@ void GEOMBase_Skeleton::keyPressEvent( QKeyEvent* e )
   if ( e->isAccepted() )
     return;
 
-  if ( e->key() == Key_F1 )
-    {
-      e->accept();
-      ClickOnHelp();
-    }
+  if ( e->key() == Qt::Key_F1 ) {
+    e->accept();
+    ClickOnHelp();
+  }
 }
index fdd00155b5f56c56908727bc64fdb325c3559782..a9f2c5aa2819ed98c5a916f4746c3fa291d4ccde 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMBase_Skeleton.h
+// Author : Damine COQUERET, Open CASCADE S.A.S.
 //
-//  File   : GEOMBase_Skeleton.h
-//  Author : Damine COQUERET
-//  Module : GEOM
-
 #ifndef GEOMBASE_SKELETON_H
 #define GEOMBASE_SKELETON_H
 
 #include "GEOM_GEOMBase.hxx"
-
-#include "DlgRef_Skeleton_QTD.h"
-
-#include "GEOMBase.h"
 #include "GEOMBase_Helper.h"
-#include "GeometryGUI.h"
 
-#include <qwidget.h>
-#include <qgroupbox.h>
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
-
-class GEOMBASE_EXPORT GEOMBase_Skeleton : public DlgRef_Skeleton_QTD, public GEOMBase_Helper
+#include <QDialog>
+
+class SalomeApp_DoubleSpinBox;
+class GeometryGUI;
+class DlgRef_Skeleton;
+class QSpinBox;
+class QDoubleSpinBox;
+class QLineEdit;
+class QButtonGroup;
+class QPushButton;
+
+#ifndef COORD_MIN
+#  define COORD_MIN -1e+15
+#  define COORD_MAX +1e+15
+#  define MAX_NUMBER 100000
+#  define DBL_DIGITS_DISPLAY 16
+#endif // COORD_MIN
+
+class GEOMBASE_EXPORT GEOMBase_Skeleton : public QDialog, public GEOMBase_Helper
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    GEOMBase_Skeleton(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                     const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+    GEOMBase_Skeleton( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
     ~GEOMBase_Skeleton();
 
 private:
     void Init();
 
 protected:
-    void closeEvent(QCloseEvent* e);
-    void keyPressEvent(QKeyEvent* e);
+    void                initSpinBox( QSpinBox*, int, int, int = 1 );
+    void                initSpinBox( SalomeApp_DoubleSpinBox*, double, double, double = 0.1, int = 3 );
+    
+    void                updateAttributes( GEOM::GEOM_Object_ptr, const QStringList& );
+
+    void                closeEvent( QCloseEvent* );
+    void                keyPressEvent( QKeyEvent* );
 
     /*! initialize "Name" field with a string "thePrefix_X" (Vertex_3)
      */
-    void initName( const char* thePrefix = 0 );
+    void                initName( const QString& = QString() );
 
     /*! returns contents of "Name" field
      */
-    virtual const char* getNewObjectName() const;
+    virtual QString getNewObjectName() const;
 
     /*! returns id of a selected "constructor" radio button or '-1' in case of error
      */
-    int getConstructorId() const;
+    int                 getConstructorId() const;
+    /*! set selected "constructor" radio button id
+     */
+    void                setConstructorId( const int );
 
-    void setHelpFileName( const QString& );
+    void                setHelpFileName( const QString& );
 
-    QLineEdit* myEditCurrentArgument; //!< Current LineEdit
-    GeometryGUI* myGeomGUI;           //!< reference GEOM GUI
-    QString myHelpFileName;
+    DlgRef_Skeleton*    mainFrame();
+    QWidget*            centralWidget();
+    QPushButton*        buttonCancel() const;
+    QPushButton*        buttonOk() const;
+    QPushButton*        buttonApply() const;
+    QPushButton*        buttonHelp() const;
+
+protected:
+    QLineEdit*          myEditCurrentArgument; //!< Current LineEdit
+    GeometryGUI*        myGeomGUI;             //!< reference GEOM GUI
+    QString             myHelpFileName;        //!< Associated HTML help file name
+    
+    QButtonGroup*       myRBGroup;             //!< radio button group
+    DlgRef_Skeleton*    myMainFrame;           //!< dialog box's mainframe widgetx
 
 protected slots:
-    virtual void ClickOnCancel();
-    void LineEditReturnPressed();
-    void DeactivateActiveDialog();
-    void ActivateThisDialog();
-    void ClickOnHelp();
+    virtual void        ClickOnCancel();
+    void                LineEditReturnPressed();
+    void                DeactivateActiveDialog();
+    void                ActivateThisDialog();
+    void                ClickOnHelp();
+
+signals:
+    void                constructorsClicked( int );
 };
 
 #endif // GEOMBASE_SKELETON_H
diff --git a/src/GEOMBase/GEOMBase_aParameterDlg.cxx b/src/GEOMBase/GEOMBase_aParameterDlg.cxx
deleted file mode 100644 (file)
index ef6097e..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : GEOMBase_aParameterDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
-#include "GEOMBase_aParameterDlg.h"
-#include "QtxDblSpinBox.h"
-
-#include <stdio.h>
-
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qvariant.h>
-#include <qvalidator.h>
-
-#ifndef WNT
-using namespace std;
-#endif
-
-
-//====================================================================================== 
-// function : GEOMBase_aParameterDlg()
-// purpose  : Constructs a GEOMBase_aParametertDlg which is a child of 'parent', with the 
-//            name 'name' and widget flags set to 'f'
-//
-//  avalue1    : is a float or integer used as default value in edit line
-//  aTitle1    : is the prompt for aValue1
-//  aTitle     : is the title for the user in dialog box
-//
-//  bottom     : the minimal value to be entered
-//  top        : the maximum value to be entered
-//  decimals   : number of decimals to be entered
-//
-//  The dialog will by default be modeless, unless you set 'modal' to
-//  TRUE to construct a modal dialog.
-// 
-//====================================================================================== 
-GEOMBase_aParameterDlg::GEOMBase_aParameterDlg(const char *aValue1, const char *aTitle1, QWidget* parent, const char* name, bool modal, WFlags fl, const double bottom, const double top, const int decimals)
-  :QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
-{
-  if(!name)
-    setName( "MyParameterDialog" );
-  resize(288, 81); 
-  setCaption(name); /* appears on the title bar */
-  setSizeGripEnabled(TRUE);
-
-  QGridLayout* topLayout = new QGridLayout(this); 
-  topLayout->setSpacing(6);
-  topLayout->setMargin(11);
-
-  QGroupBox* mainGrp = new QGroupBox(this, "mainGrp");
-  mainGrp->setColumnLayout(0, Qt::Vertical);
-  mainGrp->layout()->setSpacing(0);
-  mainGrp->layout()->setMargin(0);
-  QGridLayout* mainGrpLayout = new QGridLayout(mainGrp->layout());
-  mainGrpLayout->setAlignment(Qt::AlignTop);
-  mainGrpLayout ->setSpacing(6);
-  mainGrpLayout->setMargin(11);
-  topLayout->addWidget(mainGrp, 0, 0);
-
-  /* aTitle1 : text prompt on left of edit line */
-  QLabel* TextLabel1 = new QLabel(mainGrp, "TextLabel1");
-  TextLabel1->setText(tr(aTitle1));  
-  mainGrpLayout->addWidget(TextLabel1, 0, 0);
-
-  mySpinBox = new QtxDblSpinBox(mainGrp, "mySpinBox");
-  mySpinBox->setPrecision(12);
-  mySpinBox->setRange(bottom, top);
-  ((QDoubleValidator*)(mySpinBox->validator()))->setRange(bottom, top, decimals);
-  mySpinBox->setValue(QString(aValue1).toDouble());
-  mainGrpLayout->addWidget(mySpinBox, 0, 1);
-  
-  QGroupBox* btnGrp = new QGroupBox(this, "btnGrp");
-  btnGrp->setColumnLayout(0, Qt::Vertical);
-  btnGrp->layout()->setSpacing(0);
-  btnGrp->layout()->setMargin(0);
-  QGridLayout* btnGrpLayout = new QGridLayout(btnGrp->layout());
-  btnGrpLayout->setAlignment(Qt::AlignTop);
-  btnGrpLayout->setSpacing(6);
-  btnGrpLayout->setMargin(11);
-  topLayout->addWidget(btnGrp, 1, 0);
-
-  /* Ok button */
-  myButtonOk = new QPushButton(btnGrp, "buttonOk");
-  myButtonOk->setText(tr("GEOM_BUT_OK"));
-  myButtonOk->setAutoDefault(TRUE);
-  myButtonOk->setDefault(TRUE);
-  btnGrpLayout->addWidget(myButtonOk, 0, 0);
-
-  btnGrpLayout->addItem(new QSpacerItem(5, 5, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1);
-
-  /* Cancel button */
-  myButtonCancel = new QPushButton(btnGrp, "buttonCancel");
-  myButtonCancel->setText(tr("GEOM_BUT_CANCEL"));
-  myButtonCancel->setAutoDefault(TRUE);
-  btnGrpLayout->addWidget(myButtonCancel, 0, 2);
-
-  /* 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 */
-  //mzn: QAD_Tools::centerWidget(this, parent);
-}
-
-
-//====================================================================================== 
-// function : ~GEOMBase_aParameterDlg() destructor
-// purpose  : Destroys the object and frees any allocated resources
-//====================================================================================== 
-GEOMBase_aParameterDlg::~GEOMBase_aParameterDlg()
-{
-  // no need to delete child widgets, Qt does it all for us
-}
-
-
-//====================================================================================== 
-// function : GEOMBase_aParameterDlg::setValue
-// purpose  : sets value
-//====================================================================================== 
-void GEOMBase_aParameterDlg::setValue(double val)
-{
-  mySpinBox->setValue(val);
-}
-
-
-//====================================================================================== 
-// function : GEOMBase_aParameterDlg::getValue
-// purpose  : gets value
-//====================================================================================== 
-double GEOMBase_aParameterDlg::getValue()
-{
-  return mySpinBox->value();
-}
diff --git a/src/GEOMBase/GEOMBase_aParameterDlg.h b/src/GEOMBase/GEOMBase_aParameterDlg.h
deleted file mode 100644 (file)
index 8dc1773..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : GEOMBase_aParameterDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
-#ifndef GEOMBase_aParameterDLG_H
-#define GEOMBase_aParameterDLG_H
-
-#include "GEOM_GEOMBase.hxx"
-
-#include <qdialog.h>
-
-class QPushButton;
-class QtxDblSpinBox;
-
-//=================================================================================
-// class    : GEOMBase_aParameterDlg
-// purpose  :
-//=================================================================================
-class GEOMBASE_EXPORT GEOMBase_aParameterDlg : public QDialog
-{ 
-    Q_OBJECT
-
-public:
-    GEOMBase_aParameterDlg(const char* aValue1 = "25", const char* aTitle1 = "Value :", QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const double bottom = -1E6, const double top = +1E6, const int decimals = 6);
-    ~GEOMBase_aParameterDlg();
-
-    void setValue(double val);
-    double getValue();
-
-private:
-    QPushButton* myButtonOk;
-    QPushButton* myButtonCancel;
-    QtxDblSpinBox* mySpinBox;
-
-};
-
-#endif // GEOMBase_aParameterDlg.h
diff --git a/src/GEOMBase/GEOMBase_aWarningDlg.cxx b/src/GEOMBase/GEOMBase_aWarningDlg.cxx
deleted file mode 100644 (file)
index 52a4530..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : GEOMBase_aWarningDlg.cxx
-//  Author : Dmitry Matveitchev
-//  Module : GEOM
-//  $Header: /home/server/cvs/GEOM/GEOM_SRC/src/GEOMBase/GEOMBase_aWarningDlg.cxx
-
-#include "GEOMBase_aWarningDlg.h"
-#include <stdio.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qvariant.h>
-#include <qvalidator.h>
-#include <qstring.h>
-#include <qscrollview.h>
-
-#ifndef WNT
-using namespace std;
-#endif
-
-GEOMBase_aWarningDlg::GEOMBase_aWarningDlg( QWidget* parent, const char* name, const QString theText, int theNum )
-  :QDialog( parent, name )
-{
-  if(!name)
-    setName( "Warning" );
-  if ( theNum < 15 )
-    resize(296, (120 + (14*theNum)) ); 
-  else
-    resize(296, 300);
-  setCaption(name); /* appears on the title bar */
-  setSizeGripEnabled(TRUE);
-
-  QGridLayout* topLayout = new QGridLayout(this); 
-  topLayout->setSpacing(6);
-  topLayout->setMargin(11);
-
-  QGroupBox* mainGrp = new QGroupBox(this, "mainGrp");
-  mainGrp->setColumnLayout(0, Qt::Vertical);
-  mainGrp->layout()->setSpacing(0);
-  mainGrp->layout()->setMargin(0);
-
-  QGridLayout* mainGrpLayout = new QGridLayout(mainGrp->layout());
-  mainGrpLayout->setAlignment(Qt::AlignTop);
-  mainGrpLayout ->setSpacing(6);
-  mainGrpLayout->setMargin(11);
-  topLayout->addWidget(mainGrp, 0, 0);
-  
-  QLabel* TextLabel = new QLabel(mainGrp, "TextLabel");
-  TextLabel->setText( QObject::tr( "GEOM_REALLY_DELETE" ).arg( theNum ) );  
-  mainGrpLayout->addWidget(TextLabel, 0, 0);
-  QScrollView* viewer = new QScrollView (mainGrp, "viewer");
-  viewer->setResizePolicy( QScrollView::AutoOneFit );
-  QLabel* TextLabel1 = new QLabel(viewer, "TextLabel1");
-  TextLabel1->setText( theText );
-  TextLabel1->setAlignment(Qt::AlignTop);
-  viewer->addChild(TextLabel1);
-  mainGrpLayout->addWidget(viewer, 1, 0);
-
-  //Create Buttons
-
-  QGroupBox* btnGrp = new QGroupBox(this, "btnGrp");
-  btnGrp->setColumnLayout(0, Qt::Vertical);
-  btnGrp->layout()->setSpacing(0);
-  btnGrp->layout()->setMargin(0);
-  QGridLayout* btnGrpLayout = new QGridLayout(btnGrp->layout());
-  btnGrpLayout->setAlignment(Qt::AlignTop);
-  btnGrpLayout->setSpacing(6);
-  btnGrpLayout->setMargin(11);
-  topLayout->addWidget(btnGrp, 1, 0);
-
-  /* No button */
-  myButtonOk = new QPushButton(btnGrp, "buttonOk");
-  myButtonOk->setText(tr("GEOM_BUT_YES"));
-  myButtonOk->setAutoDefault(TRUE);
-  btnGrpLayout->addWidget(myButtonOk, 0, 0);
-
-  btnGrpLayout->addItem(new QSpacerItem(5, 5, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1);
-
-  /* Yes button */
-  myButtonCancel = new QPushButton(btnGrp, "buttonCancel");
-  myButtonCancel->setText(tr("GEOM_BUT_NO"));
-  myButtonCancel->setAutoDefault(TRUE);
-  myButtonCancel->setDefault(TRUE);
-  btnGrpLayout->addWidget(myButtonCancel, 0, 2);
-
-  /* signals and slots connections */
-  connect(myButtonOk, SIGNAL(clicked()), this, SLOT(accept()));
-  connect(myButtonCancel, SIGNAL(clicked()), this, SLOT(reject()));
-}
-
-
-//====================================================================================== 
-// function : ~GEOMBase_aWarningDlg() destructor
-// purpose  : Destroys the object and frees any allocated resources
-//====================================================================================== 
-GEOMBase_aWarningDlg::~GEOMBase_aWarningDlg()
-{
-  // no need to delete child widgets, Qt does it all for us
-}
-
-
-
diff --git a/src/GEOMBase/GEOMBase_aWarningDlg.h b/src/GEOMBase/GEOMBase_aWarningDlg.h
deleted file mode 100644 (file)
index 6601062..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : GEOMBase_aWarningDlg.h
-//  Author : Dmitry Matveitchev
-//  Module : GEOM
-//  $Header: /home/server/cvs/GEOM/GEOM_SRC/src/GEOMBase/GEOMBase_aWarningDlg.h
-
-#ifndef GEOMBase_aWarningDLG_H
-#define GEOMBase_aWarningDLG_H
-
-#include <qdialog.h>
-#include <qwidget.h>
-
-class QString;
-class QPushButton;
-
-//=================================================================================
-// class    : GEOMBase_aWarningDlg
-// purpose  :
-//=================================================================================
-class GEOMBase_aWarningDlg : public QDialog
-{ 
-    Q_OBJECT
-
-public:
-    GEOMBase_aWarningDlg( QWidget* parent, const char* name, QString theText, int nb );
-    ~GEOMBase_aWarningDlg();
-
-private:
-    QPushButton* myButtonOk;
-    QPushButton* myButtonCancel;
-
-};
-
-#endif
index 99b3716715fd1d1ebf6656c9392108c8ac774077..8f19982a45ff6ddcd6da478468c13de4103904ea 100755 (executable)
@@ -1,47 +1,38 @@
-//  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 
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : GEOM_GEOMBase.hxx
-//  Author : Alexander A. BORODIN
-//  Module : GEOM
-
-#ifndef _GEOM_GEOMBase_HXX_
-#define _GEOM_GEOMBase_HXX_
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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_GEOMBase.hxx
+// Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+//
+#ifndef GEOM_GEOMBASE_HXX
+#define GEOM_GEOMBASE_HXX
 
-#ifdef WNT
- #if defined GEOMBASE_EXPORTS
-  #if defined WIN32
-   #define GEOMBASE_EXPORT __declspec( dllexport )
-  #else
-   #define GEOMBASE_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define GEOMBASE_EXPORT __declspec( dllimport )
-  #else
-   #define GEOMBASE_EXPORT
-  #endif
- #endif
+#if defined WIN32
+#  if defined GEOMBASE_EXPORTS
+#    define GEOMBASE_EXPORT __declspec( dllexport )
+#  else
+#    define GEOMBASE_EXPORT __declspec( dllimport )
+#  endif
 #else
- #define GEOMBASE_EXPORT
+#  define GEOMBASE_EXPORT
 #endif
 
-#endif
+#endif // GEOM_GEOMBASE_HXX
index 1e6d475c5ede4eae7ae826ba69c1e97cd545b02a..060f4e26daa5fb442a2a4bf7968f4158830eb0ff 100644 (file)
@@ -1,35 +1,32 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2004  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOM_Operation.cxx
+// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
 //
-//  File   : GEOM_Operation.cxx
-//  Author : Sergey ANIKIN
-//  Module : GEOM
-//  $Header$
-
 #include "GEOM_Operation.h"
 
-#include "SUIT_Application.h"
-#include "SalomeApp_Tools.h"
+#include <SUIT_Application.h>
+#include <SalomeApp_Tools.h>
 
 
 //================================================================
@@ -62,7 +59,7 @@ void GEOM_Operation::startOperation()
     try {
       myIOperation->StartOperation();
     }
-    catch( const SALOME::SALOME_Exception& e ) {
+    catch ( const SALOME::SALOME_Exception& e ) {
       SalomeApp_Tools:: QtCatchCorbaException( e );
     }
   }
@@ -80,7 +77,7 @@ void GEOM_Operation::commitOperation()
     try {
       myIOperation->FinishOperation();
     }
-    catch( const SALOME::SALOME_Exception& e ) {
+    catch ( const SALOME::SALOME_Exception& e ) {
       SalomeApp_Tools:: QtCatchCorbaException( e );
     }
   }
@@ -116,7 +113,7 @@ void GEOM_Operation::abortOperation()
     try {
       myIOperation->AbortOperation();
     }
-    catch( const SALOME::SALOME_Exception& e ) {
+    catch ( const SALOME::SALOME_Exception& e ) {
       SalomeApp_Tools::QtCatchCorbaException( e );
     }
   }
index c6654a9eaa997e102a80875e3bc22c1a344b4ea8..39e9fd682aad88d8853d098b7c42f1775f9f64b7 100644 (file)
@@ -1,41 +1,37 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2004  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOM_Operation.h
+// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
 //
-//  File   : GEOM_Operation.h
-//  Author : Sergey ANIKIN
-//  Module : GEOM
-//  $Header$
-
 #ifndef GEOM_OPERATION_H
 #define GEOM_OPERATION_H
 
 #include "GEOM_GEOMBase.hxx"
 
-#include "SUIT_Operation.h"
+#include <SUIT_Operation.h>
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(GEOM_Gen)
 
-
 class GEOMBASE_EXPORT GEOM_Operation : public SUIT_Operation
 {
 public:
@@ -44,14 +40,14 @@ public:
 
 protected:
   // Reimplemented from SUIT_Operation
-  virtual void    startOperation();        
-  virtual void    commitOperation();
-  virtual void    suspendOperation();
-  virtual void    resumeOperation();
-  virtual void    abortOperation();
+  virtual void               startOperation();        
+  virtual void               commitOperation();
+  virtual void               suspendOperation();
+  virtual void               resumeOperation();
+  virtual void               abortOperation();
 
 private:
   GEOM::GEOM_IOperations_var myIOperation;
 };
 
-#endif
+#endif // GEOM_OPERATION_H
index 078b1c4a27334ab30144e14e9dc0612114f8d929..5c7b9bdb970b468f4adcb4f7453f48c0d6b3bd51 100644 (file)
@@ -1,95 +1,79 @@
-#  GEOM GEOMBASE : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM GEOMBASE : 
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : GEOMBase
 #
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOMBase.la
 
 # header files 
-salomeinclude_HEADERS = \
-       GEOMBase.h \
-       GEOMBase_Skeleton.h \
-       GEOMBase_Helper.h \
-       GEOM_Operation.h \
-       GEOMBase_aWarningDlg.h \
+salomeinclude_HEADERS =                \
+       GEOMBase.h              \
+       GEOMBase_Skeleton.h     \
+       GEOMBase_Helper.h       \
+       GEOM_Operation.h        \
        GEOM_GEOMBase.hxx
 
-dist_libGEOMBase_la_SOURCES = \
-       GEOMBase.cxx \
-       GEOMBase_Skeleton.cxx \
-       GEOMBase_aParameterDlg.cxx \
-       GEOMBase_Helper.cxx \
-       GEOMBase_aWarningDlg.cxx \
+dist_libGEOMBase_la_SOURCES =          \
+       GEOMBase.cxx                    \
+       GEOMBase_Skeleton.cxx           \
+       GEOMBase_Helper.cxx             \
        GEOM_Operation.cxx
 
-MOC_FILES = \
-       GEOMBase_Skeleton_moc.cxx \
-       GEOMBase_aWarningDlg_moc.cxx \
-       GEOMBase_aParameterDlg_moc.cxx
-
-nodist_libGEOMBase_la_SOURCES= \
-        $(MOC_FILES)
-
-#LIB_CLIENT_IDL = SALOME_Exception.idl \
-#               SALOMEDS.idl \
-#               SALOMEDS_Attributes.idl \
-#                 SALOME_GenericObj.idl \
-#               SALOME_Component.idl \
-#               GEOM_Gen.idl
+MOC_FILES =                            \
+       GEOMBase_Skeleton_moc.cxx
 
-#LIB_SERVER_IDL = 
+nodist_libGEOMBase_la_SOURCES =        \
+       $(MOC_FILES)
 
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libGEOMBase_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../DlgRef \
-       -I$(top_builddir)/idl \
+libGEOMBase_la_CPPFLAGS =              \
+       $(QT_INCLUDES)                  \
+       $(VTK_INCLUDES)                 \
+       $(CAS_CPPFLAGS)                 \
+       $(PYTHON_INCLUDES)              \
+       $(BOOST_CPPFLAGS)               \
+       $(KERNEL_CXXFLAGS)              \
+       $(GUI_CXXFLAGS)                 \
+       $(CORBA_CXXFLAGS)               \
+       $(CORBA_INCLUDES)               \
+       -I$(srcdir)/../OBJECT           \
+       -I$(srcdir)/../GEOMClient       \
+       -I$(srcdir)/../GEOMImpl         \
+       -I$(srcdir)/../GEOMGUI          \
+       -I$(srcdir)/../DlgRef           \
+       -I$(top_builddir)/src/DlgRef    \
+       -I$(top_builddir)/idl           \
        -I$(top_builddir)/salome_adm/unix
 
-libGEOMBase_la_LDFLAGS  = \
-       ../../idl/libSalomeIDLGEOM.la \
-       ../GEOMGUI/libGEOM.la \
-       ../DlgRef/libDlgRef.la \
-       $(KERNEL_LDFLAGS) -lOpUtil \
+libGEOMBase_la_LDFLAGS  =              \
+       ../../idl/libSalomeIDLGEOM.la   \
+       ../GEOMGUI/libGEOM.la           \
+       ../DlgRef/libDlgRef.la          \
+       $(KERNEL_LDFLAGS) -lOpUtil      \
        $(GUI_LDFLAGS) -lsuit -lOCCViewer -lVTKViewer -lSVTK -lSalomePrs -lSalomeApp -lCAM \
        $(CAS_LDPATH) -lTKPrim
diff --git a/src/GEOMClient/GEOMClient.pro b/src/GEOMClient/GEOMClient.pro
new file mode 100644 (file)
index 0000000..db1ca79
--- /dev/null
@@ -0,0 +1,60 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = GEOMClient
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+CAS_TKTopAlgo = -L$${CASROOT}/Linux/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo
+
+CORBA_LIBS = -L$$(OMNIORBDIR)/lib -lomniORB4 -lomniDynamic4 -lCOS4 -lCOSDynamic4 -lomnithread
+
+STDLIB = -lstdc++
+
+INCLUDEPATH += $${CORBA_INCLUDES} $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS} $$(GEOM_ROOT_DIR)/idl ../../salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/idl -lSalomeIDLGEOM -L$$(GEOM_ROOT_DIR)/lib -lGEOMbasic $${KERNEL_LDFLAGS} -lSalomeIDLKernel -lOpUtil $${CAS_TKTopAlgo} $${CORBA_LIBS} $${STDLIB}
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += GEOMCLIENT_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+HEADERS  = GEOM_Client.hxx
+
+SOURCES  = GEOM_Client.cxx
+        
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index 5f89234b9c25892ae1ec7eeb5a60054bbb7483bc..88bd374a388e315c0fd259ac0399158eb9e1e5a3 100644 (file)
@@ -1,33 +1,30 @@
-//  GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
+//
+//  GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client
 //  File   : GEOM_Client.cxx
 //  Author : Yves FRICAUD/Lucien PIGNOLONI
 //  Module : GEOM
 //  $Header$
-
-using namespace std;
-
+//
 #include <Standard_Stream.hxx>
 
 #include <Standard_Stream.hxx>
@@ -36,7 +33,7 @@ using namespace std;
 
 #include "GEOM_Client.hxx"
 #include <SALOMEconfig.h>
-#include "OpUtil.hxx"
+#include "Basics_Utils.hxx"
 #include "utilities.h"
 
 #include <BRep_Builder.hxx>
@@ -68,7 +65,7 @@ using namespace std;
 //=======================================================================
 TopoDS_Shape GEOM_Client::Load( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape )
 {
-    string hst_client = GetHostname();
+    std::string hst_client = Kernel_Utils::GetHostname();
 
     Engines::Container_var ctn_server = geom->GetContainerRef();
     long                   pid_server = ctn_server->getPID();
@@ -83,7 +80,7 @@ TopoDS_Shape GEOM_Client::Load( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr a
         int sizebuf = SeqFile->length();
         char* buf;
         buf = (char*) &SeqFile[0];
-        istrstream streamBrep(buf,sizebuf);
+        std::istrstream streamBrep(buf,sizebuf);
         BRep_Builder aBuilder;
         BRepTools::Read(S, streamBrep, aBuilder);
         return(S);
index 161fcc1051ae5ca61dc1822d7cf644e7f04a2d8f..ba7a9ef6d94e3b9ee6391b580c6e171ed7af057f 100644 (file)
@@ -1,31 +1,30 @@
-//  GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 GEOMClient : tool to transfer BREP files from GEOM server to GEOM client
 //  File   : GEOM_Client.hxx
 //  Author : Yves FRICAUD
 //  Module : GEOM
 //  $Header$
-
+//
 #ifndef _GEOM_Client_HeaderFile
 #define _GEOM_Client_HeaderFile
 
index 9b1cc44c95f65ebcd78630e626ab65629ce581a5..6db3208feb99aacfa836f10ee0d444b7d4899c6c 100644 (file)
@@ -1,60 +1,61 @@
-#  GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY 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 GEOMClient : tool to transfer BREP files from GEOM server to GEOM client
 #  File   : Makefile.in
 #  Author : Patrick GOLDBRONN (CEA)
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS = \
-               GEOM_Client.hxx
-
+salomeinclude_HEADERS =        \
+       GEOM_Client.hxx
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOMClient.la
 
 # Sources files
-dist_libGEOMClient_la_SOURCES = \
+dist_libGEOMClient_la_SOURCES =        \
                GEOM_Client.cxx
 
-# additionnal information to compil and link file
-libGEOMClient_la_CPPFLAGS = \
-       $(CORBA_CXXFLAGS) \
-        $(CORBA_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       -I$(top_builddir)/idl \
+# additional information to compile and link file
+
+libGEOMClient_la_CPPFLAGS =    \
+       $(CORBA_CXXFLAGS)       \
+        $(CORBA_INCLUDES)      \
+       $(CAS_CPPFLAGS)         \
+       $(KERNEL_CXXFLAGS)      \
+       -I$(top_builddir)/idl   \
        -I$(top_builddir)/salome_adm/unix
 
-libGEOMClient_la_LDFLAGS  = \
-       ../../idl/libSalomeIDLGEOM.la \
-       ../GEOM/libGEOMbasic.la \
-       $(KERNEL_LDFLAGS) -lSalomeIDLKernel -lOpUtil \
-       $(CAS_TKTopAlgo) \
-       $(CORBA_LIBS) \
-       $(STDLIB)
+libGEOMClient_la_LDFLAGS  =                            \
+       ../../idl/libSalomeIDLGEOM.la                   \
+       ../GEOM/libGEOMbasic.la                         \
+       $(KERNEL_LDFLAGS) -lSalomeIDLKernel -lOpUtil    \
+       $(CAS_TKTopAlgo)
+
+# \
+#      $(CORBA_LIBS) \
+#      #$(STDLIB)
 
index 54facab664ef2df0ab7b66e5ee3af567beec03f4..315aa6ca59a03476306b1ad5bcce73adaf822c45 100644 (file)
@@ -1,31 +1,30 @@
-//  GEOM GEOMDS : implementation of Geometry component data structure and Geometry documents management
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 GEOMDS : implementation of Geometry component data structure and Geometry documents management
 //  File   : GeomDS_Commands.cxx
 //  Author : Yves FRICAUD/Lucien PIGNOLONI
 //  Module : GEOM
 //  $Header$
-
+//
 using namespace std;
 #include "utilities.h"
 #include "GEOMDS_Commands.ixx"
index 879a3ac7b5fc968b585928f614ea78992d6c16f7..662528e634e75625df6309f7794b157abf4819bc 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM GEOMDS : implementation of Geometry component data structure and Geometry documents management
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 GEOMDS : implementation of Geometry component data structure and Geometry documents management
 //  File   : GEOMDS_Commands.jxx
 //  Module : GEOM
-
+//
 #ifndef _TDF_Label_HeaderFile
 #include <TDF_Label.hxx>
 #endif
diff --git a/src/GEOMFiltersSelection/GEOMFiltersSelection.pro b/src/GEOMFiltersSelection/GEOMFiltersSelection.pro
new file mode 100644 (file)
index 0000000..7654802
--- /dev/null
@@ -0,0 +1,74 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = GEOMFiltersSelection
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+GUI_LDFLAGS = -L$$(GUI_ROOT_DIR)/lib/salome
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+INCLUDEPATH += $${QT_INCLUDES} $${CAS_CPPFLAGS} $${BOOST_CPPFLAGS} $${GUI_CXXFLAGS} $${KERNEL_CXXFLAGS} $${CORBA_CXXFLAGS} $${CORBA_INCLUDES} ../GEOMClient $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/idl -lSalomeIDLGEOM -L$$(GEOM_ROOT_DIR)/lib -lGEOMClient $${GUI_LDFLAGS} -lsuit -lSalomeApp -lSalomeSession $${KERNEL_LDFLAGS} -lSalomeLifeCycleCORBA -lSalomeContainer -lTOOLSDS
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+HEADERS  = GEOM_SelectionFilter.h
+HEADERS += GEOM_EdgeFilter.h
+HEADERS += GEOM_FaceFilter.h
+HEADERS += GEOM_TypeFilter.h
+HEADERS += GEOM_PreviewFilter.h
+HEADERS += GEOM_LogicalFilter.h
+HEADERS += GEOM_OCCFilter.h
+
+SOURCES  = GEOM_SelectionFilter.cxx
+SOURCES += GEOM_EdgeFilter.cxx
+SOURCES += GEOM_FaceFilter.cxx
+SOURCES += GEOM_TypeFilter.cxx
+SOURCES += GEOM_PreviewFilter.cxx
+SOURCES += GEOM_LogicalFilter.cxx
+SOURCES += GEOM_OCCFilter.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
diff --git a/src/GEOMFiltersSelection/GEOM_CompoundFilter.cxx b/src/GEOMFiltersSelection/GEOM_CompoundFilter.cxx
new file mode 100644 (file)
index 0000000..7f598cc
--- /dev/null
@@ -0,0 +1,135 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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
+//
+//  GEOM GEOM_CompoundFilter : filter selector for the viewer
+//  File   : GEOM_CompoundFilter.cxx
+//  Author : Roman NIKOLAEV
+//  Module : GEOM
+//
+#include "GEOM_CompoundFilter.h"
+
+// OCCT Includes
+#include <TopTools_MapOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopoDS_Iterator.hxx>
+
+
+
+//=======================================================================
+// function : GEOM_CompoundFilter
+// purpose  : 
+//=======================================================================
+GEOM_CompoundFilter::GEOM_CompoundFilter(SalomeApp_Study* study)
+: GEOM_SelectionFilter( study )
+{
+  add( TopAbs_COMPOUND );
+}
+
+//=======================================================================
+// function : ~GEOM_CompoundFilter
+// purpose  : 
+//=======================================================================
+GEOM_CompoundFilter::~GEOM_CompoundFilter()
+{
+}
+
+//=======================================================================
+// function : isOk
+// purpose  : 
+//=======================================================================
+bool GEOM_CompoundFilter::isOk( const SUIT_DataOwner* sOwner) const
+{
+  if(GEOM_SelectionFilter::isOk(sOwner)){
+
+    GEOM::GEOM_Object_var obj = getObject( sOwner );
+    TopoDS_Shape shape;
+    if ( getShape( obj, shape )){
+      bool subTypes[TopAbs_SHAPE];
+      getInfo(shape,subTypes);
+      QList<int>::const_iterator it;
+      bool result = false;
+      for ( it = myKinds.constBegin(); it != myKinds.constEnd(); ++it )
+        result = result || subTypes[(*it)];
+      
+      return result;
+    }
+  }
+  return false;
+}
+
+
+//=======================================================================
+// function : addSubType
+// purpose  : 
+//=======================================================================
+void GEOM_CompoundFilter::addSubType( const int type)
+{
+  if(!myKinds.contains(type))
+    myKinds.append(type);
+}
+
+//=======================================================================
+// function : addSubTypes
+// purpose  : 
+//=======================================================================
+void GEOM_CompoundFilter::addSubTypes(const QList<int>& kinds)
+{
+  myKinds = kinds;     
+}
+
+//=======================================================================
+// function : getInfo()
+// purpose  : 
+//=======================================================================
+void GEOM_CompoundFilter::getInfo(const TopoDS_Shape& aShape, bool subTypes[]) const
+{
+  int iType, nbTypes[TopAbs_SHAPE];
+  for (iType = 0; iType < TopAbs_SHAPE; ++iType){
+    nbTypes[iType] = 0;
+    subTypes[iType] = false;
+  }
+
+  nbTypes[aShape.ShapeType()]++;
+  TopTools_MapOfShape aMapOfShape;
+  aMapOfShape.Add(aShape);
+  TopTools_ListOfShape aListOfShape;
+  aListOfShape.Append(aShape);
+  
+  TopTools_ListIteratorOfListOfShape itL (aListOfShape);
+  for (; itL.More(); itL.Next()) {
+    TopoDS_Iterator it (itL.Value());
+    for (; it.More(); it.Next()) {
+      TopoDS_Shape s = it.Value();
+      if (aMapOfShape.Add(s)) {
+        aListOfShape.Append(s);
+        nbTypes[s.ShapeType()]++;
+      }
+    }
+  }
+  
+  for(iType = TopAbs_COMPSOLID; iType < TopAbs_SHAPE; ++iType) {
+    if(nbTypes[iType] > 0) {
+      subTypes[iType] = true;
+      break;
+    }
+  }
+}
diff --git a/src/GEOMFiltersSelection/GEOM_CompoundFilter.h b/src/GEOMFiltersSelection/GEOM_CompoundFilter.h
new file mode 100644 (file)
index 0000000..ea174a8
--- /dev/null
@@ -0,0 +1,48 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 GEOM_COMPOUNDFILTER_H
+#define GEOM_COMPOUNDFILTER_H
+#include "GEOM_SelectionFilter.h"
+
+#include <QList>
+
+class Standard_EXPORT GEOM_CompoundFilter : public GEOM_SelectionFilter
+{
+ public:
+  GEOM_CompoundFilter( SalomeApp_Study* study );
+  ~GEOM_CompoundFilter();
+
+  virtual bool isOk( const SUIT_DataOwner* ) const;
+  void addSubType(const int );
+  void addSubTypes(const QList<int>& );
+
+ private:
+  void getInfo(const TopoDS_Shape&, bool subTypes []) const;
+  
+  
+ private:
+  QList<int>              myKinds;
+};
+
+
+#endif
+
index a73bb3eb268d525a8807cfa1c6404cef2a09b705..c47f8b793f13341d81cae108ff8baa81d91ca4dd 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 "GEOM_EdgeFilter.h"
 
index 3cc49eecfd1f47697c4ec06586c33c97aa666896..9977bdf65b252b8492e9a2149240d7a6ddd963a3 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 GEOM_EDGEFILTER_H
 #define GEOM_EDGEFILTER_H
diff --git a/src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx b/src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx
deleted file mode 100644 (file)
index 54a19c1..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the 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_EdgeFilter.hxx
-//  Module : GEOM
-
-#ifndef _GEOM_EdgeFilter_HeaderFile
-#define _GEOM_EdgeFilter_HeaderFile
-
-#ifndef _Handle_GEOM_EdgeFilter_HeaderFile
-#include "Handle_GEOM_EdgeFilter.hxx"
-#endif
-
-#include "SALOME_InteractiveObject.hxx"
-#include "GEOM_ShapeTypeFilter.hxx"
-
-// IDL Headers
-#include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(GEOM_Gen)
-#include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
-
-// Open CASCADE Includes
-#include <Standard.hxx>
-#include <StdSelect_TypeOfEdge.hxx>
-
-class GEOM_EdgeFilter : public GEOM_ShapeTypeFilter {
-
-public:
-
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
- // Methods PUBLIC
- // 
-Standard_EXPORT GEOM_EdgeFilter( const StdSelect_TypeOfEdge Edge );
-Standard_EXPORT ~GEOM_EdgeFilter();
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& GEOM_EdgeFilter_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
- Standard_EXPORT virtual Standard_Boolean IsShapeOk(const TopoDS_Shape& theShape ) const;
-
- // Fields PROTECTED
- //
-StdSelect_TypeOfEdge  myKind;
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-
-
-};
-
-
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
-#endif
diff --git a/src/GEOMFiltersSelection/GEOM_EdgeFilter.ixx b/src/GEOMFiltersSelection/GEOM_EdgeFilter.ixx
deleted file mode 100644 (file)
index 1b3af32..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the 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_EdgeFilter.ixx
-//  Module : GEOM
-
-#include "GEOM_EdgeFilter.jxx"
-
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-GEOM_EdgeFilter::~GEOM_EdgeFilter() {}
-
-
-Standard_EXPORT Handle_Standard_Type& GEOM_EdgeFilter_Type_()
-{
-
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(GEOM_ShapeTypeFilter);
-  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(GEOM_ShapeTypeFilter);
-  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
-  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
-  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
-
-  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
-  static Handle_Standard_Type _aType = new Standard_Type("GEOM_EdgeFilter",
-                                                        sizeof(GEOM_EdgeFilter),
-                                                        1,
-                                                        (Standard_Address)_Ancestors,
-                                                        (Standard_Address)NULL);
-
-  return _aType;
-}
-
-
-// DownCast method
-//   allow safe downcasting
-//
-const Handle(GEOM_EdgeFilter) Handle(GEOM_EdgeFilter)::DownCast(const Handle(Standard_Transient)& AnObject) 
-{
-  Handle(GEOM_EdgeFilter) _anOtherObject;
-
-  if (!AnObject.IsNull()) {
-     if (AnObject->IsKind(STANDARD_TYPE(GEOM_EdgeFilter))) {
-       _anOtherObject = Handle(GEOM_EdgeFilter)((Handle(GEOM_EdgeFilter)&)AnObject);
-     }
-  }
-
-  return _anOtherObject ;
-}
-const Handle(Standard_Type)& GEOM_EdgeFilter::DynamicType() const 
-{ 
-  return STANDARD_TYPE(GEOM_EdgeFilter) ; 
-}
-Standard_Boolean GEOM_EdgeFilter::IsKind(const Handle(Standard_Type)& AType) const 
-{ 
-  return (STANDARD_TYPE(GEOM_EdgeFilter) == AType || GEOM_ShapeTypeFilter::IsKind(AType)); 
-}
-Handle_GEOM_EdgeFilter::~Handle_GEOM_EdgeFilter() {}
-
diff --git a/src/GEOMFiltersSelection/GEOM_EdgeFilter.jxx b/src/GEOMFiltersSelection/GEOM_EdgeFilter.jxx
deleted file mode 100644 (file)
index 7912459..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the 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_EdgeFilter.jxx
-//  Module : GEOM
-
-#ifndef _GEOM_EdgeFilter_HeaderFile
-#include "GEOM_EdgeFilter.hxx"
-#endif
index 732165db79d03adf592ba97ee5995728aa76fdc8..9b126852c94f9bd287880c8533bb573138fac60b 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 "GEOM_FaceFilter.h"
 
index 03a15421851681fec6341783ecc76f84b9481f5b..9f68f01a818c91108d16a6aadb6afe9ef525b63f 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 GEOM_FACEFILTER_H
 #define GEOM_FACEFILTER_H
diff --git a/src/GEOMFiltersSelection/GEOM_FaceFilter.hxx b/src/GEOMFiltersSelection/GEOM_FaceFilter.hxx
deleted file mode 100644 (file)
index 7184542..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the 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_FaceFilter.hxx
-//  Module : GEOM
-
-#ifndef _GEOM_FaceFilter_HeaderFile
-#define _GEOM_FaceFilter_HeaderFile
-
-#ifndef _Handle_GEOM_FaceFilter_HeaderFile
-#include "Handle_GEOM_FaceFilter.hxx"
-#endif
-
-#include "GEOM_ShapeTypeFilter.hxx"
-
-// IDL Headers
-#include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(GEOM_Gen)
-#include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
-
-// Open CASCADE Includes
-#include <Standard.hxx>
-#include <StdSelect_TypeOfFace.hxx>
-
-class GEOM_FaceFilter : public GEOM_ShapeTypeFilter {
-
-public:
-
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
- // Methods PUBLIC
- // 
-Standard_EXPORT GEOM_FaceFilter( const StdSelect_TypeOfFace Face );
-Standard_EXPORT ~GEOM_FaceFilter();
-
-
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& GEOM_FaceFilter_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
- Standard_EXPORT virtual Standard_Boolean IsShapeOk(const TopoDS_Shape& theShape ) const;
-
-
- // Fields PROTECTED
- //
-StdSelect_TypeOfFace  myKind;
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-
-
-};
-
-
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
-#endif
diff --git a/src/GEOMFiltersSelection/GEOM_FaceFilter.ixx b/src/GEOMFiltersSelection/GEOM_FaceFilter.ixx
deleted file mode 100644 (file)
index 92b872d..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the 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_FaceFilter.ixx
-//  Module : GEOM
-
-#include "GEOM_FaceFilter.jxx"
-
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-GEOM_FaceFilter::~GEOM_FaceFilter() {}
-
-
-Standard_EXPORT Handle_Standard_Type& GEOM_FaceFilter_Type_()
-{
-
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(GEOM_ShapeTypeFilter);
-  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(GEOM_ShapeTypeFilter);
-  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
-  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
-  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
-
-  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
-  static Handle_Standard_Type _aType = new Standard_Type("GEOM_FaceFilter",
-                                                        sizeof(GEOM_FaceFilter),
-                                                        1,
-                                                        (Standard_Address)_Ancestors,
-                                                        (Standard_Address)NULL);
-
-  return _aType;
-}
-
-
-// DownCast method
-//   allow safe downcasting
-//
-const Handle(GEOM_FaceFilter) Handle(GEOM_FaceFilter)::DownCast(const Handle(Standard_Transient)& AnObject) 
-{
-  Handle(GEOM_FaceFilter) _anOtherObject;
-
-  if (!AnObject.IsNull()) {
-     if (AnObject->IsKind(STANDARD_TYPE(GEOM_FaceFilter))) {
-       _anOtherObject = Handle(GEOM_FaceFilter)((Handle(GEOM_FaceFilter)&)AnObject);
-     }
-  }
-
-  return _anOtherObject ;
-}
-const Handle(Standard_Type)& GEOM_FaceFilter::DynamicType() const 
-{ 
-  return STANDARD_TYPE(GEOM_FaceFilter) ; 
-}
-Standard_Boolean GEOM_FaceFilter::IsKind(const Handle(Standard_Type)& AType) const 
-{ 
-  return (STANDARD_TYPE(GEOM_FaceFilter) == AType || GEOM_ShapeTypeFilter::IsKind(AType)); 
-}
-Handle_GEOM_FaceFilter::~Handle_GEOM_FaceFilter() {}
-
diff --git a/src/GEOMFiltersSelection/GEOM_FaceFilter.jxx b/src/GEOMFiltersSelection/GEOM_FaceFilter.jxx
deleted file mode 100644 (file)
index 43abd89..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the 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_FaceFilter.jxx
-//  Module : GEOM
-
-#ifndef _GEOM_FaceFilter_HeaderFile
-#include "GEOM_FaceFilter.hxx"
-#endif
index a67a992191e848ddf82111c9b19786b6e1136ee6..1f54c3854b19a578db0c659e6db8d55838d13174 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 "GEOM_LogicalFilter.h"
 
@@ -23,7 +25,7 @@
 // function : GEOM_LogicalFilter
 // purpose  : 
 //=======================================================================
-GEOM_LogicalFilter::GEOM_LogicalFilter( const QPtrList<SUIT_SelectionFilter>& lst, const int op )
+GEOM_LogicalFilter::GEOM_LogicalFilter( const QList<SUIT_SelectionFilter*>& lst, const int op )
 : SUIT_SelectionFilter()
 {
   setFilters( lst ); 
@@ -45,8 +47,12 @@ GEOM_LogicalFilter::~GEOM_LogicalFilter()
 bool GEOM_LogicalFilter::isOk( const SUIT_DataOwner* owner ) const
 {
   GEOM_LogicalFilter* non_const_this = (GEOM_LogicalFilter*)this;
-  for ( SUIT_SelectionFilter* filter = non_const_this->myFilters.first(); filter; filter = non_const_this->myFilters.next() )
+  QListIterator<SUIT_SelectionFilter*> it( non_const_this->myFilters );
+  while ( it.hasNext() )
   {
+    SUIT_SelectionFilter* filter = it.next();
+    if ( !filter ) continue;
+
     if ( myOperation == LO_OR && filter->isOk( owner ) )
       return true;
     if ( myOperation == LO_AND && !filter->isOk( owner ) )
@@ -62,7 +68,7 @@ bool GEOM_LogicalFilter::isOk( const SUIT_DataOwner* owner ) const
 // function : setFilters
 // purpose  : 
 //=======================================================================
-void GEOM_LogicalFilter::setFilters( const QPtrList<SUIT_SelectionFilter>& lst )
+void GEOM_LogicalFilter::setFilters( const QList<SUIT_SelectionFilter*>& lst )
 {
   myFilters = lst;
 }
@@ -80,7 +86,7 @@ void GEOM_LogicalFilter::setOperation( const int op )
 // function : getFilters
 // purpose  : 
 //=======================================================================
-QPtrList<SUIT_SelectionFilter> GEOM_LogicalFilter::getFilters() const 
+QList<SUIT_SelectionFilter*> GEOM_LogicalFilter::getFilters() const 
 {
   return myFilters;
 }
index dbb590c491e9eda081ff0608ea7c6d4df0983637..d0ba7c683cff6201db298d3430e8613c7aa4b3d9 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 GEOM_LOGICALFILTER_H
 #define GEOM_LOGICALFILTER_H
@@ -23,7 +25,7 @@
 #include <SUIT_SelectionFilter.h>
 #include <Standard_Macro.hxx>
 
-#include <qptrlist.h>
+#include <QList>
 
 class Standard_EXPORT GEOM_LogicalFilter : public SUIT_SelectionFilter
 {
@@ -31,19 +33,19 @@ public:
   enum { LO_OR, LO_AND, LO_NOT, LO_UNDEFINED };
 
 public:
-  GEOM_LogicalFilter( const QPtrList<SUIT_SelectionFilter>& lst, const int op );
+  GEOM_LogicalFilter( const QList<SUIT_SelectionFilter*>& lst, const int op );
   ~GEOM_LogicalFilter();
 
   virtual bool                   isOk( const SUIT_DataOwner* ) const;
 
-  void                           setFilters( const QPtrList<SUIT_SelectionFilter>& lst );
+  void                           setFilters( const QList<SUIT_SelectionFilter*>& lst );
   void                           setOperation( const int );
-  QPtrList<SUIT_SelectionFilter> getFilters() const;
+  QList<SUIT_SelectionFilter*>   getFilters() const;
   int                            getOperation() const;
 
 private:
-  QPtrList<SUIT_SelectionFilter>  myFilters;
-  int                             myOperation;
+  QList<SUIT_SelectionFilter*>   myFilters;
+  int                            myOperation;
 
 };
 
diff --git a/src/GEOMFiltersSelection/GEOM_LogicalFilter.hxx b/src/GEOMFiltersSelection/GEOM_LogicalFilter.hxx
deleted file mode 100644 (file)
index eeb6e61..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-//  SALOME SALOMEGUI : implementation of desktop and GUI kernel
-//
-//  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_LogicalFilter.hxx
-//  Author : Sergey LITONIN
-//  Module : GEOM
-
-#ifndef _GEOM_LogicalFilter_HeaderFile
-#define _GEOM_LogicalFilter_HeaderFile
-
-#include "SALOME_Filter.hxx"
-
-#include <Standard_DefineHandle.hxx>
-#include <NCollection_StdBase.hxx>
-#include <NCollection_DefineList.hxx>
-
-DEFINE_STANDARD_HANDLE( GEOM_LogicalFilter, SALOME_Filter )
-
-DEFINE_BASECOLLECTION( GEOM_FilterColl, Handle(SALOME_Filter) )
-DEFINE_LIST( GEOM_ListOfFilter, GEOM_FilterColl, Handle(SALOME_Filter) )
-
-
-/*
-  Class       : GEOM_LogicalFilter
-  Description : Filter for combaining several filters with logical operation (OR or AND)
-*/
-
-class GEOM_LogicalFilter : public SALOME_Filter
-{
-public:
-
-  enum { LO_OR, LO_AND, LO_NOT, LO_UNDEFINED };
-
-public:
-
-                              GEOM_LogicalFilter( const GEOM_ListOfFilter&, const int  );
-                              GEOM_LogicalFilter( const Handle(SALOME_Filter)&, const int );
-
-
-  virtual                     ~GEOM_LogicalFilter();
-  virtual                     Standard_Boolean IsOk( const Handle(SALOME_InteractiveObject)& ) const;
-
-  void                        SetFilters( const GEOM_ListOfFilter& );
-  void                        SetLogOp( const int );
-  const GEOM_ListOfFilter&    GetFilters() const;
-  int                         GetLogOp() const;
-
-private:
-
-  GEOM_ListOfFilter           myFilters;
-  int                         myLogOp;
-
-public:
-  DEFINE_STANDARD_RTTI( GEOM_LogicalFilter )
-};
-
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
index e62acd406e52010619fe2b5f076debb17a9b4580..75027c74c2eabfdbafce7f3c071b33ba91881f7e 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 "GEOM_OCCFilter.h"
 
index eccfc5f6a758475d5e1cce4550e1e1f69bdeb624..c21fd356bd3654a316d0f884fc0b8c07098813b4 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 GEOM_OCCFILTER_H
 #define GEOM_OCCFILTER_H
index 1be775274dde60a966b789d0d777c4f5c36a242a..40ce102be0ca758e62e01dbdef77753f99543a44 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 "GEOM_PreviewFilter.h"
 
@@ -45,6 +47,6 @@ GEOM_PreviewFilter::~GEOM_PreviewFilter()
 bool GEOM_PreviewFilter::isOk( const SUIT_DataOwner* sOwner ) const
 {
   const LightApp_DataOwner* owner = dynamic_cast<const LightApp_DataOwner*> ( sOwner );
-  return ( owner && strstr( owner->entry(), "TEMP" ) );
+  return ( owner && strstr( owner->entry().toLatin1().constData(), "TEMP" ) );
 }
 
index e9c57f656735b8f42aece6db5138159dc2e723cf..68b7f46443bfbed795d3f1b58a764da47fe80283 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 GEOM_PREVIEW_FILTER_H
 #define GEOM_PREVIEW_FILTER_H
diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.hxx b/src/GEOMFiltersSelection/GEOM_PreviewFilter.hxx
deleted file mode 100644 (file)
index 1411745..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2004  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_PreviewFilter.hxx
-//  Module : GEOM
-
-#ifndef _GEOM_PreviewFilter_HeaderFile
-#define _GEOM_PreviewFilter_HeaderFile
-
-#ifndef _Handle_GEOM_PreviewFilter_HeaderFile
-#include "Handle_GEOM_PreviewFilter.hxx"
-#endif
-
-#include "SALOME_InteractiveObject.hxx"
-#include "SALOME_Filter.hxx"
-
-// IDL Headers
-
-
-// Open CASCADE Includes
-#include <Standard.hxx>
-
-class GEOM_PreviewFilter : public SALOME_Filter {
-
-public:
-
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
- // Methods PUBLIC
- // 
-Standard_EXPORT GEOM_PreviewFilter();
-Standard_EXPORT ~GEOM_PreviewFilter();
-
-Standard_EXPORT virtual  Standard_Boolean IsOk(const Handle(SALOME_InteractiveObject)& anobj) const;
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& GEOM_PreviewFilter_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-
-
-};
-
-
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
-#endif
diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.ixx b/src/GEOMFiltersSelection/GEOM_PreviewFilter.ixx
deleted file mode 100644 (file)
index 2222f51..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2004  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_PreviewFilter.ixx
-//  Module : GEOM
-
-#include "GEOM_PreviewFilter.jxx"
-
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-GEOM_PreviewFilter::~GEOM_PreviewFilter() {}
-
-
-Standard_EXPORT Handle_Standard_Type& GEOM_PreviewFilter_Type_()
-{
-
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(SALOME_Filter);
-  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(SALOME_Filter);
-  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
-  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
-  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
-
-  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
-  static Handle_Standard_Type _aType = new Standard_Type("GEOM_PreviewFilter",
-                                                        sizeof(GEOM_PreviewFilter),
-                                                        1,
-                                                        (Standard_Address)_Ancestors,
-                                                        (Standard_Address)NULL);
-
-  return _aType;
-}
-
-
-// DownCast method
-//   allow safe downcasting
-//
-const Handle(GEOM_PreviewFilter) Handle(GEOM_PreviewFilter)::DownCast(const Handle(Standard_Transient)& AnObject) 
-{
-  Handle(GEOM_PreviewFilter) _anOtherObject;
-
-  if (!AnObject.IsNull()) {
-     if (AnObject->IsKind(STANDARD_TYPE(GEOM_PreviewFilter))) {
-       _anOtherObject = Handle(GEOM_PreviewFilter)((Handle(GEOM_PreviewFilter)&)AnObject);
-     }
-  }
-
-  return _anOtherObject ;
-}
-const Handle(Standard_Type)& GEOM_PreviewFilter::DynamicType() const 
-{ 
-  return STANDARD_TYPE(GEOM_PreviewFilter) ; 
-}
-Standard_Boolean GEOM_PreviewFilter::IsKind(const Handle(Standard_Type)& AType) const 
-{ 
-  return (STANDARD_TYPE(GEOM_PreviewFilter) == AType || SALOME_Filter::IsKind(AType)); 
-}
-Handle_GEOM_PreviewFilter::~Handle_GEOM_PreviewFilter() {}
-
diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.jxx b/src/GEOMFiltersSelection/GEOM_PreviewFilter.jxx
deleted file mode 100644 (file)
index 4342c9c..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2004  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_PreviewFilter.jxx
-//  Module : GEOM
-
-#ifndef _GEOM_PreviewFilter_HeaderFile
-#include "GEOM_PreviewFilter.hxx"
-#endif
index 6d20b194ccff1fa5ceffdd21525990f673999d74..a8360dc5191d156365eb707c592c0eb10a22ffae 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 "GEOM_SelectionFilter.h"
 
@@ -29,9 +31,6 @@
 
 #include <SUIT_Session.h>
 
-#include <SALOMEDSClient.hxx>
-
-
 //=======================================================================
 // function : GEOM_SelectionFilter
 // purpose  :
@@ -84,7 +83,7 @@ GEOM::GEOM_Object_ptr GEOM_SelectionFilter::getObject( const SUIT_DataOwner* sOw
     _PTR(Study) study = appStudy->studyDS();
     QString entry = owner->entry();
 
-    _PTR(SObject) aSO (study->FindObjectID(entry.latin1())), aRefSO;
+    _PTR(SObject) aSO (study->FindObjectID(entry.toStdString())), aRefSO;
     if( extractReference && aSO && aSO->ReferencedObject( aRefSO ) )
       aSO = aRefSO;
 
@@ -164,7 +163,7 @@ void GEOM_SelectionFilter::add( const int type )
 void GEOM_SelectionFilter::remove( const int type )
 {
   if ( contains( type ) )
-    myTypes.remove( type );
+    myTypes.removeAll( type );
 }
 
 //=======================================================================
index 45b0fd969380b26649335ca745e160803b080e22..aca520747a7a61ea7a2dcdf062c000e2440d7a73 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 GEOM_SELECTIONFILTER_H
 #define GEOM_SELECTIONFILTER_H
@@ -24,7 +26,7 @@
 
 #include <TopoDS_Shape.hxx>
 
-#include <qvaluelist.h>
+#include <QList>
 
 // IDL Headers
 #include <SALOMEconfig.h>
@@ -52,7 +54,7 @@ protected:
   bool                  isShapeOk( const TopoDS_Shape& ) const;
 
 private:
-  QValueList<int>       myTypes;
+  QList<int>            myTypes;
   bool                  myAll;
 
 };
diff --git a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx
deleted file mode 100644 (file)
index 1de7bd2..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the 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_ShapeTypeFilter.cxx
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
-
-#include <Standard_Stream.hxx>
-
-#include "GEOM_ShapeTypeFilter.ixx"
-#include "SALOME_InteractiveObject.hxx"
-#include "GEOM_Client.hxx"
-#include "QAD_Application.h"
-#include "QAD_Desktop.h"
-#include "utilities.h"
-
-#include <TopoDS_Shape.hxx>
-
-//=======================================================================
-// function : getShape()
-// purpose  : returns a TopoDS_Shape stored in GEOM_Object
-//=======================================================================
-static bool getShape( const GEOM::GEOM_Object_ptr& theObject, TopoDS_Shape& theShape )
-{
-  if ( !CORBA::is_nil( theObject ) )
-  {
-    static GEOM::GEOM_Gen_var myGeom;
-    if(CORBA::is_nil(myGeom) {
-      Engines::Component_var comp = QAD_Application::getDesktop()->getEngine( "FactoryServer", "GEOM" );
-      myGeom = GEOM::GEOM_Gen::_narrow( comp );
-    }
-    TopoDS_Shape aTopoDSShape = GEOM_Client().GetShape( myGeom, theObject );
-        
-    if ( !aTopoDSShape.IsNull() )
-    {
-      theShape = aTopoDSShape;
-       return true;
-    }
-  }
-  return false;
-}
-
-//=======================================================================
-// function : ConvertIOinGEOMObject()
-// purpose  :
-//=======================================================================
-static GEOM::GEOM_Object_ptr convertIOinGEOMObject(
-  const Handle(SALOME_InteractiveObject)& theIO, Standard_Boolean& theResult )
-{
-  theResult = Standard_False;
-  GEOM::GEOM_Object_var aReturnObject;
-  if ( !theIO.IsNull() )
-  {
-    const char* anEntry = theIO->getEntry();
-    SALOMEDS::SObject_var aSObj =
-      QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument()->FindObjectID( anEntry );
-    if ( !CORBA::is_nil( aSObj ) )
-    {
-      aReturnObject = GEOM::GEOM_Object::_narrow( aSObj->GetObject() );
-      theResult = !CORBA::is_nil( aReturnObject );
-    }
-  }
-  return aReturnObject._retn();
-}
-
-//=======================================================================
-// function : ShapeTypeFilter
-// purpose  : 
-//=======================================================================
-GEOM_ShapeTypeFilter::GEOM_ShapeTypeFilter( const TopAbs_ShapeEnum theShapeType,
-                                            const bool theIsAll ) 
-{
-  myIsAll = theIsAll;
-  myShapeTypes.Add( theShapeType );
-  myTypeFilter = new SALOME_TypeFilter( "GEOM" );
-}
-
-//=======================================================================
-// function : ShapeTypeFilter
-// purpose  : 
-//=======================================================================
-GEOM_ShapeTypeFilter::GEOM_ShapeTypeFilter( const TColStd_MapOfInteger& theShapeTypes,
-                                            const bool theIsAll ) 
-{
-  myIsAll = theIsAll;
-  myShapeTypes = theShapeTypes;
-  myTypeFilter = new SALOME_TypeFilter( "GEOM" );
-}
-
-//=======================================================================
-// function : IsOk
-// purpose  : 
-//=======================================================================
-Standard_Boolean GEOM_ShapeTypeFilter::IsOk(
-  const Handle(SALOME_InteractiveObject)& anObj ) const 
-{
-  if ( !myTypeFilter->IsOk(anObj) ) 
-    return Standard_False;
-
-  Standard_Boolean aResult = Standard_False;
-  GEOM::GEOM_Object_ptr aGeomObj = convertIOinGEOMObject( anObj, aResult );
-  if ( !CORBA::is_nil( aGeomObj ) && aResult && aGeomObj->IsShape() )
-  {
-    if ( myIsAll )
-      return true;
-    TopoDS_Shape aShape;
-    if ( getShape( aGeomObj, aShape ) )
-    {
-      if ( myShapeTypes.Contains( aShape.ShapeType() ) )
-        return IsShapeOk( aShape );
-    }
-  }
-  return Standard_False;
-}
-
-//=======================================================================
-// function : IsShapeOk
-// purpose  : 
-//=======================================================================
-Standard_Boolean GEOM_ShapeTypeFilter::IsShapeOk( const TopoDS_Shape& ) const
-{
-  return Standard_True;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.hxx b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.hxx
deleted file mode 100644 (file)
index 5af6de1..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the 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_ShapeTypeFilter.hxx
-//  Module : GEOM
-
-#ifndef _GEOM_ShapeTypeFilter_HeaderFile
-#define _GEOM_ShapeTypeFilter_HeaderFile
-
-#ifndef _Handle_GEOM_ShapeTypeFilter_HeaderFile
-#include "Handle_GEOM_ShapeTypeFilter.hxx"
-#endif
-
-#include "SALOME_InteractiveObject.hxx"
-#include "SALOME_Filter.hxx"
-#include "SALOME_TypeFilter.hxx"
-
-// IDL Headers
-#include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(GEOM_Gen)
-#include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
-
-// Open CASCADE Includes
-#include <Standard.hxx>
-#include <TopAbs.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TColStd_MapOfInteger.hxx>
-
-class GEOM_ShapeTypeFilter : public SALOME_Filter
-{
-
-public:
-
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
- // Methods PUBLIC
- //
-Standard_EXPORT GEOM_ShapeTypeFilter( const TopAbs_ShapeEnum theShapeType,
-                                      const bool theIsAll = false );
-Standard_EXPORT GEOM_ShapeTypeFilter( const TColStd_MapOfInteger& theShapeTypes,
-                                      const bool theIsAll = false );
-Standard_EXPORT ~GEOM_ShapeTypeFilter();
-
-Standard_EXPORT virtual  Standard_Boolean IsOk(const Handle(SALOME_InteractiveObject)& anobj) const;
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& GEOM_ShapeTypeFilter_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- //
- Standard_EXPORT virtual Standard_Boolean IsShapeOk(const TopoDS_Shape& theShape ) const;
-
-
- // Fields PROTECTED
- //
-TColStd_MapOfInteger myShapeTypes;
-Handle(SALOME_TypeFilter) myTypeFilter;
-
-private: 
-
- bool myIsAll;
-
-
-};
-
-
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
-#endif
diff --git a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.ixx b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.ixx
deleted file mode 100644 (file)
index 86ca838..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the 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_ShapeTypeFilter.ixx
-//  Module : GEOM
-
-#include "GEOM_ShapeTypeFilter.jxx"
-
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-GEOM_ShapeTypeFilter::~GEOM_ShapeTypeFilter() {}
-
-
-Standard_EXPORT Handle_Standard_Type& GEOM_ShapeTypeFilter_Type_()
-{
-
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(SALOME_Filter);
-  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(SALOME_Filter);
-  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
-  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
-  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
-
-  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
-  static Handle_Standard_Type _aType = new Standard_Type("GEOM_ShapeTypeFilter",
-                                                        sizeof(GEOM_ShapeTypeFilter),
-                                                        1,
-                                                        (Standard_Address)_Ancestors,
-                                                        (Standard_Address)NULL);
-
-  return _aType;
-}
-
-
-// DownCast method
-//   allow safe downcasting
-//
-const Handle(GEOM_ShapeTypeFilter) Handle(GEOM_ShapeTypeFilter)::DownCast(const Handle(Standard_Transient)& AnObject) 
-{
-  Handle(GEOM_ShapeTypeFilter) _anOtherObject;
-
-  if (!AnObject.IsNull()) {
-     if (AnObject->IsKind(STANDARD_TYPE(GEOM_ShapeTypeFilter))) {
-       _anOtherObject = Handle(GEOM_ShapeTypeFilter)((Handle(GEOM_ShapeTypeFilter)&)AnObject);
-     }
-  }
-
-  return _anOtherObject ;
-}
-const Handle(Standard_Type)& GEOM_ShapeTypeFilter::DynamicType() const 
-{ 
-  return STANDARD_TYPE(GEOM_ShapeTypeFilter) ; 
-}
-Standard_Boolean GEOM_ShapeTypeFilter::IsKind(const Handle(Standard_Type)& AType) const 
-{ 
-  return (STANDARD_TYPE(GEOM_ShapeTypeFilter) == AType || SALOME_Filter::IsKind(AType)); 
-}
-Handle_GEOM_ShapeTypeFilter::~Handle_GEOM_ShapeTypeFilter() {}
-
diff --git a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.jxx b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.jxx
deleted file mode 100644 (file)
index 0ddda34..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the 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_ShapeTypeFilter.jxx
-//  Module : GEOM
-
-#ifndef _GEOM_ShapeTypeFilter_HeaderFile
-#include "GEOM_ShapeTypeFilter.hxx"
-#endif
index daa00f0f1575f6659ba8623f88664d1e7041eba5..a9bbde7380e790af5232d2f349b8c1cd279e04c4 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 "GEOM_TypeFilter.h"
 
index ec2235ee746da35192eadee4ae7836e7a0e2f287..d1e57fb9afc157e78f25b4f134b4bdc86c48dd9c 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 GEOM_TYPEFILTER_H
 #define GEOM_TYPEFILTER_H
diff --git a/src/GEOMFiltersSelection/GEOM_TypeFilter.hxx b/src/GEOMFiltersSelection/GEOM_TypeFilter.hxx
deleted file mode 100644 (file)
index 8be86f6..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-//  GEOM GEOMGUI : Implementation of selection filters for GEOM module
-//
-//  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_TypeFilter.hxx
-//  Author : Sergey LITONIN
-//  Module : GEOM
-
-#ifndef _GEOM_TypeFilter_HeaderFile
-#define _GEOM_TypeFilter_HeaderFile
-
-#include "SALOME_TypeFilter.hxx"
-
-#include <Standard_DefineHandle.hxx>
-
-DEFINE_STANDARD_HANDLE( GEOM_TypeFilter, SALOME_TypeFilter )
-
-/*
-  Class       : GEOM_TypeFilter
-  Description : Filter for verifyimg type of geom object ( GEOM_POINT, GEOM_MARKER  and so on )
-*/
-
-class GEOM_TypeFilter : public SALOME_TypeFilter
-{
-
-public:
-
-                              GEOM_TypeFilter( const int  );
-
-
-  virtual                     ~GEOM_TypeFilter();
-  virtual                     Standard_Boolean IsOk( const Handle(SALOME_InteractiveObject)& ) const;
-
-  void                        SetType( const int );
-  int                         GetType() const;
-
-private:
-
-  int                         myType;
-
-public:
-  DEFINE_STANDARD_RTTI( GEOM_TypeFilter )
-};
-
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/GEOMFiltersSelection/Handle_GEOM_EdgeFilter.hxx b/src/GEOMFiltersSelection/Handle_GEOM_EdgeFilter.hxx
deleted file mode 100644 (file)
index 37fb4c6..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the 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   : Handle_GEOM_EdgeFilter.hxx
-//  Module : GEOM
-
-#ifndef _Handle_GEOM_EdgeFilter_HeaderFile
-#define _Handle_GEOM_EdgeFilter_HeaderFile
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Handle_GEOM_ShapeTypeFilter_HeaderFile
-#include "Handle_GEOM_ShapeTypeFilter.hxx"
-#endif
-
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(GEOM_ShapeTypeFilter);
-class GEOM_EdgeFilter;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOM_EdgeFilter);
-
-class Handle(GEOM_EdgeFilter) : public Handle(GEOM_ShapeTypeFilter) {
-  public:
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
-    Handle(GEOM_EdgeFilter)():Handle(GEOM_ShapeTypeFilter)() {} 
-    Handle(GEOM_EdgeFilter)(const Handle(GEOM_EdgeFilter)& aHandle) : Handle(GEOM_ShapeTypeFilter)(aHandle) 
-     {
-     }
-
-    Handle(GEOM_EdgeFilter)(const GEOM_EdgeFilter* anItem) : Handle(GEOM_ShapeTypeFilter)((GEOM_ShapeTypeFilter *)anItem) 
-     {
-     }
-
-    Handle(GEOM_EdgeFilter)& operator=(const Handle(GEOM_EdgeFilter)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOM_EdgeFilter)& operator=(const GEOM_EdgeFilter* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOM_EdgeFilter* operator->() 
-     {
-      return (GEOM_EdgeFilter *)ControlAccess();
-     }
-
-    GEOM_EdgeFilter* operator->() const 
-     {
-      return (GEOM_EdgeFilter *)ControlAccess();
-     }
-
-   Standard_EXPORT ~Handle(GEOM_EdgeFilter)();
-   Standard_EXPORT static const Handle(GEOM_EdgeFilter) DownCast(const Handle(Standard_Transient)& AnObject);
-};
-#endif
diff --git a/src/GEOMFiltersSelection/Handle_GEOM_FaceFilter.hxx b/src/GEOMFiltersSelection/Handle_GEOM_FaceFilter.hxx
deleted file mode 100644 (file)
index e1b669f..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the 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   : Handle_GEOM_FaceFilter.hxx
-//  Module : GEOM
-
-#ifndef _Handle_GEOM_FaceFilter_HeaderFile
-#define _Handle_GEOM_FaceFilter_HeaderFile
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Handle_GEOM_ShapeTypeFilter_HeaderFile
-#include "Handle_GEOM_ShapeTypeFilter.hxx"
-#endif
-
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(GEOM_ShapeTypeFilter);
-class GEOM_FaceFilter;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOM_FaceFilter);
-
-class Handle(GEOM_FaceFilter) : public Handle(GEOM_ShapeTypeFilter) {
-  public:
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
-    Handle(GEOM_FaceFilter)():Handle(GEOM_ShapeTypeFilter)() {} 
-    Handle(GEOM_FaceFilter)(const Handle(GEOM_FaceFilter)& aHandle) : Handle(GEOM_ShapeTypeFilter)(aHandle) 
-     {
-     }
-
-    Handle(GEOM_FaceFilter)(const GEOM_FaceFilter* anItem) : Handle(GEOM_ShapeTypeFilter)((GEOM_ShapeTypeFilter *)anItem) 
-     {
-     }
-
-    Handle(GEOM_FaceFilter)& operator=(const Handle(GEOM_FaceFilter)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOM_FaceFilter)& operator=(const GEOM_FaceFilter* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOM_FaceFilter* operator->() 
-     {
-      return (GEOM_FaceFilter *)ControlAccess();
-     }
-
-    GEOM_FaceFilter* operator->() const 
-     {
-      return (GEOM_FaceFilter *)ControlAccess();
-     }
-
-   Standard_EXPORT ~Handle(GEOM_FaceFilter)();
-   Standard_EXPORT static const Handle(GEOM_FaceFilter) DownCast(const Handle(Standard_Transient)& AnObject);
-};
-#endif
diff --git a/src/GEOMFiltersSelection/Handle_GEOM_PreviewFilter.hxx b/src/GEOMFiltersSelection/Handle_GEOM_PreviewFilter.hxx
deleted file mode 100644 (file)
index a5d7c53..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2004  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   : Handle_GEOM_PreviewFilter
-//  Module : GEOM
-
-#ifndef _Handle_GEOM_PreviewFilter_HeaderFile
-#define _Handle_GEOM_PreviewFilter_HeaderFile
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Handle_SALOME_Filter_HeaderFile
-#include "Handle_SALOME_Filter.hxx"
-#endif
-
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(SALOME_Filter);
-class GEOM_PreviewFilter;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOM_PreviewFilter);
-
-class Handle(GEOM_PreviewFilter) : public Handle(SALOME_Filter) {
-  public:
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
-    Handle(GEOM_PreviewFilter)():Handle(SALOME_Filter)() {} 
-    Handle(GEOM_PreviewFilter)(const Handle(GEOM_PreviewFilter)& aHandle) : Handle(SALOME_Filter)(aHandle) 
-     {
-     }
-
-    Handle(GEOM_PreviewFilter)(const GEOM_PreviewFilter* anItem) : Handle(SALOME_Filter)((SALOME_Filter *)anItem) 
-     {
-     }
-
-    Handle(GEOM_PreviewFilter)& operator=(const Handle(GEOM_PreviewFilter)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOM_PreviewFilter)& operator=(const GEOM_PreviewFilter* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOM_PreviewFilter* operator->() 
-     {
-      return (GEOM_PreviewFilter *)ControlAccess();
-     }
-
-    GEOM_PreviewFilter* operator->() const 
-     {
-      return (GEOM_PreviewFilter *)ControlAccess();
-     }
-
-   Standard_EXPORT ~Handle(GEOM_PreviewFilter)();
-   Standard_EXPORT static const Handle(GEOM_PreviewFilter) DownCast(const Handle(Standard_Transient)& AnObject);
-};
-#endif
diff --git a/src/GEOMFiltersSelection/Handle_GEOM_ShapeTypeFilter.hxx b/src/GEOMFiltersSelection/Handle_GEOM_ShapeTypeFilter.hxx
deleted file mode 100644 (file)
index c9de83c..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the 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   : Handle_GEOM_ShapeTypeFilter.hxx
-//  Module : GEOM
-
-#ifndef _Handle_GEOM_ShapeTypeFilter_HeaderFile
-#define _Handle_GEOM_ShapeTypeFilter_HeaderFile
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Handle_SALOME_Filter_HeaderFile
-#include "Handle_SALOME_Filter.hxx"
-#endif
-
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(SALOME_Filter);
-class GEOM_ShapeTypeFilter;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOM_ShapeTypeFilter);
-
-class Handle(GEOM_ShapeTypeFilter) : public Handle(SALOME_Filter) {
-  public:
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
-    Handle(GEOM_ShapeTypeFilter)():Handle(SALOME_Filter)() {} 
-    Handle(GEOM_ShapeTypeFilter)(const Handle(GEOM_ShapeTypeFilter)& aHandle) : Handle(SALOME_Filter)(aHandle) 
-     {
-     }
-
-    Handle(GEOM_ShapeTypeFilter)(const GEOM_ShapeTypeFilter* anItem) : Handle(SALOME_Filter)((SALOME_Filter *)anItem) 
-     {
-     }
-
-    Handle(GEOM_ShapeTypeFilter)& operator=(const Handle(GEOM_ShapeTypeFilter)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOM_ShapeTypeFilter)& operator=(const GEOM_ShapeTypeFilter* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOM_ShapeTypeFilter* operator->() 
-     {
-      return (GEOM_ShapeTypeFilter *)ControlAccess();
-     }
-
-    GEOM_ShapeTypeFilter* operator->() const 
-     {
-      return (GEOM_ShapeTypeFilter *)ControlAccess();
-     }
-
-   Standard_EXPORT ~Handle(GEOM_ShapeTypeFilter)();
-   Standard_EXPORT static const Handle(GEOM_ShapeTypeFilter) DownCast(const Handle(Standard_Transient)& AnObject);
-};
-#endif
index 43f5b0d1750d35ce25c72555a9fff1a43870fe25..d84453a4eb02046dd906e00e24e71853ee46d44b 100644 (file)
@@ -1,75 +1,72 @@
-#  GEOM GEOMFiltersSelection : filter selector for the viewer
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM GEOMFiltersSelection : filter selector for the viewer
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : GEOMFiltersSelection
 #
-#  File   : Makefile.in
-#  Author : Patrick GOLDBRONN (CEA)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header$
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOMFiltersSelection.la
 
 # header files
-salomeinclude_HEADERS = \
-       GEOM_SelectionFilter.h \
-       GEOM_EdgeFilter.h \
-       GEOM_FaceFilter.h \
-       GEOM_TypeFilter.h \
-       GEOM_PreviewFilter.h \
-       GEOM_LogicalFilter.h \
-       GEOM_OCCFilter.h
+salomeinclude_HEADERS =        \
+       GEOM_SelectionFilter.h  \
+       GEOM_EdgeFilter.h       \
+       GEOM_FaceFilter.h       \
+       GEOM_TypeFilter.h       \
+       GEOM_PreviewFilter.h    \
+       GEOM_LogicalFilter.h    \
+       GEOM_OCCFilter.h        \
+       GEOM_CompoundFilter.h
 
 # Sources
 dist_libGEOMFiltersSelection_la_SOURCES = \
-       GEOM_SelectionFilter.cxx \
-       GEOM_EdgeFilter.cxx \
-       GEOM_FaceFilter.cxx \
-       GEOM_TypeFilter.cxx \
-        GEOM_PreviewFilter.cxx \
-       GEOM_LogicalFilter.cxx \
-       GEOM_OCCFilter.cxx
-
-# LIB_CLIENT_IDL= GEOM_Gen.idl SALOMEDS.idl SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
+       GEOM_SelectionFilter.cxx        \
+       GEOM_EdgeFilter.cxx             \
+       GEOM_FaceFilter.cxx             \
+       GEOM_TypeFilter.cxx             \
+       GEOM_PreviewFilter.cxx          \
+       GEOM_LogicalFilter.cxx          \
+       GEOM_OCCFilter.cxx              \
+       GEOM_CompoundFilter.cxx
 
+# additional information to compile and link file
 
-# additionnal information to compil and link file
-libGEOMFiltersSelection_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(BOOST_CPPFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMClient \
-       -I$(top_builddir)/idl \
+libGEOMFiltersSelection_la_CPPFLAGS =  \
+       $(QT_INCLUDES)                  \
+       $(CAS_CPPFLAGS)                 \
+       $(BOOST_CPPFLAGS)               \
+       $(GUI_CXXFLAGS)                 \
+       $(KERNEL_CXXFLAGS)              \
+       $(CORBA_CXXFLAGS)               \
+       $(CORBA_INCLUDES)               \
+       -I$(srcdir)/../GEOMClient       \
+       -I$(top_builddir)/idl           \
        -I$(top_builddir)/salome_adm/unix
 
 libGEOMFiltersSelection_la_LDFLAGS  = \
-       ../../idl/libSalomeIDLGEOM.la \
-       ../GEOMClient/libGEOMClient.la \
-       $(GUI_LDFLAGS) -lsuit -lSalomeApp -lSalomeSession \
+       ../../idl/libSalomeIDLGEOM.la                           \
+       ../GEOMClient/libGEOMClient.la                          \
+       $(GUI_LDFLAGS) -lsuit -lSalomeApp -lSalomeSession       \
        $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeContainer -lTOOLSDS
index aa6f6eae180a8a76f3c9f4dc23cf04f0596ea879..c6797a789c52d2db7bacaa63896a8e3ad2dcda33 100644 (file)
@@ -1,39 +1,33 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMGUI.cxx
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
-//  File   : GEOMGUI.cxx
-//  Author : Vadim SANDLER
-//  Module : GEOM
-//  $Header$
-
 #include "GEOMGUI.h"
-
-#include "SUIT_Desktop.h"
-#include "SUIT_ViewWindow.h"
-
 #include "GeometryGUI.h"
 
-#include <qevent.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ViewWindow.h>
 
 //=================================================================================
 // class    : GEOMGUI::GEOMGUI
index 8874590bb0537cba80ed40e7e5304180d1cc3ba1..afb014ab2bce785bd7e39acce8fe732ea82b4513 100644 (file)
@@ -1,37 +1,34 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : GEOMGUI.h
-//  Author : Vadim SANDLER
-//  Module : GEOM
-//  $Header$
-
-#if !defined( __GEOMGUI_H )
-#define __GEOMGUI_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : GEOMGUI.h
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
+//
+#ifndef GEOMGUI_H
+#define GEOMGUI_H
 
 #include "GEOM_GEOMGUI.hxx"
 
-#include <qobject.h>
+#include <QObject>
 
 class SUIT_Desktop;
 class SUIT_ViewWindow;
@@ -67,5 +64,5 @@ private:
   GeometryGUI*  myGeometryGUI;
 };
 
-#endif // __GEOMGUI_H
+#endif // GEOMGUI_H
 
diff --git a/src/GEOMGUI/GEOMGUI.pro b/src/GEOMGUI/GEOMGUI.pro
new file mode 100644 (file)
index 0000000..9e95a0a
--- /dev/null
@@ -0,0 +1,85 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = GEOM
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+GUI_LDFLAGS = -L$$(GUI_ROOT_DIR)/lib/salome
+
+INCLUDEPATH += $${QT_INCLUDES} $${VTK_INCLUDES} $${CAS_CPPFLAGS} $${PYTHON_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} $${CORBA_INCLUDES} ../OBJECT ../GEOMFiltersSelection ../GEOMClient ../GEOMImpl $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lGEOMFiltersSelection -lGEOMClient -lGEOMObject $${KERNEL_LDFLAGS} -lSalomeLifeCycleCORBA $${GUI_LDFLAGS} -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += GEOMGUI_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+HEADERS  = GeometryGUI.h
+HEADERS += GEOMGUI.h
+HEADERS += GEOM_Displayer.h
+HEADERS += GEOMGUI_OCCSelector.h
+HEADERS += GEOMGUI_Selection.h
+HEADERS += GeometryGUI_Swig.hxx
+HEADERS += GeometryGUI_Swig.i
+HEADERS += GEOM_GEOMGUI.hxx
+
+SOURCES  = GeometryGUI.cxx
+SOURCES += GEOMGUI.cxx
+SOURCES += GEOM_Displayer.cxx
+SOURCES += GEOMGUI_OCCSelector.cxx
+SOURCES += GEOMGUI_Selection.cxx
+SOURCES += GeometryGUI_Swig.cxx
+
+TRANSLATIONS = GEOM_images.ts \
+               GEOM_msg_en.ts \
+               GEOM_msg_fr.ts
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+resources.files = *.qm
+resources.path = ../../resources
+
+INSTALLS += includes resources
index 0cd04c86fea0af0cec87e27e5838f835d8ca786b..6fed25fa8ef00cdaf98e2a3e2e4cfba981fffba5 100644 (file)
@@ -1,23 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMGUI_OCCSelector.cxx
+// Author : Alexander SOLOVYOV, Open CASCADE S.A.S. (alexander.solovyov@opencascade.com)
 //
-
 #include "GEOMGUI_OCCSelector.h"
 
 #include <LightApp_DataSubOwner.h>
@@ -100,6 +104,7 @@ void GEOMGUI_OCCSelector::getSelection( SUIT_DataOwnerPtrList& aList ) const
           if (!bigShape.IsEqual(curBigShape))
           {
             curBigShape = bigShape;
+            subShapes.Clear();
             TopExp::MapShapes(bigShape, subShapes);
           }
           index = subShapes.FindIndex(subShape);
@@ -211,12 +216,12 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
     {
       QString entry = subOwner->entry();
 #ifndef WNT
-      if ( indexesMap.IsBound( TCollection_AsciiString((char*)entry.latin1())))
+      if ( indexesMap.IsBound( TCollection_AsciiString(entry.toLatin1().data())))
 #else
-         if ( indexesMap.IsBound( (char*)entry.latin1()))
+      if ( indexesMap.IsBound( entry.toLatin1().data() ) )
 #endif
       {
-       TColStd_IndexedMapOfInteger& subIndexes = indexesMap.ChangeFind((char*)entry.latin1());
+       TColStd_IndexedMapOfInteger& subIndexes = indexesMap.ChangeFind(entry.toLatin1().data());
        subIndexes.Add( subOwner->index() );
        //indexesMap.replace( entry, subIndexes );
       }
@@ -224,7 +229,7 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
       {
        TColStd_IndexedMapOfInteger subIndexes;
        subIndexes.Add( subOwner->index() );
-       indexesMap.Bind((char*)entry.latin1(), subIndexes);
+       indexesMap.Bind(entry.toLatin1().data(), subIndexes);
       }
     }
     else // the owner is NOT a sub owner, maybe it is a DataOwner == GLOBAL selection
@@ -268,10 +273,11 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
           {
             // has a local selection
             Handle(AIS_Shape) aisShape = Handle(AIS_Shape)::DownCast( io );
-            if (!aisShape.IsNull() && indexesMap.IsBound((char*)entryStr.latin1()))
+            if (!aisShape.IsNull() && indexesMap.IsBound(entryStr.toLatin1().data()))
             {
               isLocal = true;
               TopoDS_Shape shape = aisShape->Shape();
+              aMapOfShapes.Clear();
               TopExp::MapShapes(shape, aMapOfShapes);
             }
           }
@@ -298,7 +304,7 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList )
           if (isLocal)
           {
             const TColStd_IndexedMapOfInteger& subIndexes =
-              indexesMap.ChangeFind((char*)entryStr.latin1());
+              indexesMap.ChangeFind(entryStr.toLatin1().data());
 
             const TopoDS_Shape& aSubShape = anOwner->Shape();
             int aSubShapeId = aMapOfShapes.FindIndex( aSubShape );
index 81be7bc3b7246799f6f391b1a76355ed0ac83e6d..ff16ecf25ace67b64b1eb70cd17c93bd64b42c99 100644 (file)
@@ -1,21 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMGUI_OCCSelector.h
+// Author : Alexander SOLOVYOV, Open CASCADE S.A.S. (alexander.solovyov@opencascade.com)
 //
 #ifndef GEOMGUI_OCCSELECTOR_H
 #define GEOMGUI_OCCSELECTOR_H
@@ -36,4 +42,4 @@ protected:
 
 };
 
-#endif
+#endif // GEOMGUI_OCCSELECTOR_H
index 70cb563b5414aa1a3621dd24dd4972a798cb88a2..d89088f618253fee8b01124d4a4772bd07539a13 100644 (file)
@@ -1,40 +1,39 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMGUI_Selection.cxx
+// Author : Alexander SOLOVYOV, Open CASCADE S.A.S. (alexander.solovyov@opencascade.com)
 //
 #include "GEOMGUI_Selection.h"
 
 #include "GeometryGUI.h"
 #include "GEOM_Displayer.h"
 
-#include <LightApp_DataOwner.h>
 #include <SalomeApp_Application.h>
 #include <SalomeApp_Study.h>
 
-#include <OCCViewer_ViewModel.h>
-
+#include <SUIT_Desktop.h>
 #include <SUIT_Session.h>
 #include <SUIT_ViewWindow.h>
 #include <SUIT_ViewManager.h>
-#include <SUIT_ViewModel.h>
-
-#include <SALOMEDSClient_SObject.hxx>
-#include <SALOMEDSClient_Study.hxx>
 
 #include <SALOME_Prs.h>
 #include <SALOME_InteractiveObject.hxx>
@@ -46,7 +45,7 @@
 #include <OCCViewer_ViewModel.h>
 #include <SVTK_ViewModel.h>
 
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_Types.hxx>
 
 // OCCT Includes
 #include <AIS.hxx>
@@ -57,6 +56,7 @@
 #include <vtkActorCollection.h>
 
 GEOMGUI_Selection::GEOMGUI_Selection()
+: LightApp_Selection()
 {
 }
 
@@ -64,28 +64,28 @@ GEOMGUI_Selection::~GEOMGUI_Selection()
 {
 }
 
-QtxValue GEOMGUI_Selection::globalParam( const QString& p ) const
+QVariant GEOMGUI_Selection::parameter( const QString& p ) const
 {
-  if ( p == "isOCC" ) return QtxValue( activeViewType() == OCCViewer_Viewer::Type() );
+  if ( p == "isOCC" ) return QVariant( activeViewType() == OCCViewer_Viewer::Type() );
   if ( p == "selectionmode" ){ 
-    return QtxValue(selectionMode()); 
+    return QVariant(selectionMode()); 
   }
-  return LightApp_Selection::globalParam( p );
+  return LightApp_Selection::parameter( p );
 }
 
-QtxValue GEOMGUI_Selection::param( const int ind, const QString& p ) const
+QVariant GEOMGUI_Selection::parameter( const int ind, const QString& p ) const
 {
-//  if      ( p == "isVisible"   )    return QtxValue( isVisible( ind ) );
+//  if      ( p == "isVisible"   )    return QVariant( isVisible( ind ) );
 // parameter isVisible is calculated in base SalomeApp_Selection
 //  else
   if( p == "type" )
-    return QtxValue( typeName( ind ) );
+    return QVariant( typeName( ind ) );
   else if ( p == "displaymode" )
-    return QtxValue( displayMode( ind ) );
+    return QVariant( displayMode( ind ) );
   else if ( p == "isAutoColor" )
-    return QtxValue( isAutoColor( ind ) );
+    return QVariant( isAutoColor( ind ) );
   else
-    return LightApp_Selection::param( ind, p );
+    return LightApp_Selection::parameter( ind, p );
 }
 
 QString GEOMGUI_Selection::typeName( const int index ) const
@@ -108,7 +108,7 @@ bool GEOMGUI_Selection::isVisible( const int index ) const
   GEOM::GEOM_Object_var obj = getObject( index );
   SALOME_View* view = GEOM_Displayer::GetActiveView();
   if ( !CORBA::is_nil( obj ) && view ) {
-    Handle(SALOME_InteractiveObject) io = new SALOME_InteractiveObject( entry( index ).latin1(), "GEOM", "TEMP_IO" );
+    Handle(SALOME_InteractiveObject) io = new SALOME_InteractiveObject( entry( index ).toLatin1().constData(), "GEOM", "TEMP_IO" );
     return view->isVisible( io );
   }
   return false;
@@ -127,7 +127,7 @@ QString GEOMGUI_Selection::displayMode( const int index ) const
   SALOME_View* view = GEOM_Displayer::GetActiveView();
   QString viewType = activeViewType();
   if ( view /*fix for 9320==>*/&& ( viewType == OCCViewer_Viewer::Type() || viewType == SVTK_Viewer::Type() ) ) {
-    SALOME_Prs* prs = view->CreatePrs( entry( index ) );
+    SALOME_Prs* prs = view->CreatePrs( entry( index ).toLatin1().constData() );
     if ( prs ) {
       if ( viewType == OCCViewer_Viewer::Type() ) { // assuming OCC
        SOCC_Prs* occPrs = (SOCC_Prs*) prs;
@@ -187,7 +187,7 @@ bool GEOMGUI_Selection::isComponent( const int index ) const
     QString anEntry = entry( index );
 
     if ( study && !anEntry.isNull() ) {
-      _PTR(SObject) aSO( study->FindObjectID( anEntry.latin1() ) );
+      _PTR(SObject) aSO( study->FindObjectID( anEntry.toStdString() ) );
       if ( aSO && aSO->GetFatherComponent() )
        return aSO->GetFatherComponent()->GetIOR() == aSO->GetIOR();
     }
@@ -205,7 +205,7 @@ GEOM::GEOM_Object_ptr GEOMGUI_Selection::getObject( const int index ) const
     QString anEntry = entry(index);
 
     if (study && !anEntry.isNull()) {
-      _PTR(SObject) aSO (study->FindObjectID(anEntry.latin1()));
+      _PTR(SObject) aSO (study->FindObjectID(anEntry.toStdString()));
       if (aSO) {
         CORBA::Object_var anObj = GeometryGUI::ClientSObjectToObject(aSO);
        return GEOM::GEOM_Object::_narrow(anObj);
index 5690229b4bacff5de3235b43cefb90bf5345c9e0..35b90f2256572cc4468a81a50806990d2b2b6bd9 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOMGUI_Selection
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File   : GEOMGUI_Selection.h
+// Author : Alexander SOLOVYOV, Open CASCADE S.A.S. (alexander.solovyov@opencascade.com)
 //
-//
-//  File   : GEOMGUI_Selection.h
-//  Author : Alexander SOLOVYOV
-//  Module : GUI
-//  $Header$
-
-#ifndef GEOMGUI_SELECTION_HeaderFile
-#define GEOMGUI_SELECTION_HeaderFile
+#ifndef GEOMGUI_SELECTION_H
+#define GEOMGUI_SELECTION_H
 
 #include "GEOM_GEOMGUI.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 
+class LightApp_SelectionMgr;
+
 class GEOMGUI_EXPORT GEOMGUI_Selection : public LightApp_Selection
 {
 public:
   GEOMGUI_Selection();
   virtual ~GEOMGUI_Selection();
 
-  virtual QtxValue      param( const int, const QString& ) const;
-  virtual QtxValue      globalParam( const QString& ) const;
+  virtual QVariant      parameter( const int, const QString& ) const;
+  virtual QVariant      parameter( const QString& ) const;
 
 private:
   bool                  isVisible( const int ) const;
@@ -56,4 +54,4 @@ private:
   GEOM::GEOM_Object_ptr getObject( const int ) const;
 };
 
-#endif
+#endif // GEOMGUI_SELECTION_H
index fdceadb4d2fdb2898b2be6de0e382ca027d34f1d..b183b3f53d0c6916cb4bd948b782b0977a1f04cf 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOM_Displayer.cxx
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
-//
-//  File   : GEOM_Displayer.cxx
-//  Author : Vadim SANDLER
-//  Module : GEOM
-//  $Header$
-
 #include "GEOM_Displayer.h"
 
 #include "GeometryGUI.h"
 
-#include "GEOM_TypeFilter.h"
-#include "GEOM_EdgeFilter.h"
-#include "GEOM_FaceFilter.h"
-#include "GEOM_PreviewFilter.h"
-#include "GEOM_LogicalFilter.h"
-#include "GEOM_OCCFilter.h"
-
-#include "GEOM_Actor.h"
-#include "GEOM_AssemblyBuilder.h"
-#include "GEOM_AISShape.hxx"
-#include "GEOM_AISVector.hxx"
-#include "GEOM_AISTrihedron.hxx"
-#include "GEOM_VTKTrihedron.hxx"
+#include <GEOM_TypeFilter.h>
+#include <GEOM_EdgeFilter.h>
+#include <GEOM_FaceFilter.h>
+#include <GEOM_CompoundFilter.h>
+#include <GEOM_PreviewFilter.h>
+#include <GEOM_LogicalFilter.h>
+#include <GEOM_OCCFilter.h>
+
+#include <GEOM_Actor.h>
+#include <GEOM_AssemblyBuilder.h>
+#include <GEOM_AISShape.hxx>
+#include <GEOM_AISVector.hxx>
+#include <GEOM_AISTrihedron.hxx>
+#include <GEOM_VTKTrihedron.hxx>
 
 #include <SUIT_Desktop.h>
 #include <SUIT_ViewWindow.h>
 #include <SUIT_Session.h>
-#include <SUIT_Tools.h>
 #include <SUIT_ViewManager.h>
+#include <SUIT_ResourceMgr.h>
 
 #include <SalomeApp_Study.h>
 #include <SalomeApp_Application.h>
@@ -57,6 +55,8 @@
 #include <SalomeApp_Tools.h>
 
 #include <SALOME_ListIteratorOfListIO.hxx>
+#include <SALOME_ListIO.hxx>
+#include <SALOME_Prs.h>
 
 #include <SOCC_Prs.h>
 #include <SOCC_ViewModel.h>
 #include <SVTK_Prs.h>
 #include <SVTK_ViewModel.h>
 
-#include <SALOMEDSClient.hxx>
-#include <SALOMEDSClient_SObject.hxx>
-
 // OCCT Includes
 #include <AIS_Drawer.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
 #include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_PointAspect.hxx>
-#include <Graphic3d_AspectMarker3d.hxx>
 #include <StdSelect_TypeOfEdge.hxx>
 #include <StdSelect_TypeOfFace.hxx>
 #include <TopoDS_Face.hxx>
 #include <vtkActorCollection.h>
 #include <vtkProperty.h>
 
-// STL Includes
-#include <cstring>
-
 // CORBA Headers
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
 
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_Types.hxx>
 
 using namespace std;
 
@@ -167,6 +160,30 @@ SUIT_SelectionFilter* GEOM_Displayer::getFilter( const int theMode )
   return aFilter;
 }
 
+//================================================================
+// Function : getComplexFilter
+// Purpose  : Get compound filter corresponding to the type of 
+//            object from GEOMImpl_Types.h
+//================================================================
+SUIT_SelectionFilter* GEOM_Displayer::getComplexFilter( const QList<int>* aSubShapes)
+{
+  GEOM_CompoundFilter* aFilter;
+  
+  if(aSubShapes != NULL ) {
+    aFilter = new GEOM_CompoundFilter(getStudy());
+    QList<int> aTopAbsTypes;
+    QList<int>::const_iterator it;
+    for(it = aSubShapes->constBegin(); it != aSubShapes->constEnd(); ++it ) {
+      int topAbsMode = getTopAbsMode(*it);
+      if(topAbsMode != -1 )
+        aTopAbsTypes.append(topAbsMode);
+    }
+    aFilter->addSubTypes(aTopAbsTypes);
+  }
+  
+  return aFilter;
+}
+
 //================================================================
 // Function : getEntry
 // Purpose  :
@@ -379,9 +396,10 @@ void GEOM_Displayer::Redisplay( const Handle(SALOME_InteractiveObject)& theIO,
   if ( app )
   {
     SUIT_Desktop* desk = app->desktop();
-    QPtrList<SUIT_ViewWindow> wnds = desk->windows();
+    QList<SUIT_ViewWindow*> wnds = desk->windows();
     SUIT_ViewWindow* wnd;
-    for ( wnd = wnds.first(); wnd; wnd = wnds.next() )
+    QListIterator<SUIT_ViewWindow*> it( wnds );
+    while ( it.hasNext() && (wnd = it.next()) )
     {
       SUIT_ViewManager* vman = wnd->getViewManager();
       if ( vman )
@@ -612,6 +630,10 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs )
                anAspect = AISShape->Attributes()->WireAspect();
                anAspect->SetColor( aColor );
                AISShape->Attributes()->SetWireAspect( anAspect );
+
+                // bug [SALOME platform 0019868]
+                // Set deviation angle. Default one is 12 degrees (Prs3d_Drawer.cxx:18)
+                AISShape->SetOwnDeviationAngle( 10*PI/180 );
              }
          }
 
@@ -666,7 +688,7 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs )
                      GEOM::GEOM_Object_var aMainObject = anOperations->GetMainShape( aGeomObject );
                      if ( !aMainObject->_is_nil() && aMainObject->GetAutoColor() )
                      {
-                       QValueList<SALOMEDS::Color> aReservedColors;
+                       QList<SALOMEDS::Color> aReservedColors;
 
                        SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( app );
                        CORBA::String_var IOR = app->orb()->object_to_string( aMainObject );
@@ -929,7 +951,7 @@ SALOME_Prs* GEOM_Displayer::buildPresentation( const QString& entry,
     if ( prs )
     {
       Handle( SALOME_InteractiveObject ) theIO = new SALOME_InteractiveObject();
-      theIO->setEntry( entry.latin1() );
+      theIO->setEntry( entry.toLatin1().constData() );
       if ( !theIO.IsNull() )
       {
        // set interactive object
@@ -1032,7 +1054,7 @@ void GEOM_Displayer::GlobalSelection( const int theMode, const bool update )
  */
 //=================================================================
 void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes,
-                                     const bool update )
+                                     const bool update, const QList<int>* theSubShapes )
 {
   SUIT_Session* session = SUIT_Session::session();
   SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( session->activeApplication() );
@@ -1076,16 +1098,26 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes,
   if ( theModes.Extent() == 1 )
     {
       int aMode = TColStd_MapIteratorOfMapOfInteger( theModes ).Key();
-      aFilter = getFilter( aMode );
+      
+      if ( aMode == GEOM_COMPOUNDFILTER )
+        aFilter = getComplexFilter( theSubShapes );
+      else    
+        aFilter = getFilter( aMode );
     }
   else if ( theModes.Extent() > 1 )
     {
       TColStd_MapOfInteger aTopAbsModes;
       TColStd_MapIteratorOfMapOfInteger anIter( theModes );
-      QPtrList<SUIT_SelectionFilter> aListOfFilters;
+      QList<SUIT_SelectionFilter*> aListOfFilters;
       for ( ; anIter.More(); anIter.Next() )
        {
-         SUIT_SelectionFilter* aFilter = getFilter( anIter.Key() );
+          SUIT_SelectionFilter* aFilter;
+          int aMode = anIter.Key();
+          if ( aMode == GEOM_COMPOUNDFILTER )
+            aFilter = getComplexFilter( theSubShapes );
+          else    
+            aFilter = getFilter( aMode );
+
          if ( aFilter )
            aListOfFilters.append( aFilter );
        }
@@ -1300,7 +1332,7 @@ int GEOM_Displayer::UnsetDisplayMode()
   return aPrevMode;
 }
 
-SALOMEDS::Color GEOM_Displayer::getUniqueColor( const QValueList<SALOMEDS::Color>& theReservedColors )
+SALOMEDS::Color GEOM_Displayer::getUniqueColor( const QList<SALOMEDS::Color>& theReservedColors )
 {
   int aHue = -1;
   int aTolerance = 64;
@@ -1323,8 +1355,8 @@ SALOMEDS::Color GEOM_Displayer::getUniqueColor( const QValueList<SALOMEDS::Color
 
     //cout << "Auto colors : ";
     bool ok = true;
-    QValueList<SALOMEDS::Color>::const_iterator it = theReservedColors.constBegin();
-    QValueList<SALOMEDS::Color>::const_iterator itEnd = theReservedColors.constEnd();
+    QList<SALOMEDS::Color>::const_iterator it = theReservedColors.constBegin();
+    QList<SALOMEDS::Color>::const_iterator itEnd = theReservedColors.constEnd();
     for( ; it != itEnd; ++it )
     {
       SALOMEDS::Color anAutoColor = *it;
index 8c877c94f46304a24007480603dbc231e0c81061..90b551fc3a395a0045d13b26672862d522d750aa 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOM_Displayer.h
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
-//
-//  File   : GEOM_Displayer.h
-//  Author : Vadim SANDLER
-//  Module : GEOM
-//  $Header$
+#ifndef GEOM_DISPLAYER_H
+#define GEOM_DISPLAYER_H
 
-#if !defined (__GEOM_DISPLAYER_H)
-#define __GEOM_DISPLAYER_H
+#include "GEOM_GEOMGUI.hxx"
 
-using namespace std;
+#include <SALOME_InteractiveObject.hxx>
 
-#include "GEOM_GEOMGUI.hxx"
+class SALOME_ListIO;
+class SALOME_View;
+class SALOME_Prs;
+class SALOME_OCCPrs;
+class SALOME_VTKPrs;
+class SALOME_OCCViewType;
 
-#include "SALOME_Prs.h"
-#include "SALOME_InteractiveObject.hxx"
-#include "SALOME_ListIO.hxx"
 #include <TopoDS_Shape.hxx>
 #include <Quantity_Color.hxx>
 #include <LightApp_Displayer.h>
 #include <Aspect_TypeOfMarker.hxx>
 
-#include <qvaluelist.h>
+#include <QList>
 
 #include <list>
 
@@ -148,11 +149,11 @@ public:
   void         LocalSelection( const Handle(SALOME_InteractiveObject)&, const int );
   void         LocalSelection( const SALOME_ListIO& theIOList, const int );
   void         GlobalSelection( const int = GEOM_ALLOBJECTS, const bool = false );
-  void         GlobalSelection( const TColStd_MapOfInteger&, const bool = false );
+  void         GlobalSelection( const TColStd_MapOfInteger&, const bool = false, const QList<int>* = 0 );
 
   SalomeApp_Study* getStudy() const;
 
-  static SALOMEDS::Color getUniqueColor( const QValueList<SALOMEDS::Color>& );
+  static SALOMEDS::Color getUniqueColor( const QList<SALOMEDS::Color>& );
 
 protected:
   /* internal methods */
@@ -171,11 +172,12 @@ protected:
   void        clearTemporary( LightApp_SelectionMgr* theSelMgr );
 
   SUIT_SelectionFilter* getFilter( const int theMode );
+  SUIT_SelectionFilter* getComplexFilter( const QList<int>* );
 
 protected:
   Handle(SALOME_InteractiveObject) myIO;
   TopoDS_Shape                     myShape;
-  string                           myName;
+  std::string                      myName;
   int                              myType;
   SALOME_View*                     myViewFrame;
 
@@ -192,5 +194,5 @@ private:
   SalomeApp_Application* myApp;
 };
 
-#endif // __GEOM_DISPLAYER_H
+#endif // GEOM_DISPLAYER_H
 
index 9508b0d19f055de5a81d49f1b4dec334c079a2a4..525dde08d9cac17ad441f5915fa129f4bc1c8b5d 100755 (executable)
@@ -1,47 +1,38 @@
-//  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 
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : GEOM_GEOMGUI.hxx
-//  Author : Alexander A. BORODIN
-//  Module : GEOM
-
-#ifndef _GEOM_GEOMGUI_HXX_
-#define _GEOM_GEOMGUI_HXX_
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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_GEOMGUI.hxx
+// Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+//
+#ifndef GEOM_GEOMGUI_HXX
+#define GEOM_GEOMGUI_HXX
 
-#ifdef WNT
- #if defined GEOMGUI_EXPORTS
-  #if defined WIN32
-   #define GEOMGUI_EXPORT __declspec( dllexport )
-  #else
-   #define GEOMGUI_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define GEOMGUI_EXPORT __declspec( dllimport )
-  #else
-   #define GEOMGUI_EXPORT
-  #endif
- #endif
+#if defined WIN32
+#  if defined GEOMGUI_EXPORTS
+#    define GEOMGUI_EXPORT __declspec( dllexport )
+#  else
+#    define GEOMGUI_EXPORT __declspec( dllimport )
+#  endif
 #else
- #define GEOMGUI_EXPORT
+#  define GEOMGUI_EXPORT
 #endif
 
-#endif
+#endif // GEOM_GEOMGUI_HXX
index 01755c6749c569735da6445f36974202e603e0bc..275247377406650d28d97b37df8325e7021dad2d 100644 (file)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
+#  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",
 # not "Foo::Pub".
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
diff --git a/src/GEOMGUI/GEOM_images.ts b/src/GEOMGUI/GEOM_images.ts
new file mode 100644 (file)
index 0000000..a4c96d0
--- /dev/null
@@ -0,0 +1,1009 @@
+<!DOCTYPE TS>
+<!--
+  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+
+  Copyright (C) 2003-2007  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
+
+-->
+<TS version="1.1" >
+    <context>
+        <name>@default</name>
+        <message>
+            <source>ICON_DLG_ADD_POINT_ON_EDGE</source>
+            <translation>pointonedge.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_ARC</source>
+            <translation>arc.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_ARCHIMEDE</source>
+            <translation>archimede.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_ARC_CENTER</source>
+            <translation>arccenter.png</translation>
+        </message>
+       <message>
+            <source>ICON_DLG_ARC_OF_ELLIPSE</source>
+            <translation>arcofellipse.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BASICPROPERTIES</source>
+            <translation>basicproperties.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BEZIER</source>
+            <translation>bezier.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BLOCK_2F</source>
+            <translation>block_2f.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BLOCK_6F</source>
+            <translation>block_6f.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BLOCK_EXPLODE</source>
+            <translation>subblock.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BLOCK_MULTITRSF_DOUBLE</source>
+            <translation>block_multitrsf_double.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BLOCK_MULTITRSF_SIMPLE</source>
+            <translation>block_multitrsf_simple.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BOUNDING_BOX</source>
+            <translation>bounding.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BOX_2P</source>
+            <translation>box2points.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BOX_DXYZ</source>
+            <translation>boxdxyz.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BUILD_COMPOUND</source>
+            <translation>build_compound.png</translation>
+        </message>
+       <message>
+            <source>ICON_DLG_DISK</source>
+            <translation>disk.png</translation>
+        </message>
+       <message>
+            <source>ICON_DLG_DISK_PNT_VEC_R</source>
+            <translation>disk_pntvecr.png</translation>
+        </message>
+       <message>
+            <source>ICON_DLG_DISK_THREE_POINTS</source>
+            <translation>disk3points.png</translation>
+        </message>
+       <message>
+            <source>ICON_DLG_DISK_R</source>
+            <translation>disk_r.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BUILD_EDGE</source>
+            <translation>build_edge.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BUILD_FACE</source>
+            <translation>build_face.png</translation>
+        </message>
+       <message>
+            <source>ICON_DLG_FACE_HW</source>
+            <translation>face_hw.png</translation>
+        </message>
+       <message>
+            <source>ICON_DLG_FACE_OBJ_HW</source>
+            <translation>face_vechw.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BUILD_SHELL</source>
+            <translation>build_shell.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BUILD_SOLID</source>
+            <translation>build_solid.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_BUILD_WIRE</source>
+            <translation>build_wire.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CENTERMASS</source>
+            <translation>centergravity.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CHAMFER</source>
+            <translation>chamfer.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CHAMFER_ALL</source>
+            <translation>chamferall.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CHAMFER_EDGE</source>
+            <translation>chamferedge.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CHAMFER_EDGE_FROM_FACE</source>
+            <translation>chamferedgefromface.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CHAMFER_FACE</source>
+            <translation>chamferface.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CHANGE_ORIENTATION</source>
+            <translation>change_orientation.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_REMOVE_EXTRA_EDGES</source>
+            <translation>remove_extra_edges.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CHECKSHAPE</source>
+            <translation>check.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CHECK_COMPOUND_OF_BLOCKS</source>
+            <translation>check_blocks_compound.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CIRCLE_PNTS</source>
+            <translation>circle3points.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CIRCLE_PV</source>
+            <translation>circlepointvector.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CIRCLE_C2P</source>
+            <translation>circlecenter2pnts.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CLOSECONTOUR</source>
+            <translation>closecontour.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_COMMON</source>
+            <translation>common.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CONE_DXYZ</source>
+            <translation>conedxyz.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CONE_PV</source>
+            <translation>conepointvector.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CUT</source>
+            <translation>cut.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CYLINDER_DXYZ</source>
+            <translation>cylinderdxyz.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_CYLINDER_PV</source>
+            <translation>cylinderpointvector.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_DIVIDE_EDGE</source>
+            <translation>pointonedge.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_ELLIPSE_PV</source>
+            <translation>ellipsepointvector.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_FILLET</source>
+            <translation>fillet.png</translation>
+        </message>
+       <message>
+            <source>ICON_DLG_FILLET_2D</source>
+            <translation>fillet2d.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_FILLET_ALL</source>
+            <translation>filletall.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_FILLET_EDGE</source>
+            <translation>filletedge.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_FILLET_FACE</source>
+            <translation>filletface.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_FILLING</source>
+            <translation>filling.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_FREE_FACES</source>
+            <translation>free_faces.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_FUSE</source>
+            <translation>fuse.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_GLUE_FACES</source>
+            <translation>glue.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_GLUE_FACES2</source>
+            <translation>glue2.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_INERTIA</source>
+            <translation>axisinertia.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_INTERPOL</source>
+            <translation>interpol.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_LINE_2P</source>
+            <translation>line2points.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_LINE_2F</source>
+            <translation>line2faces.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_MINDIST</source>
+            <translation>mindist.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_MIRROR_AXE</source>
+            <translation>mirrorAxe.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_MIRROR_PLANE</source>
+            <translation>mirrorPlane.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_MIRROR_POINT</source>
+            <translation>mirrorPoint.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_MULTIROTATION</source>
+            <translation>multirotation.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_MULTIROTATION_DOUBLE</source>
+            <translation>multirotationdouble.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_MULTIROTATION_SIMPLE</source>
+            <translation>multirotationsimple.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_MULTITRANSLATION</source>
+            <translation>multitranslation.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_MULTITRANSLATION_DOUBLE</source>
+            <translation>multitranslationdouble.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_MULTITRANSLATION_SIMPLE</source>
+            <translation>multitranslationsimple.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_OFFSET</source>
+            <translation>offset.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_PARTITION</source>
+            <translation>partition.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_PARTITION_KEEP_FACES</source>
+            <translation>partitionkeep.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_PARTITION_PLANE</source>
+            <translation>partitionplane.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_PIPE</source>
+            <translation>pipe.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_PIPE_BINORMAL</source>
+            <translation>pipebinormal.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_PLANE_3PNTS</source>
+            <translation>plane3points.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_PLANE_FACE</source>
+            <translation>planeface.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_PLANE_PV</source>
+            <translation>planepointvector.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_POINT</source>
+            <translation>point2.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_POINT_EDGE</source>
+            <translation>pointonedge.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_POINT_REF</source>
+            <translation>point3.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_POINT_LINES</source>
+            <translation>point_line_intersection.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_POLYLINE</source>
+            <translation>polyline.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_POSITION</source>
+            <translation>position.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_NORMALE</source>
+            <translation>normale.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_ANGLE</source>
+            <translation>angle.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_POSITION2</source>
+            <translation>position2.png</translation>
+        </message>
+       <message>
+            <source>ICON_DLG_POSITION3</source>
+            <translation>position3.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_PRISM</source>
+            <translation>prism.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_PRISM_2P</source>
+            <translation>prism2.png</translation>
+        </message>
+       <message>
+            <source>ICON_DLG_PRISM_DXDYDZ</source>
+            <translation>prism3.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_PROPAGATE</source>
+            <translation>propagate.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_QUAD_FACE_2_EDGE</source>
+            <translation>block_face_2e.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_QUAD_FACE_4_EDGE</source>
+            <translation>block_face_4e.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_QUAD_FACE_4_VERT</source>
+            <translation>block_face_4v.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_REDO</source>
+            <translation>redo.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_REVOL</source>
+            <translation>revol.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_ROTATION</source>
+            <translation>rotate.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_ROTATION_THREE_POINTS</source>
+            <translation>rotatepnt.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SCALE</source>
+            <translation>scale.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SECTION</source>
+            <translation>section.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SEWING</source>
+            <translation>sewing.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SHAPEPROCESS</source>
+            <translation>shapeprocess.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SPHERE_DXYZ</source>
+            <translation>spheredxyz.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SPHERE_P</source>
+            <translation>spherepoint.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SPLINE</source>
+            <translation>spline.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SUBSHAPE</source>
+            <translation>subshape.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SUPPRESS_HOLES</source>
+            <translation>supressHolesOnFaceShell.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SUPPRESS_INT_WIRES</source>
+            <translation>suppressintwires.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SUPRESS_FACE</source>
+            <translation>supressface.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SUPRESS_HOLE</source>
+            <translation>supresshole.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SUPRESS_HOLE_FACE_SHELL</source>
+            <translation>supressHolesOnFaceShell.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_TOLERANCE</source>
+            <translation>tolerance.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_TORUS_DXYZ</source>
+            <translation>torusdxyz.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_TORUS_PV</source>
+            <translation>toruspointvector.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_TRANSLATION_DXYZ</source>
+            <translation>translationDxyz.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_TRANSLATION_POINTS</source>
+            <translation>translationPoints.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_TRANSLATION_VECTOR</source>
+            <translation>translationVector.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_UNDO</source>
+            <translation>undo.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_VECTOR_2P</source>
+            <translation>vector2points.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_VECTOR_DXYZ</source>
+            <translation>vectordxyz.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_WHATIS</source>
+            <translation>whatis.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_WPLANE_FACE</source>
+            <translation>planeworkingface.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_WPLANE_ORIGIN</source>
+            <translation>planeworkingorigin.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_WPLANE_VECTOR</source>
+            <translation>planeworkingvector.png</translation>
+        </message>
+        <message>
+            <source>ICON_MARKER</source>
+            <translation>marker.png</translation>
+        </message>
+        <message>
+            <source>ICON_MARKER2</source>
+            <translation>marker2.png</translation>
+        </message>
+        <message>
+            <source>ICON_MARKER3</source>
+            <translation>marker3.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_BLOCK</source>
+            <translation>tree_block.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_COMPOUND</source>
+            <translation>tree_compound.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_COMPSOLID</source>
+            <translation>tree_compsolid.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_EDGE</source>
+            <translation>tree_edge.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_FACE</source>
+            <translation>tree_face.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_GROUP_EDGE</source>
+            <translation>tree_group_edge.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_GROUP_FACE</source>
+            <translation>tree_group_face.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_GROUP_PNT</source>
+            <translation>tree_group_vertex.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_GROUP_SOLID</source>
+            <translation>tree_group_solid.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_Geometry</source>
+            <translation>geometry.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_LCS</source>
+            <translation>tree_lcs.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_SHAPE</source>
+            <translation>tree_shape.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_SHELL</source>
+            <translation>tree_shell.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_SOLID</source>
+            <translation>tree_solid.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_VERTEX</source>
+            <translation>tree_vertex.png</translation>
+        </message>
+        <message>
+            <source>ICON_OBJBROWSER_WIRE</source>
+            <translation>tree_wire.png</translation>
+        </message>
+        <message>
+            <source>ICON_SELECT</source>
+            <translation>select1.png</translation>
+        </message>
+        <message>
+            <source>ICO_ARC</source>
+            <translation>arc.png</translation>
+        </message>
+        <message>
+            <source>ICO_ARCHIMEDE</source>
+            <translation>archimede.png</translation>
+        </message>
+        <message>
+            <source>ICO_BASIC_PROPS</source>
+            <translation>basicproperties.png</translation>
+        </message>
+        <message>
+            <source>ICO_BND_BOX</source>
+            <translation>bounding.png</translation>
+        </message>
+        <message>
+            <source>ICO_BOX</source>
+            <translation>box.png</translation>
+        </message>
+        <message>
+            <source>ICO_CHAMFER</source>
+            <translation>chamfer.png</translation>
+        </message>
+        <message>
+            <source>ICO_CHANGE_ORIENTATION</source>
+            <translation>change_orientation.png</translation>
+        </message>
+        <message>
+            <source>ICO_CHECK</source>
+            <translation>check.png</translation>
+        </message>
+        <message>
+            <source>ICO_CHECK_COMPOUND</source>
+            <translation>check_blocks_compound.png</translation>
+        </message>
+        <message>
+            <source>ICO_CHECK_FREE_BNDS</source>
+            <translation>free_bound.png</translation>
+        </message>
+        <message>
+            <source>ICO_CHECK_FREE_FACES</source>
+            <translation>free_faces.png</translation>
+        </message>
+        <message>
+            <source>ICO_CIRCLE</source>
+            <translation>circle.png</translation>
+        </message>
+        <message>
+            <source>ICO_CLOSE_CONTOUR</source>
+            <translation>closecontour.png</translation>
+        </message>
+        <message>
+            <source>ICO_COMMON</source>
+            <translation>common.png</translation>
+        </message>
+        <message>
+            <source>ICO_COMPOUND</source>
+            <translation>build_compound.png</translation>
+        </message>
+        <message>
+            <source>ICO_COMPOUND_SEL_ONLY</source>
+            <translation>build_compound.png</translation>
+        </message>
+        <message>
+            <source>ICO_CONE</source>
+            <translation>cone.png</translation>
+        </message>
+        <message>
+            <source>ICO_CURVE</source>
+            <translation>spline.png</translation>
+        </message>
+        <message>
+            <source>ICO_CUT</source>
+            <translation>cut.png</translation>
+        </message>
+        <message>
+            <source>ICO_CYLINDER</source>
+            <translation>cylinder.png</translation>
+        </message>
+        <message>
+            <source>ICO_DELETE</source>
+            <translation>delete.png</translation>
+        </message>
+       <message>
+            <source>ICO_DISK</source>
+            <translation>disk.png</translation>
+        </message>
+        <message>
+            <source>ICO_DISPLAY</source>
+            <translation>display.png</translation>
+        </message>
+        <message>
+            <source>ICO_DISPLAY_ALL</source>
+            <translation>displayall.png</translation>
+        </message>
+        <message>
+            <source>ICO_DISPLAY_ONLY</source>
+            <translation>displayonly.png</translation>
+        </message>
+        <message>
+            <source>ICO_EDGE</source>
+            <translation>build_edge.png</translation>
+        </message>
+        <message>
+            <source>ICO_EDGE_SEL_ONLY</source>
+            <translation>build_edge.png</translation>
+        </message>
+        <message>
+            <source>ICO_ELLIPSE</source>
+            <translation>ellipse.png</translation>
+        </message>
+        <message>
+            <source>ICO_ERASE</source>
+            <translation>erase.png</translation>
+        </message>
+        <message>
+            <source>ICO_ERASE_ALL</source>
+            <translation>eraseall.png</translation>
+        </message>
+        <message>
+            <source>ICO_EXPLODE</source>
+            <translation>subshape.png</translation>
+        </message>
+        <message>
+            <source>ICO_EXPLODE_BLOCKS</source>
+            <translation>subshape.png</translation>
+        </message>
+        <message>
+            <source>ICO_EXTRUSION</source>
+            <translation>prism.png</translation>
+        </message>
+        <message>
+            <source>ICO_FACE</source>
+            <translation>build_face.png</translation>
+        </message>
+        <message>
+            <source>ICO_FACE_SEL_ONLY</source>
+            <translation>build_face.png</translation>
+        </message>
+        <message>
+            <source>ICO_FILLET</source>
+            <translation>fillet.png</translation>
+        </message>
+       <message>
+            <source>ICO_FILLET_2D</source>
+            <translation>fillet2d.png</translation>
+        </message>
+        <message>
+            <source>ICO_FILLING</source>
+            <translation>filling.png</translation>
+        </message>
+        <message>
+            <source>ICO_FUSE</source>
+            <translation>fuse.png</translation>
+        </message>
+        <message>
+            <source>ICO_GLUE_FACES</source>
+            <translation>glue.png</translation>
+        </message>
+        <message>
+            <source>ICO_GROUP_CREATE</source>
+            <translation>group_new.png</translation>
+        </message>
+        <message>
+            <source>ICO_GROUP_EDIT</source>
+            <translation>group_edit.png</translation>
+        </message>
+        <message>
+            <source>ICO_HEX_SOLID</source>
+            <translation>box.png</translation>
+        </message>
+        <message>
+            <source>ICO_INERTIA</source>
+            <translation>axisinertia.png</translation>
+        </message>
+       <message>
+            <source>ICO_LINE</source>
+            <translation>line.png</translation>
+        </message>
+        <message>
+            <source>ICO_LOCAL_CS</source>
+            <translation>marker.png</translation>
+        </message>
+        <message>
+            <source>ICO_MASS_CENTER</source>
+            <translation>centergravity.png</translation>
+        </message>
+        <message>
+            <source>ICO_MIN_DIST</source>
+            <translation>mindist.png</translation>
+        </message>
+        <message>
+            <source>ICO_MIRROR</source>
+            <translation>mirrorPlane.png</translation>
+        </message>
+        <message>
+            <source>ICO_MODIFY_LOCATION</source>
+            <translation>position2.png</translation>
+        </message>
+        <message>
+            <source>ICO_MUL_ROTATION</source>
+            <translation>multirotation.png</translation>
+        </message>
+        <message>
+            <source>ICO_MUL_TRANSFORM</source>
+            <translation>multirotation.png</translation>
+        </message>
+        <message>
+            <source>ICO_MUL_TRANSLATION</source>
+            <translation>multitranslation.png</translation>
+        </message>
+        <message>
+            <source>ICO_OFFSET</source>
+            <translation>offset.png</translation>
+        </message>
+        <message>
+            <source>ICO_PARTITION</source>
+            <translation>partition.png</translation>
+        </message>
+        <message>
+            <source>ICO_PIPE</source>
+            <translation>pipe.png</translation>
+        </message>
+        <message>
+            <source>ICO_PLANE</source>
+            <translation>plane.png</translation>
+        </message>
+        <message>
+            <source>ICO_REMOVE_EXTRA_EDGES</source>
+            <translation>remove_extra_edges.png</translation>
+        </message>
+        <message>
+            <source>ICO_NORMALE</source>
+            <translation>normale.png</translation>
+        </message>
+        <message>
+            <source>ICO_MEASURE_ANGLE</source>
+            <translation>angle.png</translation>
+        </message>
+        <message>
+            <source>ICO_POINT</source>
+            <translation>point2.png</translation>
+        </message>
+        <message>
+            <source>ICO_POINT_COORDS</source>
+            <translation>point_coord.png</translation>
+        </message>
+        <message>
+            <source>ICO_POINT_ON_EDGE</source>
+            <translation>pointonedge.png</translation>
+        </message>
+        <message>
+            <source>ICO_POP_CREATE_GROUP</source>
+            <translation>group_new.png</translation>
+        </message>
+        <message>
+            <source>ICO_PROPAGATE</source>
+            <translation>propagate.png</translation>
+        </message>
+        <message>
+            <source>ICO_Q_FACE</source>
+            <translation>build_face.png</translation>
+        </message>
+        <message>
+            <source>ICO_REVOLUTION</source>
+            <translation>revol.png</translation>
+        </message>
+        <message>
+            <source>ICO_ROTATION</source>
+            <translation>rotate.png</translation>
+        </message>
+        <message>
+            <source>ICO_SCALE</source>
+            <translation>scale.png</translation>
+        </message>
+        <message>
+            <source>ICO_SECTION</source>
+            <translation>section.png</translation>
+        </message>
+        <message>
+            <source>ICO_SEWING</source>
+            <translation>sewing.png</translation>
+        </message>
+       <message>
+            <source>ICO_SHADING</source>
+            <translation>shading.png</translation>
+        </message>
+        <message>
+            <source>ICO_SHAPE_PROCESS</source>
+            <translation>shapeprocess.png</translation>
+        </message>
+        <message>
+            <source>ICO_SHELL</source>
+            <translation>build_shell.png</translation>
+        </message>
+        <message>
+            <source>ICO_SHELL_SEL_ONLY</source>
+            <translation>build_shell.png</translation>
+        </message>
+        <message>
+            <source>ICO_SKETCH</source>
+            <translation>sketch.png</translation>
+        </message>
+       <message>
+            <source>ICO_3DSKETCH</source>
+            <translation>3dsketch.png</translation>
+        </message>
+        <message>
+            <source>ICO_SOLID</source>
+            <translation>build_solid.png</translation>
+        </message>
+        <message>
+            <source>ICO_SOLID_SEL_ONLY</source>
+            <translation>build_solid.png</translation>
+        </message>
+        <message>
+            <source>ICO_SPHERE</source>
+            <translation>sphere.png</translation>
+        </message>
+        <message>
+            <source>ICO_SUPPERSS_HOLES</source>
+            <translation>supresshole.png</translation>
+        </message>
+        <message>
+            <source>ICO_SUPPRESS_FACES</source>
+            <translation>supressface.png</translation>
+        </message>
+        <message>
+            <source>ICO_SUPPRESS_INT_WIRES</source>
+            <translation>suppressintwires.png</translation>
+        </message>
+        <message>
+            <source>ICO_TOLERANCE</source>
+            <translation>tolerance.png</translation>
+        </message>
+        <message>
+            <source>ICO_TORUS</source>
+            <translation>torus.png</translation>
+        </message>
+        <message>
+            <source>ICO_TRANSLATION</source>
+            <translation>translationVector.png</translation>
+        </message>
+        <message>
+            <source>ICO_VECTOR</source>
+            <translation>vector.png</translation>
+        </message>
+        <message>
+            <source>ICO_VERTEX_SEL_ONLY</source>
+            <translation>point2.png</translation>
+        </message>
+        <message>
+            <source>ICO_WHAT_IS</source>
+            <translation>whatis.png</translation>
+        </message>
+        <message>
+            <source>ICO_WIRE</source>
+            <translation>build_wire.png</translation>
+        </message>
+        <message>
+            <source>ICO_WIRE_SEL_ONLY</source>
+            <translation>build_wire.png</translation>
+        </message>
+        <message>
+            <source>ICO_WORK_PLANE</source>
+            <translation>planeWorking.png</translation>
+        </message>
+        <message>
+            <source>ICO_GET_SHAPES_ON_SHAPES</source>
+            <translation>shapesonshape.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_POINT_FACE</source>
+            <translation>pointonface.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SHAPES_ON_SHAPE</source>
+            <translation>shapesonshape.png</translation>
+        </message>
+        <message>
+            <source>ICON_DLG_SCALE_ALONG_AXES</source>
+            <translation>scale_along_axes.png</translation>
+        </message>
+    </context>
+</TS>
index 11e004ab0f7f12104eaa64f788b411aa7751a0dc..74caf6b0e2b9f4990caa3fd128fb2a69a18109cc 100644 (file)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
+#  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",
 # not "Foo::Pub".
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "POT-Creation-Date: 2002-03-19 09:35:48 AM CET\n"
-"PO-Revision-Date: 2003-10-27 17:32+0100\n"
+"PO-Revision-Date: 2008-03-12 12:26+0300\n"
 "Last-Translator: FULLNAME <EMAIL@ADDRESS>\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 
@@ -183,11 +186,11 @@ msgstr "%1 Objects"
 
 #: GeometryGUI.cxx:4414
 msgid "GEOM_MEN_SKETCHER_X"
-msgstr "Enter a length to set X"
+msgstr "Enter a Length to Set X"
 
 #: GeometryGUI.cxx:4438
 msgid "GEOM_MEN_SKETCHER_Y"
-msgstr "Enter a length to set Y"
+msgstr "Enter a Length to Set Y"
 
 #: GeometryGUI.cxx:2898
 msgid "GEOM_MEN_TRANSPARENCY"
@@ -203,11 +206,11 @@ msgstr "Y :"
 
 #: GeometryGUI_NbIsosDlg.cxx:36
 msgid "GEOM_MEN_ISOU"
-msgstr "Isos u :"
+msgstr "Isos U :"
 
 #: GeometryGUI_NbIsosDlg.cxx:53
 msgid "GEOM_MEN_ISOV"
-msgstr "Isos v :"
+msgstr "Isos V :"
 
 #: GeometryGUI_TransparencyDlg.cxx:31
 msgid "GEOM_MEN_TRANSPARENCY_LABEL"
@@ -241,6 +244,9 @@ msgstr "Warning"
 msgid "GEOM_REALLY_DELETE"
 msgstr "Do you really want to delete this %1 object(s):"
 
+msgid "GEOM_DELETE_OBJECTS"
+msgstr "Delete objects"
+
 #
 #==============================================================================
 #
@@ -678,6 +684,10 @@ msgstr "Edge"
 msgid "GEOM_FACE"
 msgstr "Face"
 
+#Face
+msgid "GEOM_PLANAR_FACE"
+msgstr "Planar Face"
+
 #Faces
 msgid "GEOM_FACES"
 msgstr "Faces"
@@ -1012,10 +1022,6 @@ msgstr "Tol. 3D :"
 msgid "GEOM_FILLING_NB_ITER"
 msgstr "Nb. Iter :"
 
-#: GeometryGUI_FillingDlg.cxx:84
-msgid "GEOM_FILLING_APPROX"
-msgstr "Approximation"
-
 #: GeometryGUI_FuseDlg.cxx:48
 msgid "GEOM_FUSE_TITLE"
 msgstr "BOOLEAN : Fuse Two Objects"
@@ -1385,7 +1391,7 @@ msgstr "Wireframe"
 
 #: GeometryGUI.cxx:4613
 msgid "GEOM_MEN_SHADING"
-msgstr "\nShading"
+msgstr "Shading"
 
 msgid "GEOM_RECONSTRUCTION_LIMIT"
 msgstr "Reconstruction Limit"
@@ -2235,7 +2241,7 @@ msgid "TOP_WORK_PLANE"
 msgstr "Create a working plane"
 
 msgid "MEN_WORK_PLANE"
-msgstr "Working plane"
+msgstr "Working Plane"
 
 msgid "STB_WORK_PLANE"
 msgstr "Create a working plane"
@@ -2244,7 +2250,7 @@ msgid "TOP_LOCAL_CS"
 msgstr "Create a local coordinate system"
 
 msgid "MEN_LOCAL_CS"
-msgstr "Local coordinate system"
+msgstr "Local Coordinate System"
 
 msgid "STB_LOCAL_CS"
 msgstr "Create a local coordinate system"
@@ -2331,7 +2337,7 @@ msgid "TOP_PIPE"
 msgstr "Extrusion along a path"
 
 msgid "MEN_PIPE"
-msgstr "Extrusion along a path"
+msgstr "Extrusion Along a Path"
 
 msgid "STB_PIPE"
 msgstr "Create a shape by Extrusion along a path"
@@ -2529,7 +2535,7 @@ msgid "TOP_MIRROR"
 msgstr "Mirror image"
 
 msgid "MEN_MIRROR"
-msgstr "Mirror image"
+msgstr "Mirror Image"
 
 msgid "STB_MIRROR"
 msgstr "Mirror image"
@@ -2538,7 +2544,7 @@ msgid "TOP_SCALE"
 msgstr "Scale transform"
 
 msgid "MEN_SCALE"
-msgstr "Scale transform"
+msgstr "Scale Transform"
 
 msgid "STB_SCALE"
 msgstr "Scale transform"
@@ -2547,7 +2553,7 @@ msgid "TOP_OFFSET"
 msgstr "Offset surface"
 
 msgid "MEN_OFFSET"
-msgstr "Offset surface"
+msgstr "Offset Surface"
 
 msgid "STB_OFFSET"
 msgstr "Offset surface"
@@ -2610,7 +2616,7 @@ msgid "TOP_CLIPPING"
 msgstr "Clipping range"
 
 msgid "MEN_CLIPPING"
-msgstr "Clipping range"
+msgstr "Clipping Range"
 
 msgid "STB_CLIPPING"
 msgstr "Clipping range"
@@ -2619,7 +2625,7 @@ msgid "TOP_MUL_TRANSFORM"
 msgstr "Multi-transformation"
 
 msgid "MEN_MUL_TRANSFORM"
-msgstr "Multi-transformation"
+msgstr "Multi-Transformation"
 
 msgid "STB_MUL_TRANSFORM"
 msgstr "Multi-transformation"
@@ -2649,7 +2655,7 @@ msgid "TOP_SHAPE_PROCESS"
 msgstr "Perform shape processing"
 
 msgid "MEN_SHAPE_PROCESS"
-msgstr "Shape processing"
+msgstr "Shape Processing"
 
 msgid "STB_SHAPE_PROCESS"
 msgstr "Perform shape processing "
@@ -2658,7 +2664,7 @@ msgid "TOP_SUPPRESS_FACES"
 msgstr "Perform suppress faces"
 
 msgid "MEN_SUPPRESS_FACES"
-msgstr "Suppress faces"
+msgstr "Suppress Faces"
 
 msgid "STB_SUPPRESS_FACES"
 msgstr "Perform suppress faces"
@@ -2667,7 +2673,7 @@ msgid "TOP_CLOSE_CONTOUR"
 msgstr "Perform close contour"
 
 msgid "MEN_CLOSE_CONTOUR"
-msgstr "Close contour"
+msgstr "Close Contour"
 
 msgid "STB_CLOSE_CONTOUR"
 msgstr "Perform close contour"
@@ -2676,7 +2682,7 @@ msgid "TOP_SUPPRESS_INT_WIRES"
 msgstr "Perform suppress internal wires"
 
 msgid "MEN_SUPPRESS_INT_WIRES"
-msgstr "Suppress internal wires"
+msgstr "Suppress Internal Wires"
 
 msgid "STB_SUPPRESS_INT_WIRES"
 msgstr "Perform suppress internal wires"
@@ -2685,7 +2691,7 @@ msgid "TOP_SUPPERSS_HOLES"
 msgstr "Perform suppress holes"
 
 msgid "MEN_SUPPERSS_HOLES"
-msgstr "Suppress holes"
+msgstr "Suppress Holes"
 
 msgid "STB_SUPPERSS_HOLES"
 msgstr "Perform suppress holes"
@@ -2703,7 +2709,7 @@ msgid "TOP_GLUE_FACES"
 msgstr "Perform glue faces"
 
 msgid "MEN_GLUE_FACES"
-msgstr "Glue faces"
+msgstr "Glue Faces"
 
 msgid "STB_GLUE_FACES"
 msgstr "Perform glue faces"
@@ -2712,7 +2718,7 @@ msgid "TOP_POINT_ON_EDGE"
 msgstr "Add point on edge"
 
 msgid "MEN_POINT_ON_EDGE"
-msgstr "Add point on edge"
+msgstr "Add Point on Edge"
 
 msgid "STB_POINT_ON_EDGE"
 msgstr "Add point on edge"
@@ -2721,7 +2727,7 @@ msgid "TOP_CHECK_FREE_BNDS"
 msgstr "Check free boundaries"
 
 msgid "MEN_CHECK_FREE_BNDS"
-msgstr "Check free boundaries"
+msgstr "Check Free Boundaries"
 
 msgid "STB_CHECK_FREE_BNDS"
 msgstr "Check free boundaries"
@@ -2730,7 +2736,7 @@ msgid "TOP_CHECK_FREE_FACES"
 msgstr "Check free faces"
 
 msgid "MEN_CHECK_FREE_FACES"
-msgstr "Check free faces"
+msgstr "Check Free Faces"
 
 msgid "STB_CHECK_FREE_FACES"
 msgstr "Check free faces"
@@ -2739,7 +2745,7 @@ msgid "TOP_CHANGE_ORIENTATION"
 msgstr "Change orientation"
 
 msgid "MEN_CHANGE_ORIENTATION"
-msgstr "Change orientation"
+msgstr "Change Orientation"
 
 msgid "STB_CHANGE_ORIENTATION"
 msgstr "Change orientation"
@@ -2748,7 +2754,7 @@ msgid "TOP_REMOVE_EXTRA_EDGES"
 msgstr "Remove extra edges"
 
 msgid "MEN_REMOVE_EXTRA_EDGES"
-msgstr "Remove extra edges"
+msgstr "Remove Extra Edges"
 
 msgid "STB_REMOVE_EXTRA_EDGES"
 msgstr "Remove extra edges"
@@ -2760,7 +2766,7 @@ msgid "TOP_POINT_COORDS"
 msgstr "Point coordinates"
 
 msgid "MEN_POINT_COORDS"
-msgstr "Point coordinates"
+msgstr "Point Coordinates"
 
 msgid "STB_POINT_COORDS"
 msgstr "Point coordinates"
@@ -2769,7 +2775,7 @@ msgid "TOP_BASIC_PROPS"
 msgstr "Basic properties"
 
 msgid "MEN_BASIC_PROPS"
-msgstr "Basic properties"
+msgstr "Basic Properties"
 
 msgid "STB_BASIC_PROPS"
 msgstr "Basic properties"
@@ -2778,7 +2784,7 @@ msgid "TOP_MASS_CENTER"
 msgstr "Compute center of mass"
 
 msgid "MEN_MASS_CENTER"
-msgstr "Center of mass"
+msgstr "Center of Mass"
 
 msgid "STB_MASS_CENTER"
 msgstr "Compute center of mass"
@@ -2787,7 +2793,7 @@ msgid "TOP_NORMALE"
 msgstr "Compute normal to a face"
 
 msgid "MEN_NORMALE"
-msgstr "Normal to a face"
+msgstr "Normal to a Face"
 
 msgid "STB_NORMALE"
 msgstr "Compute normal to a face in a point (optional)"
@@ -2808,7 +2814,7 @@ msgid "TOP_BND_BOX"
 msgstr "Compute bounding box"
 
 msgid "MEN_BND_BOX"
-msgstr "Bounding box"
+msgstr "Bounding Box"
 
 msgid "STB_BND_BOX"
 msgstr "Compute bounding box"
@@ -2817,7 +2823,7 @@ msgid "TOP_MIN_DIST"
 msgstr "Compute minimum distance"
 
 msgid "MEN_MIN_DIST"
-msgstr "Min distance"
+msgstr "Min Distance"
 
 msgid "STB_MIN_DIST"
 msgstr "Compute minimum distance"
@@ -2835,7 +2841,7 @@ msgid "TOP_TOLERANCE"
 msgstr "Compute tolerance"
 
 msgid "MEN_TOLERANCE"
-msgstr "Compute tolerance"
+msgstr "Compute Tolerance"
 
 msgid "STB_TOLERANCE"
 msgstr "Compute tolerance"
@@ -2862,7 +2868,7 @@ msgid "TOP_CHECK_COMPOUND"
 msgstr "Check compound of blocks"
 
 msgid "MEN_CHECK_COMPOUND"
-msgstr "Check compound of blocks"
+msgstr "Check Compound of Blocks"
 
 msgid "STB_CHECK_COMPOUND"
 msgstr "Check compound of blocks"
@@ -2889,7 +2895,7 @@ msgid "TOP_SHADING_COLOR"
 msgstr "Set shading color"
 
 msgid "MEN_SHADING_COLOR"
-msgstr "Shading color"
+msgstr "Shading Color"
 
 msgid "STB_SHADING_COLOR"
 msgstr "Set shading color"
@@ -2907,7 +2913,7 @@ msgid "TOP_STEP_VALUE"
 msgstr "Set step value"
 
 msgid "MEN_STEP_VALUE"
-msgstr "Step value"
+msgstr "Step Value"
 
 msgid "STB_STEP_VALUE"
 msgstr "Set step value"
@@ -2916,7 +2922,7 @@ msgid "MEN_VIEW"
 msgstr "View"
 
 msgid "MEN_DISPLAY_MODE"
-msgstr "Display mode"
+msgstr "Display Mode"
 
 msgid "TOP_SHADING"
 msgstr "Shading"
@@ -2934,7 +2940,7 @@ msgid "TOP_DISPLAY_ALL"
 msgstr "Show all"
 
 msgid "MEN_DISPLAY_ALL"
-msgstr "Show all"
+msgstr "Show All"
 
 msgid "STB_DISPLAY_ALL"
 msgstr "Show all"
@@ -2943,7 +2949,7 @@ msgid "TOP_ERASE_ALL"
 msgstr "Hide all"
 
 msgid "MEN_ERASE_ALL"
-msgstr "Hide all"
+msgstr "Hide All"
 
 msgid "STB_ERASE_ALL"
 msgstr "Hide all"
@@ -2961,7 +2967,7 @@ msgid "TOP_DISPLAY_ONLY"
 msgstr "Show only"
 
 msgid "MEN_DISPLAY_ONLY"
-msgstr "Show only"
+msgstr "Show Only"
 
 msgid "STB_DISPLAY_ONLY"
 msgstr "Show only"
@@ -3006,7 +3012,7 @@ msgid "TOP_POP_AUTO_COLOR"
 msgstr "Auto color"
 
 msgid "MEN_POP_AUTO_COLOR"
-msgstr "Auto color"
+msgstr "Auto Color"
 
 msgid "STB_POP_AUTO_COLOR"
 msgstr "Auto color"
@@ -3015,7 +3021,7 @@ msgid "TOP_POP_DISABLE_AUTO_COLOR"
 msgstr "Disable auto color"
 
 msgid "MEN_POP_DISABLE_AUTO_COLOR"
-msgstr "Disable auto color"
+msgstr "Disable Auto Color"
 
 msgid "STB_POP_DISABLE_AUTO_COLOR"
 msgstr "Disable auto color"
@@ -3063,7 +3069,7 @@ msgid "TOOL_PRIMITIVES"
 msgstr "Primitives"
 
 msgid "TOOL_BOOLEAN"
-msgstr "Boolean operations"
+msgstr "Boolean Operations"
 
 msgid "TOOL_GENERATION"
 msgstr "Generation"
diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
new file mode 100644 (file)
index 0000000..15ac7e8
--- /dev/null
@@ -0,0 +1,4141 @@
+<!DOCTYPE TS>
+<!--
+  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+
+  Copyright (C) 2003-2007  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
+
+-->
+<TS version="1.1" >
+    <context>
+        <name>@default</name>
+        <message>
+            <source>CHANGE_ORIENTATION_NEW_OBJ_NAME</source>
+            <translation>Invert</translation>
+        </message>
+        <message>
+            <source>CLOSE_CONTOUR_NEW_OBJ_NAME</source>
+            <translation>CloseContour</translation>
+        </message>
+        <message>
+            <source>DEP_OBJECT</source>
+            <translation>Selected object has been used to create another one.
+It can't be deleted </translation>
+        </message>
+        <message>
+            <source>DEVIDE_EDGE_NEW_OBJECT_NAME</source>
+            <translation>NewObject</translation>
+        </message>
+        <message>
+            <source>ERROR_SHAPE_TYPE</source>
+            <translation>Object of incorrect type selected!
+Please, select face, shell or solid and try again</translation>
+        </message>
+       <message>
+           <source> iErr : 10</source>
+           <translation>the Classifier is NULL</translation>
+       </message>
+       <message>
+           <source> iErr : 11</source>
+           <translation>the Shape is NULL</translation>
+       </message>
+       <message>
+           <source> iErr : 12</source>
+           <translation>Unallowed Type of Subshape</translation>
+       </message>
+       <message>
+           <source> iErr : 13</source>
+           <translation>Unallowed State</translation>
+       </message>
+       <message>
+           <source> iErr : 15</source>
+           <translation>Unallowed Surface Type</translation>
+       </message>
+       <message>
+           <source> iErr : 20</source>
+           <translation>Triangulation is not Found</translation>
+       </message>
+       <message>
+           <source> iErr : 30</source>
+           <translation>Can not Obtain the Line From the Link</translation>
+       </message>
+       <message>
+           <source> iErr : 40</source>
+           <translation>A Point Can Not Be Classified</translation>
+       </message>
+       <message>
+           <source> iErr : 41</source>
+           <translation>Invalid Data for Classifier</translation>
+       </message>
+        <message>
+            <source>GEOM_2D_CONTINUTY</source>
+            <translation>2D continuity</translation>
+        </message>
+        <message>
+            <source>GEOM_2D_CURVE_MODE</source>
+            <translation>2D curve mode</translation>
+        </message>
+        <message>
+            <source>GEOM_2D_TOLERANCE</source>
+            <translation>2D tolerance</translation>
+        </message>
+        <message>
+            <source>GEOM_3D_CONTINUTY</source>
+            <translation>3D continuity</translation>
+        </message>
+        <message>
+            <source>GEOM_3D_CURVE_MODE</source>
+            <translation>3D curve mode</translation>
+        </message>
+        <message>
+            <source>GEOM_3D_TOLERANCE</source>
+            <translation>3D tolerance</translation>
+        </message>
+        <message>
+            <source>GEOM_3_POINTS</source>
+            <translation>3 points</translation>
+        </message>
+        <message>
+            <source>GEOM_ADD_POINT</source>
+            <translation>Add point</translation>
+        </message>
+        <message>
+            <source>GEOM_ANGLE</source>
+            <translation>Angle :</translation>
+        </message>
+        <message>
+            <source>GEOM_ANGLE_1</source>
+            <translation>Angle</translation>
+        </message>
+        <message>
+            <source>GEOM_ARC</source>
+            <translation>Arc</translation>
+        </message>
+        <message>
+            <source>GEOM_ARCHIMEDE</source>
+            <translation>Archimede</translation>
+        </message>
+        <message>
+            <source>GEOM_ARCHIMEDE_TITLE</source>
+            <translation>Archimede Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_ARC_TITLE</source>
+            <translation>Arc Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_ARGUMENTS</source>
+            <translation>Arguments</translation>
+        </message>
+        <message>
+            <source>GEOM_AXE_MIRROR</source>
+            <translation>Axe Mirror</translation>
+        </message>
+        <message>
+            <source>GEOM_AXIS</source>
+            <translation>Axis</translation>
+        </message>
+        <message>
+            <source>GEOM_BASE</source>
+            <translation>Base</translation>
+        </message>
+        <message>
+            <source>GEOM_BASE_OBJECT</source>
+            <translation>Base Object</translation>
+        </message>
+        <message>
+            <source>GEOM_BASE_POINT</source>
+            <translation>Base Point</translation>
+        </message>
+        <message>
+            <source>GEOM_BEZIER</source>
+            <translation>Bezier</translation>
+        </message>
+        <message>
+            <source>GEOM_BINORMAL</source>
+            <translation>BiNormal</translation>
+        </message>
+        <message>
+            <source>GEOM_BLOCK</source>
+            <translation>Hexahedral Solid</translation>
+        </message>
+        <message>
+            <source>GEOM_BLOCKS_COMPOUND</source>
+            <translation>BlocksCompound</translation>
+        </message>
+        <message>
+            <source>GEOM_BLOCK_EXPLODE</source>
+            <translation>Sub Blocks</translation>
+        </message>
+        <message>
+            <source>GEOM_BLOCK_EXPLODE_TITLE</source>
+            <translation>Sub Blocks Selection</translation>
+        </message>
+        <message>
+            <source>GEOM_BLOCK_MULTITRSF</source>
+            <translation>Block Multi-Transformation</translation>
+        </message>
+        <message>
+            <source>GEOM_BLOCK_MULTITRSF_DOUBLE</source>
+            <translation>Multi-Transformation Double</translation>
+        </message>
+        <message>
+            <source>GEOM_BLOCK_MULTITRSF_SIMPLE</source>
+            <translation>Multi-Transformation Simple</translation>
+        </message>
+        <message>
+            <source>GEOM_BLOCK_MULTITRSF_TITLE</source>
+            <translation>Block Multi-Transformation</translation>
+        </message>
+        <message>
+            <source>GEOM_BLOCK_TITLE</source>
+            <translation>Hexahedral Solid Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_BNDBOX</source>
+            <translation>Bounding Box</translation>
+        </message>
+        <message>
+            <source>GEOM_BNDBOX_OBJDIM</source>
+            <translation>Object And Its Dimensions</translation>
+        </message>
+        <message>
+            <source>GEOM_BNDBOX_TITLE</source>
+            <translation>Bounding Box Informations</translation>
+        </message>
+        <message>
+            <source>GEOM_BOX</source>
+            <translation>Box</translation>
+        </message>
+        <message>
+            <source>GEOM_BOX_OBJ</source>
+            <translation>Dimensions At Origin</translation>
+        </message>
+        <message>
+            <source>GEOM_BOX_TITLE</source>
+            <translation>Box Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_BSplineRestriction</source>
+            <translation>BSplineRestriction</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_APPLY</source>
+            <translation>&amp;Apply</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_CANCEL</source>
+            <translation>&amp;Cancel</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_CLOSE</source>
+            <translation>&amp;Close</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_CLOSE_SKETCH</source>
+            <translation>Sketch Closure</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_END_SKETCH</source>
+            <translation>Sketch Validation</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_EXPLODE</source>
+            <translation>&amp;Explode</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_HELP</source>
+            <translation>&amp;Help</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_NO</source>
+            <translation>&amp;No</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_OK</source>
+            <translation>O&amp;k</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_APPLY_AND_CLOSE</source>
+            <translation>A&amp;pply and Close</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_YES</source>
+            <translation>&amp;Yes</translation>
+        </message>
+        <message>
+            <source>GEOM_BY_LENGTH</source>
+            <translation>By length</translation>
+        </message>
+        <message>
+            <source>GEOM_BY_PARAMETER</source>
+            <translation>By parameter</translation>
+        </message>
+        <message>
+            <source>GEOM_CENTER</source>
+            <translation>Center</translation>
+        </message>
+        <message>
+            <source>GEOM_CENTER_POINT</source>
+            <translation>Center Point</translation>
+        </message>
+        <message>
+            <source>GEOM_CENTRAL_POINT</source>
+            <translation>Central Point</translation>
+        </message>
+        <message>
+            <source>GEOM_CHAMFER</source>
+            <translation>Chamfer</translation>
+        </message>
+        <message>
+            <source>GEOM_CHAMFER_ABORT</source>
+            <translation>Chamfer can't be computed with %1 and %2</translation>
+        </message>
+        <message>
+            <source>GEOM_CHAMFER_ALL</source>
+            <translation>Chamfer On Whole Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_CHAMFER_EDGES</source>
+            <translation>Chamfer On Edges From Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_CHAMFER_FACES</source>
+            <translation>Chamfer On Faces From Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_CHAMFER_TITLE</source>
+            <translation>Chamfer Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_CHANGE_ORIENTATION</source>
+            <translation>Objects to change orientation</translation>
+        </message>
+        <message>
+            <source>GEOM_CHANGE_ORIENTATION_TITLE</source>
+            <translation>Change orientation</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_BLOCKS_COMPOUND</source>
+            <translation>Check and Improve Blocks Compound</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_BLOCKS_COMPOUND_ERRORS</source>
+            <translation>Errors</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_BLOCKS_COMPOUND_HAS_ERRORS</source>
+            <translation>The Compound of Blocks has errors</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_BLOCKS_COMPOUND_HAS_NO_ERRORS</source>
+            <translation>The Compound of Blocks has no errors</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_BLOCKS_COMPOUND_SUBSHAPES</source>
+            <translation>Incriminated Sub-Shapes</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_INFOS</source>
+            <translation>Object And Its Topological Information</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_SHAPE</source>
+            <translation>Check Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_TITLE</source>
+            <translation>Check Shape Information</translation>
+        </message>
+        <message>
+            <source>GEOM_CIRCLE</source>
+            <translation>Circle</translation>
+        </message>
+        <message>
+            <source>GEOM_CIRCLE_TITLE</source>
+            <translation>Circle Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_CLOSECONTOUR_TITLE</source>
+            <translation>Close contour</translation>
+        </message>
+        <message>
+            <source>GEOM_CMASS</source>
+            <translation>Center Of Mass</translation>
+        </message>
+        <message>
+            <source>GEOM_CMASS_TITLE</source>
+            <translation>Center Of Mass Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_COMMON</source>
+            <translation>Common</translation>
+        </message>
+        <message>
+            <source>GEOM_COMMON_TITLE</source>
+            <translation>Common Of Two Objects</translation>
+        </message>
+        <message>
+            <source>GEOM_COMPOUND</source>
+            <translation>Compound</translation>
+        </message>
+        <message>
+            <source>GEOM_COMPOUNDSOLID</source>
+            <translation>CompSolid</translation>
+        </message>
+        <message>
+            <source>GEOM_COMPOUND_TITLE</source>
+            <translation>Create A Compound</translation>
+        </message>
+        <message>
+            <source>GEOM_CONE</source>
+            <translation>Cone</translation>
+        </message>
+        <message>
+            <source>GEOM_CONE_TITLE</source>
+            <translation>Cone Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_CONFIRM</source>
+            <translation>Confirm operation</translation>
+        </message>
+        <message>
+            <source>GEOM_CONFIRM_INFO</source>
+            <translation>Shape contains %1 sub shapes !</translation>
+        </message>
+        <message>
+            <source>GEOM_COOR</source>
+            <translation>Coord. :</translation>
+        </message>
+        <message>
+            <source>GEOM_COORDINATES</source>
+            <translation>Coordinates</translation>
+        </message>
+        <message>
+            <source>GEOM_CREATE_COPY</source>
+            <translation>Create a copy</translation>
+        </message>
+        <message>
+            <source>GEOM_CREATE_SINGLE_SOLID</source>
+            <translation>Create a single solid</translation>
+        </message>
+        <message>
+            <source>GEOM_CURVE</source>
+            <translation>Curve</translation>
+        </message>
+        <message>
+            <source>GEOM_CURVE_CONTINUTY</source>
+            <translation>Curve continuity</translation>
+        </message>
+        <message>
+            <source>GEOM_CURVE_TITLE</source>
+            <translation>Curve Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_CUT</source>
+            <translation>Cut</translation>
+        </message>
+        <message>
+            <source>GEOM_CUT_TITLE</source>
+            <translation>Cut Of Two Objects</translation>
+        </message>
+        <message>
+            <source>GEOM_CYLINDER</source>
+            <translation>Cylinder</translation>
+        </message>
+        <message>
+            <source>GEOM_CYLINDER_TITLE</source>
+            <translation>Cylinder Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_D1</source>
+            <translation>D1 :</translation>
+        </message>
+        <message>
+            <source>GEOM_D2</source>
+            <translation>D2 :</translation>
+        </message>
+        <message>
+            <source>GEOM_DETECT</source>
+            <translation>Detect</translation>
+        </message>
+        <message>
+            <source>GEOM_DIAGONAL_POINTS</source>
+            <translation>Diagonal Points</translation>
+        </message>
+       <message>
+            <source>GEOM_DISK</source>
+            <translation>Disk</translation>
+        </message>
+       <message>
+            <source>GEOM_DISK_TITLE</source>
+            <translation>Create A Disk</translation>
+        </message>
+        <message>
+            <source>GEOM_DIMENSIONS</source>
+            <translation>Dimensions</translation>
+        </message>
+        <message>
+            <source>GEOM_DISTANCE</source>
+            <translation>Distance</translation>
+        </message>
+        <message>
+            <source>GEOM_DIVIDE_EDGE_TITLE</source>
+            <translation>Addition of point</translation>
+        </message>
+        <message>
+            <source>GEOM_DX</source>
+            <translation>Dx :</translation>
+        </message>
+        <message>
+            <source>GEOM_DY</source>
+            <translation>Dy :</translation>
+        </message>
+        <message>
+            <source>GEOM_DZ</source>
+            <translation>Dz :</translation>
+        </message>
+        <message>
+            <source>GEOM_DropSmallEdges</source>
+            <translation>DropSmallEdges</translation>
+        </message>
+        <message>
+            <source>GEOM_EDGE</source>
+            <translation>Edge</translation>
+        </message>
+        <message>
+            <source>GEOM_EDGE_TITLE</source>
+            <translation>Create An Edge</translation>
+        </message>
+        <message>
+            <source>GEOM_ELLIPSE</source>
+            <translation>Ellipse</translation>
+        </message>
+        <message>
+            <source>GEOM_ELLIPSE_ERROR_1</source>
+            <translation>Error creating ellipse.  Reason: minor radius is greater than major radius.</translation>
+        </message>
+        <message>
+            <source>GEOM_ELLIPSE_TITLE</source>
+            <translation>Ellipse Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_END_LCS</source>
+            <translation>End LCS</translation>
+        </message>
+        <message>
+            <source>GEOM_ERROR</source>
+            <translation>Error</translation>
+        </message>
+        <message>
+            <source>GEOM_ERROR_STATUS</source>
+            <translation>Operation status</translation>
+        </message>
+        <message>
+            <source>GEOM_ERR_GET_ENGINE</source>
+            <translation>Failed to obtain GEOM Engine component.  Reload Geometry module and try again.</translation>
+        </message>
+        <message>
+            <source>GEOM_ERR_LIB_NOT_FOUND</source>
+            <translation>GUI library corresponding to the user action can not be found or loaded</translation>
+        </message>
+        <message>
+            <source>GEOM_EXTRUSION</source>
+            <translation>Extrusion</translation>
+        </message>
+        <message>
+            <source>GEOM_EXTRUSION_BSV</source>
+            <translation>Base Shape + Vector</translation>
+        </message>
+        <message>
+            <source>GEOM_EXTRUSION_BSV_2P</source>
+            <translation>Base Shape + 2 Points</translation>
+        </message>
+       <message>
+            <source>GEOM_EXTRUSION_DXDYDZ</source>
+            <translation>Base Shape + DX DY DZ Vector</translation>
+        </message>
+        <message>
+            <source>GEOM_EXTRUSION_TITLE</source>
+            <translation>Construction by Extrusion</translation>
+        </message>
+        <message>
+            <source>GEOM_FACE</source>
+            <translation>Face</translation>
+        </message>
+       <message>
+            <source>GEOM_LCS</source>
+            <translation>Local coordinate system</translation>
+        </message>
+        <message>
+            <source>GEOM_FACES</source>
+            <translation>Faces</translation>
+        </message>
+        <message>
+            <source>GEOM_FACE_FFW</source>
+            <translation>Face creation from wires and/or edges</translation>
+        </message>
+        <message>
+            <source>GEOM_FACE_OPT</source>
+            <translation>Try to create a planar face</translation>
+        </message>
+        <message>
+            <source>GEOM_FACE_OR_LCS</source>
+            <translation>Face or LCS</translation>
+        </message>
+        <message>
+            <source>GEOM_FACE_SELECTION</source>
+            <translation>Face Selection</translation>
+        </message>
+        <message>
+            <source>GEOM_FACE_TITLE</source>
+            <translation>Create A Face</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLET</source>
+            <translation>Fillet</translation>
+        </message>
+       <message>
+            <source>GEOM_FILLET_2D</source>
+            <translation>Fillet 2D</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLET_ABORT</source>
+            <translation>Fillet can't be computed with radius %1</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLET_ALL</source>
+            <translation>Fillet On Whole Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLET_EDGES</source>
+            <translation>Fillet On Edges From Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLET_FACES</source>
+            <translation>Fillet On Faces From Shape</translation>
+        </message>
+       <message>
+            <source>GEOM_FILLET_VERTEXES</source>
+            <translation>Fillet On Vertexes From Face</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLET_TITLE</source>
+            <translation>Fillet Construction</translation>
+        </message>
+       <message>
+            <source>GEOM_FILLET_2D_TITLE</source>
+            <translation>2D Fillet Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING</source>
+            <translation>Filling</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_ARG</source>
+            <translation>Arguments And Parameters</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_COMPOUND</source>
+            <translation>Edges compound</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_MAX_DEG</source>
+            <translation>Max deg</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_MIN_DEG</source>
+            <translation>Min deg</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_NB_ITER</source>
+            <translation>Nb. Iter :</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_TITLE</source>
+            <translation>Filling Surface With Edges</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_TOL_2D</source>
+            <translation>Tol. 2D :</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_TOL_3D</source>
+            <translation>Tol. 3D :</translation>
+        </message>
+        <message>
+            <source>GEOM_FREE_BOUNDARIES</source>
+            <translation>Free boundaries</translation>
+        </message>
+        <message>
+            <source>GEOM_FREE_BOUNDS_ERROR</source>
+            <translation>Object is not selected</translation>
+        </message>
+        <message>
+            <source>GEOM_FREE_BOUNDS_MSG</source>
+            <translation>Number of free boundaries detected: %1 (%2 closed, %3 open)</translation>
+        </message>
+        <message>
+            <source>GEOM_FREE_BOUNDS_TLT</source>
+            <translation>Free boundary detection</translation>
+        </message>
+        <message>
+            <source>GEOM_FREE_FACES</source>
+            <translation>Free faces</translation>
+        </message>
+        <message>
+            <source>GEOM_FREE_FACES_TITLE</source>
+            <translation>Free faces</translation>
+        </message>
+        <message>
+            <source>GEOM_FUSE</source>
+            <translation>Fuse</translation>
+        </message>
+        <message>
+            <source>GEOM_FUSE_TITLE</source>
+            <translation>Fuse Two Objects</translation>
+        </message>
+        <message>
+            <source>GEOM_FixFaceSize</source>
+            <translation>FixFaceSize</translation>
+        </message>
+        <message>
+            <source>GEOM_FixShape</source>
+            <translation>FixShape</translation>
+        </message>
+        <message>
+            <source>GEOM_GLUE</source>
+            <translation>Glue</translation>
+        </message>
+        <message>
+            <source>GEOM_GLUE_TITLE</source>
+            <translation>Glue faces</translation>
+        </message>
+        <message>
+            <source>GEOM_HEIGHT</source>
+            <translation>Height :</translation>
+        </message>
+        <message>
+            <source>GEOM_HOLES</source>
+            <translation>Holes</translation>
+        </message>
+        <message>
+            <source>GEOM_IDENTICAL_NAMES_SELECT_BY_MOUSE</source>
+            <translation>Identical names : select by mouse !</translation>
+        </message>
+        <message>
+            <source>GEOM_IMPORT</source>
+            <translation>Imported_Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_INCORRECT_INPUT</source>
+            <translation>Some parameters are missing</translation>
+        </message>
+        <message>
+            <source>GEOM_INERTIA_CONSTR</source>
+            <translation>Matrix And Moments Of Inertia</translation>
+        </message>
+        <message>
+            <source>GEOM_INERTIA_I</source>
+            <translation>%1:1 :</translation>
+        </message>
+        <message>
+            <source>GEOM_INERTIA_IXYZ</source>
+            <translation>IX &amp; IY &amp; IZ :</translation>
+        </message>
+        <message>
+            <source>GEOM_INERTIA_TITLE</source>
+            <translation>Calculs Of Inertia</translation>
+        </message>
+        <message>
+            <source>GEOM_INF_LOADED</source>
+            <translation>File %1 loaded.</translation>
+        </message>
+        <message>
+            <source>GEOM_INTERNAL_WIRES</source>
+            <translation>Internal wires</translation>
+        </message>
+        <message>
+            <source>GEOM_INTERPOL</source>
+            <translation>Interpolation</translation>
+        </message>
+        <message>
+            <source>GEOM_KEEP_OBJECT</source>
+            <translation>Keep Object</translation>
+        </message>
+        <message>
+            <source>GEOM_LENGTH</source>
+            <translation>Length :</translation>
+        </message>
+        <message>
+            <source>GEOM_LINE</source>
+            <translation>Line</translation>
+        </message>
+        <message>
+            <source>GEOM_LINE_TITLE</source>
+            <translation>Line Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_MAIN_OBJECT</source>
+            <translation>Main Object</translation>
+        </message>
+        <message>
+            <source>GEOM_MARKER</source>
+            <translation>Marker</translation>
+        </message>
+        <message>
+            <source>GEOM_MARKER_TITLE</source>
+            <translation>Create marker</translation>
+        </message>
+        <message>
+            <source>GEOM_MATERIAL_ID</source>
+            <translation>Material ID:</translation>
+        </message>
+        <message>
+            <source>GEOM_MATERIAL_MATERIAL</source>
+            <translation>Material</translation>
+        </message>
+        <message>
+            <source>GEOM_MATERIAL_SET</source>
+            <translation>&lt;&lt; Set</translation>
+        </message>
+        <message>
+            <source>GEOM_MATERIAL_SHAPE</source>
+            <translation>Shapes</translation>
+        </message>
+        <message>
+            <source>GEOM_MATERIAL_TITLE</source>
+            <translation>Define materials for Dominant Fuse</translation>
+        </message>
+        <message>
+            <source>GEOM_MATRIX</source>
+            <translation>Matrix :</translation>
+        </message>
+        <message>
+            <source>GEOM_MAX</source>
+            <translation>Max :</translation>
+        </message>
+        <message>
+            <source>GEOM_MAX_3D_TOLERANCE</source>
+            <translation>Max 3D tolerance</translation>
+        </message>
+        <message>
+            <source>GEOM_MAX_TOLERANCE</source>
+            <translation>Max tolerance</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_ALL_FILES</source>
+            <translation>All Files ( * )</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_ANGLE</source>
+            <translation>Angle :</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_COMPONENT</source>
+            <translation>Geometry</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_ENTER_ANGLE</source>
+            <translation>Enter An Angle In Degrees</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_EXPORT</source>
+            <translation>Export</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_IMPORT</source>
+            <translation>Import</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_ISOS</source>
+            <translation>Select Number Of Isos</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_ISOU</source>
+            <translation>Isos U :</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_ISOV</source>
+            <translation>Isos V :</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_POPUP_NAME</source>
+            <translation>%1 Objects</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_SHADING</source>
+            <translation>Shading</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_SKETCHER_X</source>
+            <translation>Enter a Length to Set X</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_SKETCHER_Y</source>
+            <translation>Enter a Length to Set Y</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_STEP_LABEL</source>
+            <translation>Step :</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_TRANSPARENCY</source>
+            <translation>Transparency</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_TRANSPARENCY_LABEL</source>
+            <translation>Transparency :</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_WIREFRAME</source>
+            <translation>Wireframe</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_X</source>
+            <translation>X :</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_Y</source>
+            <translation>Y :</translation>
+        </message>
+        <message>
+            <source>GEOM_MESHING_DEFLECTION</source>
+            <translation>Meshing Deflect. :</translation>
+        </message>
+        <message>
+            <source>GEOM_MIN</source>
+            <translation>Min :</translation>
+        </message>
+        <message>
+            <source>GEOM_MINDIST_OBJ</source>
+            <translation>Objects And Results</translation>
+        </message>
+        <message>
+            <source>GEOM_MINDIST_TITLE</source>
+            <translation>Minimun Distance Between Two Objects</translation>
+        </message>
+        <message>
+            <source>GEOM_MIRROR</source>
+            <translation>Mirror</translation>
+        </message>
+        <message>
+            <source>GEOM_MIRROR_TITLE</source>
+            <translation>Mirror An Object</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTIROTATION</source>
+            <translation>Multi-Rotation</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTIROTATION_DOUBLE</source>
+            <translation>Multi Rotation Double</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTIROTATION_SIMPLE</source>
+            <translation>Multi Rotation Simple</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTIROTATION_TITLE</source>
+            <translation>Multi-Rotation</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTITRANSLATION</source>
+            <translation>Multi-Translation</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTITRANSLATION_DOUBLE</source>
+            <translation>Multi Translation Double</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTITRANSLATION_SIMPLE</source>
+            <translation>Multi Translation Simple</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTITRANSLATION_TITLE</source>
+            <translation>Multi-Translation</translation>
+        </message>
+        <message>
+            <source>GEOM_NAME_INCORRECT</source>
+            <translation>Object name not found</translation>
+        </message>
+        <message>
+            <source>GEOM_NB_BLOCKS_NO_OTHERS</source>
+            <translation>There are %1 specified blocks and NO other solids</translation>
+        </message>
+        <message>
+            <source>GEOM_NB_BLOCKS_SOME_OTHERS</source>
+            <translation>There are %1 specified blocks and some other solids</translation>
+        </message>
+        <message>
+            <source>GEOM_NB_TIMES</source>
+            <translation>Nb. Times :</translation>
+        </message>
+        <message>
+            <source>GEOM_NB_TIMES_U</source>
+            <translation>Nb. Times U :</translation>
+        </message>
+        <message>
+            <source>GEOM_NB_TIMES_V</source>
+            <translation>Nb. Times V :</translation>
+        </message>
+        <message>
+            <source>GEOM_NODES</source>
+            <translation>Nodes</translation>
+        </message>
+        <message>
+            <source>GEOM_NUM_SPLIT_POINTS</source>
+            <translation>Number of splitting points</translation>
+        </message>
+        <message>
+            <source>GEOM_OBJECT</source>
+            <translation>Object</translation>
+        </message>
+       <message>
+            <source>GEOM_OBJECT_TYPE</source>
+            <translation>Object Type</translation>
+        </message>
+        <message>
+            <source>GEOM_OBJECTS</source>
+            <translation>Objects</translation>
+        </message>
+        <message>
+            <source>GEOM_OBJECT_I</source>
+            <translation>Object %1</translation>
+        </message>
+        <message>
+            <source>GEOM_OBJECT_RESULT</source>
+            <translation>Object And Result</translation>
+        </message>
+        <message>
+            <source>GEOM_OFFSET</source>
+            <translation>Offset</translation>
+        </message>
+        <message>
+            <source>GEOM_OFFSET_TITLE</source>
+            <translation>Offset Surface</translation>
+        </message>
+        <message>
+            <source>GEOM_OPERATIONS</source>
+            <translation>Operations</translation>
+        </message>
+        <message>
+            <source>GEOM_ORIENTATION</source>
+            <translation>Orientation</translation>
+        </message>
+        <message>
+            <source>GEOM_ORIENTATION_OPT</source>
+            <translation>Reverse orientation with normal vectors simulation</translation>
+        </message>
+        <message>
+            <source>GEOM_ORIENTATION_TITLE</source>
+            <translation>Change Orientation</translation>
+        </message>
+        <message>
+            <source>GEOM_PARAMETER</source>
+            <translation>Parameter :</translation>
+        </message>
+        <message>
+            <source>GEOM_PARAMETERS</source>
+            <translation>Parameters</translation>
+        </message>
+        <message>
+            <source>GEOM_PARAM_POINT</source>
+            <translation>Parametric point</translation>
+        </message>
+        <message>
+            <source>GEOM_PARTITION</source>
+            <translation>Partition</translation>
+        </message>
+        <message>
+            <source>GEOM_PARTITION_HALFSPACE</source>
+            <translation>Half-space partition</translation>
+        </message>
+        <message>
+            <source>GEOM_PARTITION_ORIENTATION</source>
+            <translation>Change Orientation</translation>
+        </message>
+        <message>
+            <source>GEOM_PARTITION_TITLE</source>
+            <translation>Partition Of Object With Tool</translation>
+        </message>
+        <message>
+            <source>GEOM_PATH_OBJECT</source>
+            <translation>Path Object</translation>
+        </message>
+        <message>
+            <source>GEOM_PIPE</source>
+            <translation>Pipe</translation>
+        </message>
+        <message>
+            <source>GEOM_PIPE_TITLE</source>
+            <translation>Pipe Construction</translation>
+        </message>
+       <message>
+            <source>GEOM_SELECT_UNPUBLISHED_EDGES</source>
+            <translation>Select unpublished edges</translation>
+        </message>
+        <message>
+            <source>GEOM_PLANE</source>
+            <translation>Plane</translation>
+        </message>
+        <message>
+            <source>GEOM_PLANE_MIRROR</source>
+            <translation>Plane Mirror</translation>
+        </message>
+        <message>
+            <source>GEOM_PLANE_PV</source>
+            <translation>Point + Vector</translation>
+        </message>
+        <message>
+            <source>GEOM_PLANE_PVC</source>
+            <translation>Point + Coordinate Vector</translation>
+        </message>
+        <message>
+            <source>GEOM_PLANE_SIZE</source>
+            <translation>Size of plane :</translation>
+        </message>
+        <message>
+            <source>GEOM_PLANE_TITLE</source>
+            <translation>Plane Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_POINT</source>
+            <translation>Point</translation>
+        </message>
+        <message>
+            <source>GEOM_POINT1</source>
+            <translation>Point 1</translation>
+        </message>
+        <message>
+            <source>GEOM_POINT2</source>
+            <translation>Point 2</translation>
+        </message>
+        <message>
+            <source>GEOM_POINT3</source>
+            <translation>Point 3</translation>
+        </message>
+        <message>
+            <source>GEOM_POINTS</source>
+            <translation>Points</translation>
+        </message>
+        <message>
+            <source>GEOM_POINT_I</source>
+            <translation>Point %1</translation>
+        </message>
+        <message>
+            <source>GEOM_POINT_MIRROR</source>
+            <translation>Point Mirror</translation>
+        </message>
+        <message>
+            <source>GEOM_POINT_TITLE</source>
+            <translation>Point Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_POLYLINE</source>
+            <translation>Polyline</translation>
+        </message>
+        <message>
+            <source>GEOM_POSITION</source>
+            <translation>Location</translation>
+        </message>
+        <message>
+            <source>GEOM_POSITION_TITLE</source>
+            <translation>Modify the Location of an Object</translation>
+        </message>
+        <message>
+            <source>GEOM_PRECISION</source>
+            <translation>Precision :</translation>
+        </message>
+        <message>
+            <source>GEOM_PROPAGATE</source>
+            <translation>Propagate</translation>
+        </message>
+        <message>
+            <source>GEOM_PROPAGATE_TITLE</source>
+            <translation>Propagate</translation>
+        </message>
+        <message>
+            <source>GEOM_PROPERTIES</source>
+            <translation>Basic Properties</translation>
+        </message>
+        <message>
+            <source>GEOM_PROPERTIES_CONSTR</source>
+            <translation>Object And Its Properties</translation>
+        </message>
+        <message>
+            <source>GEOM_PROPERTIES_SURFACE</source>
+            <translation>Surface is :</translation>
+        </message>
+        <message>
+            <source>GEOM_PROPERTIES_TITLE</source>
+            <translation>Basic Properties Informations</translation>
+        </message>
+        <message>
+            <source>GEOM_PROPERTIES_VOLUME</source>
+            <translation>Volume is :</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_ABORT</source>
+            <translation>Operation aborted</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_COMMAND</source>
+            <translation>No command associated with this id = %1.</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_DONE</source>
+            <translation>Operation done</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_EXPORT</source>
+            <translation>Exporting geometry to %1 ...</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_LOADING</source>
+            <translation>Loading %1 ...</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_MIN_DIST</source>
+            <translation>Min Distance not computed</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_NOT_FOR_VTK_VIEWER</source>
+            <translation>Not allowed in VTK viewer</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_NULLSHAPE</source>
+            <translation>Error, null or inappropriate shape !</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_READY</source>
+            <translation>Ready</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_SELECT_EDGE</source>
+            <translation>Select edges and click on Apply</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_SELECT_FACE</source>
+            <translation>Select faces to suppress and click on Ok/Apply</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_SELECT_FIRST</source>
+            <translation>Select main shape first</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_SELECT_SUBSHAPES</source>
+            <translation>Select Sub Shapes</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_SHAPE_IN_STUDY</source>
+            <translation>Main shape must be in the study before</translation>
+        </message>
+        <message>
+            <source>GEOM_QUAD_FACE</source>
+            <translation>Quadrangle Face</translation>
+        </message>
+        <message>
+            <source>GEOM_QUAD_FACE_TITLE</source>
+            <translation>Quadrangle Face Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_RADIUS</source>
+            <translation>Radius :</translation>
+        </message>
+        <message>
+            <source>GEOM_RADIUS_I</source>
+            <translation>Radius %1 :</translation>
+        </message>
+        <message>
+            <source>GEOM_RADIUS_MAJOR</source>
+            <translation>Major radius :</translation>
+        </message>
+        <message>
+            <source>GEOM_RADIUS_MINOR</source>
+            <translation>Minor radius :</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT</source>
+            <translation>Resulting Type</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT_EDGE</source>
+            <translation>Edge</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT_FACE</source>
+            <translation>Face</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT_SHAPE</source>
+            <translation>Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT_SHELL</source>
+            <translation>Shell</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT_SOLID</source>
+            <translation>Solid</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT_VERTEX</source>
+            <translation>Vertex</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT_WIRE</source>
+            <translation>Wire</translation>
+        </message>
+        <message>
+            <source>GEOM_REF_POINT</source>
+            <translation>Point with reference</translation>
+        </message>
+        <message>
+            <source>GEOM_REMOVE_ALL_HOLES</source>
+            <translation>Remove all holes</translation>
+        </message>
+        <message>
+            <source>GEOM_REMOVE_ALL_INT_WIRES</source>
+            <translation>Remove all internal wires</translation>
+        </message>
+        <message>
+            <source>GEOM_REMOVE_HOLES_TITLE</source>
+            <translation>Suppress holes</translation>
+        </message>
+        <message>
+            <source>GEOM_REMOVE_INTERNAL_WIRES_TITLE</source>
+            <translation>Suppress internal wires</translation>
+        </message>
+        <message>
+            <source>GEOM_REMOVE_WEBS</source>
+            <translation>Remove webs</translation>
+        </message>
+        <message>
+            <source>GEOM_REQUIRED_DEGREE</source>
+            <translation>Required degree</translation>
+        </message>
+        <message>
+            <source>GEOM_REQUIRED_NUM_SEGMENTS</source>
+            <translation>Required number of segments</translation>
+        </message>
+        <message>
+            <source>GEOM_REVERSE</source>
+            <translation>Reverse</translation>
+        </message>
+       <message>
+            <source>GEOM_REVERSE_DIRECTION</source>
+            <translation>Reverse Direction</translation>
+        </message>
+        <message>
+            <source>GEOM_REVERSE_PLANE</source>
+            <translation>Reverse the plane normal</translation>
+        </message>
+        <message>
+            <source>GEOM_REVERSE_U</source>
+            <translation>Reverse U</translation>
+        </message>
+        <message>
+            <source>GEOM_REVERSE_V</source>
+            <translation>Reverse V</translation>
+        </message>
+        <message>
+            <source>GEOM_REVERSE_VECTOR</source>
+            <translation>Reverse Vector</translation>
+        </message>
+        <message>
+            <source>GEOM_REVOLUTION</source>
+            <translation>Revolution</translation>
+        </message>
+        <message>
+            <source>GEOM_REVOLUTION_TITLE</source>
+            <translation>Construction By Revolution</translation>
+        </message>
+        <message>
+            <source>GEOM_ROTATION</source>
+            <translation>Rotation</translation>
+        </message>
+        <message>
+            <source>GEOM_ROTATION_TITLE</source>
+            <translation>Rotation Of An Object</translation>
+        </message>
+        <message>
+            <source>GEOM_SCALE</source>
+            <translation>Scale</translation>
+        </message>
+        <message>
+            <source>GEOM_SCALE_FACTOR</source>
+            <translation>Scale Factor :</translation>
+        </message>
+        <message>
+            <source>GEOM_SCALE_TITLE</source>
+            <translation>Scale An Object</translation>
+        </message>
+        <message>
+            <source>GEOM_SECTION</source>
+            <translation>Section</translation>
+        </message>
+        <message>
+            <source>GEOM_SECTION_TITLE</source>
+            <translation>Section Of Two Objects</translation>
+        </message>
+        <message>
+            <source>GEOM_SELECTED_FACE</source>
+            <translation>Selected face</translation>
+        </message>
+        <message>
+            <source>GEOM_SELECTED_OBJECTS</source>
+            <translation>Selected objects</translation>
+        </message>
+        <message>
+            <source>GEOM_SELECTED_SHAPE</source>
+            <translation>Selected shape</translation>
+        </message>
+        <message>
+            <source>GEOM_SELECTION</source>
+            <translation>Selection</translation>
+        </message>
+        <message>
+            <source>GEOM_SET_MATERIALS</source>
+            <translation>Set materials</translation>
+        </message>
+        <message>
+            <source>GEOM_SEWING</source>
+            <translation>Sewing</translation>
+        </message>
+        <message>
+            <source>GEOM_SEWING_TITLE</source>
+            <translation>Topological sewing</translation>
+        </message>
+        <message>
+            <source>GEOM_SHAPE</source>
+            <translation>Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_SHAPEPROCESS_TITLE</source>
+            <translation>Shape Processing</translation>
+        </message>
+        <message>
+            <source>GEOM_SHAPES</source>
+            <translation>Shapes</translation>
+        </message>
+        <message>
+            <source>GEOM_SHELL</source>
+            <translation>Shell</translation>
+        </message>
+        <message>
+            <source>GEOM_SHELLS</source>
+            <translation>Shells</translation>
+        </message>
+        <message>
+            <source>GEOM_SHELL_TITLE</source>
+            <translation>Shell Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_ABS</source>
+            <translation>Absolute</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_ANGLE</source>
+            <translation>Angle</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_ANGLE2</source>
+            <translation>Angle :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_APPLY</source>
+            <translation>Apply</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_ARC</source>
+            <translation>Arc</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_DEST</source>
+            <translation>Destination</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_DIR</source>
+            <translation>Direction</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_DX2</source>
+            <translation>DX :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_DY2</source>
+            <translation>DY :</translation>
+        </message>
+       <message>
+            <source>GEOM_SKETCHER_DZ2</source>
+            <translation>DZ :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_EL</source>
+            <translation>Element Type</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_LENGTH</source>
+            <translation>Length</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_LENGTH2</source>
+            <translation>Length :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_PER</source>
+            <translation>Perpendicular</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_POINT</source>
+            <translation>Point</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_POINT2</source>
+            <translation>Point :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_RADIUS2</source>
+            <translation>Radius :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_REL</source>
+            <translation>Relative</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_SEGMENT</source>
+            <translation>Segment</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_SEL</source>
+            <translation>Selection</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_TAN</source>
+            <translation>Tangent</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_TITLE</source>
+            <translation>Sketch Construction</translation>
+        </message>
+       <message>
+            <source>GEOM_3DSKETCHER_TITLE</source>
+            <translation>3D Sketch Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_TYPE</source>
+            <translation>Type</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_UNDO</source>
+            <translation>Undo</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_VALUES</source>
+            <translation>Values</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_VX2</source>
+            <translation>VX :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_VXVY</source>
+            <translation>VX-VY</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_VY2</source>
+            <translation>VY :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_X</source>
+            <translation>X</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_X2</source>
+            <translation>X :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_X3</source>
+            <translation>Abs. X :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_Y</source>
+            <translation>Y</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_Y2</source>
+            <translation>Y :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_Y3</source>
+            <translation>Abs. Y :</translation>
+        </message>
+       <message>
+            <source>GEOM_SKETCHER_Z2</source>
+            <translation>Z :</translation>
+        </message>
+       <message>
+            <source>GEOM_3DSKETCHER</source>
+            <translation>3D Sketcher</translation>
+        </message>
+       <message>
+            <source>GEOM_COORDINATES_TYPE</source>
+            <translation>Coordinates Type</translation>
+        </message>
+        <message>
+            <source>GEOM_SOLID</source>
+            <translation>Solid</translation>
+        </message>
+        <message>
+            <source>GEOM_SOLID_TITLE</source>
+            <translation>Solid Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_SPHERE</source>
+            <translation>Sphere</translation>
+        </message>
+        <message>
+            <source>GEOM_SPHERE_CR</source>
+            <translation>Center + Radius</translation>
+        </message>
+        <message>
+            <source>GEOM_SPHERE_RO</source>
+            <translation>Radius At Origin</translation>
+        </message>
+        <message>
+            <source>GEOM_SPHERE_TITLE</source>
+            <translation>Sphere Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_SPLINE</source>
+            <translation>Spline</translation>
+        </message>
+        <message>
+            <source>GEOM_SPLINE_TITLE</source>
+            <translation>Spline Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_START_LCS</source>
+            <translation>Start LCS</translation>
+        </message>
+       <message>
+            <source>SELECT_UNPUBLISHED_EDGES</source>
+            <translation>Select unpublished edges</translation>
+        </message>
+        <message>
+            <source>GEOM_STEP</source>
+            <translation>Step :</translation>
+        </message>
+        <message>
+            <source>GEOM_STEP_TITLE</source>
+            <translation>Step value for GUI constructions</translation>
+        </message>
+        <message>
+            <source>GEOM_STEP_U</source>
+            <translation>Step U :</translation>
+        </message>
+        <message>
+            <source>GEOM_STEP_V</source>
+            <translation>Step V :</translation>
+        </message>
+        <message>
+            <source>GEOM_STUDY_LOCKED</source>
+            <translation>The active study is locked and therefore cannot be modified</translation>
+        </message>
+        <message>
+            <source>GEOM_SUBSHAPE_SELECT</source>
+            <translation>Select Sub Shapes</translation>
+        </message>
+        <message>
+            <source>GEOM_SUBSHAPE_TITLE</source>
+            <translation>Sub Shapes Selection</translation>
+        </message>
+        <message>
+            <source>GEOM_SUBSHAPE_TYPE</source>
+            <translation>Sub Shapes Type :</translation>
+        </message>
+        <message>
+            <source>GEOM_SUB_SHAPE</source>
+            <translation>Sub Shapes</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESSHOLE_FACE_SHELL</source>
+            <translation>Face or shell</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESSHOLE_SELECTFACE</source>
+            <translation>Select the face with hole</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESSHOLE_SELECTFACE_END</source>
+            <translation>Select end face (if hole traversing)</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESSHOLE_SELECTWIRE</source>
+            <translation>Select wire on face</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESSHOLE_SELECTWIRE_END</source>
+            <translation>Select end wire (if hole traversing)</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESSHOLE_SELECT_HOLES_ON_FACE</source>
+            <translation>Select hole(s) on the face</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESSHOLE_TITLE</source>
+            <translation>Suppress holes</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESS_RESULT</source>
+            <translation>Suppress Result</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESS_RESULT_INSIDE</source>
+            <translation>Inside</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESS_RESULT_OUTSIDE</source>
+            <translation>Outside</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPRESSFACE</source>
+            <translation>Supress Face</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPRESSFACE_SELECT</source>
+            <translation>Select Faces To Suppress</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPRESSFACE_TITLE</source>
+            <translation>Suppress Faces In An Object</translation>
+        </message>
+        <message>
+            <source>GEOM_SURFACE_CONTINUTY</source>
+            <translation>Surface continuity</translation>
+        </message>
+        <message>
+            <source>GEOM_SURFACE_MODE</source>
+            <translation>Surface mode</translation>
+        </message>
+        <message>
+            <source>GEOM_SURFCONE</source>
+            <translation>Conical Face</translation>
+        </message>
+        <message>
+            <source>GEOM_SURFCYLINDER</source>
+            <translation>Cylindrical Face</translation>
+        </message>
+        <message>
+            <source>GEOM_SURFSPHERE</source>
+            <translation>Spherical Face</translation>
+        </message>
+        <message>
+            <source>GEOM_SURFTORUS</source>
+            <translation>Toroidal Face</translation>
+        </message>
+        <message>
+            <source>GEOM_SameParameter</source>
+            <translation>SameParameter</translation>
+        </message>
+        <message>
+            <source>GEOM_SplitAngle</source>
+            <translation>SplitAngle</translation>
+        </message>
+        <message>
+            <source>GEOM_SplitClosedFaces</source>
+            <translation>SplitClosedFaces</translation>
+        </message>
+        <message>
+            <source>GEOM_SplitContinuity</source>
+            <translation>SplitContinuity</translation>
+        </message>
+        <message>
+            <source>GEOM_TOLERANCE</source>
+            <translation>Tolerance</translation>
+        </message>
+        <message>
+            <source>GEOM_TOLERANCE_CONSTR</source>
+            <translation>Object And Its Tolerances</translation>
+        </message>
+        <message>
+            <source>GEOM_TOLERANCE_EDGE</source>
+            <translation>Edge :</translation>
+        </message>
+        <message>
+            <source>GEOM_TOLERANCE_FACE</source>
+            <translation>Face :</translation>
+        </message>
+        <message>
+            <source>GEOM_TOLERANCE_TITLE</source>
+            <translation>Maximum Tolerance</translation>
+        </message>
+        <message>
+            <source>GEOM_TOLERANCE_VERTEX</source>
+            <translation>Vertex :</translation>
+        </message>
+        <message>
+            <source>GEOM_TOOL_OBJECT</source>
+            <translation>Tool Object</translation>
+        </message>
+        <message>
+            <source>GEOM_TORUS</source>
+            <translation>Torus</translation>
+        </message>
+        <message>
+            <source>GEOM_TORUS_TITLE</source>
+            <translation>Torus Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_TRANSLATION</source>
+            <translation>Translation</translation>
+        </message>
+        <message>
+            <source>GEOM_TRANSLATION_COOR</source>
+            <translation>Translation With Coordinates</translation>
+        </message>
+        <message>
+            <source>GEOM_TRANSLATION_TITLE</source>
+            <translation>Translation Of An Object</translation>
+        </message>
+        <message>
+            <source>GEOM_TRANSPARENCY_OPAQUE</source>
+            <translation>Opaque</translation>
+        </message>
+        <message>
+            <source>GEOM_TRANSPARENCY_TITLE</source>
+            <translation>Transparency</translation>
+        </message>
+        <message>
+            <source>GEOM_TRANSPARENCY_TRANSPARENT</source>
+            <translation>Transparent</translation>
+        </message>
+        <message>
+            <source>GEOM_TRIHEDRON</source>
+            <translation>Trihedron</translation>
+        </message>
+        <message>
+            <source>GEOM_ToBezier</source>
+            <translation>ToBezier</translation>
+        </message>
+        <message>
+            <source>GEOM_VALUE</source>
+            <translation>Value</translation>
+        </message>
+        <message>
+            <source>GEOM_VECTOR</source>
+            <translation>Vector</translation>
+        </message>
+        <message>
+            <source>GEOM_VECTOR_LENGTH</source>
+            <translation>Vector Length :</translation>
+        </message>
+        <message>
+            <source>GEOM_VECTOR_TITLE</source>
+            <translation>Vector Construction</translation>
+        </message>
+        <message>
+            <source>GEOM_VECTOR_U</source>
+            <translation>Vector U</translation>
+        </message>
+        <message>
+            <source>GEOM_VECTOR_V</source>
+            <translation>Vector V</translation>
+        </message>
+        <message>
+            <source>GEOM_VERTEX</source>
+            <translation>Vertex</translation>
+        </message>
+       <message>
+            <source>GEOM_VERTEXES</source>
+            <translation>Vertexes</translation>
+        </message>
+        <message>
+            <source>GEOM_WATER_DENSITY</source>
+            <translation>Water Density :</translation>
+        </message>
+        <message>
+            <source>GEOM_WEIGHT</source>
+            <translation>Weight :</translation>
+        </message>
+       <message>
+            <source>GEOM_WIDTH</source>
+            <translation>Width :</translation>
+        </message>
+        <message>
+            <source>GEOM_WHATIS</source>
+            <translation>Whatis</translation>
+        </message>
+        <message>
+            <source>GEOM_WHATIS_OBJECT</source>
+            <translation>Object And Its Topological Informations</translation>
+        </message>
+        <message>
+            <source>GEOM_WHATIS_TITLE</source>
+            <translation>Whatis Informations</translation>
+        </message>
+        <message>
+            <source>GEOM_WIRE</source>
+            <translation>Wire</translation>
+        </message>
+        <message>
+            <source>GEOM_WIRES</source>
+            <translation>Wire(s)</translation>
+        </message>
+        <message>
+            <source>GEOM_WIRES_TO_REMOVE</source>
+            <translation>Wires to remove</translation>
+        </message>
+        <message>
+            <source>GEOM_WIREZ</source>
+            <translation>Wires</translation>
+        </message>
+        <message>
+            <source>GEOM_WIRE_CONNECT</source>
+            <translation>Wire creation from wires/edges connected</translation>
+        </message>
+        <message>
+            <source>GEOM_WIRE_TITLE</source>
+            <translation>Create A Wire</translation>
+        </message>
+        <message>
+            <source>GEOM_WPLANE</source>
+            <translation>Working Plane</translation>
+        </message>
+        <message>
+            <source>GEOM_WPLANE_FACE</source>
+            <translation>Plane, Planar Face or LCS</translation>
+        </message>
+        <message>
+            <source>GEOM_WPLANE_ORIGIN</source>
+            <translation>Select a plane</translation>
+        </message>
+        <message>
+            <source>GEOM_WPLANE_OXY</source>
+            <translation>OXY</translation>
+        </message>
+        <message>
+            <source>GEOM_WPLANE_OYZ</source>
+            <translation>OYZ</translation>
+        </message>
+        <message>
+            <source>GEOM_WPLANE_OZX</source>
+            <translation>OZX</translation>
+        </message>
+        <message>
+            <source>GEOM_WPLANE_TITLE</source>
+            <translation>Working Plane Selection</translation>
+        </message>
+        <message>
+            <source>GEOM_WPLANE_VECTOR</source>
+            <translation>Select 2 vectors</translation>
+        </message>
+        <message>
+            <source>GEOM_WPLANE_VX</source>
+            <translation>Vector X</translation>
+        </message>
+        <message>
+            <source>GEOM_WPLANE_VZ</source>
+            <translation>Vector Z</translation>
+        </message>
+        <message>
+            <source>GEOM_WRN_RADIUS_NULL</source>
+            <translation>Radius is null</translation>
+        </message>
+        <message>
+            <source>GEOM_WRN_WARNING</source>
+            <translation>Warning</translation>
+        </message>
+        <message>
+            <source>WRN_SHAPE_UNCLOSED</source>
+            <translation>Unable to create solid from unclosed shape %1</translation>
+        </message>
+        <message>
+            <source>GEOM_X</source>
+            <translation>X :</translation>
+        </message>
+        <message>
+            <source>GEOM_Y</source>
+            <translation>Y :</translation>
+        </message>
+        <message>
+            <source>GEOM_Z</source>
+            <translation>Z :</translation>
+        </message>
+        <message>
+            <source>GLUE_NEW_OBJ_NAME</source>
+            <translation>Glue</translation>
+        </message>
+        <message>
+            <source>MEN_ALL_SEL_ONLY</source>
+            <translation>Select All</translation>
+        </message>
+        <message>
+            <source>MEN_ARC</source>
+            <translation>Arc</translation>
+        </message>
+        <message>
+            <source>MEN_ARCHIMEDE</source>
+            <translation>Archimede</translation>
+        </message>
+        <message>
+            <source>MEN_BASIC</source>
+            <translation>Basic</translation>
+        </message>
+        <message>
+            <source>MEN_BASIC_PROPS</source>
+            <translation>Basic Properties</translation>
+        </message>
+        <message>
+            <source>MEN_BLOCKS</source>
+            <translation>Blocks</translation>
+        </message>
+        <message>
+            <source>MEN_BND_BOX</source>
+            <translation>Bounding Box</translation>
+        </message>
+        <message>
+            <source>MEN_BOOLEAN</source>
+            <translation>Boolean</translation>
+        </message>
+        <message>
+            <source>MEN_BOX</source>
+            <translation>Box</translation>
+        </message>
+        <message>
+            <source>MEN_BUILD</source>
+            <translation>Build</translation>
+        </message>
+        <message>
+            <source>MEN_CHAMFER</source>
+            <translation>Chamfer</translation>
+        </message>
+        <message>
+            <source>MEN_CHANGE_ORIENTATION</source>
+            <translation>Change Orientation</translation>
+        </message>
+        <message>
+            <source>MEN_CHECK</source>
+            <translation>Check</translation>
+        </message>
+        <message>
+            <source>MEN_CHECK_COMPOUND</source>
+            <translation>Check Compound of Blocks</translation>
+        </message>
+        <message>
+            <source>MEN_CHECK_FREE_BNDS</source>
+            <translation>Check Free Boundaries</translation>
+        </message>
+        <message>
+            <source>MEN_CHECK_FREE_FACES</source>
+            <translation>Check Free Faces</translation>
+        </message>
+        <message>
+            <source>MEN_CHECK_GEOMETRY</source>
+            <translation>Check Geometry</translation>
+        </message>
+        <message>
+            <source>MEN_CIRCLE</source>
+            <translation>Circle</translation>
+        </message>
+        <message>
+            <source>MEN_CLIPPING</source>
+            <translation>Clipping Range</translation>
+        </message>
+        <message>
+            <source>MEN_CLOSE_CONTOUR</source>
+            <translation>Close Contour</translation>
+        </message>
+        <message>
+            <source>MEN_COMMON</source>
+            <translation>Common</translation>
+        </message>
+        <message>
+            <source>MEN_COMPOUND</source>
+            <translation>Compound</translation>
+        </message>
+        <message>
+            <source>MEN_COMPOUND_SEL_ONLY</source>
+            <translation>Compound</translation>
+        </message>
+        <message>
+            <source>MEN_CONE</source>
+            <translation>Cone</translation>
+        </message>
+        <message>
+            <source>MEN_CURVE</source>
+            <translation>Curve</translation>
+        </message>
+        <message>
+            <source>MEN_CUT</source>
+            <translation>Cut</translation>
+        </message>
+        <message>
+            <source>MEN_CYLINDER</source>
+            <translation>Cylinder</translation>
+        </message>
+        <message>
+            <source>MEN_DELETE</source>
+            <translation>Delete</translation>
+        </message>
+        <message>
+            <source>MEN_DIMENSIONS</source>
+            <translation>Dimensions</translation>
+        </message>
+        <message>
+            <source>MEN_DISPLAY</source>
+            <translation>Show</translation>
+        </message>
+       <message>
+            <source>MEN_DISK</source>
+            <translation>Disk</translation>
+        </message>
+        <message>
+            <source>MEN_DISPLAY_ALL</source>
+            <translation>Show All</translation>
+        </message>
+        <message>
+            <source>MEN_DISPLAY_MODE</source>
+            <translation>Display Mode</translation>
+        </message>
+        <message>
+            <source>MEN_DISPLAY_ONLY</source>
+            <translation>Show Only</translation>
+        </message>
+        <message>
+            <source>MEN_EDGE</source>
+            <translation>Edge</translation>
+        </message>
+        <message>
+            <source>MEN_EDGE_SEL_ONLY</source>
+            <translation>Edge</translation>
+        </message>
+        <message>
+            <source>MEN_EDIT</source>
+            <translation>Edit</translation>
+        </message>
+        <message>
+            <source>MEN_ELLIPSE</source>
+            <translation>Ellipse</translation>
+        </message>
+        <message>
+            <source>MEN_ERASE</source>
+            <translation>Hide</translation>
+        </message>
+        <message>
+            <source>MEN_ERASE_ALL</source>
+            <translation>Hide All</translation>
+        </message>
+        <message>
+            <source>MEN_EXPLODE</source>
+            <translation>Explode</translation>
+        </message>
+        <message>
+            <source>MEN_EXPLODE_BLOCKS</source>
+            <translation>Explode on Blocks</translation>
+        </message>
+        <message>
+            <source>MEN_EXPORT</source>
+            <translation>Export...</translation>
+        </message>
+        <message>
+            <source>MEN_EXTRUSION</source>
+            <translation>Extrusion</translation>
+        </message>
+        <message>
+            <source>MEN_FACE</source>
+            <translation>Face</translation>
+        </message>
+        <message>
+            <source>MEN_FACE_SEL_ONLY</source>
+            <translation>Face</translation>
+        </message>
+        <message>
+            <source>MEN_FILE</source>
+            <translation>File</translation>
+        </message>
+        <message>
+            <source>MEN_FILLET</source>
+            <translation>Fillet</translation>
+        </message>
+       <message>
+            <source>MEN_FILLET_2D</source>
+            <translation>Fillet 2D</translation>
+        </message>
+        <message>
+            <source>MEN_FILLING</source>
+            <translation>Filling</translation>
+        </message>
+        <message>
+            <source>MEN_FUSE</source>
+            <translation>Fuse</translation>
+        </message>
+        <message>
+            <source>MEN_GENERATION</source>
+            <translation>Generation</translation>
+        </message>
+        <message>
+            <source>MEN_GLUE_FACES</source>
+            <translation>Glue Faces</translation>
+        </message>
+        <message>
+            <source>MEN_GROUP</source>
+            <translation>Group</translation>
+        </message>
+        <message>
+            <source>MEN_GROUP_CREATE</source>
+            <translation>Create</translation>
+        </message>
+        <message>
+            <source>MEN_GROUP_EDIT</source>
+            <translation>Edit</translation>
+        </message>
+        <message>
+            <source>MEN_RELOAD_IMPORTED</source>
+            <translation>Reload From Disk</translation>
+        </message>
+        <message>
+            <source>MEN_HEX_SOLID</source>
+            <translation>Hexahedral Solid</translation>
+        </message>
+        <message>
+            <source>MEN_IMPORT</source>
+            <translation>Import...</translation>
+        </message>
+        <message>
+            <source>MEN_INERTIA</source>
+            <translation>Inertia</translation>
+        </message>
+        <message>
+            <source>MEN_ISOS</source>
+            <translation>Isos</translation>
+        </message>
+        <message>
+            <source>MEN_LINE</source>
+            <translation>Line</translation>
+        </message>
+        <message>
+            <source>MEN_LOCAL_CS</source>
+            <translation>Local Coordinate System</translation>
+        </message>
+        <message>
+            <source>MEN_MASS_CENTER</source>
+            <translation>Center of Mass</translation>
+        </message>
+        <message>
+            <source>MEN_MEASURES</source>
+            <translation>Measures</translation>
+        </message>
+        <message>
+            <source>MEN_MIN_DIST</source>
+            <translation>Min Distance</translation>
+        </message>
+        <message>
+            <source>MEN_MIRROR</source>
+            <translation>Mirror Image</translation>
+        </message>
+        <message>
+            <source>MEN_MODIFY_LOCATION</source>
+            <translation>Modify the Location</translation>
+        </message>
+        <message>
+            <source>MEN_MUL_ROTATION</source>
+            <translation>Multi-Rotation</translation>
+        </message>
+        <message>
+            <source>MEN_MUL_TRANSFORM</source>
+            <translation>Multi-Transformation</translation>
+        </message>
+        <message>
+            <source>MEN_MUL_TRANSLATION</source>
+            <translation>Multi-Translation</translation>
+        </message>
+        <message>
+            <source>MEN_NEW_ENTITY</source>
+            <translation>New Entity</translation>
+        </message>
+        <message>
+            <source>MEN_OFFSET</source>
+            <translation>Offset Surface</translation>
+        </message>
+        <message>
+            <source>MEN_OPERATIONS</source>
+            <translation>Operations</translation>
+        </message>
+        <message>
+            <source>MEN_PARTITION</source>
+            <translation>Partition</translation>
+        </message>
+        <message>
+            <source>MEN_PIPE</source>
+            <translation>Extrusion Along a Path</translation>
+        </message>
+        <message>
+            <source>MEN_PLANE</source>
+            <translation>Plane</translation>
+        </message>
+        <message>
+            <source>MEN_POINT</source>
+            <translation>Point</translation>
+        </message>
+        <message>
+            <source>MEN_POINT_COORDS</source>
+            <translation>Point Coordinates</translation>
+        </message>
+        <message>
+            <source>MEN_POINT_ON_EDGE</source>
+            <translation>Add Point on Edge</translation>
+        </message>
+        <message>
+            <source>MEN_POP_COLOR</source>
+            <translation>Color</translation>
+        </message>
+        <message>
+            <source>MEN_POP_CREATE_GROUP</source>
+            <translation>Create Group</translation>
+        </message>
+        <message>
+            <source>MEN_POP_ISOS</source>
+            <translation>Isos</translation>
+        </message>
+        <message>
+            <source>MEN_POP_RENAME</source>
+            <translation>Rename</translation>
+        </message>
+        <message>
+            <source>MEN_POP_SHADING</source>
+            <translation>Shading</translation>
+        </message>
+        <message>
+            <source>MEN_POP_TRANSPARENCY</source>
+            <translation>Transparency</translation>
+        </message>
+        <message>
+            <source>MEN_POP_WIREFRAME</source>
+            <translation>Wireframe</translation>
+        </message>
+        <message>
+            <source>MEN_PREFERENCES</source>
+            <translation>Preferences</translation>
+        </message>
+        <message>
+            <source>MEN_PREFERENCES_GEOM</source>
+            <translation>Geometry</translation>
+        </message>
+        <message>
+            <source>MEN_PRIMITIVES</source>
+            <translation>Primitives</translation>
+        </message>
+        <message>
+            <source>MEN_PROPAGATE</source>
+            <translation>Propagate</translation>
+        </message>
+        <message>
+            <source>MEN_Q_FACE</source>
+            <translation>Quadrangle Face</translation>
+        </message>
+        <message>
+            <source>MEN_REPAIR</source>
+            <translation>Repair</translation>
+        </message>
+        <message>
+            <source>MEN_REVOLUTION</source>
+            <translation>Revolution</translation>
+        </message>
+        <message>
+            <source>MEN_ROTATION</source>
+            <translation>Rotation</translation>
+        </message>
+        <message>
+            <source>MEN_SCALE</source>
+            <translation>Scale Transform</translation>
+        </message>
+        <message>
+            <source>MEN_SECTION</source>
+            <translation>Section</translation>
+        </message>
+        <message>
+            <source>MEN_SELECT_ONLY</source>
+            <translation>Select Only</translation>
+        </message>
+        <message>
+            <source>MEN_SEWING</source>
+            <translation>Sewing</translation>
+        </message>
+        <message>
+            <source>MEN_SHADING</source>
+            <translation>Shading</translation>
+        </message>
+        <message>
+            <source>MEN_SHADING_COLOR</source>
+            <translation>Shading Color</translation>
+        </message>
+        <message>
+            <source>MEN_SHAPE_PROCESS</source>
+            <translation>Shape Processing</translation>
+        </message>
+        <message>
+            <source>MEN_SHELL</source>
+            <translation>Shell</translation>
+        </message>
+        <message>
+            <source>MEN_SHELL_SEL_ONLY</source>
+            <translation>Shell</translation>
+        </message>
+        <message>
+            <source>MEN_SKETCH</source>
+            <translation>Sketch</translation>
+        </message>
+       <message>
+            <source>MEN_3DSKETCH</source>
+            <translation>3D Sketch</translation>
+        </message>
+        <message>
+            <source>MEN_SOLID</source>
+            <translation>Solid</translation>
+        </message>
+        <message>
+            <source>MEN_SOLID_SEL_ONLY</source>
+            <translation>Solid</translation>
+        </message>
+        <message>
+            <source>MEN_SPHERE</source>
+            <translation>Sphere</translation>
+        </message>
+        <message>
+            <source>MEN_STEP_VALUE</source>
+            <translation>Step Value</translation>
+        </message>
+        <message>
+            <source>MEN_SUPPERSS_HOLES</source>
+            <translation>Suppress Holes</translation>
+        </message>
+        <message>
+            <source>MEN_SUPPRESS_FACES</source>
+            <translation>Suppress Faces</translation>
+        </message>
+        <message>
+            <source>MEN_SUPPRESS_INT_WIRES</source>
+            <translation>Suppress Internal Wires</translation>
+        </message>
+        <message>
+            <source>MEN_TOLERANCE</source>
+            <translation>Compute Tolerance</translation>
+        </message>
+        <message>
+            <source>MEN_TOOLS</source>
+            <translation>Tools</translation>
+        </message>
+        <message>
+            <source>MEN_TORUS</source>
+            <translation>Torus</translation>
+        </message>
+        <message>
+            <source>MEN_TRANSFORMATION</source>
+            <translation>Transformation</translation>
+        </message>
+        <message>
+            <source>MEN_TRANSLATION</source>
+            <translation>Translation</translation>
+        </message>
+        <message>
+            <source>MEN_VECTOR</source>
+            <translation>Vector</translation>
+        </message>
+        <message>
+            <source>MEN_VERTEX_SEL_ONLY</source>
+            <translation>Vertex</translation>
+        </message>
+        <message>
+            <source>MEN_VIEW</source>
+            <translation>View</translation>
+        </message>
+        <message>
+            <source>MEN_WHAT_IS</source>
+            <translation>What is</translation>
+        </message>
+        <message>
+            <source>MEN_WIRE</source>
+            <translation>Wire</translation>
+        </message>
+        <message>
+            <source>MEN_WIREFRAME</source>
+            <translation>Wireframe</translation>
+        </message>
+        <message>
+            <source>MEN_WIRE_SEL_ONLY</source>
+            <translation>Wire</translation>
+        </message>
+        <message>
+            <source>MEN_WORK_PLANE</source>
+            <translation>Working Plane</translation>
+        </message>
+        <message>
+            <source>NAME_LBL</source>
+            <translation>Name: </translation>
+        </message>
+        <message>
+            <source>NON_GEOM_OBJECTS_SELECTED</source>
+            <translation>There are objects selected which do not belong to %1 component.</translation>
+        </message>
+        <message>
+            <source>PREF_DISPLAY_MODE</source>
+            <translation>Default display mode</translation>
+        </message>
+        <message>
+            <source>PREF_FREE_BOUND_COLOR</source>
+            <translation>Color of free boundaries</translation>
+        </message>
+        <message>
+            <source>PREF_GROUP_GENERAL</source>
+            <translation>General</translation>
+        </message>
+        <message>
+            <source>PREF_GROUP_OCCVIEWER</source>
+            <translation>OCC Viewer 3d</translation>
+        </message>
+        <message>
+            <source>PREF_GROUP_VERTEX</source>
+            <translation>Marker of Points</translation>
+        </message>
+        <message>
+            <source>PREF_ISOS_COLOR</source>
+            <translation>Color of isolines</translation>
+        </message>
+        <message>
+            <source>PREF_LINE_COLOR</source>
+            <translation>Color of edges, vectors, wires</translation>
+        </message>
+        <message>
+            <source>PREF_MARKER_SCALE</source>
+            <translation>Size</translation>
+        </message>
+        <message>
+            <source>PREF_POINT_COLOR</source>
+            <translation>Color of points</translation>
+        </message>
+        <message>
+            <source>PREF_SHADING_COLOR</source>
+            <translation>Default shading color</translation>
+        </message>
+        <message>
+            <source>PREF_STEP_VALUE</source>
+            <translation>Step value for spin boxes</translation>
+        </message>
+        <message>
+            <source>PREF_TAB_SETTINGS</source>
+            <translation>Settings</translation>
+        </message>
+        <message>
+            <source>PREF_TYPE_OF_MARKER</source>
+            <translation>Type</translation>
+        </message>
+        <message>
+            <source>PREF_WIREFRAME_COLOR</source>
+            <translation>Default wireframe color</translation>
+        </message>
+        <message>
+            <source>PROCESS_SHAPE_NEW_OBJ_NAME</source>
+            <translation>ProcessShape</translation>
+        </message>
+        <message>
+            <source>REMOVE_HOLES_NEW_OBJ_NAME</source>
+            <translation>SupressHoles</translation>
+        </message>
+        <message>
+            <source>REMOVE_INT_WIRES_NEW_OBJ_NAME</source>
+            <translation>RemoveIntWires</translation>
+        </message>
+        <message>
+            <source>SEWING_NEW_OBJ_NAME</source>
+            <translation>Sewing</translation>
+        </message>
+        <message>
+            <source>STB_ALL_SEL_ONLY</source>
+            <translation>Select all Objects</translation>
+        </message>
+        <message>
+            <source>STB_ARC</source>
+            <translation>Create an arc</translation>
+        </message>
+        <message>
+            <source>STB_ARCHIMEDE</source>
+            <translation>Archimede</translation>
+        </message>
+        <message>
+            <source>STB_BASIC_PROPS</source>
+            <translation>Basic properties</translation>
+        </message>
+        <message>
+            <source>STB_BND_BOX</source>
+            <translation>Compute bounding box</translation>
+        </message>
+        <message>
+            <source>STB_BOX</source>
+            <translation>Create a box</translation>
+        </message>
+        <message>
+            <source>STB_CHAMFER</source>
+            <translation>Chamfer</translation>
+        </message>
+        <message>
+            <source>STB_CHANGE_ORIENTATION</source>
+            <translation>Change orientation</translation>
+        </message>
+        <message>
+            <source>STB_CHECK</source>
+            <translation>Check</translation>
+        </message>
+        <message>
+            <source>STB_CHECK_COMPOUND</source>
+            <translation>Check compound of blocks</translation>
+        </message>
+        <message>
+            <source>STB_CHECK_FREE_BNDS</source>
+            <translation>Check free boundaries</translation>
+        </message>
+        <message>
+            <source>STB_CHECK_FREE_FACES</source>
+            <translation>Check free faces</translation>
+        </message>
+        <message>
+            <source>STB_CHECK_GEOMETRY</source>
+            <translation>Check Geometry</translation>
+        </message>
+        <message>
+            <source>STB_CIRCLE</source>
+            <translation>Create a circle</translation>
+        </message>
+        <message>
+            <source>STB_CLIPPING</source>
+            <translation>Clipping range</translation>
+        </message>
+        <message>
+            <source>STB_CLOSE_CONTOUR</source>
+            <translation>Perform close contour</translation>
+        </message>
+        <message>
+            <source>STB_COMMON</source>
+            <translation>Common</translation>
+        </message>
+        <message>
+            <source>STB_COMPOUND</source>
+            <translation>Build a compound</translation>
+        </message>
+        <message>
+            <source>STB_COMPOUND_SEL_ONLY</source>
+            <translation>Select only a Compounds</translation>
+        </message>
+        <message>
+            <source>STB_CONE</source>
+            <translation>Create a cone</translation>
+        </message>
+        <message>
+            <source>STB_CURVE</source>
+            <translation>Create a curve</translation>
+        </message>
+        <message>
+            <source>STB_CUT</source>
+            <translation>Cut</translation>
+        </message>
+        <message>
+            <source>STB_CYLINDER</source>
+            <translation>Create a cylinder</translation>
+        </message>
+        <message>
+            <source>STB_DELETE</source>
+            <translation>Delete object</translation>
+        </message>
+       <message>
+            <source>STB_DISK</source>
+            <translation>Create a disk</translation>
+        </message>
+        <message>
+            <source>STB_DISPLAY</source>
+            <translation>Show object(s)</translation>
+        </message>
+        <message>
+            <source>STB_DISPLAY_ALL</source>
+            <translation>Show all</translation>
+        </message>
+        <message>
+            <source>STB_DISPLAY_ONLY</source>
+            <translation>Show only</translation>
+        </message>
+        <message>
+            <source>STB_EDGE</source>
+            <translation>Build an edge</translation>
+        </message>
+        <message>
+            <source>STB_EDGE_SEL_ONLY</source>
+            <translation>Select only a Edges</translation>
+        </message>
+        <message>
+            <source>STB_ELLIPSE</source>
+            <translation>Create an ellipse</translation>
+        </message>
+        <message>
+            <source>STB_ERASE</source>
+            <translation>Hide object(s)</translation>
+        </message>
+        <message>
+            <source>STB_ERASE_ALL</source>
+            <translation>Hide all</translation>
+        </message>
+        <message>
+            <source>STB_EXPLODE</source>
+            <translation>Explode</translation>
+        </message>
+        <message>
+            <source>STB_EXPLODE_BLOCKS</source>
+            <translation>Explode on Blocks</translation>
+        </message>
+        <message>
+            <source>STB_EXPORT</source>
+            <translation>Export geometry to BREP file</translation>
+        </message>
+        <message>
+            <source>STB_EXTRUSION</source>
+            <translation>Create an extrusion</translation>
+        </message>
+        <message>
+            <source>STB_FACE</source>
+            <translation>Build a face</translation>
+        </message>
+        <message>
+            <source>STB_FACE_SEL_ONLY</source>
+            <translation>Select only a Faces</translation>
+        </message>
+        <message>
+            <source>STB_FILLET</source>
+            <translation>Fillet</translation>
+        </message>
+        <message>
+            <source>STB_FILLING</source>
+            <translation>Create a filling</translation>
+        </message>
+        <message>
+            <source>STB_FUSE</source>
+            <translation>Fuse</translation>
+        </message>
+        <message>
+            <source>STB_GLUE_FACES</source>
+            <translation>Perform glue faces</translation>
+        </message>
+        <message>
+            <source>STB_GROUP_CREATE</source>
+            <translation>Create a group</translation>
+        </message>
+        <message>
+            <source>STB_GROUP_EDIT</source>
+            <translation>Edit a group</translation>
+        </message>
+        <message>
+            <source>STB_RELOAD_IMPORTED</source>
+            <translation>Reload imported shape from its original place on disk</translation>
+        </message>
+        <message>
+            <source>STB_HEX_SOLID</source>
+            <translation>Hexahedral Solid</translation>
+        </message>
+        <message>
+            <source>STB_IMPORT</source>
+            <translation>Import geometry from BREP file</translation>
+        </message>
+        <message>
+            <source>STB_INERTIA</source>
+            <translation>Compute intertia</translation>
+        </message>
+        <message>
+            <source>STB_ISOS</source>
+            <translation>Set number of isolines</translation>
+        </message>
+        <message>
+            <source>STB_LINE</source>
+            <translation>Create a line</translation>
+        </message>
+        <message>
+            <source>STB_LOCAL_CS</source>
+            <translation>Create a local coordinate system</translation>
+        </message>
+        <message>
+            <source>STB_MASS_CENTER</source>
+            <translation>Compute center of mass</translation>
+        </message>
+        <message>
+            <source>STB_MIN_DIST</source>
+            <translation>Compute minimum distance</translation>
+        </message>
+        <message>
+            <source>STB_MIRROR</source>
+            <translation>Mirror image</translation>
+        </message>
+        <message>
+            <source>STB_MODIFY_LOCATION</source>
+            <translation>Modify the Location</translation>
+        </message>
+        <message>
+            <source>STB_MUL_ROTATION</source>
+            <translation>Multi-Rotation</translation>
+        </message>
+        <message>
+            <source>STB_MUL_TRANSFORM</source>
+            <translation>Multi-transformation</translation>
+        </message>
+        <message>
+            <source>STB_MUL_TRANSLATION</source>
+            <translation>Multi-Translation</translation>
+        </message>
+        <message>
+            <source>STB_OFFSET</source>
+            <translation>Offset surface</translation>
+        </message>
+        <message>
+            <source>STB_PARTITION</source>
+            <translation>Partition</translation>
+        </message>
+        <message>
+            <source>STB_PIPE</source>
+            <translation>Create a shape by Extrusion along a path</translation>
+        </message>
+        <message>
+            <source>STB_PLANE</source>
+            <translation>Create a plane</translation>
+        </message>
+        <message>
+            <source>STB_POINT</source>
+            <translation>Create a point</translation>
+        </message>
+        <message>
+            <source>STB_POINT_COORDS</source>
+            <translation>Point coordinates</translation>
+        </message>
+        <message>
+            <source>STB_POINT_ON_EDGE</source>
+            <translation>Add point on edge</translation>
+        </message>
+        <message>
+            <source>STB_POP_COLOR</source>
+            <translation>Color</translation>
+        </message>
+        <message>
+            <source>STB_POP_CREATE_GROUP</source>
+            <translation>Create Group</translation>
+        </message>
+        <message>
+            <source>STB_POP_ISOS</source>
+            <translation>Isolines</translation>
+        </message>
+        <message>
+            <source>STB_POP_RENAME</source>
+            <translation>Rename</translation>
+        </message>
+        <message>
+            <source>STB_POP_SHADING</source>
+            <translation>Shading</translation>
+        </message>
+        <message>
+            <source>STB_POP_TRANSPARENCY</source>
+            <translation>Transparency</translation>
+        </message>
+        <message>
+            <source>STB_POP_WIREFRAME</source>
+            <translation>Wireframe</translation>
+        </message>
+        <message>
+            <source>STB_PROPAGATE</source>
+            <translation>Propagate</translation>
+        </message>
+        <message>
+            <source>STB_Q_FACE</source>
+            <translation>Quadrangle Face</translation>
+        </message>
+        <message>
+            <source>STB_REVOLUTION</source>
+            <translation>Create a revolution</translation>
+        </message>
+        <message>
+            <source>STB_ROTATION</source>
+            <translation>Rotation</translation>
+        </message>
+        <message>
+            <source>STB_SCALE</source>
+            <translation>Scale transform</translation>
+        </message>
+        <message>
+            <source>STB_SECTION</source>
+            <translation>Section</translation>
+        </message>
+        <message>
+            <source>STB_SEWING</source>
+            <translation>Perform sewing</translation>
+        </message>
+        <message>
+            <source>STB_SHADING</source>
+            <translation>Shading</translation>
+        </message>
+        <message>
+            <source>STB_SHADING_COLOR</source>
+            <translation>Set shading color</translation>
+        </message>
+        <message>
+            <source>STB_SHAPE_PROCESS</source>
+            <translation>Perform shape processing </translation>
+        </message>
+        <message>
+            <source>STB_SHELL</source>
+            <translation>Build a shell</translation>
+        </message>
+        <message>
+            <source>STB_SHELL_SEL_ONLY</source>
+            <translation>Select only a Shells</translation>
+        </message>
+        <message>
+            <source>STB_SKETCH</source>
+            <translation>Sketch</translation>
+        </message>
+        <message>
+            <source>STB_SOLID</source>
+            <translation>Build a solid</translation>
+        </message>
+        <message>
+            <source>STB_SOLID_SEL_ONLY</source>
+            <translation>Select only a Solids</translation>
+        </message>
+        <message>
+            <source>STB_SPHERE</source>
+            <translation>Create a sphere</translation>
+        </message>
+        <message>
+            <source>STB_STEP_VALUE</source>
+            <translation>Set step value</translation>
+        </message>
+        <message>
+            <source>STB_SUPPERSS_HOLES</source>
+            <translation>Perform suppress holes</translation>
+        </message>
+        <message>
+            <source>STB_SUPPRESS_FACES</source>
+            <translation>Perform suppress faces</translation>
+        </message>
+        <message>
+            <source>STB_SUPPRESS_INT_WIRES</source>
+            <translation>Perform suppress internal wires</translation>
+        </message>
+        <message>
+            <source>STB_TOLERANCE</source>
+            <translation>Compute tolerance</translation>
+        </message>
+        <message>
+            <source>STB_TORUS</source>
+            <translation>Create a torus</translation>
+        </message>
+        <message>
+            <source>STB_TRANSLATION</source>
+            <translation>Translation</translation>
+        </message>
+        <message>
+            <source>STB_VECTOR</source>
+            <translation>Create a vector</translation>
+        </message>
+        <message>
+            <source>STB_VERTEX_SEL_ONLY</source>
+            <translation>Select only a Points</translation>
+        </message>
+        <message>
+            <source>STB_WHAT_IS</source>
+            <translation>What is</translation>
+        </message>
+        <message>
+            <source>STB_WIRE</source>
+            <translation>Build a wire</translation>
+        </message>
+        <message>
+            <source>STB_WIRE_SEL_ONLY</source>
+            <translation>Select only a Wires</translation>
+        </message>
+        <message>
+            <source>STB_WORK_PLANE</source>
+            <translation>Create a working plane</translation>
+        </message>
+        <message>
+            <source>SUPPRESS_RESULT</source>
+            <translation>Suppress Result</translation>
+        </message>
+        <message>
+            <source>SUPRESS_FACE_NEW_OBJ_NAME</source>
+            <translation>SupressFaces</translation>
+        </message>
+        <message>
+            <source>ShHealOper_ErrorExecution_msg</source>
+            <translation>Shape Healing algorithm failed</translation>
+        </message>
+        <message>
+            <source>ShHealOper_InvalidParameters_msg</source>
+            <translation>Incorrect parameters for Shape Healing algorithm</translation>
+        </message>
+        <message>
+            <source>ShHealOper_NotError_msg</source>
+            <translation>Shape Healing algorithm has done no modification of the original shape</translation>
+        </message>
+        <message>
+            <source>TLT_RENAME</source>
+            <translation>Rename</translation>
+        </message>
+        <message>
+            <source>TOM_O</source>
+            <translation>O</translation>
+        </message>
+        <message>
+            <source>TOM_O_PLUS</source>
+            <translation>+ in O</translation>
+        </message>
+        <message>
+            <source>TOM_O_POINT</source>
+            <translation>. in O</translation>
+        </message>
+        <message>
+            <source>TOM_O_STAR</source>
+            <translation>* in O</translation>
+        </message>
+        <message>
+            <source>TOM_O_X</source>
+            <translation>X in O</translation>
+        </message>
+        <message>
+            <source>TOM_PLUS</source>
+            <translation>+</translation>
+        </message>
+        <message>
+            <source>TOM_POINT</source>
+            <translation>.</translation>
+        </message>
+        <message>
+            <source>TOM_STAR</source>
+            <translation>*</translation>
+        </message>
+        <message>
+            <source>TOM_X</source>
+            <translation>X</translation>
+        </message>
+        <message>
+            <source>TOOL_BASIC</source>
+            <translation>Basic</translation>
+        </message>
+        <message>
+            <source>TOOL_BOOLEAN</source>
+            <translation>Boolean operations</translation>
+        </message>
+        <message>
+            <source>TOOL_GENERATION</source>
+            <translation>Generation</translation>
+        </message>
+        <message>
+            <source>TOOL_PRIMITIVES</source>
+            <translation>Primitives</translation>
+        </message>
+        <message>
+            <source>TOOL_TRANSFORMATION</source>
+            <translation>Transformation</translation>
+        </message>
+        <message>
+            <source>TOP_ARC</source>
+            <translation>Create an arc</translation>
+        </message>
+        <message>
+            <source>TOP_ARCHIMEDE</source>
+            <translation>Archimede</translation>
+        </message>
+        <message>
+            <source>TOP_BASIC_PROPS</source>
+            <translation>Basic properties</translation>
+        </message>
+        <message>
+            <source>TOP_BND_BOX</source>
+            <translation>Compute bounding box</translation>
+        </message>
+        <message>
+            <source>TOP_BOX</source>
+            <translation>Create a box</translation>
+        </message>
+        <message>
+            <source>TOP_CHAMFER</source>
+            <translation>Chamfer</translation>
+        </message>
+        <message>
+            <source>TOP_CHANGE_ORIENTATION</source>
+            <translation>Change orientation</translation>
+        </message>
+        <message>
+            <source>TOP_CHECK</source>
+            <translation>Check</translation>
+        </message>
+        <message>
+            <source>TOP_CHECK_COMPOUND</source>
+            <translation>Check compound of blocks</translation>
+        </message>
+        <message>
+            <source>TOP_CHECK_FREE_BNDS</source>
+            <translation>Check free boundaries</translation>
+        </message>
+        <message>
+            <source>TOP_CHECK_FREE_FACES</source>
+            <translation>Check free faces</translation>
+        </message>
+        <message>
+            <source>TOP_CHECK_GEOMETRY</source>
+            <translation>Check Geometry</translation>
+        </message>
+        <message>
+            <source>TOP_CIRCLE</source>
+            <translation>Create a circle</translation>
+        </message>
+        <message>
+            <source>TOP_CLIPPING</source>
+            <translation>Clipping range</translation>
+        </message>
+        <message>
+            <source>TOP_CLOSE_CONTOUR</source>
+            <translation>Perform close contour</translation>
+        </message>
+        <message>
+            <source>TOP_COMMON</source>
+            <translation>Common</translation>
+        </message>
+        <message>
+            <source>TOP_COMPOUND</source>
+            <translation>Build a compound</translation>
+        </message>
+        <message>
+            <source>TOP_CONE</source>
+            <translation>Create a cone</translation>
+        </message>
+        <message>
+            <source>TOP_CURVE</source>
+            <translation>Create a curve</translation>
+        </message>
+        <message>
+            <source>TOP_CUT</source>
+            <translation>Cut</translation>
+        </message>
+        <message>
+            <source>TOP_CYLINDER</source>
+            <translation>Create a cylinder</translation>
+        </message>
+        <message>
+            <source>TOP_DELETE</source>
+            <translation>Delete object</translation>
+        </message>
+       <message>
+            <source>TOP_DISK</source>
+            <translation>Build a Disk</translation>
+        </message>
+        <message>
+            <source>TOP_DISPLAY</source>
+            <translation>Show</translation>
+        </message>
+        <message>
+            <source>TOP_DISPLAY_ALL</source>
+            <translation>Show all</translation>
+        </message>
+        <message>
+            <source>TOP_DISPLAY_ONLY</source>
+            <translation>Show only</translation>
+        </message>
+        <message>
+            <source>TOP_EDGE</source>
+            <translation>Build an edge</translation>
+        </message>
+        <message>
+            <source>TOP_ELLIPSE</source>
+            <translation>Create an ellipse</translation>
+        </message>
+        <message>
+            <source>TOP_ERASE</source>
+            <translation>Hide</translation>
+        </message>
+        <message>
+            <source>TOP_ERASE_ALL</source>
+            <translation>Hide all</translation>
+        </message>
+        <message>
+            <source>TOP_EXPLODE</source>
+            <translation>Explode</translation>
+        </message>
+        <message>
+            <source>TOP_EXPLODE_BLOCKS</source>
+            <translation>Explode on Blocks</translation>
+        </message>
+        <message>
+            <source>TOP_EXPORT</source>
+            <translation>Export geometry to BREP file</translation>
+        </message>
+        <message>
+            <source>TOP_EXTRUSION</source>
+            <translation>Create an extrusion</translation>
+        </message>
+        <message>
+            <source>TOP_FACE</source>
+            <translation>Build a face</translation>
+        </message>
+        <message>
+            <source>TOP_FILLET</source>
+            <translation>Fillet</translation>
+        </message>
+        <message>
+            <source>TOP_FILLING</source>
+            <translation>Create a filling</translation>
+        </message>
+        <message>
+            <source>TOP_FUSE</source>
+            <translation>Fuse</translation>
+        </message>
+        <message>
+            <source>TOP_GLUE_FACES</source>
+            <translation>Perform glue faces</translation>
+        </message>
+        <message>
+            <source>TOP_GROUP_CREATE</source>
+            <translation>Create a group</translation>
+        </message>
+        <message>
+            <source>TOP_GROUP_EDIT</source>
+            <translation>Edit a group</translation>
+        </message>
+        <message>
+            <source>TOP_HEX_SOLID</source>
+            <translation>Hexahedral Solid</translation>
+        </message>
+        <message>
+            <source>TOP_IMPORT</source>
+            <translation>Import geometry from BREP file</translation>
+        </message>
+        <message>
+            <source>TOP_INERTIA</source>
+            <translation>Compute intertia</translation>
+        </message>
+        <message>
+            <source>TOP_ISOS</source>
+            <translation>Set number of isolines</translation>
+        </message>
+        <message>
+            <source>TOP_LINE</source>
+            <translation>Create a line</translation>
+        </message>
+        <message>
+            <source>TOP_LOCAL_CS</source>
+            <translation>Create a local coordinate system</translation>
+        </message>
+        <message>
+            <source>TOP_MASS_CENTER</source>
+            <translation>Compute center of mass</translation>
+        </message>
+        <message>
+            <source>TOP_MIN_DIST</source>
+            <translation>Compute minimum distance</translation>
+        </message>
+        <message>
+            <source>TOP_MIRROR</source>
+            <translation>Mirror image</translation>
+        </message>
+        <message>
+            <source>TOP_MODIFY_LOCATION</source>
+            <translation>Modify the Location</translation>
+        </message>
+        <message>
+            <source>TOP_MUL_ROTATION</source>
+            <translation>Multi-Rotation</translation>
+        </message>
+        <message>
+            <source>TOP_MUL_TRANSFORM</source>
+            <translation>Multi-transformation</translation>
+        </message>
+        <message>
+            <source>TOP_MUL_TRANSLATION</source>
+            <translation>Multi-Translation</translation>
+        </message>
+        <message>
+            <source>TOP_OFFSET</source>
+            <translation>Offset surface</translation>
+        </message>
+        <message>
+            <source>TOP_PARTITION</source>
+            <translation>Partition</translation>
+        </message>
+        <message>
+            <source>TOP_PIPE</source>
+            <translation>Extrusion along a path</translation>
+        </message>
+        <message>
+            <source>TOP_PLANE</source>
+            <translation>Create a plane</translation>
+        </message>
+        <message>
+            <source>TOP_POINT</source>
+            <translation>Create a point</translation>
+        </message>
+        <message>
+            <source>TOP_POINT_COORDS</source>
+            <translation>Point coordinates</translation>
+        </message>
+        <message>
+            <source>TOP_POINT_ON_EDGE</source>
+            <translation>Add point on edge</translation>
+        </message>
+        <message>
+            <source>TOP_POP_COLOR</source>
+            <translation>Color</translation>
+        </message>
+        <message>
+            <source>TOP_POP_CREATE_GROUP</source>
+            <translation>Create Group</translation>
+        </message>
+        <message>
+            <source>TOP_POP_ISOS</source>
+            <translation>Isolines</translation>
+        </message>
+        <message>
+            <source>TOP_POP_RENAME</source>
+            <translation>Rename</translation>
+        </message>
+        <message>
+            <source>TOP_POP_SHADING</source>
+            <translation>Shading</translation>
+        </message>
+        <message>
+            <source>TOP_POP_TRANSPARENCY</source>
+            <translation>Transparency</translation>
+        </message>
+        <message>
+            <source>TOP_POP_WIREFRAME</source>
+            <translation>Wireframe</translation>
+        </message>
+        <message>
+            <source>TOP_PROPAGATE</source>
+            <translation>Propagate</translation>
+        </message>
+        <message>
+            <source>TOP_Q_FACE</source>
+            <translation>Quadrangle Face</translation>
+        </message>
+        <message>
+            <source>TOP_REVOLUTION</source>
+            <translation>Create a revolution</translation>
+        </message>
+        <message>
+            <source>TOP_ROTATION</source>
+            <translation>Rotation</translation>
+        </message>
+        <message>
+            <source>TOP_SCALE</source>
+            <translation>Scale transform</translation>
+        </message>
+        <message>
+            <source>TOP_SECTION</source>
+            <translation>Section</translation>
+        </message>
+        <message>
+            <source>TOP_SEWING</source>
+            <translation>Perform sewing</translation>
+        </message>
+        <message>
+            <source>TOP_SHADING</source>
+            <translation>Shading</translation>
+        </message>
+        <message>
+            <source>TOP_SHADING_COLOR</source>
+            <translation>Set shading color</translation>
+        </message>
+        <message>
+            <source>TOP_SHAPE_PROCESS</source>
+            <translation>Perform shape processing</translation>
+        </message>
+        <message>
+            <source>TOP_SHELL</source>
+            <translation>Build a shell</translation>
+        </message>
+        <message>
+            <source>TOP_SKETCH</source>
+            <translation>Sketch</translation>
+        </message>
+        <message>
+            <source>TOP_SOLID</source>
+            <translation>Build a solid</translation>
+        </message>
+        <message>
+            <source>TOP_SPHERE</source>
+            <translation>Create a sphere</translation>
+        </message>
+        <message>
+            <source>TOP_STEP_VALUE</source>
+            <translation>Set step value</translation>
+        </message>
+        <message>
+            <source>TOP_SUPPERSS_HOLES</source>
+            <translation>Perform suppress holes</translation>
+        </message>
+        <message>
+            <source>TOP_SUPPRESS_FACES</source>
+            <translation>Perform suppress faces</translation>
+        </message>
+        <message>
+            <source>TOP_SUPPRESS_INT_WIRES</source>
+            <translation>Perform suppress internal wires</translation>
+        </message>
+        <message>
+            <source>TOP_TOLERANCE</source>
+            <translation>Compute tolerance</translation>
+        </message>
+        <message>
+            <source>TOP_TORUS</source>
+            <translation>Create a torus</translation>
+        </message>
+        <message>
+            <source>TOP_TRANSLATION</source>
+            <translation>Translation</translation>
+        </message>
+        <message>
+            <source>TOP_VECTOR</source>
+            <translation>Create a vector</translation>
+        </message>
+        <message>
+            <source>TOP_WHAT_IS</source>
+            <translation>What is</translation>
+        </message>
+        <message>
+            <source>TOP_WIRE</source>
+            <translation>Build a wire</translation>
+        </message>
+        <message>
+            <source>TOP_WORK_PLANE</source>
+            <translation>Create a working plane</translation>
+        </message>
+        <message>
+            <source>WRN_NOT_IMPLEMENTED</source>
+            <translation>Sorry, this functionality is not yet implemented</translation>
+        </message>
+        <message>
+            <source>_S_</source>
+            <translation>(s)</translation>
+        </message>
+        <message>
+            <source>NOT_FOUND_ANY</source>
+            <translation>Not a single entity has been found</translation>
+        </message>
+        <message>
+            <source>GEOM_FACE_I</source>
+            <translation>Face %1</translation>
+        </message>
+        <message>
+            <source>GEOM_CONSTANT_RADIUS</source>
+            <translation>Radius :</translation>
+        </message>
+        <message>
+            <source>GEOM_R1</source>
+            <translation>R1 :</translation>
+        </message>
+        <message>
+            <source>GEOM_R2</source>
+            <translation>R2 :</translation>
+        </message>
+        <message>
+            <source>GEOM_BOTHWAY</source>
+            <translation>Both Directions</translation>
+        </message>
+        <message>
+            <source>GEOM_NORMALE</source>
+            <translation>Normal To A Face</translation>
+        </message>
+        <message>
+            <source>GEOM_VECTOR_NORMALE</source>
+            <translation>Vector_Normal</translation>
+        </message>
+        <message>
+            <source>GEOM_LINE1</source>
+            <translation>Line 1</translation>
+        </message>
+        <message>
+            <source>GEOM_LINE2</source>
+            <translation>Line 2</translation>
+        </message>
+        <message>
+            <source>GEOM_D</source>
+            <translation>D :</translation>
+        </message>
+        <message>
+            <source>GEOM_CHAMFER_EDGE</source>
+            <translation>Chamfer On Selected Edges</translation>
+        </message>
+        <message>
+            <source>SELECTED_EDGE</source>
+            <translation>Selected Edges</translation>
+        </message>
+        <message>
+            <source>GEOM_NORMALE_TITLE</source>
+            <translation>Create Normal To A Face</translation>
+        </message>
+        <message>
+            <source>GEOM_MEASURE_ANGLE_TITLE</source>
+            <translation>Angle Between Two Straight Edges/Lines/Vectors</translation>
+        </message>
+        <message>
+            <source>GEOM_MEASURE_ANGLE_ANGLE</source>
+            <translation>Angle</translation>
+        </message>
+        <message>
+            <source>GEOM_MEASURE_ANGLE_OBJ</source>
+            <translation>Objects And Results</translation>
+        </message>
+        <message>
+            <source>GEOM_MEASURE_ANGLE_IS</source>
+            <translation>Angle in degrees :</translation>
+        </message>
+        <message>
+            <source>GEOM_LINE_INTERSECTION</source>
+            <translation>Point On Lines Intersection</translation>
+        </message>
+        <message>
+            <source>GEOM_KEEP_NONLIMIT_SHAPES</source>
+            <translation>Keep shapes of lower type</translation>
+        </message>
+        <message>
+            <source>GEOM_CENTER_2POINTS</source>
+            <translation>Center and two points</translation>
+        </message>
+        <message>
+            <source>GEOM_REMOVE_EXTRA_EDGES_TITLE</source>
+            <translation>Remove extra edges</translation>
+        </message>
+        <message>
+            <source>GEOM_REMOVE_EXTRA_EDGES</source>
+            <translation>Object to remove extra edges</translation>
+        </message>
+        <message>
+            <source>REMOVE_EXTRA_EDGES_NEW_OBJ_NAME</source>
+            <translation>NoExtraEdges</translation>
+        </message>
+        <message>
+            <source>TOP_REMOVE_EXTRA_EDGES</source>
+            <translation>Remove extra edges</translation>
+        </message>
+        <message>
+            <source>MEN_REMOVE_EXTRA_EDGES</source>
+            <translation>Remove Extra Edges</translation>
+        </message>
+        <message>
+            <source>STB_REMOVE_EXTRA_EDGES</source>
+            <translation>Remove extra edges</translation>
+        </message>
+        <message>
+            <source>TOP_NORMALE</source>
+            <translation>Compute normal to a face</translation>
+        </message>
+        <message>
+            <source>MEN_NORMALE</source>
+            <translation>Normal to a Face</translation>
+        </message>
+        <message>
+            <source>STB_NORMALE</source>
+            <translation>Compute normal to a face in a point (optional)</translation>
+        </message>
+        <message>
+            <source>TOP_MEASURE_ANGLE</source>
+            <translation>Compute angle</translation>
+        </message>
+        <message>
+            <source>MEN_MEASURE_ANGLE</source>
+            <translation>Angle</translation>
+        </message>
+        <message>
+            <source>STB_MEASURE_ANGLE</source>
+            <translation>Compute angle between two lines or linear edges</translation>
+        </message>
+        <message>
+            <source>TOP_POP_AUTO_COLOR</source>
+            <translation>Auto color</translation>
+        </message>
+        <message>
+            <source>MEN_POP_AUTO_COLOR</source>
+            <translation>Auto Color</translation>
+        </message>
+        <message>
+            <source>STB_POP_AUTO_COLOR</source>
+            <translation>Auto color</translation>
+        </message>
+        <message>
+            <source>TOP_POP_DISABLE_AUTO_COLOR</source>
+            <translation>Disable auto color</translation>
+        </message>
+        <message>
+            <source>MEN_POP_DISABLE_AUTO_COLOR</source>
+            <translation>Disable Auto Color</translation>
+        </message>
+        <message>
+            <source>STB_POP_DISABLE_AUTO_COLOR</source>
+            <translation>Disable auto color</translation>
+        </message>
+        <message>
+            <source>GEOM_RESULT_NAME_GRP</source>
+            <translation>Result name</translation>
+        </message>
+        <message>
+            <source>GEOM_RESULT_NAME_LBL</source>
+            <translation>Name</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_APPROX</source>
+            <translation>Approximation</translation>
+        </message>
+        <message>
+            <source>GEOM_WRN_NO_APPROPRIATE_SELECTION</source>
+            <translation>No appropriate objects selected</translation>
+        </message>
+        <message>
+            <source>GEOM_SHAPES_ON_SHAPE</source>
+            <translation>Get shapes on shape</translation>
+        </message>
+        <message>
+            <source>GEOM_SHAPES_ON_SHAPE_ESHAPE</source>
+            <translation>Shape for exploding</translation>
+        </message>
+        <message>
+            <source>GEOM_SHAPES_ON_SHAPE_CSHAPE</source>
+            <translation>Shape for checking</translation>
+        </message>
+        <message>
+            <source>GEOM_SHAPES_ON_SHAPE_STATE</source>
+            <translation>State</translation>
+        </message>
+        <message>
+            <source>GEOM_KIND_OF_SHAPE</source>
+            <translation>Kind of Shape :</translation>
+        </message>
+        <message>
+            <source>GEOM_CLOSED</source>
+            <translation>Closed</translation>
+        </message>
+        <message>
+            <source>GEOM_UNCLOSED</source>
+            <translation>Opened</translation>
+        </message>
+        <message>
+            <source>GEOM_CLOSEDUNCLOSED</source>
+            <translation>Not defined, Closed or Opened. Possibly, error occured.</translation>
+        </message>
+        <message>
+            <source>GEOM_DISK_CIRCLE</source>
+            <translation>Disk</translation>
+        </message>
+        <message>
+            <source>GEOM_DISK_ELLIPSE</source>
+            <translation>Elliptical face</translation>
+        </message>
+        <message>
+            <source>GEOM_PLANAR_FACE</source>
+            <translation>Planar Face</translation>
+        </message>
+        <message>
+            <source>GEOM_POLYGON</source>
+            <translation>Polygon</translation>
+        </message>
+        <message>
+            <source>GEOM_NORMAL</source>
+            <translation>Normal direction</translation>
+        </message>
+        <message>
+            <source>GEOM_DIRECTION</source>
+            <translation>Direction</translation>
+        </message>
+        <message>
+            <source>GEOM_UPARAMETER</source>
+            <translation>U-parameter :</translation>
+        </message>
+        <message>
+            <source>GEOM_VPARAMETER</source>
+            <translation>V-parameter :</translation>
+        </message>
+        <message>
+            <source>GEOM_X_I</source>
+            <translation>X%1 :</translation>
+        </message>
+        <message>
+            <source>GEOM_Y_I</source>
+            <translation>Y%1 :</translation>
+        </message>
+        <message>
+            <source>GEOM_Z_I</source>
+            <translation>Z%1 :</translation>
+        </message>
+        <message>
+            <source>GEOM_SHAPES_ON_SHAPE_TITLE</source>
+            <translation>Get shapes on shape</translation>
+        </message>
+        <message>
+            <source>GEOM_SCALE_FACTOR_X</source>
+            <translation>Scale Factor X :</translation>
+        </message>
+        <message>
+            <source>GEOM_SCALE_FACTOR_Y</source>
+            <translation>Scale Factor Y :</translation>
+        </message>
+        <message>
+            <source>GEOM_SCALE_FACTOR_Z</source>
+            <translation>Scale Factor Z :</translation>
+        </message>
+        <message>
+            <source>GEOM_STATE_IN</source>
+            <translation>IN</translation>
+        </message>
+        <message>
+            <source>GEOM_STATE_OUT</source>
+            <translation>OUT</translation>
+        </message>
+        <message>
+            <source>GEOM_STATE_ON</source>
+            <translation>ON</translation>
+        </message>
+        <message>
+            <source>GEOM_STATE_ONIN</source>
+            <translation>ONIN</translation>
+        </message>
+        <message>
+            <source>GEOM_STATE_ONOUT</source>
+            <translation>ONOUT</translation>
+        </message>
+        <message>
+            <source>GEOM_STATE_INOUT</source>
+            <translation>INOUT</translation>
+        </message>
+        <message>
+            <source>TOP_GET_SHAPES_ON_SHAPES</source>
+            <translation>Get shapes on shape</translation>
+        </message>
+        <message>
+            <source>MEN_GET_SHAPES_ON_SHAPES</source>
+            <translation>Get Shapes on Shape</translation>
+        </message>
+        <message>
+            <source>STB_GET_SHAPES_ON_SHAPES</source>
+            <translation>Get shapes on shape</translation>
+        </message>
+        <message>
+            <source>GEOM_PUBLISH_RESULT_GRP</source>
+            <translation>Advanced options</translation>
+        </message>
+        <message>
+            <source>GEOM_RESTORE_SUB_SHAPES</source>
+            <translation>Set presentation parameters and subshapes from arguments</translation>
+        </message>
+        <message>
+            <source>GEOM_ALL_IMPORT_FILES</source>
+            <translation>All supported formats ( %1 )</translation>
+        </message>
+        <message>
+            <source>GEOM_UNSUPPORTED_TYPE</source>
+            <translation>Unsupported format for the file</translation>
+        </message>
+        <message>
+            <source>GEOM_UNKNOWN_IMPORT_ERROR</source>
+            <translation>Unknown error</translation>
+        </message>
+        <message>
+            <source>GEOM_IMPORT_ERRORS</source>
+            <translation>Import operation has finished with errors:</translation>
+        </message>
+    </context>
+    <context>
+        <name>BasicGUI_MarkerDlg</name>
+        <message>
+            <source>CAPTION</source>
+            <translation>Local CS Construction</translation>
+        </message>
+        <message>
+            <source>DX</source>
+            <translation>Dx</translation>
+        </message>
+        <message>
+            <source>DY</source>
+            <translation>Dy</translation>
+        </message>
+        <message>
+            <source>DZ</source>
+            <translation>Dz</translation>
+        </message>
+        <message>
+            <source>LCS_NAME</source>
+            <translation>LocalCS</translation>
+        </message>
+        <message>
+            <source>LOCALCS</source>
+            <translation>Local coordinate system</translation>
+        </message>
+        <message>
+            <source>ORIGIN</source>
+            <translation>Coordinates of origin</translation>
+        </message>
+        <message>
+            <source>VEC_PARALLEL</source>
+            <translation>Coordinate system axes cannot be parallel</translation>
+        </message>
+        <message>
+            <source>XDIR</source>
+            <translation>X axis direction</translation>
+        </message>
+        <message>
+            <source>YDIR</source>
+            <translation>Y axis direction</translation>
+        </message>
+    </context>
+    <context>
+        <name>BlocksGUI_BlockDlg</name>
+        <message>
+            <source>FACE_1</source>
+            <translation>Face 1</translation>
+        </message>
+        <message>
+            <source>FACE_2</source>
+            <translation>Face 2</translation>
+        </message>
+        <message>
+            <source>FACE_3</source>
+            <translation>Face 3</translation>
+        </message>
+        <message>
+            <source>FACE_4</source>
+            <translation>Face 4</translation>
+        </message>
+        <message>
+            <source>FACE_5</source>
+            <translation>Face 5</translation>
+        </message>
+        <message>
+            <source>FACE_6</source>
+            <translation>Face 6</translation>
+        </message>
+    </context>
+    <context>
+        <name>BlocksGUI_ExplodeDlg</name>
+        <message>
+            <source>NB_FACES_MAX</source>
+            <translation>Max. nb. faces</translation>
+        </message>
+        <message>
+            <source>NB_FACES_MIN</source>
+            <translation>Min. nb. faces</translation>
+        </message>
+    </context>
+    <context>
+        <name>BlocksGUI_QuadFaceDlg</name>
+        <message>
+            <source>EDGE_1</source>
+            <translation>Edge 1</translation>
+        </message>
+        <message>
+            <source>EDGE_2</source>
+            <translation>Edge 2</translation>
+        </message>
+        <message>
+            <source>EDGE_3</source>
+            <translation>Edge 3</translation>
+        </message>
+        <message>
+            <source>EDGE_4</source>
+            <translation>Edge 4</translation>
+        </message>
+        <message>
+            <source>VERTEX_1</source>
+            <translation>Vertex 1</translation>
+        </message>
+        <message>
+            <source>VERTEX_2</source>
+            <translation>Vertex 2</translation>
+        </message>
+        <message>
+            <source>VERTEX_3</source>
+            <translation>Vertex 3</translation>
+        </message>
+        <message>
+            <source>VERTEX_4</source>
+            <translation>Vertex 4</translation>
+        </message>
+    </context>
+    <context>
+        <name>BlocksGUI_TrsfDlg</name>
+        <message>
+            <source>FACE_1</source>
+            <translation>Face 1</translation>
+        </message>
+        <message>
+            <source>FACE_1U</source>
+            <translation>Face 1 U</translation>
+        </message>
+        <message>
+            <source>FACE_1V</source>
+            <translation>Face 1 V</translation>
+        </message>
+        <message>
+            <source>FACE_2</source>
+            <translation>Face 2</translation>
+        </message>
+        <message>
+            <source>FACE_2U</source>
+            <translation>Face 2 U</translation>
+        </message>
+        <message>
+            <source>FACE_2V</source>
+            <translation>Face 2 V</translation>
+        </message>
+    </context>
+    <context>
+        <name>EntityGUI_SketcherDlg</name>
+        <message>
+            <source>CANNOT_CLOSE</source>
+            <translation>It is impossible to close sketch
+Number of sketch points too small</translation>
+        </message>
+    </context>
+    <context>
+        <name>EntityGUI_SubShapeDlg</name>
+        <message>
+            <source>NO_SUBSHAPES_SELECTED</source>
+            <translation>Please, select one or more sub-shapes</translation>
+        </message>
+    </context>
+    <context>
+        <name>GroupGUI</name>
+        <message>
+            <source>NO_GROUP</source>
+            <translation>Please, select a group to edit</translation>
+        </message>
+    </context>
+    <context>
+        <name>GroupGUI_GroupDlg</name>
+        <message>
+            <source>ADD</source>
+            <translation>Add</translation>
+        </message>
+        <message>
+            <source>CREATE_GROUP_TITLE</source>
+            <translation>Create Group</translation>
+        </message>
+        <message>
+            <source>EDIT_GROUP_TITLE</source>
+            <translation>Edit Group</translation>
+        </message>
+        <message>
+            <source>EMPTY_LIST</source>
+            <translation>Please, select one or more sub-shapes to put into the group</translation>
+        </message>
+        <message>
+            <source>EMPTY_NAME</source>
+            <translation>Please, specify a non-empty group name</translation>
+        </message>
+        <message>
+            <source>GROUP_NAME</source>
+            <translation>Group Name</translation>
+        </message>
+        <message>
+            <source>GROUP_PREFIX</source>
+            <translation>Group</translation>
+        </message>
+        <message>
+            <source>MAIN_SHAPE</source>
+            <translation>Main Shape</translation>
+        </message>
+        <message>
+            <source>MAIN_SUB_SHAPES</source>
+            <translation>Main Shape And Sub-Shapes</translation>
+        </message>
+        <message>
+            <source>NO_GROUP</source>
+            <translation>Please, select a group to edit</translation>
+        </message>
+        <message>
+            <source>NO_MAIN_OBJ</source>
+            <translation>Please, select a main shape</translation>
+        </message>
+        <message>
+            <source>REMOVE</source>
+            <translation>Remove</translation>
+        </message>
+        <message>
+            <source>SELECT_ALL</source>
+            <translation>Select All</translation>
+        </message>
+        <message>
+            <source>SHAPE_SEL_RESTR</source>
+            <translation>Main Shape Selection restriction</translation>
+        </message>
+        <message>
+            <source>SHAPE_TYPE</source>
+            <translation>Shape Type</translation>
+        </message>
+        <message>
+            <source>NO_RESTR</source>
+            <translation>No restriction</translation>
+        </message>
+        <message>
+            <source>GEOM_PARTS_OF_SHAPE2</source>
+            <translation>Geometrical parts of the Second Shape</translation>
+        </message>
+        <message>
+            <source>SUBSHAPES_OF_SHAPE2</source>
+            <translation>Only Sub-Shapes of the Second Shape</translation>
+        </message>
+        <message>
+            <source>SECOND_SHAPE</source>
+            <translation>Second Shape</translation>
+        </message>
+    </context>
+    <context>
+        <name>MeasureGUI_1Sel1TextView1Check_QTD</name>
+        <message>
+            <source>CHECK_SHAPE_GEOMETRY</source>
+            <translation>Check also geometry</translation>
+        </message>
+    </context>
+    <context>
+        <name>MeasureGUI_PointDlg</name>
+        <message>
+            <source>CAPTION</source>
+            <translation>Point Coordinates</translation>
+        </message>
+        <message>
+            <source>COORDINATES</source>
+            <translation>Point and its coordinates</translation>
+        </message>
+        <message>
+            <source>POINT</source>
+            <translation>Point</translation>
+        </message>
+        <message>
+            <source>X</source>
+            <translation>X</translation>
+        </message>
+        <message>
+            <source>Y</source>
+            <translation>Y</translation>
+        </message>
+        <message>
+            <source>Z</source>
+            <translation>Z</translation>
+        </message>
+    </context>
+    <context>
+        <name>OperationGUI_ChamferDlg</name>
+        <message>
+            <source>D</source>
+            <translation>D</translation>
+        </message>
+        <message>
+            <source>FACE_1</source>
+            <translation>Face 1</translation>
+        </message>
+        <message>
+            <source>FACE_2</source>
+            <translation>Face 2</translation>
+        </message>
+        <message>
+            <source>SELECTED_FACES</source>
+            <translation>Selected faces</translation>
+        </message>
+    </context>
+    <context>
+        <name>OperationGUI_FilletDlg</name>
+        <message>
+            <source>SELECTED_EDGES</source>
+            <translation>Selected edges</translation>
+        </message>
+        <message>
+            <source>SELECTED_FACES</source>
+            <translation>Selected faces</translation>
+        </message>
+    </context>
+    <context>
+        <name>RepairGUI_FreeBoundDlg</name>
+        <message>
+            <source>CAPTION</source>
+            <translation>Check free boundaries</translation>
+        </message>
+        <message>
+            <source>FREE_BOUND</source>
+            <translation>Free boundaries</translation>
+        </message>
+        <message>
+            <source>NUMBER_CLOSED</source>
+            <translation>Number of closed free boundaries: </translation>
+        </message>
+        <message>
+            <source>NUMBER_OPEN</source>
+            <translation>Number of open free boundaries: </translation>
+        </message>
+    </context>
+    <context>
+        <name>RepairGUI_GlueDlg</name>
+        <message>
+            <source>FACES_FOR_GLUING_ARE_DETECTED</source>
+            <translation>There are %1 face(s) that can be glued. They are coloured on the screen with red colour.
+Please close this message box and select faces for glueing</translation>
+        </message>
+        <message>
+            <source>GLUE_FACES</source>
+            <translation>Glue faces</translation>
+        </message>
+        <message>
+            <source>SELECT_FACES</source>
+            <translation>Select Faces</translation>
+        </message>
+        <message>
+            <source>THERE_ARE_NO_FACES_FOR_GLUING</source>
+            <translation>There are no faces for gluing</translation>
+        </message>
+    </context>
+    <context>
+        <name>RepairGUI_ShapeProcessDlg</name>
+        <message>
+            <source>ERROR_NO_OBJECTS</source>
+            <translation>Please, select a geometrical object for Shape Processing.</translation>
+        </message>
+        <message>
+            <source>ERROR_NO_OPERATORS</source>
+            <translation>Please, select at least one Shape Process operation to proceed.</translation>
+        </message>
+        <message>
+            <source>TIME_CONSUMING</source>
+            <translation>Enabling this option may result in a very time-consuming operation for some input shapes.
+Would you like to continue?</translation>
+        </message>
+    </context>
+    <context>
+        <name>GEOMToolsGUI_DeleteDlg</name>
+        <message>
+            <source>GEOM_REALLY_DELETE</source>
+            <translation>Do you really want to delete %1 object(s)?</translation>
+        </message>
+        <message>
+            <source>GEOM_REALLY_DELETE_ALL</source>
+            <translation>Do you really want to delete all objects?</translation>
+        </message>
+        <message>
+            <source>GEOM_DELETE_OBJECTS</source>
+            <translation>Delete objects</translation>
+        </message>
+    </context>
+</TS>
index d4efd381dcb5c38c266a4611c28e903d74640974..a0aaf1884807fe47f6d68d57b0c394a39db4687a 100644 (file)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
+#  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",
 # not "Foo::Pub".
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts
new file mode 100644 (file)
index 0000000..608ad25
--- /dev/null
@@ -0,0 +1,1445 @@
+<!DOCTYPE TS>
+<!--
+  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+
+  Copyright (C) 2003-2007  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
+
+-->
+<TS version="1.1" >
+    <context>
+        <name>@default</name>
+        <message>
+            <source>GEOM_ANGLE</source>
+            <translation>Angle :</translation>
+        </message>
+        <message>
+            <source>GEOM_ARC</source>
+            <translation>Arc</translation>
+        </message>
+        <message>
+            <source>GEOM_ARCHIMEDE</source>
+            <translation>Archimde</translation>
+        </message>
+        <message>
+            <source>GEOM_ARCHIMEDE_TITLE</source>
+            <translation>Construction d'Archimde</translation>
+        </message>
+        <message>
+            <source>GEOM_ARC_TITLE</source>
+            <translation>Construction d'un Arc</translation>
+        </message>
+        <message>
+            <source>GEOM_ARGUMENTS</source>
+            <translation>Arguments</translation>
+        </message>
+        <message>
+            <source>GEOM_AXE_MIRROR</source>
+            <translation>Axe Miroir</translation>
+        </message>
+        <message>
+            <source>GEOM_AXIS</source>
+            <translation>Axe</translation>
+        </message>
+        <message>
+            <source>GEOM_BASE</source>
+            <translation>Base</translation>
+        </message>
+        <message>
+            <source>GEOM_BASE_OBJECT</source>
+            <translation>Objet De Base</translation>
+        </message>
+        <message>
+            <source>GEOM_BASE_POINT</source>
+            <translation>Point De Base</translation>
+        </message>
+        <message>
+            <source>GEOM_BEZIER</source>
+            <translation>Bezier</translation>
+        </message>
+        <message>
+            <source>GEOM_BNDBOX</source>
+            <translation>Boite Anglobante</translation>
+        </message>
+        <message>
+            <source>GEOM_BNDBOX_OBJDIM</source>
+            <translation>Objet and ses dimensions</translation>
+        </message>
+        <message>
+            <source>GEOM_BNDBOX_TITLE</source>
+            <translation>Boite Englobante</translation>
+        </message>
+        <message>
+            <source>GEOM_BOX</source>
+            <translation>Boite</translation>
+        </message>
+        <message>
+            <source>GEOM_BOX_OBJ</source>
+            <translation>Dimensions A l'Origine</translation>
+        </message>
+        <message>
+            <source>GEOM_BOX_TITLE</source>
+            <translation>Construction d'une Boite</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_APPLY</source>
+            <translation>&amp;Appliquer</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_CANCEL</source>
+            <translation>&amp;Annuler</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_CLOSE</source>
+            <translation>&amp;Fermer</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_CLOSE_SKETCH</source>
+            <translation>Fermer Sketch</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_END_SKETCH</source>
+            <translation>Terminer Sketch</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_EXPLODE</source>
+            <translation>&amp;Exploser</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_HELP</source>
+            <translation>&amp;Aide</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_NO</source>
+            <translation>&amp;Non</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_OK</source>
+            <translation>&amp;Ok</translation>
+        </message>
+        <message>
+            <source>GEOM_BUT_YES</source>
+            <translation>&amp;Oui</translation>
+        </message>
+        <message>
+            <source>GEOM_CENTER</source>
+            <translation>Centre</translation>
+        </message>
+        <message>
+            <source>GEOM_CENTER_POINT</source>
+            <translation>Point Centre</translation>
+        </message>
+        <message>
+            <source>GEOM_CENTRAL_POINT</source>
+            <translation>Point Central</translation>
+        </message>
+        <message>
+            <source>GEOM_CHAMFER</source>
+            <translation>Chanfrein</translation>
+        </message>
+        <message>
+            <source>GEOM_CHAMFER_ABORT</source>
+            <translation>Le chanfrein ne peut-tre realis avec %1 et %2 </translation>
+        </message>
+        <message>
+            <source>GEOM_CHAMFER_ALL</source>
+            <translation>Chanfrein sur toute la Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_CHAMFER_EDGES</source>
+            <translation>Chanfrein sur Edges de la Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_CHAMFER_FACES</source>
+            <translation>Chanfrein sur Faces de la Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_CHAMFER_TITLE</source>
+            <translation>Construction d'un Chanfrein</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_BLOCKS_COMPOUND</source>
+            <translation>Check Blocks Compound</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_BLOCKS_COMPOUND_ERRORS</source>
+            <translation>Errors</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_BLOCKS_COMPOUND_HAS_ERRORS</source>
+            <translation>The Compound of Blocks has errors</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_BLOCKS_COMPOUND_HAS_NO_ERRORS</source>
+            <translation>The Compound of Blocks has no errors</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_BLOCKS_COMPOUND_SUBSHAPES</source>
+            <translation>Incriminated Sub-Shapes</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_COMPOUND_BLOCKS_TITLE</source>
+            <translation>Check Blocks Compound</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_INFOS</source>
+            <translation>Objet et ses Informations Topologiques</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_SHAPE</source>
+            <translation>Check Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_CHECK_TITLE</source>
+            <translation>Check Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_CIRCLE</source>
+            <translation>Cercle</translation>
+        </message>
+        <message>
+            <source>GEOM_CIRCLE_TITLE</source>
+            <translation>Construction d'un Cercle</translation>
+        </message>
+        <message>
+            <source>GEOM_CMASS</source>
+            <translation>Centre de Masse</translation>
+        </message>
+        <message>
+            <source>GEOM_CMASS_TITLE</source>
+            <translation>Centre De Gravit</translation>
+        </message>
+        <message>
+            <source>GEOM_COMMON</source>
+            <translation>Joindre</translation>
+        </message>
+        <message>
+            <source>GEOM_COMMON_TITLE</source>
+            <translation>BOOLEEN : Jonction De Deux Objets</translation>
+        </message>
+        <message>
+            <source>GEOM_COMPOUND</source>
+            <translation>Compound</translation>
+        </message>
+        <message>
+            <source>GEOM_COMPOUNDSOLID</source>
+            <translation>CompSolid</translation>
+        </message>
+        <message>
+            <source>GEOM_COMPOUND_TITLE</source>
+            <translation>Cration d'un Compound</translation>
+        </message>
+        <message>
+            <source>GEOM_CONE</source>
+            <translation>Cone</translation>
+        </message>
+        <message>
+            <source>GEOM_CONE_TITLE</source>
+            <translation>Construction d'un Cone</translation>
+        </message>
+        <message>
+            <source>GEOM_CONFIRM</source>
+            <translation>Confirmer cette operation</translation>
+        </message>
+        <message>
+            <source>GEOM_CONFIRM_INFO</source>
+            <translation>L'objet contient %1 sous objets</translation>
+        </message>
+        <message>
+            <source>GEOM_COOR</source>
+            <translation>Coord. :</translation>
+        </message>
+        <message>
+            <source>GEOM_COORDINATES</source>
+            <translation>Coordonnes</translation>
+        </message>
+        <message>
+            <source>GEOM_CREATE_COPY</source>
+            <translation>Create a copy</translation>
+        </message>
+        <message>
+            <source>GEOM_CREATE_SINGLE_SOLID</source>
+            <translation>Create a single solid</translation>
+        </message>
+        <message>
+            <source>GEOM_CUT</source>
+            <translation>Couper</translation>
+        </message>
+        <message>
+            <source>GEOM_CUT_TITLE</source>
+            <translation>BOOLEEN : Couper Deux Objets</translation>
+        </message>
+        <message>
+            <source>GEOM_CYLINDER</source>
+            <translation>Cylindre</translation>
+        </message>
+        <message>
+            <source>GEOM_CYLINDER_TITLE</source>
+            <translation>Construction d'un Cylindre</translation>
+        </message>
+        <message>
+            <source>GEOM_D1</source>
+            <translation>D1 :</translation>
+        </message>
+        <message>
+            <source>GEOM_D2</source>
+            <translation>D2 :</translation>
+        </message>
+        <message>
+            <source>GEOM_DIAGONAL_POINTS</source>
+            <translation>Points Diagonaux</translation>
+        </message>
+        <message>
+            <source>GEOM_DIMENSIONS</source>
+            <translation>Dimensions</translation>
+        </message>
+        <message>
+            <source>GEOM_DISTANCE</source>
+            <translation>Distance</translation>
+        </message>
+        <message>
+            <source>GEOM_DX</source>
+            <translation>Dx :</translation>
+        </message>
+        <message>
+            <source>GEOM_DY</source>
+            <translation>Dy :</translation>
+        </message>
+        <message>
+            <source>GEOM_DZ</source>
+            <translation>Dz :</translation>
+        </message>
+        <message>
+            <source>GEOM_EDGE</source>
+            <translation>Edge</translation>
+        </message>
+        <message>
+            <source>GEOM_EDGE_TITLE</source>
+            <translation>Cration d'un Edge</translation>
+        </message>
+        <message>
+            <source>GEOM_ELLIPSE</source>
+            <translation>Ellipse</translation>
+        </message>
+        <message>
+            <source>GEOM_ELLIPSE_TITLE</source>
+            <translation>Construction d'Ellipses</translation>
+        </message>
+        <message>
+            <source>GEOM_EXTRUSION</source>
+            <translation>Extrusion</translation>
+        </message>
+        <message>
+            <source>GEOM_EXTRUSION_BSV</source>
+            <translation>Shape de base + Vecteur</translation>
+        </message>
+        <message>
+            <source>GEOM_EXTRUSION_BSV_2P</source>
+            <translation>Shape de base + 2 Points</translation>
+        </message>
+        <message>
+            <source>GEOM_EXTRUSION_TITLE</source>
+            <translation>Extruder une Shape de base</translation>
+        </message>
+        <message>
+            <source>GEOM_FACE</source>
+            <translation>Face</translation>
+        </message>
+        <message>
+            <source>GEOM_FACES</source>
+            <translation>Faces</translation>
+        </message>
+        <message>
+            <source>GEOM_FACE_FFW</source>
+            <translation>Face a partir d'un wire</translation>
+        </message>
+        <message>
+            <source>GEOM_FACE_OPT</source>
+            <translation>Cration d'une Face plane</translation>
+        </message>
+        <message>
+            <source>GEOM_FACE_SELECTION</source>
+            <translation>Selection de Face</translation>
+        </message>
+        <message>
+            <source>GEOM_FACE_TITLE</source>
+            <translation>Cration d'une Face</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLET</source>
+            <translation>Conge</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLET_ABORT</source>
+            <translation>Le cong ne peut-tre realis avec un rayon de %1 </translation>
+        </message>
+        <message>
+            <source>GEOM_FILLET_ALL</source>
+            <translation>Cong sur toute la Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLET_EDGES</source>
+            <translation>Cong sur Edges de la Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLET_FACES</source>
+            <translation>Cong sur Faces de la Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLET_TITLE</source>
+            <translation>Construction d'un Cong</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING</source>
+            <translation>Surface Par Edges</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_ARG</source>
+            <translation>Argument Et Parametres</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_COMPOUND</source>
+            <translation>Compound de Edges</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_MAX_DEG</source>
+            <translation>Max. Deg</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_MIN_DEG</source>
+            <translation>Min. Deg</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_NB_ITER</source>
+            <translation>Nb. Iter</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_TITLE</source>
+            <translation>Surface Par Edges</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_TOL_2D</source>
+            <translation>Tol. 2D</translation>
+        </message>
+        <message>
+            <source>GEOM_FILLING_TOL_3D</source>
+            <translation>Tol. 3D</translation>
+        </message>
+        <message>
+            <source>GEOM_FREE_FACES</source>
+            <translation>Free faces</translation>
+        </message>
+        <message>
+            <source>GEOM_FREE_FACES_TITLE</source>
+            <translation>Free faces</translation>
+        </message>
+        <message>
+            <source>GEOM_FUSE</source>
+            <translation>Fusionner</translation>
+        </message>
+        <message>
+            <source>GEOM_FUSE_TITLE</source>
+            <translation>BOOLEEN : Fusionner deux Objets</translation>
+        </message>
+        <message>
+            <source>GEOM_HEIGHT</source>
+            <translation>Hauteur</translation>
+        </message>
+        <message>
+            <source>GEOM_IDENTICAL_NAMES_SELECT_BY_MOUSE</source>
+            <translation>Noms identiques : selectionner avec la souris !</translation>
+        </message>
+        <message>
+            <source>GEOM_INERTIA_CONSTR</source>
+            <translation>Matrice Et Moments d'Inertie</translation>
+        </message>
+        <message>
+            <source>GEOM_INERTIA_I</source>
+            <translation>%1:1</translation>
+        </message>
+        <message>
+            <source>GEOM_INERTIA_IXYZ</source>
+            <translation>IX &amp; IY &amp; IZ</translation>
+        </message>
+        <message>
+            <source>GEOM_INERTIA_TITLE</source>
+            <translation>Calculs d'Inertie</translation>
+        </message>
+        <message>
+            <source>GEOM_INF_LOADED</source>
+            <translation>Le fichier %1 est charg.</translation>
+        </message>
+        <message>
+            <source>GEOM_INTERPOL</source>
+            <translation>Interpolation</translation>
+        </message>
+        <message>
+            <source>GEOM_KEEP_OBJECT</source>
+            <translation>Objet garde</translation>
+        </message>
+        <message>
+            <source>GEOM_LENGTH</source>
+            <translation>Longueur :</translation>
+        </message>
+        <message>
+            <source>GEOM_LINE</source>
+            <translation>Ligne</translation>
+        </message>
+        <message>
+            <source>GEOM_LINE_TITLE</source>
+            <translation>Construction d'une Ligne</translation>
+        </message>
+        <message>
+            <source>GEOM_MAIN_OBJECT</source>
+            <translation>Objet Principal</translation>
+        </message>
+        <message>
+            <source>GEOM_MATERIAL_ID</source>
+            <translation>Material ID:</translation>
+        </message>
+        <message>
+            <source>GEOM_MATERIAL_MATERIAL</source>
+            <translation>Material</translation>
+        </message>
+        <message>
+            <source>GEOM_MATERIAL_SET</source>
+            <translation>&lt;&lt; Set</translation>
+        </message>
+        <message>
+            <source>GEOM_MATERIAL_SHAPE</source>
+            <translation>Shapes</translation>
+        </message>
+        <message>
+            <source>GEOM_MATERIAL_TITLE</source>
+            <translation>Define materials for Dominant Fuse</translation>
+        </message>
+        <message>
+            <source>GEOM_MATRIX</source>
+            <translation>Matrice :</translation>
+        </message>
+        <message>
+            <source>GEOM_MAX</source>
+            <translation>Max :</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_ALL_FILES</source>
+            <translation>Tous fichiers ( * )</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_ANGLE</source>
+            <translation>Angle :</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_COMPONENT</source>
+            <translation>Gometrie</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_ENTER_ANGLE</source>
+            <translation>Saisir un angle en degrs</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_EXPORT</source>
+            <translation>Exporter</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_IMPORT</source>
+            <translation>Importer</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_ISOS</source>
+            <translation>Choisir un nombre d'isos</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_ISOU</source>
+            <translation>Isos u :</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_ISOV</source>
+            <translation>Isos v :</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_LOAD_SCRIPT</source>
+            <translation>Fichiers PYTHON ( *.py )</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_POPUP_NAME</source>
+            <translation>%1 Objets</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_SHADING</source>
+            <translation>Ombr</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_SKETCHER_X</source>
+            <translation>Saisir une longueur pour fixer X</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_SKETCHER_Y</source>
+            <translation>Saisir une longueur pour fixer Y</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_STEP_LABEL</source>
+            <translation>Increment</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_TRANSPARENCY</source>
+            <translation>Transparence</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_TRANSPARENCY_LABEL</source>
+            <translation>Transparence :</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_WIREFRAME</source>
+            <translation>Filaire</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_X</source>
+            <translation>X :</translation>
+        </message>
+        <message>
+            <source>GEOM_MEN_Y</source>
+            <translation>Y :</translation>
+        </message>
+        <message>
+            <source>GEOM_MESHING_DEFLECTION</source>
+            <translation>Dflection Du Maillage :</translation>
+        </message>
+        <message>
+            <source>GEOM_MIN</source>
+            <translation>Min :</translation>
+        </message>
+        <message>
+            <source>GEOM_MINDIST_OBJ</source>
+            <translation>Objets Et Resultats</translation>
+        </message>
+        <message>
+            <source>GEOM_MINDIST_TITLE</source>
+            <translation>Distance Minimale entre Deux Objets</translation>
+        </message>
+        <message>
+            <source>GEOM_MIRROR</source>
+            <translation>Miroir</translation>
+        </message>
+        <message>
+            <source>GEOM_MIRROR_TITLE</source>
+            <translation>Methode Miroir</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTIROTATION</source>
+            <translation>Multi-Rotation</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTIROTATION_DOUBLE</source>
+            <translation>Multi Rotation Double</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTIROTATION_SIMPLE</source>
+            <translation>Multi Rotation Simple</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTIROTATION_TITLE</source>
+            <translation>Multi-Rotation</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTITRANSLATION</source>
+            <translation>Multi-Translation</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTITRANSLATION_DOUBLE</source>
+            <translation>Multi Translation Double</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTITRANSLATION_SIMPLE</source>
+            <translation>Multi Translation Simple</translation>
+        </message>
+        <message>
+            <source>GEOM_MULTITRANSLATION_TITLE</source>
+            <translation>Multi-Translation</translation>
+        </message>
+        <message>
+            <source>GEOM_NAME_INCORRECT</source>
+            <translation>Le nom saisi n'existe pas</translation>
+        </message>
+        <message>
+            <source>GEOM_NB_TIMES</source>
+            <translation>Nb. Fois :</translation>
+        </message>
+        <message>
+            <source>GEOM_NB_TIMES_U</source>
+            <translation>Nb. Fois U :</translation>
+        </message>
+        <message>
+            <source>GEOM_NB_TIMES_V</source>
+            <translation>Nb. Fois V :</translation>
+        </message>
+        <message>
+            <source>GEOM_OBJECT</source>
+            <translation>Objet</translation>
+        </message>
+        <message>
+            <source>GEOM_OBJECTS</source>
+            <translation>Objets</translation>
+        </message>
+        <message>
+            <source>GEOM_OBJECT_I</source>
+            <translation>Objet %1</translation>
+        </message>
+        <message>
+            <source>GEOM_OBJECT_RESULT</source>
+            <translation>Objet Et Rsultat</translation>
+        </message>
+        <message>
+            <source>GEOM_ORIENTATION</source>
+            <translation>Orientation</translation>
+        </message>
+        <message>
+            <source>GEOM_ORIENTATION_OPT</source>
+            <translation>Renverser l'orientation avec une simulation de vecteur normal</translation>
+        </message>
+        <message>
+            <source>GEOM_ORIENTATION_TITLE</source>
+            <translation>Changer l'Orientation</translation>
+        </message>
+        <message>
+            <source>GEOM_PARAMETER</source>
+            <translation>Paramtre :</translation>
+        </message>
+        <message>
+            <source>GEOM_PARAM_POINT</source>
+            <translation>Point paramtrique</translation>
+        </message>
+        <message>
+            <source>GEOM_PARTITION</source>
+            <translation>Partition</translation>
+        </message>
+        <message>
+            <source>GEOM_PARTITION_HALFSPACE</source>
+            <translation>Half-space partition</translation>
+        </message>
+        <message>
+            <source>GEOM_PARTITION_ORIENTATION</source>
+            <translation>Change l'orientation</translation>
+        </message>
+        <message>
+            <source>GEOM_PARTITION_TITLE</source>
+            <translation>Partition d'Objects Avec Outils</translation>
+        </message>
+        <message>
+            <source>GEOM_PATH_OBJECT</source>
+            <translation>Objet Chemin</translation>
+        </message>
+        <message>
+            <source>GEOM_PIPE</source>
+            <translation>Pipe</translation>
+        </message>
+        <message>
+            <source>GEOM_PIPE_TITLE</source>
+            <translation>Construction d'une Pipe</translation>
+        </message>
+        <message>
+            <source>GEOM_PLANE</source>
+            <translation>Plan</translation>
+        </message>
+        <message>
+            <source>GEOM_PLANE_MIRROR</source>
+            <translation>Plan Miroir</translation>
+        </message>
+        <message>
+            <source>GEOM_PLANE_PV</source>
+            <translation>Point + Vecteur</translation>
+        </message>
+        <message>
+            <source>GEOM_PLANE_PVC</source>
+            <translation>Point + Vecteur Coordonnes</translation>
+        </message>
+        <message>
+            <source>GEOM_PLANE_SIZE</source>
+            <translation>Taille du plan :</translation>
+        </message>
+        <message>
+            <source>GEOM_PLANE_TITLE</source>
+            <translation>Construction d'un Plan</translation>
+        </message>
+        <message>
+            <source>GEOM_POINT</source>
+            <translation>Point</translation>
+        </message>
+        <message>
+            <source>GEOM_POINTS</source>
+            <translation>Points</translation>
+        </message>
+        <message>
+            <source>GEOM_POINT_I</source>
+            <translation>Point %1</translation>
+        </message>
+        <message>
+            <source>GEOM_POINT_MIRROR</source>
+            <translation>Point Miroir</translation>
+        </message>
+        <message>
+            <source>GEOM_POINT_TITLE</source>
+            <translation>Construction d'un Point</translation>
+        </message>
+        <message>
+            <source>GEOM_PRECISION</source>
+            <translation>Prcision :</translation>
+        </message>
+        <message>
+            <source>GEOM_PROPAGATE</source>
+            <translation>Propagate</translation>
+        </message>
+        <message>
+            <source>GEOM_PROPAGATE_TITLE</source>
+            <translation>Propagate</translation>
+        </message>
+        <message>
+            <source>GEOM_PROPERTIES</source>
+            <translation>Basiques Proprietes</translation>
+        </message>
+        <message>
+            <source>GEOM_PROPERTIES_CONSTR</source>
+            <translation>Objet et ses Proprietes</translation>
+        </message>
+        <message>
+            <source>GEOM_PROPERTIES_SURFACE</source>
+            <translation>Surface :</translation>
+        </message>
+        <message>
+            <source>GEOM_PROPERTIES_TITLE</source>
+            <translation>Proprietes Basiques</translation>
+        </message>
+        <message>
+            <source>GEOM_PROPERTIES_VOLUME</source>
+            <translation>Volume :</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_ABORT</source>
+            <translation>L'opration a echou</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_COMMAND</source>
+            <translation>Pas de commande associe  l'id = %1.</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_DONE</source>
+            <translation>Opration effectue</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_LOADING</source>
+            <translation>Chargement de %1 ...</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_MIN_DIST</source>
+            <translation>Min Distance non calculer</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_NOT_FOR_VTK_VIEWER</source>
+            <translation>Non permis dans viewer VTK</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_NULLSHAPE</source>
+            <translation>Erreur, objet inconsistant ou inappropri !</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_READY</source>
+            <translation>Prt...</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_SELECT_EDGE</source>
+            <translation>Selectionner les edges et clicker sur Apply</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_SELECT_FACE</source>
+            <translation>Select les faces a supprimer et clicker sur Ok/Apply</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_SELECT_FIRST</source>
+            <translation>Selectionner la shape principale en premier</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_SELECT_SUBSHAPES</source>
+            <translation>Selection de sous objets</translation>
+        </message>
+        <message>
+            <source>GEOM_PRP_SHAPE_IN_STUDY</source>
+            <translation>La shape principale doit etre avant dans l'etude</translation>
+        </message>
+        <message>
+            <source>GEOM_RADIUS</source>
+            <translation>Rayon</translation>
+        </message>
+        <message>
+            <source>GEOM_RADIUS_I</source>
+            <translation>Rayon %1</translation>
+        </message>
+        <message>
+            <source>GEOM_RADIUS_MAJOR</source>
+            <translation>Rayon max. :</translation>
+        </message>
+        <message>
+            <source>GEOM_RADIUS_MINOR</source>
+            <translation>Rayon min. :</translation>
+        </message>
+        <message>
+            <source>GEOM_REALLY_DELETE</source>
+            <translation>Voulez-vous supprimer l'object(s) ?</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT</source>
+            <translation>Limite de Reconstruction</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT_EDGE</source>
+            <translation>Edge</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT_FACE</source>
+            <translation>Face</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT_SHAPE</source>
+            <translation>Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT_SHELL</source>
+            <translation>Shell</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT_SOLID</source>
+            <translation>Solid</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT_VERTEX</source>
+            <translation>Vertex</translation>
+        </message>
+        <message>
+            <source>GEOM_RECONSTRUCTION_LIMIT_WIRE</source>
+            <translation>Wire</translation>
+        </message>
+        <message>
+            <source>GEOM_REMOVE_WEBS</source>
+            <translation>Remove webs</translation>
+        </message>
+        <message>
+            <source>GEOM_REVERSE</source>
+            <translation>Renverser</translation>
+        </message>
+        <message>
+            <source>GEOM_REVERSE_U</source>
+            <translation>Renverser U</translation>
+        </message>
+        <message>
+            <source>GEOM_REVERSE_V</source>
+            <translation>Reverser V</translation>
+        </message>
+        <message>
+            <source>GEOM_REVERSE_VECTOR</source>
+            <translation>Renverser Le Vecteur</translation>
+        </message>
+        <message>
+            <source>GEOM_REVOLUTION</source>
+            <translation>Rvolution</translation>
+        </message>
+        <message>
+            <source>GEOM_REVOLUTION_TITLE</source>
+            <translation>Construction Par Revolution</translation>
+        </message>
+        <message>
+            <source>GEOM_ROTATION</source>
+            <translation>Rotation</translation>
+        </message>
+        <message>
+            <source>GEOM_ROTATION_TITLE</source>
+            <translation>Rotation d'un Objet</translation>
+        </message>
+        <message>
+            <source>GEOM_SCALE</source>
+            <translation>Echelle</translation>
+        </message>
+        <message>
+            <source>GEOM_SCALE_FACTOR</source>
+            <translation>Facteur d'echelle</translation>
+        </message>
+        <message>
+            <source>GEOM_SCALE_TITLE</source>
+            <translation>Echelle d'un Objet</translation>
+        </message>
+        <message>
+            <source>GEOM_SECTION</source>
+            <translation>Section</translation>
+        </message>
+        <message>
+            <source>GEOM_SECTION_TITLE</source>
+            <translation>BOOLEEN : Section De Deux Objets</translation>
+        </message>
+        <message>
+            <source>GEOM_SELECTION</source>
+            <translation>Slection</translation>
+        </message>
+        <message>
+            <source>GEOM_SET_MATERIALS</source>
+            <translation>Set materials</translation>
+        </message>
+        <message>
+            <source>GEOM_SEWING</source>
+            <translation>Coudre</translation>
+        </message>
+        <message>
+            <source>GEOM_SEWING_TITLE</source>
+            <translation>Coudre des Topologies</translation>
+        </message>
+        <message>
+            <source>GEOM_SHAPE</source>
+            <translation>Shape</translation>
+        </message>
+        <message>
+            <source>GEOM_SHELL</source>
+            <translation>Shell</translation>
+        </message>
+        <message>
+            <source>GEOM_SHELLS</source>
+            <translation>Shells</translation>
+        </message>
+        <message>
+            <source>GEOM_SHELL_TITLE</source>
+            <translation>Construction d'une Shell</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_ABS</source>
+            <translation>Absolu</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_ANGLE</source>
+            <translation>Angle</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_ANGLE2</source>
+            <translation>Angle :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_APPLY</source>
+            <translation>Appliquer</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_ARC</source>
+            <translation>Arc</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_DEST</source>
+            <translation>Destination</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_DIR</source>
+            <translation>Direction</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_DX2</source>
+            <translation>DX :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_DY2</source>
+            <translation>DY :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_EL</source>
+            <translation>Type d'Element</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_LENGTH</source>
+            <translation>Longueur</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_LENGTH2</source>
+            <translation>Longueur :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_PER</source>
+            <translation>Perpendiculaire</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_POINT</source>
+            <translation>Point</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_POINT2</source>
+            <translation>Point :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_RADIUS2</source>
+            <translation>Radius :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_REL</source>
+            <translation>Relative</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_SEGMENT</source>
+            <translation>Sgment</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_SEL</source>
+            <translation>Slection</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_TAN</source>
+            <translation>Tangent</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_TITLE</source>
+            <translation>Construction de Sketch</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_TYPE</source>
+            <translation>Type</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_UNDO</source>
+            <translation>Undo</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_VALUES</source>
+            <translation>Valeurs</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_VX2</source>
+            <translation>VX :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_VXVY</source>
+            <translation>VX-VY</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_VY2</source>
+            <translation>VY :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_X</source>
+            <translation>X</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_X2</source>
+            <translation>X :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_X3</source>
+            <translation>Abs. X :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_Y</source>
+            <translation>Y</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_Y2</source>
+            <translation>Y :</translation>
+        </message>
+        <message>
+            <source>GEOM_SKETCHER_Y3</source>
+            <translation>Abs. Y :</translation>
+        </message>
+        <message>
+            <source>GEOM_SOLID</source>
+            <translation>Solide</translation>
+        </message>
+        <message>
+            <source>GEOM_SOLID_TITLE</source>
+            <translation>Construction d'un Solid</translation>
+        </message>
+        <message>
+            <source>GEOM_SPHERE</source>
+            <translation>Sphre</translation>
+        </message>
+        <message>
+            <source>GEOM_SPHERE_CR</source>
+            <translation>Centre + rayon</translation>
+        </message>
+        <message>
+            <source>GEOM_SPHERE_RO</source>
+            <translation>Rayon a l'origine</translation>
+        </message>
+        <message>
+            <source>GEOM_SPHERE_TITLE</source>
+            <translation>Construction d'une Sphere</translation>
+        </message>
+        <message>
+            <source>GEOM_SPLINE</source>
+            <translation>Spline</translation>
+        </message>
+        <message>
+            <source>GEOM_SPLINE_TITLE</source>
+            <translation>Construction de Splines</translation>
+        </message>
+        <message>
+            <source>GEOM_STEP</source>
+            <translation>Pas :</translation>
+        </message>
+        <message>
+            <source>GEOM_STEP_TITLE</source>
+            <translation>Increment par dfaut lors des constructions</translation>
+        </message>
+        <message>
+            <source>GEOM_STEP_U</source>
+            <translation>Pas U :</translation>
+        </message>
+        <message>
+            <source>GEOM_STEP_V</source>
+            <translation>Pas V :</translation>
+        </message>
+        <message>
+            <source>GEOM_SUBSHAPE_SELECT</source>
+            <translation>Selectionner de Sous Shapes</translation>
+        </message>
+        <message>
+            <source>GEOM_SUBSHAPE_TITLE</source>
+            <translation>Selection de Sous Shapes</translation>
+        </message>
+        <message>
+            <source>GEOM_SUBSHAPE_TYPE</source>
+            <translation>Type de Sous Shapes</translation>
+        </message>
+        <message>
+            <source>GEOM_SUB_SHAPE</source>
+            <translation>Sous Shapes</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESSHOLE_FACE_SHELL</source>
+            <translation>Face ou shell</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESSHOLE_SELECTFACE</source>
+            <translation>Selection de la face initiale</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESSHOLE_SELECTFACE_END</source>
+            <translation>Selection de la face terminale (si trou traversant)</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESSHOLE_SELECTWIRE</source>
+            <translation>Selection du contour/trou sur la face</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESSHOLE_SELECTWIRE_END</source>
+            <translation>Selection de contour final (si trou traversant)</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESSHOLE_SELECT_HOLES_ON_FACE</source>
+            <translation>Selection de trou(s) sur la face</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESSHOLE_TITLE</source>
+            <translation>Suppression de trous</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESS_RESULT</source>
+            <translation>Supprimer le Resultat</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESS_RESULT_INSIDE</source>
+            <translation>Intrieur</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPPRESS_RESULT_OUTSIDE</source>
+            <translation>Extrieur</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPRESSFACE</source>
+            <translation>Supression de Face</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPRESSFACE_SELECT</source>
+            <translation>Selectionner les Faces a Supprimer</translation>
+        </message>
+        <message>
+            <source>GEOM_SUPRESSFACE_TITLE</source>
+            <translation>Supprimer des Faces dans un Objet</translation>
+        </message>
+        <message>
+            <source>GEOM_SURFCONE</source>
+            <translation>Face Conique</translation>
+        </message>
+        <message>
+            <source>GEOM_SURFCYLINDER</source>
+            <translation>Face Cylindrique</translation>
+        </message>
+        <message>
+            <source>GEOM_SURFSPHERE</source>
+            <translation>Face Sphrique</translation>
+        </message>
+        <message>
+            <source>GEOM_SURFTORUS</source>
+            <translation>Face Toroique</translation>
+        </message>
+        <message>
+            <source>GEOM_TOLERANCE</source>
+            <translation>Tolrance</translation>
+        </message>
+        <message>
+            <source>GEOM_TOLERANCE_CONSTR</source>
+            <translation>Object et ses Tolerances</translation>
+        </message>
+        <message>
+            <source>GEOM_TOLERANCE_EDGE</source>
+            <translation>Edge :</translation>
+        </message>
+        <message>
+            <source>GEOM_TOLERANCE_FACE</source>
+            <translation>Face :</translation>
+        </message>
+        <message>
+            <source>GEOM_TOLERANCE_TITLE</source>
+            <translation>Tolerance Maximale</translation>
+        </message>
+        <message>
+            <source>GEOM_TOLERANCE_VERTEX</source>
+            <translation>Vertex :</translation>
+        </message>
+        <message>
+            <source>GEOM_TOOL_OBJECT</source>
+            <translation>Objet Outil</translation>
+        </message>
+        <message>
+            <source>GEOM_TORUS</source>
+            <translation>Tore</translation>
+        </message>
+        <message>
+            <source>GEOM_TORUS_TITLE</source>
+            <translation>Constructiond'un Tore</translation>
+        </message>
+        <message>
+            <source>GEOM_TRANSLATION</source>
+            <translation>Translation</translation>
+        </message>
+        <message>
+            <source>GEOM_TRANSLATION_COOR</source>
+            <translation>Translation Avec Coordonnees</translation>
+        </message>
+        <message>
+            <source>GEOM_TRANSLATION_TITLE</source>
+            <translation>Translation d'un Objet</translation>
+        </message>
+        <message>
+            <source>GEOM_TRANSPARENCY_OPAQUE</source>
+            <translation>Opaque</translation>
+        </message>
+        <message>
+            <source>GEOM_TRANSPARENCY_TITLE</source>
+            <translation>Transparence</translation>
+        </message>
+        <message>
+            <source>GEOM_TRANSPARENCY_TRANSPARENT</source>
+            <translation>Transparent</translation>
+        </message>
+        <message>
+            <source>GEOM_VECTOR</source>
+            <translation>Vecteur</translation>
+        </message>
+        <message>
+            <source>GEOM_VECTOR_LENGTH</source>
+            <translation>Longueur Du Vecteur :</translation>
+        </message>
+        <message>
+            <source>GEOM_VECTOR_TITLE</source>
+            <translation>Construction d'un Vecteur</translation>
+        </message>
+        <message>
+            <source>GEOM_VECTOR_U</source>
+            <translation>Vecteur U</translation>
+        </message>
+        <message>
+            <source>GEOM_VECTOR_V</source>
+            <translation>Vecteur V</translation>
+        </message>
+        <message>
+            <source>GEOM_VERTEX</source>
+            <translation>Vertex</translation>
+        </message>
+        <message>
+            <source>GEOM_WATER_DENSITY</source>
+            <translation>Densit de l'eau :</translation>
+        </message>
+        <message>
+            <source>GEOM_WEIGHT</source>
+            <translation>poids</translation>
+        </message>
+        <message>
+            <source>GEOM_WHATIS</source>
+            <translation>Whatis</translation>
+        </message>
+        <message>
+            <source>GEOM_WHATIS_OBJECT</source>
+            <translation>Objet et ses Informations Topologiques</translation>
+        </message>
+        <message>
+            <source>GEOM_WHATIS_TITLE</source>
+            <translation>Whatis</translation>
+        </message>
+        <message>
+            <source>GEOM_WIRE</source>
+            <translation>Wire</translation>
+        </message>
+        <message>
+            <source>GEOM_WIRES</source>
+            <translation>Wire(s)</translation>
+        </message>
+        <message>
+            <source>GEOM_WIRE_CONNECT</source>
+            <translation>Creation d'un Wire a partir de wires/edges connectes</translation>
+        </message>
+        <message>
+            <source>GEOM_WIRE_TITLE</source>
+            <translation>Creer un Wire</translation>
+        </message>
+        <message>
+            <source>GEOM_WPLANE</source>
+            <translation>Plan de Travail</translation>
+        </message>
+        <message>
+            <source>GEOM_WPLANE_FACE</source>
+            <translation>Plan Ou Face plane</translation>
+        </message>
+        <message>
+            <source>GEOM_WPLANE_TITLE</source>
+            <translation>plan de travail</translation>
+        </message>
+        <message>
+            <source>GEOM_WRN_RADIUS_NULL</source>
+            <translation>Le rayon est nul</translation>
+        </message>
+        <message>
+            <source>GEOM_WRN_WARNING</source>
+            <translation>Avertissement</translation>
+        </message>
+        <message>
+            <source>GEOM_X</source>
+            <translation>X :</translation>
+        </message>
+        <message>
+            <source>GEOM_Y</source>
+            <translation>Y :</translation>
+        </message>
+        <message>
+            <source>GEOM_Z</source>
+            <translation>Z :</translation>
+        </message>
+        <message>
+            <source>SUPPRESS_RESULT</source>
+            <translation>Suppress Result</translation>
+        </message>
+    </context>
+</TS>
index 11d602f2c9d44a33dcd4945e65b3af28869cc6ae..54722fe9336e3c3951c7fcf44df913a1cdb94d97 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GeometryGUI.cxx
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
-//
-//  File   : GeometryGUI.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "GeometryGUI.h"
 #include "GEOMGUI_OCCSelector.h"
 #include "GEOMGUI_Selection.h"
 #include "GEOM_Displayer.h"
+#include "GEOM_AISShape.hxx"
+
+#include "GEOM_Actor.h"
 
+#include <SUIT_Desktop.h>
 #include <SUIT_MessageBox.h>
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
 #include <OCCViewer_ViewModel.h>
 #include <OCCViewer_ViewManager.h>
 
+#include <SOCC_ViewModel.h>
+#include <SOCC_ViewWindow.h>
+
 #include <SVTK_ViewWindow.h>
 #include <SVTK_RenderWindowInteractor.h>
 #include <SVTK_InteractorStyle.h>
 #include <SVTK_ViewModel.h>
-#include <SVTK_ViewManager.h>
 
 #include <SalomeApp_Application.h>
+#include <SalomeApp_Study.h>
+
 #include <LightApp_SelectionMgr.h>
 #include <LightApp_VTKSelector.h>
-#include <SalomeApp_Study.h>
+#include <LightApp_DataObject.h>
 #include <LightApp_Preferences.h>
+
 #include <SALOME_LifeCycleCORBA.hxx>
 #include <SALOME_ListIO.hxx>
+#include <SALOME_ListIteratorOfListIO.hxx>
 
-// External includes
-#include <qfileinfo.h>
-#include <qpainter.h>
+#include <SALOMEDSClient_ClientFactory.hxx>
+#include <SALOMEDSClient_IParameters.hxx>
 
+// External includes
+#include <QMenu>
+#include <QAction>
+#include <QFileInfo>
+#include <QString>
+#include <QPainter>
+
+#include <AIS_Drawer.hxx>
+#include <AIS_ListOfInteractive.hxx>
+#include <AIS_ListIteratorOfListOfInteractive.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_IsoAspect.hxx>
 #include <Aspect_TypeOfMarker.hxx>
 #include <OSD_SharedLibrary.hxx>
+#include <NCollection_DataMap.hxx>
 
 #include <utilities.h>
 
 #include <vtkCamera.h>
 #include <vtkRenderer.h>
 
+#include "GEOMImpl_Types.hxx"
+
+using namespace Qt;
 
 extern "C" {
   Standard_EXPORT CAM_Module* createModule() {
@@ -129,41 +149,14 @@ SALOMEDS::Study_var GeometryGUI::ClientStudyToStudy (_PTR(Study) theStudy)
   return aDSStudy._retn();
 }
 
-//=================================================================================
-// class   : CustomItem
-// purpose : Set Font to a text.
-//=================================================================================
-class CustomItem : public QCustomMenuItem
+//=======================================================================
+// function : JoinObjectParameters
+// purpose  :
+//=======================================================================
+char* GeometryGUI::JoinObjectParameters(const QStringList& theParametersList)
 {
-public:
-  CustomItem(const QString& s, const QFont& f) : myString(s), myFont(f) {}
-  ~CustomItem() {}
-
-  void paint(QPainter* p, const QColorGroup& cg, bool act, bool /*enabled*/, int x, int y, int w, int h)
-  {
-    p->save();
-    p->fillRect( x, y, w, h, act ? cg.highlight() : cg.mid() );
-    p->setPen( act ? cg.highlightedText() : cg.buttonText() );
-    p->setFont( myFont );
-    p->drawText( x, y, w, h, AlignHCenter | AlignVCenter | ShowPrefix | DontClip | SingleLine, myString );
-    p->restore();
-  }
-
-  QSize sizeHint()
-  {
-    return QFontMetrics( myFont ).size( AlignHCenter | AlignVCenter | ShowPrefix | DontClip | SingleLine, myString );
-  }
-
-  bool fullSpan() const
-  {
-    return true;
-  }
-
-private:
-  QString myString;
-  QFont   myFont;
-};
-
+  return theParametersList.join(":").toLatin1().data();
+}
 //=======================================================================
 // function : GeometryGUI::GeometryGUI()
 // purpose  : Constructor
@@ -186,9 +179,6 @@ GeometryGUI::GeometryGUI() :
   gp_Dir direction = gp_Dir(0., 0., 1.);
   myWorkingPlane = gp_Ax3(origin, direction);
 
-  myOCCSelectors.setAutoDelete( true );
-  myVTKSelectors.setAutoDelete( true );
-
   myDisplayer = 0;
   myLocalSelectionMode = GEOM_ALLOBJECTS;
 }
@@ -199,6 +189,11 @@ GeometryGUI::GeometryGUI() :
 //=======================================================================
 GeometryGUI::~GeometryGUI()
 {
+  while (!myOCCSelectors.isEmpty())
+    delete myOCCSelectors.takeFirst();
+
+  while (!myVTKSelectors.isEmpty())
+    delete myVTKSelectors.takeFirst();
 }
 
 //=======================================================================
@@ -210,19 +205,21 @@ GEOMGUI* GeometryGUI::getLibrary( const QString& libraryName )
 {
   if ( !myGUIMap.contains( libraryName ) ) {
     // try to load library if it is not loaded yet
-    QCString libs;
+    QString libs;
 #ifndef WNT
-    if ( (libs = getenv( "LD_LIBRARY_PATH" )) ) {
-      QStringList dirList = QStringList::split( ":", libs, false ); // skip empty entries
+    libs = getenv( "LD_LIBRARY_PATH" );
+    if( !libs.isEmpty() ) {
+      QStringList dirList = libs.split( ":", QString::SkipEmptyParts ); // skip empty entries
 #else
-      if ( (libs = getenv( "PATH" )) ) {
-        QStringList dirList = QStringList::split( ";", libs, false ); // skip empty entries
+    libs = getenv( "PATH" );
+    if( !libs.isEmpty() ) {
+      QStringList dirList = libs.split( ";", QString::SkipEmptyParts ); // skip empty entries
 #endif
       for( int i = dirList.count()-1; i >= 0; i-- ) {
        QString dir = dirList[ i ];
        QFileInfo fi( Qtx::addSlash( dirList[ i ] ) + libraryName );
        if( fi.exists() ) {
-         OSD_SharedLibrary aSharedLibrary( (char*)fi.fileName().latin1() );
+         OSD_SharedLibrary aSharedLibrary( fi.fileName().toLatin1().data() );
          bool res = aSharedLibrary.DlOpen( OSD_RTLD_LAZY );
          if( !res ) {
            MESSAGE( "Can't open library : " << aSharedLibrary.DlError() );
@@ -358,7 +355,7 @@ void GeometryGUI::OnGUIEvent( int id )
 
   // fix for IPAL9103, point 2
   if ( CORBA::is_nil( GetGeomGen() ) ) {
-    SUIT_MessageBox::error1( desk, tr( "GEOM_ERROR" ), tr( "GEOM_ERR_GET_ENGINE" ), tr( "GEOM_BUT_OK" ) );
+    SUIT_MessageBox::critical( desk, tr( "GEOM_ERROR" ), tr( "GEOM_ERR_GET_ENGINE" ), tr( "GEOM_BUT_OK" ) );
     return;
   }
 
@@ -382,8 +379,6 @@ void GeometryGUI::OnGUIEvent( int id )
       id == 33   ||  // MENU EDIT - DELETE
       id == 411  ||  // MENU SETTINGS - ADD IN STUDY
       id == 412  ||  // MENU SETTINGS - SHADING COLOR
-      id == 413  ||  // MENU SETTINGS - ISOS
-      id == 414  ||  // MENU SETTINGS - STEP VALUE FOR SPIN BOXES
       id == 5103 ||  // MENU TOOLS - CHECK GEOMETRY
       id == 8032 ||  // POPUP VIEWER - COLOR
       id == 8033 ||  // POPUP VIEWER - TRANSPARENCY
@@ -434,7 +429,9 @@ void GeometryGUI::OnGUIEvent( int id )
           id == 4022 ||  // MENU PRIMITIVE - CYLINDER
           id == 4023 ||  // MENU PRIMITIVE - SPHERE
           id == 4024 ||  // MENU PRIMITIVE - TORUS
-          id == 4025 ) { // MENU PRIMITIVE - CONE
+          id == 4025 ||  // MENU PRIMITIVE - CONE
+          id == 4026 ||  // MENU PRIMITIVE - FACE
+          id == 4027 ) { // MENU PRIMITIVE - DISK
 #ifndef WNT
        library = getLibrary( "libPrimitiveGUI.so" );
 #else
@@ -452,6 +449,7 @@ void GeometryGUI::OnGUIEvent( int id )
 #endif
   }
   else if( id == 404 ||   // MENU ENTITY - SKETCHER
+           id == 405 ||   // MENU ENTITY - 3D SKETCHER
           id == 407 ) {  // MENU ENTITY - EXPLODE
 #ifndef WNT
        library = getLibrary( "libEntityGUI.so" );
@@ -488,7 +486,8 @@ void GeometryGUI::OnGUIEvent( int id )
           id == 5025 ||  // MENU TRANSFORMATION - SCALE
           id == 5026 ||  // MENU TRANSFORMATION - OFFSET
           id == 5027 ||  // MENU TRANSFORMATION - MULTI-TRANSLATION
-          id == 5028 ) { // MENU TRANSFORMATION - MULTI-ROTATION
+          id == 5028 ||  // MENU TRANSFORMATION - MULTI-ROTATION
+           id == 5029 ) { // CONTEXT(POPUP) MENU - RELOAD_IMPORTED
 #ifndef WNT
        library = getLibrary( "libTransformationGUI.so" );
 #else
@@ -499,7 +498,9 @@ void GeometryGUI::OnGUIEvent( int id )
           id == 504 ||   // MENU OPERATION - ARCHIMEDE
           id == 505 ||   // MENU OPERATION - FILLET
           id == 506 ||   // MENU OPERATION - CHAMFER
-          id == 507 ) {  // MENU OPERATION - CLIPPING RANGE
+          id == 507 ||   // MENU OPERATION - CLIPPING RANGE
+          id == 508 ||   // MENU OPERATION - GET SHAPES ON SHAPE
+          id == 509 ) {  // MENU OPERATION - FILLET 2D
 #ifndef WNT
        library = getLibrary( "libOperationGUI.so" );
 #else
@@ -535,7 +536,7 @@ void GeometryGUI::OnGUIEvent( int id )
           id == 706   ||  // MENU MEASURE - WHATIS
           id == 707   ||  // MENU MEASURE - CHECK
           id == 7072  ||  // MENU MEASURE - CHECK COMPOUND OF BLOCKS
-          id == 708 ) {  // MENU MEASURE - POINT COORDINATES
+          id == 708 ) {   // MENU MEASURE - POINT COORDINATES
 #ifndef WNT
        library = getLibrary( "libMeasureGUI.so" );
 #else
@@ -555,7 +556,7 @@ void GeometryGUI::OnGUIEvent( int id )
            id == 9998  ||  // MENU BLOCKS - MULTI-TRANSFORMATION
            id == 9997  ||  // MENU BLOCKS - QUADRANGLE FACE
            id == 99991 ||  // MENU BLOCKS - PROPAGATE
-           id == 9995 ) { // MENU BLOCKS - EXPLODE ON BLOCKS
+           id == 9995 ) {  // MENU BLOCKS - EXPLODE ON BLOCKS
 #ifndef WNT
        library = getLibrary( "libBlocksGUI.so" );
 #else
@@ -567,7 +568,7 @@ void GeometryGUI::OnGUIEvent( int id )
   if ( library )
     library->OnGUIEvent( id, desk );
   else
-    SUIT_MessageBox::error1( desk, tr( "GEOM_ERROR" ), tr( "GEOM_ERR_LIB_NOT_FOUND" ), tr( "GEOM_BUT_OK" ) );
+    SUIT_MessageBox::critical( desk, tr( "GEOM_ERROR" ), tr( "GEOM_ERR_LIB_NOT_FOUND" ), tr( "GEOM_BUT_OK" ) );
 }
 
 
@@ -582,7 +583,7 @@ void GeometryGUI::OnKeyPress( SUIT_ViewWindow* win, QKeyEvent* pe )
   for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) {
     SUIT_Application* anApp = application();
     if (!anApp) return;
-    bOk = bOk && it.data()->OnKeyPress( pe, anApp->desktop(), win );
+    bOk = bOk && it.value()->OnKeyPress( pe, anApp->desktop(), win );
   }
 //  return bOk;
 }
@@ -599,7 +600,7 @@ void GeometryGUI::OnMouseMove( SUIT_ViewWindow* win, QMouseEvent* pe )
   for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) {
     SUIT_Application* anApp = application();
     if (!anApp) return;
-    bOk = bOk && it.data()->OnMouseMove( pe, anApp->desktop(), win );
+    bOk = bOk && it.value()->OnMouseMove( pe, anApp->desktop(), win );
   }
 //  return bOk;
 }
@@ -618,7 +619,7 @@ void GeometryGUI::OnMousePress( SUIT_ViewWindow* win, QMouseEvent* pe )
   for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) {
     SUIT_Application* anApp = application();
     if (!anApp) return;
-    processed = processed || it.data()->OnMousePress( pe, anApp->desktop(), win );
+    processed = processed || it.value()->OnMousePress( pe, anApp->desktop(), win );
   }
 //  return processed;
 }
@@ -738,20 +739,20 @@ bool GeometryGUI::SetSettings()
 //=======================================================================
 void GeometryGUI::createGeomAction( const int id, const QString& po_id, const QString& icon_id, const int key, const bool toggle  )
 {
-  QIconSet icon;
+  QIcon icon;
   QWidget* parent = application()->desktop();
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
   QPixmap pix;
   if ( icon_id.length() )
-    pix = resMgr->loadPixmap( "GEOM", tr( icon_id ) );
+    pix = resMgr->loadPixmap( "GEOM", tr( icon_id.toLatin1().constData() ) );
   else
-    pix = resMgr->loadPixmap( "GEOM", tr( QString( "ICO_" )+po_id ), false );
+    pix = resMgr->loadPixmap( "GEOM", tr( (QString( "ICO_" )+po_id).toLatin1().constData() ), false );
   if ( !pix.isNull() )
-    icon = QIconSet( pix );
+    icon = QIcon( pix );
 
-  QString tooltip    = tr( QString( "TOP_" )+po_id ),
-          menu       = tr( QString( "MEN_" )+po_id ),
-          status_bar = tr( QString( "STB_" )+po_id );
+  QString tooltip    = tr( (QString( "TOP_" )+po_id).toLatin1().constData() ),
+          menu       = tr( (QString( "MEN_" )+po_id).toLatin1().constData() ),
+          status_bar = tr( (QString( "STB_" )+po_id).toLatin1().constData() );
 
   createAction( id, tooltip, icon, menu, status_bar, key, parent, toggle, this, SLOT( OnGUIEvent() )  );
 }
@@ -771,7 +772,7 @@ void GeometryGUI::initialize( CAM_Application* app )
   createGeomAction( 111, "IMPORT", "", (CTRL + Key_I) );
   createGeomAction( 121, "EXPORT", "", (CTRL + Key_E) );
 
-  createGeomAction( 33, "DELETE", "", Key_Delete );
+  createGeomAction( 33, "DELETE", "", Qt::Key_Delete );
 
   createGeomAction( 4011, "POINT" );
   createGeomAction( 4012, "LINE" );
@@ -789,6 +790,8 @@ void GeometryGUI::initialize( CAM_Application* app )
   createGeomAction( 4023, "SPHERE" );
   createGeomAction( 4024, "TORUS" );
   createGeomAction( 4025, "CONE" );
+  createGeomAction( 4026, "FACE" );
+  createGeomAction( 4027, "DISK" );
 
   createGeomAction( 4031, "EXTRUSION" );
   createGeomAction( 4032, "REVOLUTION" );
@@ -798,10 +801,13 @@ void GeometryGUI::initialize( CAM_Application* app )
   createGeomAction( 800, "GROUP_CREATE" );
   createGeomAction( 801, "GROUP_EDIT" );
 
+  createGeomAction( 5029, "RELOAD_IMPORTED" );
+
   createGeomAction( 9997, "Q_FACE" );
   createGeomAction( 9999, "HEX_SOLID" );
 
   createGeomAction( 404, "SKETCH" );
+  createGeomAction( 405, "3DSKETCH" );
   createGeomAction( 407, "EXPLODE" );
 
   createGeomAction( 4081, "EDGE" );
@@ -830,6 +836,8 @@ void GeometryGUI::initialize( CAM_Application* app )
   createGeomAction( 505, "FILLET" );
   createGeomAction( 506, "CHAMFER" );
   //createGeomAction( 507, "CLIPPING" );
+  createGeomAction( 508, "GET_SHAPES_ON_SHAPES" );
+  createGeomAction( 509, "FILLET_2D" );
 
   createGeomAction( 9998, "MUL_TRANSFORM" );
   createGeomAction( 9995, "EXPLODE_BLOCKS" );
@@ -866,8 +874,6 @@ void GeometryGUI::initialize( CAM_Application* app )
   createGeomAction( 5103, "CHECK_GEOMETRY" );
 #endif
   createGeomAction( 412, "SHADING_COLOR" );
-  createGeomAction( 413, "ISOS" );
-  createGeomAction( 414, "STEP_VALUE" );
 
   createGeomAction( 211, "SHADING" );
   createGeomAction( 212, "DISPLAY_ALL" );
@@ -884,7 +890,7 @@ void GeometryGUI::initialize( CAM_Application* app )
   createGeomAction( 213, "DISPLAY_ONLY" );
   createGeomAction( 215, "ERASE" );
 
-  createGeomAction( 901, "POP_RENAME", "", Key_F2 );
+  createGeomAction( 901, "POP_RENAME", "", Qt::Key_F2 );
   createGeomAction( 80311, "POP_WIREFRAME", "", 0, true );
   createGeomAction( 80312, "POP_SHADING", "", 0, true );
   createGeomAction( 8032, "POP_COLOR" );
@@ -930,6 +936,8 @@ void GeometryGUI::initialize( CAM_Application* app )
   createMenu( 4023, primId, -1 );
   createMenu( 4024, primId, -1 );
   createMenu( 4025, primId, -1 );
+  createMenu( 4026, primId, -1 );
+  createMenu( 4027, primId, -1 );
 
   int genId = createMenu( tr( "MEN_GENERATION" ), newEntId, -1 );
   createMenu( 4031, genId, -1 );
@@ -949,6 +957,7 @@ void GeometryGUI::initialize( CAM_Application* app )
 
   createMenu( separator(), newEntId, -1 );
   createMenu( 404, newEntId, -1 );
+  createMenu( 405, newEntId, -1 );
   createMenu( separator(), newEntId, -1 );
   createMenu( 407, newEntId, -1 );
 
@@ -981,7 +990,9 @@ void GeometryGUI::initialize( CAM_Application* app )
 
   createMenu( 503, operId, -1 );
   createMenu( 504, operId, -1 );
+  createMenu( 508, operId, -1 );
   createMenu( separator(), operId, -1 );
+  createMenu( 509, transId, -1 );
   createMenu( 505, transId, -1 );
   createMenu( 506, transId, -1 );
   //createMenu( 507, transId, -1 );
@@ -1040,8 +1051,6 @@ void GeometryGUI::initialize( CAM_Application* app )
   //createMenu( separator(), prefId, -1 );
   //int geomId = createMenu( tr( "MEN_PREFERENCES_GEOM" ), prefId, -1 );
   //createMenu( 412, geomId, -1 );
-  //createMenu( 413, geomId, -1 );
-  //createMenu( 414, geomId, -1 );
   //createMenu( separator(), prefId, -1 );
 
   int viewId = createMenu( tr( "MEN_VIEW" ), -1, -1 );
@@ -1085,6 +1094,8 @@ void GeometryGUI::initialize( CAM_Application* app )
   createTool( 4023, primTbId );
   createTool( 4024, primTbId );
   createTool( 4025, primTbId );
+  createTool( 4026, primTbId );
+  createTool( 4027, primTbId );
 
   int boolTbId = createTool( tr( "TOOL_BOOLEAN" ) );
   createTool( 5011, boolTbId );
@@ -1122,33 +1133,33 @@ void GeometryGUI::initialize( CAM_Application* app )
 
   QtxPopupMgr* mgr = popupMgr();
   mgr->insert( action(  901 ), -1, -1 );  // rename
-  mgr->setRule( action( 901 ), "$type in {'Shape' 'Group'} and selcount=1", true );
+  mgr->setRule( action( 901 ), QString("$type in {'Shape' 'Group'} and selcount=1"), QtxPopupMgr::VisibleRule );
   mgr->insert( action(   33 ), -1, -1 );  // delete
-  mgr->setRule( action(  33 ), "$type in {'Shape' 'Group'} and selcount>0", true );
+  mgr->setRule( action(  33 ), QString("$type in {'Shape' 'Group'} and selcount>0"), QtxPopupMgr::VisibleRule );
   mgr->insert( action(  8001 ), -1, -1 ); // create group
-  mgr->setRule( action( 8001 ), "client='ObjectBrowser' and type='Shape' and selcount=1 and isOCC=true", true );
+  mgr->setRule( action( 8001 ), QString("client='ObjectBrowser' and type='Shape' and selcount=1 and isOCC=true"), QtxPopupMgr::VisibleRule );
   mgr->insert( action(  801 ), -1, -1 );  // edit group
-  mgr->setRule( action( 801 ),  "client='ObjectBrowser' and type='Group' and selcount=1 and isOCC=true", true );
+  mgr->setRule( action( 801 ),  QString("client='ObjectBrowser' and type='Group' and selcount=1 and isOCC=true"), QtxPopupMgr::VisibleRule );
   mgr->insert( separator(), -1, -1 );     // -----------
   dispmodeId = mgr->insert(  tr( "MEN_DISPLAY_MODE" ), -1, -1 ); // display mode menu
   mgr->insert( action(  80311 ), dispmodeId, -1 ); // wireframe
-  mgr->setRule( action( 80311 ), clientOCCorVTK_AndSomeVisible, true );
-  mgr->setRule( action( 80311 ), clientOCCorVTK + " and displaymode='Wireframe'", false );
+  mgr->setRule( action( 80311 ), clientOCCorVTK_AndSomeVisible, QtxPopupMgr::VisibleRule );
+  mgr->setRule( action( 80311 ), clientOCCorVTK + " and displaymode='Wireframe'", QtxPopupMgr::ToggleRule );
   mgr->insert( action(  80312 ), dispmodeId, -1 ); // shading
-  mgr->setRule( action( 80312 ), clientOCCorVTK_AndSomeVisible, true );
-  mgr->setRule( action( 80312 ), clientOCCorVTK + " and displaymode='Shading'", false );
+  mgr->setRule( action( 80312 ), clientOCCorVTK_AndSomeVisible, QtxPopupMgr::VisibleRule );
+  mgr->setRule( action( 80312 ), clientOCCorVTK + " and displaymode='Shading'", QtxPopupMgr::ToggleRule );
   mgr->insert( separator(), -1, -1 );     // -----------
   mgr->insert( action(  8032 ), -1, -1 ); // color
-  mgr->setRule( action( 8032 ), clientOCCorVTKorOB_AndSomeVisible + " and ($component={'GEOM'})", true );
+  mgr->setRule( action( 8032 ), clientOCCorVTKorOB_AndSomeVisible + " and ($component={'GEOM'})", QtxPopupMgr::VisibleRule );
   mgr->insert( action(  8033 ), -1, -1 ); // transparency
-  mgr->setRule( action( 8033 ), clientOCCorVTK_AndSomeVisible, true );
+  mgr->setRule( action( 8033 ), clientOCCorVTK_AndSomeVisible, QtxPopupMgr::VisibleRule );
   mgr->insert( action(  8034 ), -1, -1 ); // isos
-  mgr->setRule( action( 8034 ), clientOCCorVTK_AndSomeVisible + " and selcount>0 and isVisible", true );
+  mgr->setRule( action( 8034 ), clientOCCorVTK_AndSomeVisible + " and selcount>0 and isVisible", QtxPopupMgr::VisibleRule );
   mgr->insert( separator(), -1, -1 );     // -----------
   mgr->insert( action(  8035 ), -1, -1 ); // auto color
-  mgr->setRule( action( 8035 ), autoColorPrefix + " and isAutoColor=false", true );
+  mgr->setRule( action( 8035 ), autoColorPrefix + " and isAutoColor=false", QtxPopupMgr::VisibleRule );
   mgr->insert( action(  8036 ), -1, -1 ); // disable auto color
-  mgr->setRule( action( 8036 ), autoColorPrefix + " and isAutoColor=true", true );
+  mgr->setRule( action( 8036 ), autoColorPrefix + " and isAutoColor=true", QtxPopupMgr::VisibleRule );
   mgr->insert( separator(), -1, -1 );     // -----------
 
 
@@ -1158,45 +1169,44 @@ void GeometryGUI::initialize( CAM_Application* app )
           types = "'Shape' 'Group'";
 
   mgr->insert( action(  216 ), -1, -1 ); // display
-  mgr->setRule( action( 216 ), rule.arg( types ).arg( "not isVisible" ), true );
+  mgr->setRule( action( 216 ), rule.arg( types ).arg( "not isVisible" ), QtxPopupMgr::VisibleRule );
 
   mgr->insert( action(  215 ), -1, -1 ); // erase
-  mgr->setRule( action( 215 ), rule.arg( types ).arg( "isVisible" ), true );
+  mgr->setRule( action( 215 ), rule.arg( types ).arg( "isVisible" ), QtxPopupMgr::VisibleRule );
 
   mgr->insert( action(  214 ), -1, -1 ); // erase All
-  mgr->setRule( action( 214 ), clientOCCorVTK, true );
+  mgr->setRule( action( 214 ), clientOCCorVTK, QtxPopupMgr::VisibleRule );
 
   QString selectOnly = "(client='OCCViewer' or client='VTKViewer') and (selcount=0)";
 
   int selectolnyId = mgr->insert( tr("MEN_SELECT_ONLY"), -1, -1);                //select only menu
   mgr->insert( action(2171), selectolnyId, -1);                                  //Vertex
-  mgr->setRule(action(2171), selectOnly, true);
-  mgr->setRule(action(2171), selectOnly + " and selectionmode='VERTEX'", false);
+  mgr->setRule(action(2171), selectOnly, QtxPopupMgr::VisibleRule);
+  mgr->setRule(action(2171), selectOnly + " and selectionmode='VERTEX'", QtxPopupMgr::ToggleRule);
   mgr->insert( action(2172), selectolnyId, -1);                                  //Edge
-  mgr->setRule(action(2172), selectOnly, true);
-  mgr->setRule(action(2172), selectOnly + " and selectionmode='EDGE'", false);
+  mgr->setRule(action(2172), selectOnly, QtxPopupMgr::VisibleRule);
+  mgr->setRule(action(2172), selectOnly + " and selectionmode='EDGE'", QtxPopupMgr::ToggleRule);
   mgr->insert( action(2173), selectolnyId, -1);                                  //Wire
-  mgr->setRule(action(2173), selectOnly, true);
-  mgr->setRule(action(2173), selectOnly + " and selectionmode='WIRE'", false);
+  mgr->setRule(action(2173), selectOnly, QtxPopupMgr::VisibleRule);
+  mgr->setRule(action(2173), selectOnly + " and selectionmode='WIRE'", QtxPopupMgr::ToggleRule);
   mgr->insert( action(2174), selectolnyId, -1);                                  //Face
-  mgr->setRule(action(2174), selectOnly, true);
-  mgr->setRule(action(2174), selectOnly + " and selectionmode='FACE'", false);
+  mgr->setRule(action(2174), selectOnly, QtxPopupMgr::VisibleRule);
+  mgr->setRule(action(2174), selectOnly + " and selectionmode='FACE'", QtxPopupMgr::ToggleRule);
   mgr->insert( action(2175), selectolnyId, -1);                                  //Shell
-  mgr->setRule(action(2175), selectOnly, true);
-  mgr->setRule(action(2175), selectOnly + " and selectionmode='SHELL'", false);
+  mgr->setRule(action(2175), selectOnly, QtxPopupMgr::VisibleRule);
+  mgr->setRule(action(2175), selectOnly + " and selectionmode='SHELL'", QtxPopupMgr::ToggleRule);
   mgr->insert( action(2176), selectolnyId, -1);                                  //Solid
-  mgr->setRule(action(2176), selectOnly, true);
-  mgr->setRule(action(2176), selectOnly + " and selectionmode='SOLID'", false);
+  mgr->setRule(action(2176), selectOnly, QtxPopupMgr::VisibleRule);
+  mgr->setRule(action(2176), selectOnly + " and selectionmode='SOLID'", QtxPopupMgr::ToggleRule);
   mgr->insert( action(2177), selectolnyId, -1);                                  //Compound
-  mgr->setRule(action(2177), selectOnly, true);
-  mgr->setRule(action(2177), selectOnly + " and selectionmode='COMPOUND'", false);
+  mgr->setRule(action(2177), selectOnly, QtxPopupMgr::VisibleRule);
+  mgr->setRule(action(2177), selectOnly + " and selectionmode='COMPOUND'", QtxPopupMgr::ToggleRule);
   mgr->insert( separator(), selectolnyId, -1);
   mgr->insert( action(2178), selectolnyId, -1);                                  //Clear selection filter
-  mgr->setRule(action(2178), selectOnly, true);
-  mgr->setRule(action(2178), selectOnly + " and selectionmode='ALL'", false);
-
+  mgr->setRule(action(2178), selectOnly, QtxPopupMgr::VisibleRule);
+  mgr->setRule(action(2178), selectOnly + " and selectionmode='ALL'", QtxPopupMgr::ToggleRule);
   mgr->insert( action(  213 ), -1, -1 ); // display only
-  mgr->setRule( action( 213 ), rule.arg( types ).arg( "true" ), true );
+  mgr->setRule( action( 213 ), rule.arg( types ).arg( "true" ), QtxPopupMgr::VisibleRule );
   mgr->insert( separator(), -1, -1 );
 
   mgr->hide( mgr->actionId( action( myEraseAll ) ) );
@@ -1225,32 +1235,50 @@ bool GeometryGUI::activateModule( SUIT_Study* study )
   // 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
+  action(111)->setEnabled( true ); // Import: CTRL + Key_I
+  action(121)->setEnabled( true ); // Export: CTRL + Key_E
+  action( 33)->setEnabled( true ); // Delete: Key_Delete
+  action(901)->setEnabled( true ); // Rename: Key_F2
 
   GUIMap::Iterator it;
   for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it )
-    it.data()->activate( application()->desktop() );
+    it.value()->activate( application()->desktop() );
 
   LightApp_SelectionMgr* sm = getApp()->selectionMgr();
+
   SUIT_ViewManager* vm;
   ViewManagerList OCCViewManagers, VTKViewManagers;
+
   application()->viewManagers( OCCViewer_Viewer::Type(), OCCViewManagers );
-  for ( vm = OCCViewManagers.first(); vm; vm = OCCViewManagers.next() )
+  QListIterator<SUIT_ViewManager*> itOCC( OCCViewManagers );
+  while ( itOCC.hasNext() && (vm = itOCC.next()) )
     myOCCSelectors.append( new GEOMGUI_OCCSelector( ((OCCViewer_ViewManager*)vm)->getOCCViewer(), sm ) );
+
   application()->viewManagers( SVTK_Viewer::Type(), VTKViewManagers );
-  for ( vm = VTKViewManagers.first(); vm; vm = VTKViewManagers.next() )
+  QListIterator<SUIT_ViewManager*> itVTK( VTKViewManagers );
+  while ( itVTK.hasNext() && (vm = itVTK.next()) )
     myVTKSelectors.append( new LightApp_VTKSelector( dynamic_cast<SVTK_Viewer*>( vm->getViewModel() ), sm ) );
 
+  //NPAL 19674
+  SALOME_ListIO selected;
+  sm->selectedObjects( selected );
+  sm->clearSelected();
+  
   // disable OCC selectors
-  //getApp()->selectionMgr()->setEnabled( false, OCCViewer_Viewer::Type() );
-  for ( GEOMGUI_OCCSelector* sr = myOCCSelectors.first(); sr; sr = myOCCSelectors.next() )
-    sr->setEnabled(true);
+  getApp()->selectionMgr()->setEnabled( false, OCCViewer_Viewer::Type() );
+  QListIterator<GEOMGUI_OCCSelector*> itOCCSel( myOCCSelectors );
+  while ( itOCCSel.hasNext() )
+    if ( GEOMGUI_OCCSelector* sr = itOCCSel.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);
+  getApp()->selectionMgr()->setEnabled( false, SVTK_Viewer::Type() );
+  QListIterator<LightApp_VTKSelector*> itVTKSel( myVTKSelectors );
+  while ( itVTKSel.hasNext() )
+    if ( LightApp_VTKSelector* sr = itVTKSel.next() )
+      sr->setEnabled(true);
+
+  sm->setSelectedObjects( selected, true );   //NPAL 19674
 
   return true;
 }
@@ -1272,325 +1300,27 @@ bool GeometryGUI::deactivateModule( SUIT_Study* study )
 
   GUIMap::Iterator it;
   for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it )
-    it.data()->deactivate();
+    it.value()->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
+  action(111)->setEnabled( false ); // Import: CTRL + Key_I
+  action(121)->setEnabled( false ); // Export: CTRL + Key_E
+  action( 33)->setEnabled( false ); // Delete: Key_Delete
+  action(901)->setEnabled( false ); // Rename: Key_F2
 
+  qDeleteAll(myOCCSelectors);
   myOCCSelectors.clear();
   getApp()->selectionMgr()->setEnabled( true, OCCViewer_Viewer::Type() );
 
+  qDeleteAll(myVTKSelectors);
   myVTKSelectors.clear();
   getApp()->selectionMgr()->setEnabled( true, SVTK_Viewer::Type() );
 
   return SalomeApp_Module::deactivateModule( study );
 }
 
-//=================================================================================
-// function : GeometryGUI::DefinePopup()
-// purpose  : Called from desktop to define popup menu [static]
-//=================================================================================
-/*
-void GeometryGUI::DefinePopup(QString& theContext, QString& theParent, QString& theObject)
-{
-  QAD_Study* ActiveStudy = QAD_Application::getDesktop()->getActiveStudy();
-  SALOME_Selection* Sel  = SALOME_Selection::Selection(ActiveStudy->getSelection());
-
-  theObject  = "";
-  theContext = "";
-
-  if ( theParent == "Viewer" ) {
-    if ( Sel->IObjectCount() == 0 )
-      theContext = "NothingSelected";
-  }
-
-  if ( Sel->IObjectCount() == 1 ) {
-    Handle(SALOME_InteractiveObject) IO = Sel->firstIObject();
-    if( IO->hasEntry() ) {
-      SALOMEDS::SObject_var sobj = ActiveStudy->getStudyDocument()->FindObjectID( IO->getEntry() );
-      if ( !sobj->_is_nil() ) {
-       SALOMEDS::SComponent_var scomp = sobj->GetFatherComponent();
-       if ( !strcmp(scomp->GetID(), IO->getEntry() ) ) {
-         // component is selected
-         theObject = "Component";
-       }
-       else {
-         GEOM::GEOM_Object_var aGObj = GEOM::GEOM_Object::_narrow( sobj->GetObject() );
-         if ( !CORBA::is_nil( aGObj ) ) {
-           switch( aGObj->GetType() ) {
-           case GEOM_GROUP:
-             theObject = "Group";
-             break;
-           default:
-             theObject = "Shape";
-             break;
-           }
-         }
-       }
-      }
-    }
-  }
-}
-
-//=================================================================================
-// function : GeometryGUI::CustomPopup()
-// purpose  : Called from desktop to create popup menu [static]
-//=================================================================================
-bool GeometryGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QString& theContext,
-                             const QString& theParent, const QString& theObject)
-{
-  GeometryGUI* geomGUI = GetGeomGUI();
-
-  // Deactivate any non modal dialog box to get the neutral point
-  geomGUI->EmitSignalDeactivateDialog();
-  QAD_Study* anActiveStudy    = parent->getActiveStudy();
-  QAD_StudyFrame* aStudyFrame = anActiveStudy->getActiveStudyFrame();
-  QAD_ViewFrame* aViewFrame   = aStudyFrame->getRightFrame()->getViewFrame();
-  SALOME_Selection* Sel       = SALOME_Selection::Selection(anActiveStudy->getSelection());
-  QString parentComponent     = ((SALOMEGUI_Desktop*)parent)->getComponentFromSelection();
-  bool isOCCViewer            = aViewFrame->getTypeView() == VIEW_OCC;
-  bool isVTKViewer            = aViewFrame->getTypeView() == VIEW_VTK;
-  int aDisplayMode            = 0;
-  QString objectName;
-
-  if ( aViewFrame->getTypeView() == VIEW_OCC )
-    aDisplayMode = ((OCCViewer_ViewFrame*)aViewFrame)->getViewer()->getAISContext()->DisplayMode();
-  else if ( aViewFrame->getTypeView() == VIEW_VTK )
-    aDisplayMode = (dynamic_cast<SVTK_ViewFrame*>( aViewFrame )->getRWInteractor()->GetDisplayMode();
-
-  int nbSel = Sel->IObjectCount();
-
-  if( nbSel == 0 ) {
-    ////// NOTHING SELECTED
-    popup->clear();
-  }
-  else if ( nbSel == 1 ) {
-    ////// SINGLE OBJECT SELECTION
-    if ( parentComponent != parent->getActiveComponent() )  {
-      ////// selected object does not belong to GEOM module:
-      // remove all commands except Display/Erase...
-      while ( 1 ) {
-       int id = popup->idAt( 0 );
-       if ( id <= QAD_TopLabel_Popup_ID )
-         popup->removeItemAt( 0 );
-       else
-         break;
-      }
-    }
-    else {
-      ////// selected object belong to the GEOM module
-      // get interactive object
-      Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
-      objectName = IObject->getName();
-      // if object has entry get SObject
-      SALOMEDS::SObject_var SO;
-      if ( IObject->hasEntry() )
-       SO = anActiveStudy->getStudyDocument()->FindObjectID( IObject->getEntry() );
-
-      if ( theObject == "Component" ) {
-       ////// menu for component
-       if ( !isOCCViewer && !isVTKViewer ) {
-         popup->removeItem( QAD_DisplayOnly_Popup_ID );
-         popup->removeItem( QAD_Display_Popup_ID );
-         popup->removeItem( QAD_Erase_Popup_ID );
-       }
-      }
-      else {
-       ////// not component (should be shape)
-       if ( IObject->hasEntry() )  /////// VSR : TO BE REMOVED
-         popup->removeItem( 804 ); // "Add in Study"
-
-       // Here could be analysis of the geom shape's type
-       // ... //
-
-       SALOMEDS::GenericAttribute_var aTmpAttr;
-       if( SO->_is_nil() || SO->GetFatherComponent()->FindAttribute( aTmpAttr, "AttributeIOR") )
-         popup->removeItem( 9024 ); // "Open" /////// VSR : TO BE REMOVED
-
-       if ( !isOCCViewer && theParent == "ObjectBrowser" ) {
-         if ( theObject == "Shape" )
-           popup->removeItem( 800 ); // Create Group
-         else if ( theObject == "Group" )
-           popup->removeItem( 801 ); // Edit Group
-       }
-
-       if ( isOCCViewer || isVTKViewer ) {
-         ////// current viewer is OCC or VTK
-         SALOME_Prs* prs = aViewFrame->CreatePrs( IObject->getEntry() );
-         if ( aViewFrame->isVisible( IObject ) ) {
-           ////// object is already displayed in the viewer
-           popup->removeItem( QAD_Display_Popup_ID );
-           if ( isOCCViewer ) {
-             ////// OCC viewer only
-             OCCViewer_Prs* occPrs = dynamic_cast<OCCViewer_Prs*>( prs );
-             if ( occPrs && !occPrs->IsNull() ) {
-               AIS_ListOfInteractive ioList;
-               occPrs->GetObjects( ioList );
-               QMenuItem* mi = popup->findItem( 803 );
-               if ( mi && mi->popup() ) {
-                 if ( ioList.First()->DisplayMode() == 0 )
-                   mi->popup()->setItemChecked( 80311, true ); // "Wireframe"
-                 else if ( ioList.First()->DisplayMode() == 1 )
-                   mi->popup()->setItemChecked( 80312, true ); // "Shading"
-                 else if ( ioList.First()->DisplayMode() < 0 )
-                   mi->popup()->setItemChecked( aDisplayMode == 0 ? 80311 : 80312 , true ); // "Wireframe" or "Shading"
-               }
-             }
-           }
-           else {
-             ////// VTK viewer only
-             //popup->removeItem( 8034 ); // "Isos"
-             SVTK_Prs* vtkPrs = dynamic_cast<SVTK_Prs*>( prs );
-             if ( vtkPrs && !vtkPrs->IsNull() ) {
-               vtkActorCollection* actorList = vtkPrs->GetObjects();
-               actorList->InitTraversal();
-               SALOME_Actor* ac = SALOME_Actor::SafeDownCast( actorList->GetNextActor() );
-               QMenuItem* mi = popup->findItem( 803 );
-               if ( ac && mi && mi->popup() ) {
-                 if ( ac->getDisplayMode() == 0 )
-                   mi->popup()->setItemChecked( 80311, true ); // "Wireframe"
-                 else if ( ac->getDisplayMode() == 1 )
-                   mi->popup()->setItemChecked( 80312, true ); // "Shading"
-                 else
-                   mi->popup()->setItemChecked( aDisplayMode == 0 ? 80311 : 80312 , true ); // "Wireframe" or "Shading"
-               }
-             }
-           }
-         }
-         else {
-           ////// object is not yet displayed in the viewer
-           popup->removeItem( 803 );  // "Display Mode"
-           popup->removeItem( 8032 ); // "Color"
-           popup->removeItem( 8033 ); // "Transparency"
-           popup->removeItem( 8034 ); // "Isos"
-           popup->removeItem( QAD_Erase_Popup_ID );
-         }
-         delete prs;
-       }
-       else {
-         ////// other viewer type (neither OCC nor VTK)
-         popup->removeItem( 803 );  // "Display Mode"
-         popup->removeItem( 8032 ); // "Color"
-         popup->removeItem( 8033 ); // "Transparency"
-         popup->removeItem( 8034 ); // "Isos"
-         popup->removeItem( QAD_Display_Popup_ID );
-         popup->removeItem( QAD_DisplayOnly_Popup_ID );
-         popup->removeItem( QAD_Erase_Popup_ID );
-       }
-      }
-    }
-  }
-  else {
-    ////// MULTIPLE SELECTION
-    if ( parentComponent != parent->getActiveComponent() )  {
-      ////// not GEOM module objects or objects belong to different modules
-      // remove all commands except Display/Erase...
-      while ( 1 ) {
-       int id = popup->idAt( 0 );
-       if ( id <= QAD_TopLabel_Popup_ID )
-         popup->removeItemAt( 0 );
-       else
-         break;
-      }
-      if ( parentComponent.isNull() )  {
-       ////// objects belong to different modules
-       popup->removeItem(QAD_Display_Popup_ID);
-       popup->removeItem(QAD_DisplayOnly_Popup_ID);
-       popup->removeItem(QAD_Erase_Popup_ID);
-      }
-      else {
-       objectName = tr( "GEOM_MEN_POPUP_NAME" ).arg( nbSel );
-      }
-    }
-    else {
-      ////// all selected objects belong to GEOM module
-      popup->removeItem( 901 ); // "Rename"
-
-      SALOME_ListIteratorOfListIO It( Sel->StoredIObjects() );
-      bool isComponent  = false;
-      bool needOpen     = false;
-      bool needDisplay  = false;
-      bool needErase    = false;
-      int needToPublish = 0;
-
-      for( ;It.More();It.Next() ) {
-       Handle(SALOME_InteractiveObject) anIObject = It.Value();
-
-       if ( aViewFrame->isVisible( anIObject ) )
-         needErase   = true;
-       else
-         needDisplay = true;
-
-       if( anIObject->hasEntry() ) {
-         needToPublish = -1; /////// VSR : TO BE REMOVED
-         SALOMEDS::SObject_var obj = anActiveStudy->getStudyDocument()->FindObjectID( anIObject->getEntry() );
-         SALOMEDS::GenericAttribute_var aTmpAttr;
-         if ( !obj->_is_nil() && !obj->GetFatherComponent()->FindAttribute( aTmpAttr, "AttributeIOR" ) )
-           needOpen = true;  /////// VSR : TO BE REMOVED
-         if ( !obj->_is_nil() && QString( obj->GetID() ) == QString( obj->GetFatherComponent()->GetID() ) )
-           isComponent = true;
-       }
-       else {
-         if ( needToPublish != -1 ) needToPublish = 1;
-       }
-      }
-      if( needOpen || ( !isOCCViewer && !isVTKViewer ) ) {
-       ////// Data is not loaded yet or current viewer is neither OCC nor VTK
-       popup->removeItem( 803 );  // "Display Mode"
-       popup->removeItem( 8032 ); // "Color"
-       popup->removeItem( 8033 ); // "Transparency"
-       popup->removeItem( 8034 ); // "Isos"
-       popup->removeItem( 804 );  // "Add in Study"
-       popup->removeItem( QAD_DisplayOnly_Popup_ID );
-       popup->removeItem( QAD_Display_Popup_ID );
-       popup->removeItem( QAD_Erase_Popup_ID );
-      }
-      else {
-       popup->removeItem( 9024 );   // "Open"
-       if ( needToPublish <= 0 )
-         popup->removeItem( 804 );  // "Add in Study"
-
-       if( isComponent ) {
-         popup->removeItem( 803 );  // "Display Mode"
-         popup->removeItem( 8032 ); // "Color"
-         popup->removeItem( 8033 ); // "Transparency"
-         popup->removeItem( 8034 ); // "Isos"
-         popup->removeItem( QAD_DisplayOnly_Popup_ID );
-       }
-
-       if ( !needDisplay )
-         popup->removeItem( QAD_Display_Popup_ID );
-       if ( !needErase )
-         popup->removeItem( QAD_Erase_Popup_ID );
-       if ( !isOCCViewer && !isVTKViewer)
-         popup->removeItem( 8034 ); // "Isos"
-      }
-    }
-  }
-
-  // check popup for unnecessary separators
-  QAD_Tools::checkPopup( popup );
-  // find popup menu's TopLabel item (with title)
-  int topItem = popup->indexOf( QAD_TopLabel_Popup_ID );
-  if ( topItem >= 0 ) {
-    // remove popup menu's title item
-    popup->removeItem( QAD_TopLabel_Popup_ID );
-    if ( theParent == "Viewer" && !objectName.isEmpty() && popup->count() > 0 ) {
-      // set bold font for popup menu's title
-      QFont f = popup->font(); f.setBold( TRUE );
-      popup->removeItem( QAD_TopLabel_Popup_ID );
-      popup->insertItem( new CustomItem( objectName, f ), QAD_TopLabel_Popup_ID, topItem );
-    }
-  }
-
-  return false;
-}
-
-*/
-
 //=======================================================================
 // function : GeometryGUI::BuildPresentation()
 // purpose  :
@@ -1610,7 +1340,7 @@ void GeometryGUI::onWindowActivated( SUIT_ViewWindow* win )
     return;
 
   const bool ViewOCC = ( win->getViewManager()->getType() == OCCViewer_Viewer::Type() );
-  const bool ViewVTK = ( win->getViewManager()->getType() == SVTK_Viewer::Type() );
+  //const bool ViewVTK = ( win->getViewManager()->getType() == SVTK_Viewer::Type() );
 
   // disable non-OCC viewframe menu commands
 //  action( 404 )->setEnabled( ViewOCC ); // SKETCHER
@@ -1620,8 +1350,6 @@ void GeometryGUI::onWindowActivated( SUIT_ViewWindow* win )
   action( 607 )->setEnabled( ViewOCC ); // RemoveInternalWires
   action( 608 )->setEnabled( ViewOCC ); // AddPointOnEdge
 //  action( 609 )->setEnabled( ViewOCC ); // Free boundaries
-  action( 413 )->setEnabled( ViewOCC ); // Isos Settings
-  action( 413 )->setEnabled( ViewVTK ); // Isos Settings
 
   action( 800 )->setEnabled( ViewOCC ); // Create Group
   action( 801 )->setEnabled( ViewOCC ); // Edit Group
@@ -1631,8 +1359,8 @@ void GeometryGUI::onWindowActivated( SUIT_ViewWindow* win )
 
 void GeometryGUI::windows( QMap<int, int>& mappa ) const
 {
-  mappa.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::DockLeft );
-  mappa.insert( SalomeApp_Application::WT_PyConsole, Qt::DockBottom );
+  mappa.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea );
+  mappa.insert( SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea );
 }
 
 void GeometryGUI::viewManagers( QStringList& lst ) const
@@ -1658,8 +1386,10 @@ void GeometryGUI::onViewManagerAdded( SUIT_ViewManager* vm )
 
     // disable OCC selectors
     getApp()->selectionMgr()->setEnabled( false, OCCViewer_Viewer::Type() );
-    for ( GEOMGUI_OCCSelector* sr = myOCCSelectors.first(); sr; sr = myOCCSelectors.next() )
-      sr->setEnabled(true);
+    QListIterator<GEOMGUI_OCCSelector*> itOCCSel( myOCCSelectors );
+    while ( itOCCSel.hasNext() )
+      if ( GEOMGUI_OCCSelector* sr = itOCCSel.next() )
+       sr->setEnabled(true);
   }
   else if ( vm->getType() == SVTK_Viewer::Type() )
   {
@@ -1668,8 +1398,10 @@ void GeometryGUI::onViewManagerAdded( SUIT_ViewManager* vm )
 
     // disable VTK selectors
     getApp()->selectionMgr()->setEnabled( false, SVTK_Viewer::Type() );
-    for ( LightApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() )
-      sr->setEnabled(true);
+    QListIterator<LightApp_VTKSelector*> itVTKSel( myVTKSelectors );
+    while ( itVTKSel.hasNext() )
+      if ( LightApp_VTKSelector* sr = itVTKSel.next() )
+       sr->setEnabled(true);
   }
 }
 
@@ -1678,21 +1410,25 @@ void GeometryGUI::onViewManagerRemoved( SUIT_ViewManager* vm )
   SUIT_ViewModel* viewer = vm->getViewModel();
   if ( vm->getType() == OCCViewer_Viewer::Type() )
   {
-    for ( GEOMGUI_OCCSelector* sr = myOCCSelectors.first(); sr; sr = myOCCSelectors.next() )
-      if ( sr->viewer() == viewer )
-      {
-       myOCCSelectors.remove( sr );
-       break;
-      }
+    QListIterator<GEOMGUI_OCCSelector*> itOCCSel( myOCCSelectors );
+    while ( itOCCSel.hasNext() )
+      if ( GEOMGUI_OCCSelector* sr = itOCCSel.next() )
+       if ( sr->viewer() == viewer )
+       {
+         delete myOCCSelectors.takeAt( myOCCSelectors.indexOf( sr ) );
+         break;
+       }
   }
   if ( vm->getType() == SVTK_Viewer::Type() )
   {
-    for ( LightApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() )
-      if ( sr->viewer() == viewer )
-      {
-       myVTKSelectors.remove( sr );
-       break;
-      }
+    QListIterator<LightApp_VTKSelector*> itVTKSel( myVTKSelectors );
+    while ( itVTKSel.hasNext() )
+      if ( LightApp_VTKSelector* sr = itVTKSel.next() )
+       if ( sr->viewer() == viewer )
+       {
+         delete myVTKSelectors.takeAt( myVTKSelectors.indexOf( sr ) );
+         break;
+       }
   }
 }
 
@@ -1700,7 +1436,7 @@ QString GeometryGUI::engineIOR() const
 {
   if ( !CORBA::is_nil( GetGeomGen() ) )
     return QString( getApp()->orb()->object_to_string( GetGeomGen() ) );
-  return QString( "" );
+  return "";
 }
 
 LightApp_Selection* GeometryGUI::createSelection() const
@@ -1708,18 +1444,39 @@ LightApp_Selection* GeometryGUI::createSelection() const
   return new GEOMGUI_Selection();
 }
 
-void GeometryGUI::contextMenuPopup( const QString& client, QPopupMenu* menu, QString& title )
+void GeometryGUI::contextMenuPopup( const QString& client, QMenu* menu, QString& title )
 {
-  SalomeApp_Module::contextMenuPopup( client, menu, title );
+  SalomeApp_Module::contextMenuPopup(client, menu, title);
+
   SALOME_ListIO lst;
-  getApp()->selectionMgr()->selectedObjects( lst );
-  if ( ( client == "OCCViewer" || client == "VTKViewer" ) && lst.Extent() == 1 ) {
-    Handle(SALOME_InteractiveObject) io = lst.First();
-    SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( application()->activeStudy() );
-    _PTR(Study) study = appStudy->studyDS();
-    _PTR(SObject) obj = study->FindObjectID( io->getEntry() );
-    if ( obj )
-      title = QString( obj->GetName().c_str() );
+  getApp()->selectionMgr()->selectedObjects(lst);
+  if (lst.Extent() < 1)
+    return;
+
+  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>(application()->activeStudy());
+  _PTR(Study) study = appStudy->studyDS();
+
+  bool isImported = true;
+  SALOME_ListIteratorOfListIO anIt (lst);
+  for (; anIt.More() && isImported; anIt.Next()) {
+    Handle(SALOME_InteractiveObject) io = anIt.Value();
+    _PTR(SObject) aSObj = study->FindObjectID(io->getEntry());
+    if (aSObj) {
+      if (lst.Extent() == 1) {
+        // Set context menu title
+        if (client == "OCCViewer" || client == "VTKViewer")
+          title = QString(aSObj->GetName().c_str());
+      }
+
+      CORBA::Object_var anObj = GeometryGUI::ClientSObjectToObject(aSObj);
+      GEOM::GEOM_Object_var aGeomObj = GEOM::GEOM_Object::_narrow(anObj);
+      if (CORBA::is_nil(aGeomObj) || aGeomObj->GetType() != GEOM_IMPORT)
+        isImported = false;
+    }
+  }
+
+  if (isImported) {
+    menu->addAction(action(5029)); // Reload imported shape
   }
 }
 
@@ -1728,10 +1485,11 @@ void GeometryGUI::createPreferences()
   int tabId = addPreference( tr( "PREF_TAB_SETTINGS" ) );
 
   int genGroup = addPreference( tr( "PREF_GROUP_GENERAL" ), tabId );
-  setPreferenceProperty( genGroup, "columns", 1 );
+  setPreferenceProperty( genGroup, "columns", 2 );
 
   int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), genGroup,
-                           LightApp_Preferences::Selector, "Geometry", "display_mode" );
+                               LightApp_Preferences::Selector, 
+                               "Geometry", "display_mode" );
 
   addPreference( tr( "PREF_SHADING_COLOR" ), genGroup,
                 LightApp_Preferences::Color, "Geometry", "shading_color" );
@@ -1755,6 +1513,7 @@ void GeometryGUI::createPreferences()
                            LightApp_Preferences::IntSpin, "Geometry", "SettingsGeomStep" );
 
   int VertexGroup = addPreference( tr( "PREF_GROUP_VERTEX" ), tabId );
+  setPreferenceProperty( VertexGroup, "columns", 2 );
 
   int typeOfMarker = addPreference( tr( "PREF_TYPE_OF_MARKER" ), VertexGroup,
                                     LightApp_Preferences::Selector, "Geometry", "type_of_marker" );
@@ -1767,7 +1526,7 @@ void GeometryGUI::createPreferences()
   aModesList.append( tr("MEN_WIREFRAME") );
   aModesList.append( tr("MEN_SHADING") );
 
-  QValueList<QVariant> anIndexesList;
+  QList<QVariant> anIndexesList;
   anIndexesList.append(0);
   anIndexesList.append(1);
 
@@ -1775,13 +1534,13 @@ void GeometryGUI::createPreferences()
   setPreferenceProperty( dispmode, "indexes", anIndexesList );
 
   // Set property for step value for spinboxes
-  setPreferenceProperty( step, "min", 0.001 );
+  setPreferenceProperty( step, "min", 1 );
   setPreferenceProperty( step, "max", 10000 );
   setPreferenceProperty( step, "precision", 3 );
 
   // Set property for type of vertex marker
   QStringList aTypeOfMarkerList;
-  QValueList<QVariant> anTypeOfMarkerIndexesList;
+  QList<QVariant> anTypeOfMarkerIndexesList;
 
   aTypeOfMarkerList.append( tr("TOM_PLUS") );
   anTypeOfMarkerIndexesList.append(Aspect_TOM_PLUS);
@@ -1848,3 +1607,440 @@ int GeometryGUI::getLocalSelectionMode() const
 {
   return myLocalSelectionMode;
 }
+
+const char gSeparator = '_'; // character used to separate parameter names
+const char gDigitsSep = ':'; // character used to separate numeric parameter values (color = r:g:b)
+
+/*!
+ * \brief Store visual parameters
+ *
+ * This method is called just before the study document is saved.
+ * Store visual parameters in AttributeParameter attribue(s)
+ */
+void GeometryGUI::storeVisualParameters (int savePoint)
+{
+  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>(application()->activeStudy());
+  if (!appStudy || !appStudy->studyDS())
+    return;
+  _PTR(Study) studyDS = appStudy->studyDS();
+
+  // componentName is used for encoding of entries when storing them in IParameters
+  std::string componentName = myComponentGeom->ComponentDataType();
+  //_PTR(SComponent) aSComponent = studyDS->FindComponent("GEOM");
+  //if (!aSComponent) return;
+
+  // IParameters
+  _PTR(AttributeParameter) ap = studyDS->GetModuleParameters("Interface Applicative",
+                                                             componentName.c_str(),
+                                                             savePoint);
+  _PTR(IParameters) ip = ClientFactory::getIParameters(ap);
+
+  // viewers counters are used for storing view_numbers in IParameters
+  int vtkViewers(0), occViewers(0);
+
+  QList<SUIT_ViewManager*> lst;
+  QList<SUIT_ViewManager*>::Iterator it;
+
+  // main cycle to store parameters of displayed objects
+  lst.clear();
+  vtkViewers = occViewers = 0;
+  getApp()->viewManagers(lst);
+  for (it = lst.begin(); it != lst.end(); it++)
+  {
+    SUIT_ViewManager* vman = *it;
+    QString vType = vman->getType();
+
+    // saving VTK actors properties
+    if (vType == SVTK_Viewer::Type())
+    {
+      QVector<SUIT_ViewWindow*> views = vman->getViews();
+      for (int i = 0, iEnd = vman->getViewsCount(); i < iEnd; i++)
+      {
+       if (SVTK_ViewWindow* vtkView = dynamic_cast<SVTK_ViewWindow*>(views[i]))
+        {
+         vtkActorCollection* allActors = vtkView->getRenderer()->GetActors();
+         allActors->InitTraversal();
+         while (vtkActor* actor = allActors->GetNextActor())
+          {
+           if (actor->GetVisibility()) // store only visible actors
+            {
+              GEOM_Actor* aGeomActor = 0;
+              if (actor->IsA("GEOM_Actor"))
+                aGeomActor = GEOM_Actor::SafeDownCast(actor);
+             if (aGeomActor && aGeomActor->hasIO())
+              {
+                Handle(SALOME_InteractiveObject) io = aGeomActor->getIO();
+                if (io->hasEntry())
+                {
+                  // entry is "encoded" = it does NOT contain component adress, since it is a
+                  // subject to change on next component loading
+                  std::string entry = ip->encodeEntry(io->getEntry(), componentName);
+
+                  std::string param, occParam = vType.toLatin1().data();
+                  occParam += gSeparator;
+                  occParam += QString::number(vtkViewers).toLatin1().data();
+                  occParam += gSeparator;
+
+                  param = occParam + "Visibility";
+                  ip->setParameter(entry, param, "On");
+
+                  param = occParam + "DisplayMode";
+                  ip->setParameter(entry, param, QString::number
+                                   (aGeomActor->getDisplayMode()).toLatin1().data());
+
+                  vtkFloatingPointType r, g, b;
+                  aGeomActor->GetColor(r, g, b);
+                  QString colorStr = QString::number(r);
+                  colorStr += gDigitsSep; colorStr += QString::number(g);
+                  colorStr += gDigitsSep; colorStr += QString::number(b);
+                  param = occParam + "Color";
+                  ip->setParameter(entry, param, colorStr.toLatin1().data());
+
+                  param = occParam + "Opacity";
+                  ip->setParameter(entry, param, QString::number(aGeomActor->GetOpacity()).toLatin1().data());
+
+                  int nbUIso(0), nbVIso(0);
+                  aGeomActor->GetNbIsos(nbUIso,nbVIso);
+                  QString isosStr = QString::number(nbUIso);
+                  isosStr += gDigitsSep;
+                  isosStr += QString::number(nbVIso);
+                  param = occParam + "Isos";
+                  ip->setParameter(entry, param, isosStr.toLatin1().data());
+                } // if (io->hasEntry())
+             } // GEOM_Actor && hasIO
+           } // isVisible
+         } // while.. actors traversal
+       } // if (vtkView)
+      } // for (views)
+      vtkViewers++;
+    } // if (SVTK view model)
+    else if (vType == SOCC_Viewer::Type()) // processing OCC viewers
+    {
+      QVector<SUIT_ViewWindow*> views = vman->getViews();
+      for (int i = 0, iEnd = vman->getViewsCount(); i < iEnd; i++)
+      {
+       SOCC_ViewWindow* occView = dynamic_cast<SOCC_ViewWindow*>(views[i]);
+       if (occView)
+        {
+          //Handle(AIS_InteractiveContext) ic =
+          //  ((OCCViewer_Viewer*)(occView->getViewManager()->getViewModel()))->getAISContext();
+          OCCViewer_Viewer* viewModel = (OCCViewer_Viewer*)(vman->getViewModel());
+          //OCCViewer_Viewer* viewModel = ((OCCViewer_ViewManager*)vman)->getOCCViewer();
+          Handle(AIS_InteractiveContext) ic = viewModel->getAISContext();
+
+          AIS_ListOfInteractive aList;
+          ic->DisplayedObjects(aList);
+
+          AIS_ListIteratorOfListOfInteractive ite (aList);
+          for (; ite.More(); ite.Next())
+          {
+            if (ite.Value()->IsInstance(STANDARD_TYPE(GEOM_AISShape)))
+            {
+              Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(ite.Value());
+              if (aSh->hasIO())
+              {
+                Handle(SALOME_InteractiveObject) io =
+                  Handle(SALOME_InteractiveObject)::DownCast(aSh->getIO());
+                if (io->hasEntry())
+                {
+                  // entry is "encoded": it does NOT contain component adress,
+                  // since it is a subject to change on next component loading
+                  std::string entry = ip->encodeEntry(io->getEntry(), componentName);
+
+                  std::string param, occParam = vType.toLatin1().data();
+                  occParam += gSeparator;
+                  occParam += QString::number(occViewers).toLatin1().data();
+                  occParam += gSeparator;
+
+                  // Visibility
+                  param = occParam + "Visibility";
+                  ip->setParameter(entry, param, "On");
+
+                  // DisplayMode
+                  param = occParam + "DisplayMode";
+                  int dm = aSh->DisplayMode();
+                  ip->setParameter(entry, param, QString::number(dm).toLatin1().data());
+
+                  // Color
+                  // is a property of GEOM_Object, it is stored by GEOM engine
+
+                  // Transparency
+                  param = occParam + "Transparency";
+                  ip->setParameter(entry, param, QString::number(aSh->Transparency()).toLatin1().data());
+
+                  // Isos
+                  Handle(AIS_Drawer) aDrawer = aSh->Attributes();
+                  int nbUIso = aDrawer->UIsoAspect()->Number();
+                  int nbVIso = aDrawer->VIsoAspect()->Number();
+                  QString isosStr = QString::number(nbUIso);
+                  isosStr += gDigitsSep;
+                  isosStr += QString::number(nbVIso);
+                  param = occParam + "Isos";
+                  ip->setParameter(entry, param, isosStr.toLatin1().data());
+                } // if (io->hasEntry())
+              } // if (io)
+           } // if (GEOM_AISShape)
+         } // for (AIS_ListOfInteractive)
+       } // if ( occView )
+      } // for ( views )
+      occViewers++;
+    } // if (SOCC view model)
+    else
+    {
+      // unknown viewer type
+    }
+  } // for (viewManagers)
+}
+
+/*!
+ * \brief Restore visual parameters
+ *
+ * This method is called after the study document is opened.
+ * Restore visual parameters from AttributeParameter attribue(s)
+ */
+void GeometryGUI::restoreVisualParameters (int savePoint)
+{
+  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>(application()->activeStudy());
+  if (!appStudy || !appStudy->studyDS())
+    return;
+  _PTR(Study) studyDS = appStudy->studyDS();
+
+  // componentName is used for encoding of entries when storing them in IParameters
+  std::string componentName = myComponentGeom->ComponentDataType();
+  //_PTR(SComponent) aSComponent = studyDS->FindComponent("GEOM");
+  //if (!aSComponent) return;
+
+  // IParameters
+  _PTR(AttributeParameter) ap = studyDS->GetModuleParameters("Interface Applicative",
+                                                             componentName.c_str(),
+                                                             savePoint);
+  _PTR(IParameters) ip = ClientFactory::getIParameters(ap);
+
+  std::vector<std::string> entries = ip->getEntries();
+
+  for (std::vector<std::string>::iterator entIt = entries.begin(); entIt != entries.end(); ++entIt)
+  {
+    // entry is a normal entry - it should be "decoded" (setting base adress of component)
+    QString entry (ip->decodeEntry(*entIt).c_str());
+
+    // Check that the entry corresponds to a real object in the Study
+    // as the object may be deleted or modified after the visual state is saved.
+    _PTR(SObject) so = studyDS->FindObjectID(entry.toLatin1().data());
+    if (!so) continue; //Skip the not existent entry
+
+    std::vector<std::string> paramNames = ip->getAllParameterNames( *entIt );
+    std::vector<std::string> paramValues = ip->getAllParameterValues( *entIt );
+
+    std::vector<std::string>::iterator namesIt = paramNames.begin();
+    std::vector<std::string>::iterator valuesIt = paramValues.begin();
+
+    // actors are stored in a map after displaying of them for
+    // quicker access in the future: map < viewID to actor >
+    NCollection_DataMap<int, GEOM_Actor*          > vtkActors;
+    NCollection_DataMap<int, Handle(GEOM_AISShape)> occActors;
+
+    for (; namesIt != paramNames.end(); ++namesIt, ++valuesIt)
+    {
+      // visual parameters are stored in strings as follows: ViewerType_ViewIndex_ParamName.
+      // '_' is used as separator and should not be used in viewer type or parameter names.
+      QStringList lst = QString((*namesIt).c_str()).split(gSeparator, QString::SkipEmptyParts);
+      if (lst.size() != 3)
+        continue;
+
+      QString viewerTypStr = lst[0];
+      QString viewIndexStr = lst[1];
+      QString paramNameStr = lst[2];
+
+      bool ok;
+      int viewIndex = viewIndexStr.toUInt(&ok);
+      if (!ok) // bad conversion of view index to integer
+       continue;
+
+      // viewers
+      if (viewerTypStr == SVTK_Viewer::Type())
+      {
+        GEOM_Actor* vActor = 0;
+        if (vtkActors.IsBound(viewIndex))
+          vActor = vtkActors.Find(viewIndex);
+
+        if (paramNameStr == "Visibility")
+        {
+          if (!vActor && displayer())
+          {
+            QList<SUIT_ViewManager*> lst;
+            getApp()->viewManagers(viewerTypStr, lst);
+
+            // SVTK ViewManager always has 1 ViewWindow, so view index is index of view manager
+            if (viewIndex >= 0 && viewIndex < lst.count()) {
+              SUIT_ViewManager* vman = lst.at(viewIndex);
+              SUIT_ViewModel* vmodel = vman->getViewModel();
+              // SVTK view model can be casted to SALOME_View
+              displayer()->Display(entry, true, dynamic_cast<SALOME_View*>(vmodel));
+
+              // store displayed actor in a temporary map for quicker
+              // access later when restoring other parameters
+              SVTK_ViewWindow* vtkView = (SVTK_ViewWindow*) vman->getActiveView();
+              vtkRenderer* Renderer = vtkView->getRenderer();
+              vtkActorCollection* theActors = Renderer->GetActors();
+              theActors->InitTraversal();
+              bool isFound = false;
+              vtkActor *ac = theActors->GetNextActor();
+              for (; ac != NULL && !isFound; ac = theActors->GetNextActor()) {
+                if (ac->IsA("GEOM_Actor")) {
+                  GEOM_Actor* aGeomAc = GEOM_Actor::SafeDownCast(ac);
+                  if (aGeomAc->hasIO()) {
+                    Handle(SALOME_InteractiveObject) io =
+                      Handle(SALOME_InteractiveObject)::DownCast(aGeomAc->getIO());
+                    if (io->hasEntry() && strcmp(io->getEntry(), entry.toLatin1().data()) == 0) {
+                      isFound = true;
+                      vtkActors.Bind(viewIndex, aGeomAc);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        } // if (paramNameStr == "Visibility")
+       else
+        {
+          // the rest properties "work" with GEOM_Actor
+         if (vActor)
+          {
+            QString val ((*valuesIt).c_str());
+
+            if (paramNameStr == "DisplayMode") {
+              vActor->setDisplayMode(val.toInt());
+            }
+            else if (paramNameStr == "Color") {
+              QStringList colors = val.split(gDigitsSep, QString::SkipEmptyParts);
+              if (colors.count() == 3)
+                vActor->SetColor(colors[0].toFloat(), colors[1].toFloat(), colors[2].toFloat());
+            }
+            else if (paramNameStr == "Opacity") {
+              vActor->SetOpacity(val.toFloat());
+            }
+            else if (paramNameStr == "Isos") {
+              QStringList isos = val.split(gDigitsSep, QString::SkipEmptyParts);
+              if (isos.count() == 2) {
+                int aIsos[2] = {isos[0].toInt(), isos[1].toInt()};
+                vActor->SetNbIsos(aIsos);
+              }
+            }
+          }
+       } // other parameters than Visibility
+      }
+      else if (viewerTypStr == SOCC_Viewer::Type())
+      {
+        //Handle(AIS_InteractiveObject) occActor;
+        Handle(GEOM_AISShape) occActor;
+        if (occActors.IsBound(viewIndex))
+          occActor = occActors.Find(viewIndex);
+
+        // ViewModel and InteractiveContext
+        SOCC_Viewer* occVModel = 0;
+        Handle(AIS_InteractiveContext) ic;
+
+        QList<SUIT_ViewManager*> lst;
+        getApp()->viewManagers(viewerTypStr, lst);
+
+        // SOCC ViewManager always has 1 ViewWindow, so view index is index of view manager
+        if (viewIndex >= 0 && viewIndex < lst.count()) {
+          SUIT_ViewManager* vman = lst.at(viewIndex);
+          SUIT_ViewModel* vmodel = vman->getViewModel();
+          occVModel = dynamic_cast<SOCC_Viewer*>(vmodel);
+          if (occVModel)
+            ic = occVModel->getAISContext();
+        }
+
+        if (ic.IsNull())
+          continue;
+
+        if (paramNameStr == "Visibility")
+        {
+         if (occActor.IsNull() && displayer())
+          {
+            displayer()->Display(entry, true, occVModel);
+
+            // store displayed actor in a temporary map for quicker
+            // access later when restoring other parameters
+            AIS_ListOfInteractive aList;
+            ic->DisplayedObjects(aList);
+            bool isFound = false;
+            AIS_ListIteratorOfListOfInteractive ite (aList);
+            for (; ite.More() && !isFound; ite.Next()) {
+              if (ite.Value()->IsInstance(STANDARD_TYPE(GEOM_AISShape))) {
+                Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(ite.Value());
+                if (aSh->hasIO()) {
+                  Handle(SALOME_InteractiveObject) io =
+                    Handle(SALOME_InteractiveObject)::DownCast(aSh->getIO());
+                  if (io->hasEntry() && strcmp(io->getEntry(), entry.toLatin1().data()) == 0) {
+                    isFound = true;
+                    occActors.Bind(viewIndex, aSh);
+                  }
+                }
+              }
+            }
+          }
+        } // if (paramNameStr == "Visibility")
+       else
+        {
+          // the rest properties "work" with GEOM_AISShape
+         if (!occActor.IsNull())
+          {
+            QString val ((*valuesIt).c_str());
+
+            if (paramNameStr == "DisplayMode") {
+              ic->SetDisplayMode(occActor, AIS_DisplayMode(val.toInt()), false);
+              //ic->Redisplay(occActor, Standard_False, Standard_True);
+            }
+            // Color is restored by the GEOM engine
+            else if (paramNameStr == "Transparency") {
+              ic->SetTransparency(occActor, val.toFloat(), false);
+              ic->Redisplay(occActor, Standard_False, Standard_True);
+            }
+            else if (paramNameStr == "Isos") {
+              QStringList isos = val.split(gDigitsSep, QString::SkipEmptyParts);
+              if (isos.count() == 2) {
+                Handle(AIS_Drawer) aDrawer = occActor->Attributes();
+                int nbUIso = isos[0].toInt();
+                int nbVIso = isos[1].toInt();
+                Handle(Prs3d_IsoAspect) uIsoAspect = aDrawer->UIsoAspect();
+                Handle(Prs3d_IsoAspect) vIsoAspect = aDrawer->VIsoAspect();
+                uIsoAspect->SetNumber(nbUIso);
+                vIsoAspect->SetNumber(nbVIso);
+                aDrawer->SetUIsoAspect(uIsoAspect);
+                aDrawer->SetVIsoAspect(vIsoAspect);
+                ic->SetLocalAttributes(occActor, aDrawer);
+                ic->Redisplay(occActor);
+              }
+            }
+          }
+       } // other parameters than Visibility
+      }
+      else
+      {
+        // unknown viewer type
+      }
+    } // for names/parameters iterator
+  } // for entries iterator
+
+  // update all VTK and OCC views
+  QList<SUIT_ViewManager*> lst;
+  getApp()->viewManagers(lst);
+  for (QList<SUIT_ViewManager*>::Iterator it = lst.begin(); it != lst.end(); it++) {
+    SUIT_ViewModel* vmodel = (*it)->getViewModel();
+    if (!vmodel)
+      continue;
+    if (vmodel->getType() == SVTK_Viewer::Type()) {
+      SVTK_ViewWindow* vtkView = (SVTK_ViewWindow*) (*it)->getActiveView();
+      vtkView->getRenderer()->ResetCameraClippingRange();
+      vtkView->Repaint();
+    }
+    else if (vmodel->getType() == SOCC_Viewer::Type()) {
+      //SOCC_ViewWindow* occView = (SOCC_ViewWindow*) (*it)->getActiveView();
+      SALOME_View* occVMod = dynamic_cast<SALOME_View*>(vmodel);
+      if (occVMod)
+        occVMod->Repaint();
+    }
+  }
+}
index 484e3883f096608d7fec1a5b0c6a400441764f72..36d06fd55b8a1f4d6df6ce79d0d8327c24bc49d5 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GeometryGUI.h
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
-//
-//  File   : GeometryGUI.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #ifndef GEOMETRYGUI_H
 #define GEOMETRYGUI_H
 
 #include "GEOM_GEOMGUI.hxx"
 
-#include "SalomeApp_Module.h"
+#include <SalomeApp_Module.h>
 
-#include "GEOMGUI.h"
-#include "GEOM_Client.hxx"
-#include "SALOME_InteractiveObject.hxx"
+#include <GEOM_Client.hxx>
+#include <SALOME_InteractiveObject.hxx>
+#include <SALOMEDSClient.hxx>
 
-#include "SALOMEDSClient.hxx"
+#include "GEOMGUI.h"
 
 // QT Includes
-#include <qmap.h>
+#include <QMap>
 
 // OCCT Includes
 #include <gp_Ax3.hxx>
@@ -52,7 +49,7 @@
 typedef QMap<QString, GEOMGUI*> GUIMap;
 
 class QDialog;
-class QPopupMenu;
+class QMenu;
 class GEOMGUI_OCCSelector;
 class LightApp_VTKSelector;
 class LightApp_Selection;
@@ -84,6 +81,8 @@ public:
   static CORBA::Object_var    ClientSObjectToObject (_PTR(SObject) theSObject);
   static SALOMEDS::Study_var  ClientStudyToStudy (_PTR(Study) theStudy);
 
+  static char*                JoinObjectParameters(const QStringList& theParametersList);
+
   GEOM_Client&                GetShapeReader()    { return myShapeReader; }
   Standard_CString&           GetFatherior()      { return myFatherior; }
   //void                        SetState( const int state ) { myState = state; }
@@ -106,7 +105,7 @@ public:
   virtual void                BuildPresentation( const Handle(SALOME_InteractiveObject)&, SUIT_ViewWindow* = 0 );
 
 //  virtual void                DefinePopup( QString & theContext, QString & theParent, QString & theObject);
-//  virtual bool                CustomPopup( QAD_Desktop* parent, QPopupMenu* popup, const QString& theContext,
+//  virtual bool                CustomPopup( QAD_Desktop* parent, QMenu* popup, const QString& theContext,
 //                                        const QString& theParent, const QString& theObject );
 
   // The Working Plane management
@@ -117,12 +116,15 @@ public:
   virtual void                windows( QMap<int, int>& ) const;
   virtual void                viewManagers( QStringList& ) const;
 
-  virtual void                contextMenuPopup( const QString&, QPopupMenu*, QString& );
+  virtual void                contextMenuPopup( const QString&, QMenu*, QString& );
   virtual void                createPreferences();
   virtual void                preferencesChanged( const QString&, const QString& );
   int                         getLocalSelectionMode() const;
   void                        setLocalSelectionMode(const int mode);
 
+  virtual void storeVisualParameters  (int savePoint);
+  virtual void restoreVisualParameters(int savePoint);
+
 public slots:
   virtual bool                deactivateModule( SUIT_Study* );
   virtual bool                activateModule( SUIT_Study* );
@@ -167,8 +169,8 @@ private:
   gp_Ax3                      myWorkingPlane;
   QMap<int,QString>           myRules;           // popup rules
 
-  QPtrList<GEOMGUI_OCCSelector>   myOCCSelectors;
-  QPtrList<LightApp_VTKSelector> myVTKSelectors;
+  QList<GEOMGUI_OCCSelector*>  myOCCSelectors;
+  QList<LightApp_VTKSelector*> myVTKSelectors;
 
   LightApp_Displayer*         myDisplayer;
   int                         myLocalSelectionMode; //Select Only
index 57df497a60dd566b120d70590cf6c18dc6525281..e1e8f139061a1f8ec20719e251fce045d63f5cad 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GeometryGUI_Swig.cxx
+// Author : Nicolas REJNERI, Paul RASCLE
 //
-//
-//  File   : GeometryGUI_Swig.cxx
-//  Author : Nicolas REJNERI, Paul RASCLE
-//  Module : GEOM
-//  $Header$
-
 #include "GeometryGUI_Swig.hxx"
-#include "SALOMEGUI_Swig.hxx"
 
 #include "GeometryGUI.h"
 
+#include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
 #include "SalomeApp_Study.h"
-#include "SalomeApp_ImportOperation.h"
 
 #include "OB_Browser.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"
-
-#include "utilities.h"
-
-#include "SALOMEDSClient.hxx"
+#include "SALOME_Event.h"
 
 // OCCT Includes
 #include <TopAbs.hxx>
index 86fa64594779e4592093f2f37280a93571868625..a0f079ac39e033e2abf42a3420aa029c4c970f55 100644 (file)
@@ -1,33 +1,30 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : GeometryGUI_Swig.hxx
-//  Author : Nicolas REJNERI, Paul RASCLE
-//  Module : GEOM
-//  $Header$
-
-#ifndef _GeometryGUI_SWIG_HXX_
-#define _GeometryGUI_SWIG_HXX_
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : GeometryGUI_Swig.hxx
+// Author : Nicolas REJNERI, Paul RASCLE
+//
+#ifndef GEOMETRYGUI_SWIG_HXX
+#define GEOMETRYGUI_SWIG_HXX
 
 #include "GEOM_GEOMGUI.hxx"
 
@@ -37,8 +34,6 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
 
-class GEOM_Client;
-
 class GEOMGUI_EXPORT GEOM_Swig
 {
 public:
@@ -61,5 +56,4 @@ public:
   bool initGeomGen();
 };
 
-
-#endif
+#endif // GEOMETRYGUI_SWIG_HXX
index d562c0ffc99994f1a72cbfa6789ef871e4bfe732..4fa8d7ea2065fae564d8e81fb112f9d0385a6b47 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GeometryGUI_Swig.i
+// Author : Nicolas REJNERI, Paul RASCLE
 //
-//
-//  File   : GeometryGUI_Swig.i
-//  Author : Nicolas REJNERI, Paul RASCLE
-//  Module : GEOM
-//  $Header$
-
 %{
 #include "GeometryGUI_Swig.hxx"
 %}
index 798553d307b22297654d1ae511fb6e7f6cb05e89..9dc50a430245df100cbd7a693771a63b8155d6f3 100644 (file)
-#  GEOM GEOMGUI : GUI for Geometry component
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM GEOMGUI : GUI for Geometry component
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : GEOMGUI
 #
-#  File   : Makefile.in
-#  Author : Marc Tajchman (CEA)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header$
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOM.la
 
 # header files 
-salomeinclude_HEADERS = \
-       GeometryGUI.h \
-       GEOMGUI.h \
-       GEOM_Displayer.h \
-       GEOMGUI_OCCSelector.h \
-       GEOMGUI_Selection.h \
-       GeometryGUI_Swig.hxx \
-       GeometryGUI_Swig.i \
+salomeinclude_HEADERS =        \
+       GeometryGUI.h           \
+       GEOMGUI.h               \
+       GEOM_Displayer.h        \
+       GEOMGUI_OCCSelector.h   \
+       GEOMGUI_Selection.h     \
+       GeometryGUI_Swig.hxx    \
+       GeometryGUI_Swig.i      \
        GEOM_GEOMGUI.hxx
 
-dist_libGEOM_la_SOURCES = \
-       GeometryGUI.cxx \
-       GEOMGUI.cxx \
-       GEOM_Displayer.cxx \
-        GEOMGUI_OCCSelector.cxx \
-       GEOMGUI_Selection.cxx \
+dist_libGEOM_la_SOURCES =      \
+       GeometryGUI.cxx         \
+       GEOMGUI.cxx             \
+       GEOM_Displayer.cxx      \
+        GEOMGUI_OCCSelector.cxx        \
+       GEOMGUI_Selection.cxx   \
        GeometryGUI_Swig.cxx
 
-MOC_FILES = \
+MOC_FILES =                    \
        GeometryGUI_moc.cxx
 
-
-nodist_libGEOM_la_SOURCES= \
+nodist_libGEOM_la_SOURCES =    \
        $(MOC_FILES)
 
 # resources files
-nodist_salomeres_DATA= \
-       GEOM_images.qm \
-       GEOM_msg_en.qm \
+nodist_salomeres_DATA =        \
+       GEOM_images.qm  \
+       GEOM_msg_en.qm  \
        GEOM_msg_fr.qm
 
-#LIB_CLIENT_IDL = SALOME_Exception.idl \
-#               SALOMEDS.idl \
-#               SALOMEDS_Attributes.idl \
-#               SALOME_GenericObj.idl \
-#               SALOME_Component.idl \
-#               GEOM_Gen.idl
-
-#LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libGEOM_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMFiltersSelection \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(top_builddir)/idl \
+libGEOM_la_CPPFLAGS =                          \
+       $(QT_INCLUDES)                          \
+       $(VTK_INCLUDES)                         \
+       $(CAS_CPPFLAGS)                         \
+       $(PYTHON_INCLUDES)                      \
+       $(BOOST_CPPFLAGS)                       \
+       $(KERNEL_CXXFLAGS)                      \
+       $(GUI_CXXFLAGS)                         \
+       $(CORBA_CXXFLAGS)                       \
+       $(CORBA_INCLUDES)                       \
+       -I$(srcdir)/../OBJECT                   \
+       -I$(srcdir)/../GEOMFiltersSelection     \
+       -I$(srcdir)/../GEOMClient               \
+       -I$(srcdir)/../GEOMImpl                 \
+       -I$(top_builddir)/idl                   \
        -I$(top_builddir)/salome_adm/unix
 
-libGEOM_la_LDFLAGS  = \
-       ../GEOMFiltersSelection/libGEOMFiltersSelection.la \
-       ../GEOMClient/libGEOMClient.la \
-       ../OBJECT/libGEOMObject.la \
-       $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA \
+libGEOM_la_LDFLAGS =                                           \
+       ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \
+       ../GEOMClient/libGEOMClient.la                          \
+       ../OBJECT/libGEOMObject.la                              \
+       $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA                \
        $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent
 # -lSalomeApp 
 # -lToolsGUI
diff --git a/src/GEOMImpl/GEOMImpl.pro b/src/GEOMImpl/GEOMImpl.pro
new file mode 100644 (file)
index 0000000..87d10ea
--- /dev/null
@@ -0,0 +1,127 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = GEOMimpl
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+STDLIB = -lstdc++
+
+CAS_LDPATH = -L$$(CASROOT)/Linux/lib
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS} $${BOOST_CPPFLAGS} ../ShHealOper ../NMTAlgo ../NMTTools ../GEOM ../GEOMAlgo ../SKETCHER ../ARCHIMEDE ../../salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lGEOMbasic -lNMTAlgo -lGEOMAlgo -lShHealOper -lGEOMArchimede -lGEOMSketcher $${KERNEL_LDFLAGS} -lSALOMELocalTrace $${STDLIB} $${CAS_LDPATH} -lTKCAF -lTKFillet -lTKOffset
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += GEOMIMPL_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+HEADERS  = GEOMImpl_Gen.hxx
+HEADERS += GEOMImpl_IBasicOperations.hxx
+HEADERS += GEOMImpl_ITransformOperations.hxx
+HEADERS += GEOMImpl_IHealingOperations.hxx
+HEADERS += GEOMImpl_I3DPrimOperations.hxx
+HEADERS += GEOMImpl_IShapesOperations.hxx
+HEADERS += GEOMImpl_IBlocksOperations.hxx
+HEADERS += GEOMImpl_IBooleanOperations.hxx
+HEADERS += GEOMImpl_ICurvesOperations.hxx
+HEADERS += GEOMImpl_ILocalOperations.hxx
+HEADERS += GEOMImpl_IInsertOperations.hxx
+HEADERS += GEOMImpl_IMeasureOperations.hxx
+HEADERS += GEOMImpl_IGroupOperations.hxx
+HEADERS += GEOMImpl_CopyDriver.hxx
+HEADERS += GEOMImpl_Types.hxx
+HEADERS += GEOM_GEOMImpl.hxx
+
+SOURCES  = GEOMImpl_IBasicOperations.cxx
+SOURCES += GEOMImpl_ITransformOperations.cxx
+SOURCES += GEOMImpl_IHealingOperations.cxx
+SOURCES += GEOMImpl_I3DPrimOperations.cxx
+SOURCES += GEOMImpl_IShapesOperations.cxx
+SOURCES += GEOMImpl_IBlocksOperations.cxx
+SOURCES += GEOMImpl_IBooleanOperations.cxx
+SOURCES += GEOMImpl_ICurvesOperations.cxx
+SOURCES += GEOMImpl_ILocalOperations.cxx
+SOURCES += GEOMImpl_IInsertOperations.cxx
+SOURCES += GEOMImpl_IMeasureOperations.cxx
+SOURCES += GEOMImpl_IGroupOperations.cxx
+SOURCES += GEOMImpl_Gen.cxx
+SOURCES += GEOMImpl_PointDriver.cxx
+SOURCES += GEOMImpl_VectorDriver.cxx
+SOURCES += GEOMImpl_LineDriver.cxx
+SOURCES += GEOMImpl_PlaneDriver.cxx
+SOURCES += GEOMImpl_MarkerDriver.cxx
+SOURCES += GEOMImpl_TranslateDriver.cxx
+SOURCES += GEOMImpl_MirrorDriver.cxx
+SOURCES += GEOMImpl_OffsetDriver.cxx
+SOURCES += GEOMImpl_ScaleDriver.cxx
+SOURCES += GEOMImpl_PositionDriver.cxx
+SOURCES += GEOMImpl_BoxDriver.cxx
+SOURCES += GEOMImpl_ConeDriver.cxx
+SOURCES += GEOMImpl_CylinderDriver.cxx
+SOURCES += GEOMImpl_SphereDriver.cxx
+SOURCES += GEOMImpl_TorusDriver.cxx
+SOURCES += GEOMImpl_PrismDriver.cxx
+SOURCES += GEOMImpl_PipeDriver.cxx
+SOURCES += GEOMImpl_ThruSectionsDriver.cxx
+SOURCES += GEOMImpl_RevolutionDriver.cxx
+SOURCES += GEOMImpl_ShapeDriver.cxx
+SOURCES += GEOMImpl_BlockDriver.cxx
+SOURCES += GEOMImpl_Block6Explorer.cxx
+SOURCES += GEOMImpl_MeasureDriver.cxx
+SOURCES += GEOMImpl_PolylineDriver.cxx
+SOURCES += GEOMImpl_CircleDriver.cxx
+SOURCES += GEOMImpl_EllipseDriver.cxx
+SOURCES += GEOMImpl_ArcDriver.cxx
+SOURCES += GEOMImpl_SplineDriver.cxx
+SOURCES += GEOMImpl_SketcherDriver.cxx
+SOURCES += GEOMImpl_FilletDriver.cxx
+SOURCES += GEOMImpl_Fillet2dDriver.cxx
+SOURCES += GEOMImpl_ChamferDriver.cxx
+SOURCES += GEOMImpl_BooleanDriver.cxx
+SOURCES += GEOMImpl_PartitionDriver.cxx
+SOURCES += GEOMImpl_CopyDriver.cxx
+SOURCES += GEOMImpl_ExportDriver.cxx
+SOURCES += GEOMImpl_ImportDriver.cxx
+SOURCES += GEOMImpl_RotateDriver.cxx
+SOURCES += GEOMImpl_ArchimedeDriver.cxx
+SOURCES += GEOMImpl_HealingDriver.cxx
+SOURCES += GEOMImpl_FillingDriver.cxx
+SOURCES += GEOMImpl_GlueDriver.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
diff --git a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx
new file mode 100755 (executable)
index 0000000..ccf53fd
--- /dev/null
@@ -0,0 +1,145 @@
+// 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 <Standard_Stream.hxx>
+
+#include <GEOMImpl_3DSketcherDriver.hxx>
+#include <GEOMImpl_I3DSketcher.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
+
+#include <GEOMImpl_IMeasureOperations.hxx>
+
+// OCCT Includes
+#include <BRepBuilderAPI_MakePolygon.hxx>
+#include <BRepBuilderAPI_MakeVertex.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Wire.hxx>
+#include <gp_Pnt.hxx>
+
+#include <Standard_ConstructionError.hxx>
+
+//=======================================================================
+//function : GetID
+//purpose  :
+//=======================================================================
+const Standard_GUID& GEOMImpl_3DSketcherDriver::GetID()
+{
+  static Standard_GUID a3DSketcherDriver("FF2BBB54-5D24-4df3-210B-3A678263EA26");
+  return a3DSketcherDriver;
+}
+
+
+//=======================================================================
+//function : GEOMImpl_3DSketcherDriver
+//purpose  :
+//=======================================================================
+GEOMImpl_3DSketcherDriver::GEOMImpl_3DSketcherDriver()
+{
+}
+
+//=======================================================================
+//function : Execute
+//purpose  :
+//=======================================================================
+Standard_Integer GEOMImpl_3DSketcherDriver::Execute(TFunction_Logbook& log) const
+{
+  if (Label().IsNull()) return 0;
+  Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
+  
+  GEOMImpl_I3DSketcher aCI (aFunction);
+
+  TopoDS_Shape aShape;
+
+  Handle(TColStd_HArray1OfReal) aCoordsArray = aCI.GetCoordinates();
+
+  BRepBuilderAPI_MakePolygon aMakePoly;
+  int anArrayLength = aCoordsArray->Length();
+  double x, y, z;
+  gp_Pnt aPnt;
+  for (int i = 0; i <=(anArrayLength - 3); i+=3) {
+    x = aCoordsArray->Value(i+1);
+    y = aCoordsArray->Value(i+2);
+    z = aCoordsArray->Value(i+3);
+    aPnt = gp_Pnt(x, y, z);
+    aMakePoly.Add(aPnt);
+  }
+  if ( anArrayLength == 3) { // Only Start Point
+    BRepBuilderAPI_MakeVertex mkVertex (aPnt);
+    aShape = mkVertex.Shape();
+  }
+  else { // Make Wire
+    if (aCoordsArray->Value(1) == x && aCoordsArray->Value(2) == y && aCoordsArray->Value(3) == z)
+      aMakePoly.Close();
+    
+    if (aMakePoly.IsDone())
+      aShape = aMakePoly.Wire();
+  }
+
+  if (aShape.IsNull()) return 0;
+
+  aFunction->SetValue(aShape);
+  log.SetTouched(Label());
+  return 1;
+}
+
+
+//=======================================================================
+//function :  GEOMImpl_3DSketcherDriver_Type_
+//purpose  :
+//=======================================================================
+Standard_EXPORT Handle_Standard_Type& GEOMImpl_3DSketcherDriver_Type_()
+{
+
+  static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver);
+  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver);
+  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
+  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
+  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
+  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
+
+
+  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
+  static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_3DSketcherDriver",
+                                                        sizeof(GEOMImpl_3DSketcherDriver),
+                                                        1,
+                                                        (Standard_Address)_Ancestors,
+                                                        (Standard_Address)NULL);
+
+  return _aType;
+}
+
+//=======================================================================
+//function : DownCast
+//purpose  :
+//=======================================================================
+const Handle(GEOMImpl_3DSketcherDriver) Handle(GEOMImpl_3DSketcherDriver)::DownCast(const Handle(Standard_Transient)& AnObject)
+{
+  Handle(GEOMImpl_3DSketcherDriver) _anOtherObject;
+
+  if (!AnObject.IsNull()) {
+     if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_3DSketcherDriver))) {
+       _anOtherObject = Handle(GEOMImpl_3DSketcherDriver)((Handle(GEOMImpl_3DSketcherDriver)&)AnObject);
+     }
+  }
+
+  return _anOtherObject ;
+}
diff --git a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx
new file mode 100755 (executable)
index 0000000..f0f2476
--- /dev/null
@@ -0,0 +1,158 @@
+// 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   : GEOMImpl_3DSketcherDriver.ixx
+//  Module : GEOMImpl
+
+#ifndef _GEOMImpl_3DSketcherDriver_HeaderFile
+#define _GEOMImpl_3DSketcherDriver_HeaderFile
+
+#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
+#include <TColStd_SequenceOfExtendedString.hxx>
+#endif
+#ifndef _Standard_TypeMismatch_HeaderFile
+#include <Standard_TypeMismatch.hxx>
+#endif
+
+#ifndef _Standard_HeaderFile
+#include <Standard.hxx>
+#endif
+
+#ifndef _Standard_Macro_HeaderFile
+#include <Standard_Macro.hxx>
+#endif
+#ifndef _Standard_HeaderFile
+#include <Standard.hxx>
+#endif
+#ifndef _Standard_GUID_HeaderFile
+#include <Standard_GUID.hxx>
+#endif 
+
+#ifndef _Handle_TFunction_Driver_HeaderFile
+#include <Handle_TFunction_Driver.hxx>
+#endif
+
+class Standard_Transient;
+class Handle_Standard_Type;
+class Handle(TFunction_Driver);
+class GEOMImpl_3DSketcherDriver;
+
+Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMImpl_3DSketcherDriver);
+
+class Handle(GEOMImpl_3DSketcherDriver) : public Handle(TFunction_Driver) {
+  public:
+    inline void* operator new(size_t,void* anAddress) 
+      {
+        return anAddress;
+      }
+    inline void* operator new(size_t size) 
+      { 
+        return Standard::Allocate(size); 
+      }
+    inline void  operator delete(void *anAddress) 
+      { 
+        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+      }
+
+    Handle(GEOMImpl_3DSketcherDriver)():Handle(TFunction_Driver)() {} 
+    Handle(GEOMImpl_3DSketcherDriver)(const Handle(GEOMImpl_3DSketcherDriver)& aHandle) : Handle(TFunction_Driver)(aHandle) 
+     {
+     }
+
+    Handle(GEOMImpl_3DSketcherDriver)(const GEOMImpl_3DSketcherDriver* anItem) : Handle(TFunction_Driver)((TFunction_Driver *)anItem) 
+     {
+     }
+
+    Handle(GEOMImpl_3DSketcherDriver)& operator=(const Handle(GEOMImpl_3DSketcherDriver)& aHandle)
+     {
+      Assign(aHandle.Access());
+      return *this;
+     }
+
+    Handle(GEOMImpl_3DSketcherDriver)& operator=(const GEOMImpl_3DSketcherDriver* anItem)
+     {
+      Assign((Standard_Transient *)anItem);
+      return *this;
+     }
+
+    GEOMImpl_3DSketcherDriver* operator->() 
+     {
+      return (GEOMImpl_3DSketcherDriver *)ControlAccess();
+     }
+
+    GEOMImpl_3DSketcherDriver* operator->() const 
+     {
+      return (GEOMImpl_3DSketcherDriver *)ControlAccess();
+     }
+
+   Standard_EXPORT ~Handle(GEOMImpl_3DSketcherDriver)() {};
+   Standard_EXPORT static const Handle(GEOMImpl_3DSketcherDriver) DownCast(const Handle(Standard_Transient)& AnObject);
+};
+
+#ifndef _TFunction_Driver_HeaderFile
+#include <TFunction_Driver.hxx>
+#endif
+#ifndef _TFunction_Logbook_HeaderFile
+#include <TFunction_Logbook.hxx>
+#endif
+#ifndef _Standard_CString_HeaderFile
+#include <Standard_CString.hxx>
+#endif
+
+class TColStd_SequenceOfExtendedString;
+
+
+class GEOMImpl_3DSketcherDriver : public TFunction_Driver {
+
+public:
+
+    inline void* operator new(size_t,void* anAddress) 
+      {
+        return anAddress;
+      }
+    inline void* operator new(size_t size) 
+      { 
+        return Standard::Allocate(size); 
+      }
+    inline void  operator delete(void *anAddress) 
+      { 
+        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+      }
+
+ // Methods PUBLIC
+ // 
+Standard_EXPORT GEOMImpl_3DSketcherDriver();
+Standard_EXPORT virtual  Standard_Integer Execute(TFunction_Logbook& log) const; 
+Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
+Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
+Standard_EXPORT static const Standard_GUID& GetID();
+Standard_EXPORT ~GEOMImpl_3DSketcherDriver() {};
+
+
+ // Type management
+ //
+Standard_EXPORT friend Handle_Standard_Type& GEOMImpl_3DSketcherDriver_Type_();
+Standard_EXPORT const Handle(Standard_Type)& DynamicType() const  { return STANDARD_TYPE(GEOMImpl_3DSketcherDriver) ; }
+Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)& AType) const { return (STANDARD_TYPE(GEOMImpl_3DSketcherDriver) == AType || TFunction_Driver::IsKind(AType)); } 
+
+
+};
+
+#endif
index d08ae24cce2561693ab6f791d963ff6aa6246bda..ad099022f9dc12d51a8b0f2e407b2d664c8f7832 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_ArcDriver.hxx>
 
 #include <GC_MakeArcOfCircle.hxx>
 #include <GC_MakeCircle.hxx>
+#include <GC_MakeArcOfEllipse.hxx>
+#include <GC_MakeEllipse.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Precision.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Circ.hxx>
+#include <gp_Elips.hxx>
 #include <Geom_Circle.hxx>
+#include <Geom_Ellipse.hxx>
 
 #include "utilities.h"
 
@@ -77,7 +82,7 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const
   Standard_Integer aType = aFunction->GetType();
 
   TopoDS_Shape aShape;
-  if ((aType == CIRC_ARC_THREE_PNT) || (aType == CIRC_ARC_CENTER))
+  if ((aType == CIRC_ARC_THREE_PNT) || (aType == CIRC_ARC_CENTER) || (aType == ELLIPSE_ARC_CENTER_TWO_PNT))
   {
     Handle(GEOM_Function) aRefPoint1 = aCI.GetPoint1();
     Handle(GEOM_Function) aRefPoint2 = aCI.GetPoint2();
@@ -107,9 +112,7 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const
       {
         GC_MakeArcOfCircle arc (aP1, aP2, aP3);
         aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
-      }
-      else // CIRC_ARC_CENTER
-      {
+      } else if ( aType == CIRC_ARC_CENTER ) { // CIRC_ARC_CENTER
         Standard_Boolean sense = aCI.GetSense();
 
         Standard_Real aRad = aP1.Distance(aP2);
@@ -125,9 +128,29 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const
 
         GC_MakeArcOfCircle arc (aGeomCirc->Circ(), aP2, aP3, Standard_True);
         aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
+      } else if ( aType == ELLIPSE_ARC_CENTER_TWO_PNT ) { // ELLIPSE_ARC_CENTER_TWO_PNT
+       if ( aP1.Distance(aP2) <= aP1.Distance(aP3) ) {
+         // Standard_ConstructionError::Raise("Arc creation aborted: the distance from Center Point to Point 1 needs to be bigger than the distance from Center Point to Point 2");      
+         cout << "aP1.Distance(aP2) <= aP1.Distance(aP3)" << endl;
+         gp_Pnt aTmpP = aP2;
+         aP2 = aP3;
+         aP3 = aTmpP;
+       }
+
+       GC_MakeEllipse ellipse (aP2, aP3, aP1);
+       Handle(Geom_Ellipse) aGeomEllipse = ellipse.Value();
+
+        gp_Vec aV1 (aP1, aP2);
+        gp_Vec aV2 (aP1, aP3);
+
+       double alpha = fabs(aV1.Angle(aV2));
+       
+       GC_MakeArcOfEllipse arc (aGeomEllipse->Elips(), aP2, aP3, Standard_True);
+       aShape = BRepBuilderAPI_MakeEdge(arc).Edge();
       }
     }
-  } else {
+  }
+  else {
   }
 
   if (aShape.IsNull()) return 0;
index 89dbdcf8131a8927488c2620ff8ae8cd55e98acb..4e84d529274066d95649598a4e895d39e3d2befc 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_ArcDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_ArcDriver_HeaderFile
 #define _GEOMImpl_ArcDriver_HeaderFile
 
index fbd03ee9ecc91a7b356546710431a4231ff1a9aa..9997cf2a795da677dd673f6f25881248883c853b 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 "GEOMImpl_ArchimedeDriver.hxx"
 #include "GEOMImpl_IArchimede.hxx"
 #include "GEOMImpl_Types.hxx"
index 3dbe0b6150a826bc241d30911e9c9fb746492b3f..1fb7839be445959cae8f8530183ade92599a27b8 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_ArchimedeDriver.hxx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_ArchimedeDriver_HeaderFile
 #define _GEOMImpl_ArchimedeDriver_HeaderFile
 
index 8366db40543d4c91537fdc3af2cf983fc2e52c16..68e3983d911d4151f35fce2f7435814a6fac67cb 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
index db0613668eb8f99a9d2ad56f6119f4554020ca1f..3ad008aed45ad0bf628bd319c49ffc1310362462 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_Block6Explorer.hxx
 //  Module : GEOMImpl
-
+//
 #ifndef GEOMImpl_Block6Explorer_HeaderFile
 #define GEOMImpl_Block6Explorer_HeaderFile
 
index 2efdd7ca2cf2df02030a47fd8fb108c56f72d477..7a98359acd338276298775bdaaf736fb64e78a4e 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <BRepOffsetAPI_MakeFilling.hxx>
@@ -34,7 +35,7 @@
 #include <GEOM_Function.hxx>
 
 #include <ShHealOper_Sewing.hxx>
-//#include <NMTAlgo_Splitter1.hxx>
+#include <ShHealOper_ShapeProcess.hxx>
 #include <GEOMAlgo_Gluer.hxx>
 #include <BlockFix_BlockFixAPI.hxx>
 
@@ -53,6 +54,7 @@
 #include <BRepBuilderAPI_MakeWire.hxx>
 #include <BRepBuilderAPI_MakePolygon.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
+#include <BRepCheck_Analyzer.hxx>
 #include <BRepClass_FaceClassifier.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <BRepExtrema_ExtPF.hxx>
@@ -507,17 +509,28 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const
       aTool.SetShape(aBlockOrComp);
       aTool.Perform();
 
-      if (aType == BLOCK_REMOVE_EXTRA) {
+      TopoDS_Shape aFixedExtra = aTool.Shape();
+
+      // Repair result
+      BRepCheck_Analyzer ana (aFixedExtra, false);
+      if (!ana.IsValid()) {
+        TopoDS_Shape aFixed;
+        ShHealOper_ShapeProcess aHealer;
+        aHealer.Perform(aFixedExtra, aFixed);
+        if (aHealer.isDone())
+          aFixedExtra = aFixed;
+      }
+
+      if (aType == BLOCK_REMOVE_EXTRA)
+      {
+        aShape = aFixedExtra;
 
-        aShape = aTool.Shape();
         if (aShape == aBlockOrComp) {
           MESSAGE("No modifications have been done");
         }
-
-      } else { // aType == BLOCK_COMPOUND_IMPROVE
-
-        TopoDS_Shape aFixedExtra = aTool.Shape();
-
+      }
+      else // aType == BLOCK_COMPOUND_IMPROVE
+      {
         // 2. Separate non-blocks
         TopTools_ListOfShape BLO; // All blocks from the given compound
         TopTools_ListOfShape NOT; // Not blocks
index a51ca743a79d05f12238887fd8587c6d3a30cc2a..9037bbecfdb856b6efe29adc5b8fe276116ec882 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_BlockDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_BlockDriver_HeaderFile
 #define _GEOMImpl_BlockDriver_HeaderFile
 
index c419cd6d5f93adbc78297384662cad6e3a0c762f..bf82f5136a13d1b932d71beaa4b533e6c9abf4ef 100644 (file)
@@ -1,23 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <GEOMImpl_BooleanDriver.hxx>
 #include <GEOMImpl_IBoolean.hxx>
 #include <GEOMImpl_Types.hxx>
@@ -38,6 +39,9 @@
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <Precision.hxx>
+#include <BRepCheck_Analyzer.hxx>
+#include <ShapeFix_ShapeTolerance.hxx>
+#include <ShapeFix_Shape.hxx>
 
 #include <Standard_ConstructionError.hxx>
 #include <StdFail_NotDone.hxx>
@@ -405,9 +409,24 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(TFunction_Logbook& log) const
   }
 
   if (aShape.IsNull()) return 0;
-  if (!BRepAlgo::IsValid(aShape)) {
-    Standard_ConstructionError::Raise("Boolean operation aborted : non valid shape result");
+
+  // 08.07.2008 skl for bug 19761 from Mantis
+  BRepCheck_Analyzer ana (aShape, Standard_True);
+  ana.Init(aShape);
+  if (!ana.IsValid()) {
+    ShapeFix_ShapeTolerance aSFT;
+    aSFT.LimitTolerance(aShape, Precision::Confusion(),
+                        Precision::Confusion(), TopAbs_SHAPE);
+    Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
+    aSfs->Perform();
+    aShape = aSfs->Shape();
+    ana.Init(aShape);
+    if (!ana.IsValid())
+      Standard_ConstructionError::Raise("Boolean operation aborted : non valid shape result");
   }
+  //if (!BRepAlgo::IsValid(aShape)) {
+  //  Standard_ConstructionError::Raise("Boolean operation aborted : non valid shape result");
+  //}
 
   aFunction->SetValue(aShape);
 
index a9b198ce14c51f7a855e4d9ddc1895b03a5ba9fa..c8d0cb10aa745f2c156e48444a463237d031c957 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_BooleanDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_BooleanDriver_HeaderFile
 #define _GEOMImpl_BooleanDriver_HeaderFile
 
index f35350788433d6b7addf52da3779e2edc03c3fb3..48be1001da8ba6a99f3744d2eb227bd94677b880 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_BoxDriver.hxx>
index 7721d2a04d9b8be89705c62c03663aa5e12705dd..ecd3377c4aa26752b57b861cd52f48990d2ff334 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_BoxDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_BoxDriver_HeaderFile
 #define _GEOMImpl_BoxDriver_HeaderFile
 
index 54431c6dcc222e61f9234fc8245e369c2949c14c..5a05432e1e42955f357d8e70c81b66dd71a63308 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_ChamferDriver.hxx>
index fbcd1292858d8d54352654fc4acd1462787c6bd9..4107f9dfe2d122c6bd6bf573d475c53a1f598595 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_ChamferDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_ChamferDriver_HeaderFile
 #define _GEOMImpl_ChamferDriver_HeaderFile
 
index 79184422b9616e9a88c21370cca98049aafcdf17..2edcc5c1b4263ae9c3a79f1c71daf661aa58ae2e 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_CircleDriver.hxx>
@@ -77,65 +78,87 @@ Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const
   TopoDS_Shape aShape;
 
   if (aType == CIRCLE_PNT_VEC_R) {
-    Handle(GEOM_Function) aRefPoint  = aCI.GetCenter();
+    // Center
+    gp_Pnt aP = gp::Origin();
+    Handle(GEOM_Function) aRefPoint = aCI.GetCenter();
+    if (!aRefPoint.IsNull()) {
+      TopoDS_Shape aShapePnt = aRefPoint->GetValue();
+      if (aShapePnt.ShapeType() != TopAbs_VERTEX) {
+        Standard_ConstructionError::Raise
+          ("Circle creation aborted: invalid center argument, must be a point");
+      }
+      aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
+    }
+    // Normal
+    gp_Vec aV = gp::DZ();
     Handle(GEOM_Function) aRefVector = aCI.GetVector();
-    TopoDS_Shape aShapePnt = aRefPoint->GetValue();
-    TopoDS_Shape aShapeVec = aRefVector->GetValue();
-    if (aShapePnt.ShapeType() == TopAbs_VERTEX &&
-        aShapeVec.ShapeType() == TopAbs_EDGE) {
-      gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
+    if (!aRefVector.IsNull()) {
+      TopoDS_Shape aShapeVec = aRefVector->GetValue();
+      if (aShapeVec.ShapeType() != TopAbs_EDGE) {
+        Standard_ConstructionError::Raise
+          ("Circle creation aborted: invalid vector argument, must be a vector or an edge");
+      }
       TopoDS_Edge anE = TopoDS::Edge(aShapeVec);
       TopoDS_Vertex V1, V2;
       TopExp::Vertices(anE, V1, V2, Standard_True);
       if (!V1.IsNull() && !V2.IsNull()) {
-        gp_Vec aV (BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
-        gp_Ax2 anAxes (aP, aV);
-        gp_Circ aCirc (anAxes, aCI.GetRadius());
-        aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
+        aV = gp_Vec(BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
+        if (aV.Magnitude() < gp::Resolution()) {
+          Standard_ConstructionError::Raise
+            ("Circle creation aborted: vector of zero length is given");
+        }
       }
     }
+    // Axes
+    gp_Ax2 anAxes (aP, aV);
+    // Circle
+    gp_Circ aCirc (anAxes, aCI.GetRadius());
+    aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
   }
- else if (aType == CIRCLE_CENTER_TWO_PNT) {
-       Handle(GEOM_Function) aRefPoint1 = aCI.GetPoint1();
-       Handle(GEOM_Function) aRefPoint2 = aCI.GetPoint2();
-       Handle(GEOM_Function) aRefPoint3 = aCI.GetPoint3();
-       TopoDS_Shape aShapePnt1 = aRefPoint1->GetValue();
-       TopoDS_Shape aShapePnt2 = aRefPoint2->GetValue();
-       TopoDS_Shape aShapePnt3 = aRefPoint3->GetValue();
-       if (aShapePnt1.ShapeType() == TopAbs_VERTEX && aShapePnt2.ShapeType() == TopAbs_VERTEX &&
-          aShapePnt3.ShapeType() == TopAbs_VERTEX)
-       {
-        gp_Pnt aP1 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt1));
-        gp_Pnt aP2 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt2));
-        gp_Pnt aP3 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt3));
-
-        if (aP1.Distance(aP2) < gp::Resolution() ||
-            aP1.Distance(aP3) < gp::Resolution() ||
-            aP2.Distance(aP3) < gp::Resolution())
-          Standard_ConstructionError::Raise("Circle creation aborted: coincident points given");
-        if (gp_Vec(aP1, aP2).IsParallel(gp_Vec(aP1, aP3), Precision::Angular()))
-          Standard_ConstructionError::Raise("Circle creation aborted: points lay on one line");
-         double x, y, z, x1, y1, z1, x2, y2, z2, dx, dy, dz, dx2, dy2, dz2, dx3, dy3, dz3, aRadius;
-        //Calculations for Radius
-        x = aP1.X(); y = aP1.Y(); z = aP1.Z();
-        x1 = aP2.X(); y1 = aP2.Y(); z1 = aP2.Z();
-        dx = x1 - x;
-         dy = y1 - y;
-        dz = z1 - z;
-        aRadius = sqrt(dx*dx + dy*dy + dz*dz);
-        //Calculations for Plane Vector
-        x2 = aP3.X(); y2 = aP3.Y(); z2 = aP3.Z();
-        dx2 = x2 - x; dy2 = y2 - y; dz2 = z2 - z;
-        dx3 = ((dy*dz2) - (dy2*dz))/100;
-        dy3 = ((dx2*dz) - (dx*dz2))/100;
-        dz3 = ((dx*dy2) - (dx2*dy))/100;
-        //Make Plane Vector
-        gp_Dir aDir ( dx3, dy3, dz3 );
-        //Make Circle
-        gp_Ax2 anAxes (aP1, aDir);
-        gp_Circ aCirc (anAxes, aRadius);
-        aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();  
-       }
+  else if (aType == CIRCLE_CENTER_TWO_PNT) {
+    Handle(GEOM_Function) aRefPoint1 = aCI.GetPoint1();
+    Handle(GEOM_Function) aRefPoint2 = aCI.GetPoint2();
+    Handle(GEOM_Function) aRefPoint3 = aCI.GetPoint3();
+    TopoDS_Shape aShapePnt1 = aRefPoint1->GetValue();
+    TopoDS_Shape aShapePnt2 = aRefPoint2->GetValue();
+    TopoDS_Shape aShapePnt3 = aRefPoint3->GetValue();
+    if (aShapePnt1.ShapeType() == TopAbs_VERTEX &&
+        aShapePnt2.ShapeType() == TopAbs_VERTEX &&
+        aShapePnt3.ShapeType() == TopAbs_VERTEX)
+    {
+      gp_Pnt aP1 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt1));
+      gp_Pnt aP2 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt2));
+      gp_Pnt aP3 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt3));
+
+      if (aP1.Distance(aP2) < gp::Resolution() ||
+          aP1.Distance(aP3) < gp::Resolution() ||
+          aP2.Distance(aP3) < gp::Resolution())
+        Standard_ConstructionError::Raise("Circle creation aborted: coincident points given");
+
+      if (gp_Vec(aP1, aP2).IsParallel(gp_Vec(aP1, aP3), Precision::Angular()))
+        Standard_ConstructionError::Raise("Circle creation aborted: points lay on one line");
+
+      double x, y, z, x1, y1, z1, x2, y2, z2, dx, dy, dz, dx2, dy2, dz2, dx3, dy3, dz3, aRadius;
+      //Calculations for Radius
+      x = aP1.X(); y = aP1.Y(); z = aP1.Z();
+      x1 = aP2.X(); y1 = aP2.Y(); z1 = aP2.Z();
+      dx = x1 - x;
+      dy = y1 - y;
+      dz = z1 - z;
+      aRadius = sqrt(dx*dx + dy*dy + dz*dz);
+      //Calculations for Plane Vector
+      x2 = aP3.X(); y2 = aP3.Y(); z2 = aP3.Z();
+      dx2 = x2 - x; dy2 = y2 - y; dz2 = z2 - z;
+      dx3 = ((dy*dz2) - (dy2*dz))/100;
+      dy3 = ((dx2*dz) - (dx*dz2))/100;
+      dz3 = ((dx*dy2) - (dx2*dy))/100;
+      //Make Plane Vector
+      gp_Dir aDir ( dx3, dy3, dz3 );
+      //Make Circle
+      gp_Ax2 anAxes (aP1, aDir);
+      gp_Circ aCirc (anAxes, aRadius);
+      aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();  
+    }
   }
   else if (aType == CIRCLE_THREE_PNT) {
     Handle(GEOM_Function) aRefPoint1 = aCI.GetPoint1();
@@ -160,7 +183,7 @@ Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const
       aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
     }  
   }
-   else {
+  else {
   }
 
   if (aShape.IsNull()) return 0;
index 8eb470385d36055bf3974769f2abcdc196fe3321..4aa2ab5dcf9d0523881f77bbf8290e1b99b4e05e 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_CircleDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_CircleDriver_HeaderFile
 #define _GEOMImpl_CircleDriver_HeaderFile
 
index d9ee6044af6e8998fd61969d51dacea91163409c..a84948554a5ee4a0d0279b67c6e99b3cc850de75 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_ConeDriver.hxx>
index 7c53100a6b6e1e8d9f6ac73c15ccce4095c59eff..81aaf27791ea6c88c132f1906b259ed009239b36 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_ConeDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_ConeDriver_HeaderFile
 #define _GEOMImpl_ConeDriver_HeaderFile
 
index 6fd87146f054155a2978d45baf236d3640c0c8c2..008d2828915da3285d2399a7995379997cf49742 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_CopyDriver.hxx>
index ca86e76648857216fd757a20dbfeff4855c9159a..4b2271be286434fe3bcc1681e7cb454ca5c33dbe 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_CopyDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_CopyDriver_HeaderFile
 #define _GEOMImpl_CopyDriver_HeaderFile
 
index cba3e36c5ed26232de47df9750063dbd33895828..3cf373e4eacbccd7382dfd5ef651c5687260f1fa 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_CylinderDriver.hxx>
index a7799c9270434f6309e5b58423016010a7c7b4a2..ab063d334917c1abe92ff03e7c7e7fe2350accf5 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_CylinderDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_CylinderDriver_HeaderFile
 #define _GEOMImpl_CylinderDriver_HeaderFile
 
diff --git a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx
new file mode 100755 (executable)
index 0000000..5804a77
--- /dev/null
@@ -0,0 +1,205 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 <Standard_Stream.hxx>
+
+#include <GEOMImpl_DiskDriver.hxx>
+#include <GEOMImpl_IDisk.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
+
+#include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRepBuilderAPI_MakeWire.hxx>
+#include <BRepBuilderAPI_MakeFace.hxx>
+#include <BRep_Tool.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopoDS_Wire.hxx>
+#include <TopAbs.hxx>
+#include <TopExp.hxx>
+
+#include <GC_MakeCircle.hxx>
+#include <Geom_Circle.hxx>
+
+#include <Standard_ConstructionError.hxx>
+#include <Precision.hxx>
+#include <gp_Pnt.hxx>
+#include <gp_Vec.hxx>
+#include <gp_Circ.hxx>
+
+//=======================================================================
+//function : GetID
+//purpose  :
+//======================================================================= 
+const Standard_GUID& GEOMImpl_DiskDriver::GetID()
+{
+  static Standard_GUID aDiskDriver("C1FEEF9D-1C6D-41ce-9507-F10D75430CE1");
+  return aDiskDriver; 
+}
+
+
+//=======================================================================
+//function : GEOMImpl_DiskDriver
+//purpose  : 
+//=======================================================================
+GEOMImpl_DiskDriver::GEOMImpl_DiskDriver() 
+{
+}
+
+//=======================================================================
+//function : Execute
+//purpose  :
+//======================================================================= 
+Standard_Integer GEOMImpl_DiskDriver::Execute(TFunction_Logbook& log) const
+{
+  if (Label().IsNull()) return 0;    
+  Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
+
+  GEOMImpl_IDisk aCI (aFunction);
+  Standard_Integer aType = aFunction->GetType();
+
+  TopoDS_Shape aShape;
+
+  if (aType == DISK_PNT_VEC_R) {
+    Handle(GEOM_Function) aRefPoint  = aCI.GetCenter();
+    Handle(GEOM_Function) aRefVector = aCI.GetVector();
+    TopoDS_Shape aShapePnt = aRefPoint->GetValue();
+    TopoDS_Shape aShapeVec = aRefVector->GetValue();
+    if (aShapePnt.ShapeType() == TopAbs_VERTEX &&
+        aShapeVec.ShapeType() == TopAbs_EDGE) {
+      gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
+      TopoDS_Edge anE = TopoDS::Edge(aShapeVec);
+      TopoDS_Vertex V1, V2;
+      TopExp::Vertices(anE, V1, V2, Standard_True);
+      if (!V1.IsNull() && !V2.IsNull()) {
+        gp_Vec aV (BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
+        gp_Ax2 anAxes (aP, -aV);
+        gp_Circ aCirc (anAxes, aCI.GetRadius());
+       TopoDS_Shape aCircle = BRepBuilderAPI_MakeEdge(aCirc).Edge();
+       BRepBuilderAPI_MakeWire MW;
+       MW.Add(TopoDS::Edge(aCircle));
+       BRepBuilderAPI_MakeFace MF (MW, Standard_False);
+       aShape = MF.Shape();
+      }
+    }
+  }
+  else if (aType == DISK_THREE_PNT) {
+    Handle(GEOM_Function) aRefPoint1 = aCI.GetPoint1();
+    Handle(GEOM_Function) aRefPoint2 = aCI.GetPoint2();
+    Handle(GEOM_Function) aRefPoint3 = aCI.GetPoint3();
+    TopoDS_Shape aShapePnt1 = aRefPoint1->GetValue();
+    TopoDS_Shape aShapePnt2 = aRefPoint2->GetValue();
+    TopoDS_Shape aShapePnt3 = aRefPoint3->GetValue();
+    if (aShapePnt1.ShapeType() == TopAbs_VERTEX &&
+        aShapePnt2.ShapeType() == TopAbs_VERTEX &&
+        aShapePnt3.ShapeType() == TopAbs_VERTEX) {
+      gp_Pnt aP1 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt1));
+      gp_Pnt aP2 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt2));
+      gp_Pnt aP3 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt3));
+      if (aP1.Distance(aP2) < gp::Resolution() ||
+          aP1.Distance(aP3) < gp::Resolution() ||
+          aP2.Distance(aP3) < gp::Resolution())
+        Standard_ConstructionError::Raise("Disk creation aborted: coincident points given");
+      if (gp_Vec(aP1, aP2).IsParallel(gp_Vec(aP1, aP3), Precision::Angular()))
+        Standard_ConstructionError::Raise("Disk creation aborted: points lay on one line");
+      Handle(Geom_Circle) aCirc = GC_MakeCircle(aP3, aP2, aP1).Value();
+      TopoDS_Shape aCircle = BRepBuilderAPI_MakeEdge(aCirc).Edge();
+      BRepBuilderAPI_MakeWire MW;
+      MW.Add(TopoDS::Edge(aCircle));
+      BRepBuilderAPI_MakeFace MF (MW, Standard_False);
+      aShape = MF.Shape();
+    }  
+  }
+  else if (aType == DISK_R) {
+    int anOrient = aCI.GetOrientation();
+    gp_Pnt aP = gp::Origin();
+    gp_Vec aV;
+    if (anOrient == 1)
+      aV = gp::DZ();
+    else if (anOrient == 2)
+      aV = gp::DX();
+    else if (anOrient == 3)
+      aV = gp::DY();
+
+    gp_Ax2 anAxes (aP, -aV);
+    gp_Circ aCirc (anAxes, aCI.GetRadius());
+    TopoDS_Shape aCircle = BRepBuilderAPI_MakeEdge(aCirc).Edge();
+    BRepBuilderAPI_MakeWire MW;
+    MW.Add(TopoDS::Edge(aCircle));
+    BRepBuilderAPI_MakeFace MF (MW, Standard_False);
+    aShape = MF.Shape();
+  }
+   else {
+  }
+
+  if (aShape.IsNull()) return 0;
+
+  aFunction->SetValue(aShape);
+
+  log.SetTouched(Label()); 
+
+  return 1;    
+}
+
+
+//=======================================================================
+//function :  GEOMImpl_DiskDriver_Type_
+//purpose  :
+//======================================================================= 
+Standard_EXPORT Handle_Standard_Type& GEOMImpl_DiskDriver_Type_()
+{
+
+  static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver);
+  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver);
+  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
+  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared); 
+  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
+  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
+
+  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
+  static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_DiskDriver",
+                                                        sizeof(GEOMImpl_DiskDriver),
+                                                        1,
+                                                        (Standard_Address)_Ancestors,
+                                                        (Standard_Address)NULL);
+
+  return _aType;
+}
+
+//=======================================================================
+//function : DownCast
+//purpose  :
+//======================================================================= 
+const Handle(GEOMImpl_DiskDriver) Handle(GEOMImpl_DiskDriver)::DownCast(const Handle(Standard_Transient)& AnObject)
+{
+  Handle(GEOMImpl_DiskDriver) _anOtherObject;
+
+  if (!AnObject.IsNull()) {
+     if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_DiskDriver))) {
+       _anOtherObject = Handle(GEOMImpl_DiskDriver)((Handle(GEOMImpl_DiskDriver)&)AnObject);
+     }
+  }
+
+  return _anOtherObject ;
+}
diff --git a/src/GEOMImpl/GEOMImpl_DiskDriver.hxx b/src/GEOMImpl/GEOMImpl_DiskDriver.hxx
new file mode 100755 (executable)
index 0000000..ffee9ed
--- /dev/null
@@ -0,0 +1,160 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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   : GEOMImpl_DiskDriver.ixx
+//  Module : GEOMImpl
+//
+#ifndef _GEOMImpl_DiskDriver_HeaderFile
+#define _GEOMImpl_DiskDriver_HeaderFile
+
+#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
+#include <TColStd_SequenceOfExtendedString.hxx>
+#endif
+#ifndef _Standard_TypeMismatch_HeaderFile
+#include <Standard_TypeMismatch.hxx>
+#endif
+
+#ifndef _Standard_HeaderFile
+#include <Standard.hxx>
+#endif
+
+#ifndef _Standard_Macro_HeaderFile
+#include <Standard_Macro.hxx>
+#endif
+#ifndef _Standard_HeaderFile
+#include <Standard.hxx>
+#endif
+#ifndef _Standard_GUID_HeaderFile
+#include <Standard_GUID.hxx>
+#endif 
+
+#ifndef _Handle_TFunction_Driver_HeaderFile
+#include <Handle_TFunction_Driver.hxx>
+#endif
+
+class Standard_Transient;
+class Handle_Standard_Type;
+class Handle(TFunction_Driver);
+class GEOMImpl_DiskDriver;
+
+Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMImpl_DiskDriver);
+
+class Handle(GEOMImpl_DiskDriver) : public Handle(TFunction_Driver) {
+  public:
+    inline void* operator new(size_t,void* anAddress) 
+      {
+        return anAddress;
+      }
+    inline void* operator new(size_t size) 
+      { 
+        return Standard::Allocate(size); 
+      }
+    inline void  operator delete(void *anAddress) 
+      { 
+        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+      }
+
+    Handle(GEOMImpl_DiskDriver)():Handle(TFunction_Driver)() {} 
+    Handle(GEOMImpl_DiskDriver)(const Handle(GEOMImpl_DiskDriver)& aHandle) : Handle(TFunction_Driver)(aHandle) 
+     {
+     }
+
+    Handle(GEOMImpl_DiskDriver)(const GEOMImpl_DiskDriver* anItem) : Handle(TFunction_Driver)((TFunction_Driver *)anItem) 
+     {
+     }
+
+    Handle(GEOMImpl_DiskDriver)& operator=(const Handle(GEOMImpl_DiskDriver)& aHandle)
+     {
+      Assign(aHandle.Access());
+      return *this;
+     }
+
+    Handle(GEOMImpl_DiskDriver)& operator=(const GEOMImpl_DiskDriver* anItem)
+     {
+      Assign((Standard_Transient *)anItem);
+      return *this;
+     }
+
+    GEOMImpl_DiskDriver* operator->() 
+     {
+      return (GEOMImpl_DiskDriver *)ControlAccess();
+     }
+
+    GEOMImpl_DiskDriver* operator->() const 
+     {
+      return (GEOMImpl_DiskDriver *)ControlAccess();
+     }
+
+   Standard_EXPORT ~Handle(GEOMImpl_DiskDriver)() {};
+   Standard_EXPORT static const Handle(GEOMImpl_DiskDriver) DownCast(const Handle(Standard_Transient)& AnObject);
+};
+
+#ifndef _TFunction_Driver_HeaderFile
+#include <TFunction_Driver.hxx>
+#endif
+#ifndef _TFunction_Logbook_HeaderFile
+#include <TFunction_Logbook.hxx>
+#endif
+#ifndef _Standard_CString_HeaderFile
+#include <Standard_CString.hxx>
+#endif
+
+class TColStd_SequenceOfExtendedString;
+
+
+class GEOMImpl_DiskDriver : public TFunction_Driver {
+
+public:
+
+    inline void* operator new(size_t,void* anAddress) 
+      {
+        return anAddress;
+      }
+    inline void* operator new(size_t size) 
+      { 
+        return Standard::Allocate(size); 
+      }
+    inline void  operator delete(void *anAddress) 
+      { 
+        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+      }
+
+ // Methods PUBLIC
+ // 
+Standard_EXPORT GEOMImpl_DiskDriver();
+Standard_EXPORT virtual  Standard_Integer Execute(TFunction_Logbook& log) const; 
+Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
+Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
+Standard_EXPORT static const Standard_GUID& GetID();
+Standard_EXPORT ~GEOMImpl_DiskDriver() {};
+
+
+ // Type management
+ //
+Standard_EXPORT friend Handle_Standard_Type& GEOMImpl_DiskDriver_Type_();
+Standard_EXPORT const Handle(Standard_Type)& DynamicType() const  { return STANDARD_TYPE(GEOMImpl_DiskDriver) ; }
+Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)& AType) const { return (STANDARD_TYPE(GEOMImpl_DiskDriver) == AType || TFunction_Driver::IsKind(AType)); } 
+
+
+};
+
+#endif
index 03685a46bedb25a36a380c782ad31abcf68ccd89..24ac23eb6e986e101680265743d08e29ee1475cd 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_EllipseDriver.hxx>
@@ -71,24 +72,44 @@ Standard_Integer GEOMImpl_EllipseDriver::Execute(TFunction_Logbook& log) const
   TopoDS_Shape aShape;
 
   if (aType == ELLIPSE_PNT_VEC_RR) {
-    Handle(GEOM_Function) aRefPoint  = aCI.GetCenter();
+    // Center
+    gp_Pnt aP = gp::Origin();
+    Handle(GEOM_Function) aRefPoint = aCI.GetCenter();
+    if (!aRefPoint.IsNull()) {
+      TopoDS_Shape aShapePnt = aRefPoint->GetValue();
+      if (aShapePnt.ShapeType() != TopAbs_VERTEX) {
+        Standard_ConstructionError::Raise
+          ("Circle creation aborted: invalid center argument, must be a point");
+      }
+      aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
+    }
+    // Normal
+    gp_Vec aV = gp::DZ();
     Handle(GEOM_Function) aRefVector = aCI.GetVector();
-    TopoDS_Shape aShapePnt = aRefPoint->GetValue();
-    TopoDS_Shape aShapeVec = aRefVector->GetValue();
-    if (aShapePnt.ShapeType() == TopAbs_VERTEX &&
-        aShapeVec.ShapeType() == TopAbs_EDGE) {
-      gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
+    if (!aRefVector.IsNull()) {
+      TopoDS_Shape aShapeVec = aRefVector->GetValue();
+      if (aShapeVec.ShapeType() != TopAbs_EDGE) {
+        Standard_ConstructionError::Raise
+          ("Circle creation aborted: invalid vector argument, must be a vector or an edge");
+      }
       TopoDS_Edge anE = TopoDS::Edge(aShapeVec);
       TopoDS_Vertex V1, V2;
       TopExp::Vertices(anE, V1, V2, Standard_True);
       if (!V1.IsNull() && !V2.IsNull()) {
-        gp_Vec aV (BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
-        gp_Ax2 anAxes (aP, aV);
-        gp_Elips anEll (anAxes, aCI.GetRMajor(), aCI.GetRMinor());
-        aShape = BRepBuilderAPI_MakeEdge(anEll).Edge();
+        aV = gp_Vec(BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
+        if (aV.Magnitude() < gp::Resolution()) {
+          Standard_ConstructionError::Raise
+            ("Circle creation aborted: vector of zero length is given");
+        }
       }
     }
-  } else {
+    // Axes
+    gp_Ax2 anAxes (aP, aV);
+    // Ellipse
+    gp_Elips anEll (anAxes, aCI.GetRMajor(), aCI.GetRMinor());
+    aShape = BRepBuilderAPI_MakeEdge(anEll).Edge();
+  }
+  else {
   }
 
   if (aShape.IsNull()) return 0;
index 9e80dc606c3aea1b708d00335609b2a36af6de27..98bdec9a55dc3f4c58664dcd5d197d8679c5fcfd 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_EllipseDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_EllipseDriver_HeaderFile
 #define _GEOMImpl_EllipseDriver_HeaderFile
 
index 5ea854b9625c36a20e9e0cc0a05bad542fe2f88f..44efd6e1e317f129c879f40f6dd28a1c912dc72b 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_ExportDriver.hxx>
index 307df242423a3911a8a493d1a54e507a3d97979a..040d7c912797002f70e3382057b1edb9018e1b42 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_ExportDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_ExportDriver_HeaderFile
 #define _GEOMImpl_ExportDriver_HeaderFile
 
diff --git a/src/GEOMImpl/GEOMImpl_FaceDriver.cxx b/src/GEOMImpl/GEOMImpl_FaceDriver.cxx
new file mode 100755 (executable)
index 0000000..197b52e
--- /dev/null
@@ -0,0 +1,169 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 <Standard_Stream.hxx>
+
+#include <GEOMImpl_FaceDriver.hxx>
+#include <GEOMImpl_IFace.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
+
+#include <GEOMImpl_IMeasureOperations.hxx>
+
+#include <BRepBuilderAPI_MakeFace.hxx>
+#include <BRep_Tool.hxx>
+#include <gp_Pnt.hxx>
+#include <gp_Pln.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopAbs.hxx>
+#include <TopExp.hxx>
+
+#include <StdFail_NotDone.hxx>
+
+//=======================================================================
+//function : GetID
+//purpose  :
+//=======================================================================
+const Standard_GUID& GEOMImpl_FaceDriver::GetID()
+{
+  static Standard_GUID aFaceDriver("F7953CC1-FF8B-4628-BF5E-9D3510DE4629");
+  return aFaceDriver;
+}
+
+
+//=======================================================================
+//function : GEOMImpl_FaceDriver
+//purpose  :
+//=======================================================================
+GEOMImpl_FaceDriver::GEOMImpl_FaceDriver()
+{
+}
+
+//=======================================================================
+//function : Execute
+//purpose  :
+//=======================================================================
+Standard_Integer GEOMImpl_FaceDriver::Execute(TFunction_Logbook& log) const
+{
+  if (Label().IsNull()) return 0;
+  Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
+
+  GEOMImpl_IFace aFI (aFunction);
+  Standard_Integer aType = aFunction->GetType();
+
+  TopoDS_Shape aShape;
+
+  if (aType == FACE_OBJ_H_W) {
+    Handle(GEOM_Function) aRefFunct = aFI.GetRef1();
+    TopoDS_Shape aRefShape = aRefFunct->GetValue();
+    if (aRefShape.ShapeType() == TopAbs_EDGE) {
+      TopoDS_Edge anEdge = TopoDS::Edge(aRefShape);
+      double aH = aFI.GetH() / 2.0;
+      double aW = aFI.GetW() / 2.0;
+      TopoDS_Vertex V1, V2;
+      TopExp::Vertices(anEdge, V1, V2, Standard_True);
+      gp_Pnt aP (BRep_Tool::Pnt(V1));
+      gp_Vec aV (BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
+      gp_Pln aPlane (aP, aV);
+      aShape = BRepBuilderAPI_MakeFace(aPlane, -aH, +aH, -aW, +aW).Shape();
+    } else if (aRefShape.ShapeType() == TopAbs_FACE) {
+      double aH = aFI.GetH() / 2.0;
+      double aW = aFI.GetW() / 2.0;
+      gp_Ax3 anAx = GEOMImpl_IMeasureOperations::GetPosition(aRefShape);
+      gp_Pln aPln (anAx);
+      aShape = BRepBuilderAPI_MakeFace(aPln, -aH, +aH, -aW, +aW).Shape();
+    }
+  }
+  else if (aType == FACE_H_W) {
+    double aH = aFI.GetH() / 2.0;
+    double aW = aFI.GetW() / 2.0;
+    TopoDS_Vertex V1, V2;
+    int anOrient = aFI.GetOrientation();
+    gp_Pnt aP = gp::Origin();
+    gp_Vec aV;
+    if (anOrient == 1)
+      aV = gp::DZ();
+    else if (anOrient == 2)
+      aV = gp::DX();
+    else if (anOrient == 3)
+      aV = gp::DY();
+
+    gp_Pln aPlane (aP, aV);
+    aShape = BRepBuilderAPI_MakeFace(aPlane, -aH, +aH, -aW, +aW).Shape();
+  }
+  else {
+  }
+
+  if (aShape.IsNull()) return 0;
+
+  aFunction->SetValue(aShape);
+
+  log.SetTouched(Label());
+
+  return 1;
+}
+
+
+//=======================================================================
+//function :  GEOMImpl_FaceDriver_Type_
+//purpose  :
+//=======================================================================
+Standard_EXPORT Handle_Standard_Type& GEOMImpl_FaceDriver_Type_()
+{
+
+  static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver);
+  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver);
+  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
+  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
+  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
+  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
+
+
+  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
+  static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_FaceDriver",
+                                                        sizeof(GEOMImpl_FaceDriver),
+                                                        1,
+                                                        (Standard_Address)_Ancestors,
+                                                        (Standard_Address)NULL);
+
+  return _aType;
+}
+
+//=======================================================================
+//function : DownCast
+//purpose  :
+//=======================================================================
+const Handle(GEOMImpl_FaceDriver) Handle(GEOMImpl_FaceDriver)::DownCast(const Handle(Standard_Transient)& AnObject)
+{
+  Handle(GEOMImpl_FaceDriver) _anOtherObject;
+
+  if (!AnObject.IsNull()) {
+     if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_FaceDriver))) {
+       _anOtherObject = Handle(GEOMImpl_FaceDriver)((Handle(GEOMImpl_FaceDriver)&)AnObject);
+     }
+  }
+
+  return _anOtherObject ;
+}
diff --git a/src/GEOMImpl/GEOMImpl_FaceDriver.hxx b/src/GEOMImpl/GEOMImpl_FaceDriver.hxx
new file mode 100755 (executable)
index 0000000..4e927d5
--- /dev/null
@@ -0,0 +1,160 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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   : GEOMImpl_FaceDriver.ixx
+//  Module : GEOMImpl
+//
+#ifndef _GEOMImpl_FaceDriver_HeaderFile
+#define _GEOMImpl_FaceDriver_HeaderFile
+
+#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
+#include <TColStd_SequenceOfExtendedString.hxx>
+#endif
+#ifndef _Standard_TypeMismatch_HeaderFile
+#include <Standard_TypeMismatch.hxx>
+#endif
+
+#ifndef _Standard_HeaderFile
+#include <Standard.hxx>
+#endif
+
+#ifndef _Standard_Macro_HeaderFile
+#include <Standard_Macro.hxx>
+#endif
+#ifndef _Standard_HeaderFile
+#include <Standard.hxx>
+#endif
+#ifndef _Standard_GUID_HeaderFile
+#include <Standard_GUID.hxx>
+#endif 
+
+#ifndef _Handle_TFunction_Driver_HeaderFile
+#include <Handle_TFunction_Driver.hxx>
+#endif
+
+class Standard_Transient;
+class Handle_Standard_Type;
+class Handle(TFunction_Driver);
+class GEOMImpl_FaceDriver;
+
+Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMImpl_FaceDriver);
+
+class Handle(GEOMImpl_FaceDriver) : public Handle(TFunction_Driver) {
+  public:
+    inline void* operator new(size_t,void* anAddress) 
+      {
+        return anAddress;
+      }
+    inline void* operator new(size_t size) 
+      { 
+        return Standard::Allocate(size); 
+      }
+    inline void  operator delete(void *anAddress) 
+      { 
+        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+      }
+
+    Handle(GEOMImpl_FaceDriver)():Handle(TFunction_Driver)() {} 
+    Handle(GEOMImpl_FaceDriver)(const Handle(GEOMImpl_FaceDriver)& aHandle) : Handle(TFunction_Driver)(aHandle) 
+     {
+     }
+
+    Handle(GEOMImpl_FaceDriver)(const GEOMImpl_FaceDriver* anItem) : Handle(TFunction_Driver)((TFunction_Driver *)anItem) 
+     {
+     }
+
+    Handle(GEOMImpl_FaceDriver)& operator=(const Handle(GEOMImpl_FaceDriver)& aHandle)
+     {
+      Assign(aHandle.Access());
+      return *this;
+     }
+
+    Handle(GEOMImpl_FaceDriver)& operator=(const GEOMImpl_FaceDriver* anItem)
+     {
+      Assign((Standard_Transient *)anItem);
+      return *this;
+     }
+
+    GEOMImpl_FaceDriver* operator->() 
+     {
+      return (GEOMImpl_FaceDriver *)ControlAccess();
+     }
+
+    GEOMImpl_FaceDriver* operator->() const 
+     {
+      return (GEOMImpl_FaceDriver *)ControlAccess();
+     }
+
+   Standard_EXPORT ~Handle(GEOMImpl_FaceDriver)() {};
+   Standard_EXPORT static const Handle(GEOMImpl_FaceDriver) DownCast(const Handle(Standard_Transient)& AnObject);
+};
+
+#ifndef _TFunction_Driver_HeaderFile
+#include <TFunction_Driver.hxx>
+#endif
+#ifndef _TFunction_Logbook_HeaderFile
+#include <TFunction_Logbook.hxx>
+#endif
+#ifndef _Standard_CString_HeaderFile
+#include <Standard_CString.hxx>
+#endif
+
+class TColStd_SequenceOfExtendedString;
+
+
+class GEOMImpl_FaceDriver : public TFunction_Driver {
+
+public:
+
+    inline void* operator new(size_t,void* anAddress) 
+      {
+        return anAddress;
+      }
+    inline void* operator new(size_t size) 
+      { 
+        return Standard::Allocate(size); 
+      }
+    inline void  operator delete(void *anAddress) 
+      { 
+        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+      }
+
+ // Methods PUBLIC
+ // 
+Standard_EXPORT GEOMImpl_FaceDriver();
+Standard_EXPORT virtual  Standard_Integer Execute(TFunction_Logbook& log) const; 
+Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
+Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
+Standard_EXPORT static const Standard_GUID& GetID();
+Standard_EXPORT ~GEOMImpl_FaceDriver() {};
+
+
+ // Type management
+ //
+Standard_EXPORT friend Handle_Standard_Type& GEOMImpl_FaceDriver_Type_();
+Standard_EXPORT const Handle(Standard_Type)& DynamicType() const  { return STANDARD_TYPE(GEOMImpl_FaceDriver) ; }
+Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)& AType) const { return (STANDARD_TYPE(GEOMImpl_FaceDriver) == AType || TFunction_Driver::IsKind(AType)); } 
+
+
+};
+
+#endif
diff --git a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx
new file mode 100755 (executable)
index 0000000..f7f2050
--- /dev/null
@@ -0,0 +1,152 @@
+// 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 <Standard_Stream.hxx>
+
+#include <GEOMImpl_Fillet2dDriver.hxx>
+#include <GEOMImpl_IFillet2d.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOMImpl_ILocalOperations.hxx>
+#include <GEOM_Function.hxx>
+
+#include <BRepFilletAPI_MakeFillet2d.hxx>
+#include <BRepCheck_Analyzer.hxx>
+#include <BRep_Tool.hxx>
+
+#include <TopoDS.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopAbs.hxx>
+#include <TopExp_Explorer.hxx>
+
+#include <ShapeFix_ShapeTolerance.hxx>
+#include <ShapeFix_Shape.hxx>
+
+#include <Precision.hxx>
+#include <gp_Pnt.hxx>
+#include <StdFail_NotDone.hxx>
+
+//=======================================================================
+//function : GetID
+//purpose  :
+//=======================================================================
+const Standard_GUID& GEOMImpl_Fillet2dDriver::GetID()
+{
+  static Standard_GUID aFillet2dDriver("FF1AAB41-2A14-4df2-581B-3A568163BA46");
+  return aFillet2dDriver;
+}
+
+
+//=======================================================================
+//function : GEOMImpl_Fillet2dDriver
+//purpose  :
+//=======================================================================
+GEOMImpl_Fillet2dDriver::GEOMImpl_Fillet2dDriver()
+{
+}
+
+//=======================================================================
+//function : Execute
+//purpose  :
+//=======================================================================
+Standard_Integer GEOMImpl_Fillet2dDriver::Execute(TFunction_Logbook& log) const
+{
+  if (Label().IsNull()) return 0;
+  Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
+
+  GEOMImpl_IFillet2d aCI (aFunction);
+
+  TopoDS_Shape aShape;
+
+  Handle(GEOM_Function) aRefShape = aCI.GetShape();
+  TopoDS_Face aFaceShape = TopoDS::Face(aRefShape->GetValue());
+
+  if (aFaceShape.ShapeType() != TopAbs_FACE)
+    Standard_ConstructionError::Raise("Wrong arguments: two faces must be given");
+
+  BRepFilletAPI_MakeFillet2d fillet2d (aFaceShape);
+
+  int aLen = aCI.GetLength();
+  int ind = 1;
+  double rad = aCI.GetR();
+  for (; ind <= aLen; ind++) {
+    TopoDS_Shape aShapeVertex;
+    if (GEOMImpl_ILocalOperations::GetSubShape
+       (aFaceShape, aCI.GetVertex(ind), aShapeVertex)) {
+      fillet2d.AddFillet(TopoDS::Vertex(aShapeVertex), rad);
+    }
+  }
+
+  fillet2d.Build();
+  if (!fillet2d.IsDone()) {
+    StdFail_NotDone::Raise("2D Fillet can't be computed on the given shape with the given radius");
+  }
+  aShape = fillet2d.Shape();
+
+  if (aShape.IsNull()) return 0;
+
+  aFunction->SetValue(aShape);
+  log.SetTouched(Label());
+
+  return 1;
+}
+
+
+//=======================================================================
+//function :  GEOMImpl_Fillet2dDriver_Type_
+//purpose  :
+//=======================================================================
+Standard_EXPORT Handle_Standard_Type& GEOMImpl_Fillet2dDriver_Type_()
+{
+
+  static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver);
+  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver);
+  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
+  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
+  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
+  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
+
+
+  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
+  static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_Fillet2dDriver",
+                                                        sizeof(GEOMImpl_Fillet2dDriver),
+                                                        1,
+                                                        (Standard_Address)_Ancestors,
+                                                        (Standard_Address)NULL);
+
+  return _aType;
+}
+
+//=======================================================================
+//function : DownCast
+//purpose  :
+//=======================================================================
+const Handle(GEOMImpl_Fillet2dDriver) Handle(GEOMImpl_Fillet2dDriver)::DownCast(const Handle(Standard_Transient)& AnObject)
+{
+  Handle(GEOMImpl_Fillet2dDriver) _anOtherObject;
+
+  if (!AnObject.IsNull()) {
+     if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_Fillet2dDriver))) {
+       _anOtherObject = Handle(GEOMImpl_Fillet2dDriver)((Handle(GEOMImpl_Fillet2dDriver)&)AnObject);
+     }
+  }
+
+  return _anOtherObject ;
+}
diff --git a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx
new file mode 100755 (executable)
index 0000000..a5448db
--- /dev/null
@@ -0,0 +1,158 @@
+// 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   : GEOMImpl_Fillet2dDriver.ixx
+//  Module : GEOMImpl
+
+#ifndef _GEOMImpl_Fillet2dDriver_HeaderFile
+#define _GEOMImpl_Fillet2dDriver_HeaderFile
+
+#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
+#include <TColStd_SequenceOfExtendedString.hxx>
+#endif
+#ifndef _Standard_TypeMismatch_HeaderFile
+#include <Standard_TypeMismatch.hxx>
+#endif
+
+#ifndef _Standard_HeaderFile
+#include <Standard.hxx>
+#endif
+
+#ifndef _Standard_Macro_HeaderFile
+#include <Standard_Macro.hxx>
+#endif
+#ifndef _Standard_HeaderFile
+#include <Standard.hxx>
+#endif
+#ifndef _Standard_GUID_HeaderFile
+#include <Standard_GUID.hxx>
+#endif 
+
+#ifndef _Handle_TFunction_Driver_HeaderFile
+#include <Handle_TFunction_Driver.hxx>
+#endif
+
+class Standard_Transient;
+class Handle_Standard_Type;
+class Handle(TFunction_Driver);
+class GEOMImpl_Fillet2dDriver;
+
+Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMImpl_Fillet2dDriver);
+
+class Handle(GEOMImpl_Fillet2dDriver) : public Handle(TFunction_Driver) {
+  public:
+    inline void* operator new(size_t,void* anAddress) 
+      {
+        return anAddress;
+      }
+    inline void* operator new(size_t size) 
+      { 
+        return Standard::Allocate(size); 
+      }
+    inline void  operator delete(void *anAddress) 
+      { 
+        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+      }
+
+    Handle(GEOMImpl_Fillet2dDriver)():Handle(TFunction_Driver)() {} 
+    Handle(GEOMImpl_Fillet2dDriver)(const Handle(GEOMImpl_Fillet2dDriver)& aHandle) : Handle(TFunction_Driver)(aHandle) 
+     {
+     }
+
+    Handle(GEOMImpl_Fillet2dDriver)(const GEOMImpl_Fillet2dDriver* anItem) : Handle(TFunction_Driver)((TFunction_Driver *)anItem) 
+     {
+     }
+
+    Handle(GEOMImpl_Fillet2dDriver)& operator=(const Handle(GEOMImpl_Fillet2dDriver)& aHandle)
+     {
+      Assign(aHandle.Access());
+      return *this;
+     }
+
+    Handle(GEOMImpl_Fillet2dDriver)& operator=(const GEOMImpl_Fillet2dDriver* anItem)
+     {
+      Assign((Standard_Transient *)anItem);
+      return *this;
+     }
+
+    GEOMImpl_Fillet2dDriver* operator->() 
+     {
+      return (GEOMImpl_Fillet2dDriver *)ControlAccess();
+     }
+
+    GEOMImpl_Fillet2dDriver* operator->() const 
+     {
+      return (GEOMImpl_Fillet2dDriver *)ControlAccess();
+     }
+
+   Standard_EXPORT ~Handle(GEOMImpl_Fillet2dDriver)() {};
+   Standard_EXPORT static const Handle(GEOMImpl_Fillet2dDriver) DownCast(const Handle(Standard_Transient)& AnObject);
+};
+
+#ifndef _TFunction_Driver_HeaderFile
+#include <TFunction_Driver.hxx>
+#endif
+#ifndef _TFunction_Logbook_HeaderFile
+#include <TFunction_Logbook.hxx>
+#endif
+#ifndef _Standard_CString_HeaderFile
+#include <Standard_CString.hxx>
+#endif
+
+class TColStd_SequenceOfExtendedString;
+
+
+class GEOMImpl_Fillet2dDriver : public TFunction_Driver {
+
+public:
+
+    inline void* operator new(size_t,void* anAddress) 
+      {
+        return anAddress;
+      }
+    inline void* operator new(size_t size) 
+      { 
+        return Standard::Allocate(size); 
+      }
+    inline void  operator delete(void *anAddress) 
+      { 
+        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+      }
+
+ // Methods PUBLIC
+ // 
+Standard_EXPORT GEOMImpl_Fillet2dDriver();
+Standard_EXPORT virtual  Standard_Integer Execute(TFunction_Logbook& log) const; 
+Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
+Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
+Standard_EXPORT static const Standard_GUID& GetID();
+Standard_EXPORT ~GEOMImpl_Fillet2dDriver() {};
+
+
+ // Type management
+ //
+Standard_EXPORT friend Handle_Standard_Type& GEOMImpl_Fillet2dDriver_Type_();
+Standard_EXPORT const Handle(Standard_Type)& DynamicType() const  { return STANDARD_TYPE(GEOMImpl_Fillet2dDriver) ; }
+Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)& AType) const { return (STANDARD_TYPE(GEOMImpl_Fillet2dDriver) == AType || TFunction_Driver::IsKind(AType)); } 
+
+
+};
+
+#endif
index e662d4cac496318b54bf15169f35c3b349d0fe4f..af8f670640552ebdfe6d08654bdf1e8ccf84a2c7 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_FilletDriver.hxx>
@@ -36,6 +37,9 @@
 #include <TopAbs.hxx>
 #include <TopExp_Explorer.hxx>
 
+#include <ShapeFix_ShapeTolerance.hxx>
+#include <ShapeFix_Shape.hxx>
+
 #include <Precision.hxx>
 #include <gp_Pnt.hxx>
 #include <StdFail_NotDone.hxx>
@@ -128,7 +132,16 @@ Standard_Integer GEOMImpl_FilletDriver::Execute(TFunction_Logbook& log) const
   // Check shape validity
   BRepCheck_Analyzer ana (aShape, false);
   if (!ana.IsValid()) {
-    StdFail_NotDone::Raise("Fillet algorithm have produced an invalid shape result");
+    // 08.07.2008 added by skl during fixing bug 19761 from Mantis
+    ShapeFix_ShapeTolerance aSFT;
+    aSFT.LimitTolerance(aShape, Precision::Confusion(),
+                        Precision::Confusion(), TopAbs_SHAPE);
+    Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
+    aSfs->Perform();
+    aShape = aSfs->Shape();
+    ana.Init(aShape);
+    if (!ana.IsValid())
+      StdFail_NotDone::Raise("Fillet algorithm have produced an invalid shape result");
   }
 
   aFunction->SetValue(aShape);
index 22a5baec736e45ab9044372fbe44657e74b49aec..d5ac84451fb9e5bd1e1258b0a0c248c185c3ec95 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_FilletDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_FilletDriver_HeaderFile
 #define _GEOMImpl_FilletDriver_HeaderFile
 
index d17febfd2406184c13cafbb5d5e9bf3efad2d902..5be038b3403cc6cc419a7d9ae86d2563ef76bd07 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_FillingDriver.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
 
+#include <TColGeom_SequenceOfCurve.hxx>
+#include <ShapeFix_Face.hxx>
+#include <GeomAPI_PointsToBSplineSurface.hxx>
+#include <Geom_BSplineCurve.hxx>
+
 //=======================================================================
 //function : GetID
 //purpose  :
@@ -99,34 +105,109 @@ Standard_Integer GEOMImpl_FillingDriver::Execute(TFunction_Logbook& log) const
   TopoDS_Shape Scurrent;
   Standard_Real First, Last;
   Handle(Geom_Curve) C;
-  GeomFill_SectionGenerator Section;
-
-  Standard_Integer i = 0;
-  for (Ex.Init(aShape, TopAbs_EDGE); Ex.More(); Ex.Next()) {
-    Scurrent = Ex.Current() ;
-    if (Scurrent.IsNull() || Scurrent.ShapeType() != TopAbs_EDGE) return 0;
-    C = BRep_Tool::Curve(TopoDS::Edge(Scurrent), First, Last);
-    C = new Geom_TrimmedCurve(C, First, Last);
-    Section.AddCurve(C);
-    i++;
-  }
-
-  /* a 'tolerance' is used to compare 2 knots : see GeomFill_Generator.cdl */
-  Section.Perform(Precision::Confusion());
-  Handle(GeomFill_Line) Line = new GeomFill_Line(i);
-
-  GeomFill_AppSurf App (mindeg, maxdeg, tol3d, tol2d, nbiter); /* user parameters */
-  App.Perform(Line, Section, isApprox);
 
-  if (!App.IsDone()) return 0;
-  Standard_Integer UDegree, VDegree, NbUPoles, NbVPoles, NbUKnots, NbVKnots;
-  App.SurfShape(UDegree, VDegree, NbUPoles, NbVPoles, NbUKnots, NbVKnots);
-  Handle(Geom_BSplineSurface) GBS = new Geom_BSplineSurface
-    (App.SurfPoles(), App.SurfWeights(), App.SurfUKnots(), App.SurfVKnots(),
-     App.SurfUMults(), App.SurfVMults(), App.UDegree(), App.VDegree());
+  TopoDS_Iterator It (aShape);
+  for (; It.More(); It.Next()) {
+    Scurrent = It.Value();
+    if (Scurrent.ShapeType() != TopAbs_EDGE)
+      Standard_ConstructionError::Raise("The argument compound must contain only edges");
+  }
 
-  if (GBS.IsNull()) return 0;
-  aShape = BRepBuilderAPI_MakeFace(GBS);
+  if (!isApprox) {
+    // make filling as in old version of SALOME (before 4.1.1)
+    GeomFill_SectionGenerator Section;
+    Standard_Integer i = 0;
+    for (Ex.Init(aShape, TopAbs_EDGE); Ex.More(); Ex.Next()) {
+      Scurrent = Ex.Current();
+      if (Scurrent.IsNull() || Scurrent.ShapeType() != TopAbs_EDGE) return 0;
+      if (BRep_Tool::Degenerated(TopoDS::Edge(Scurrent))) continue;
+      C = BRep_Tool::Curve(TopoDS::Edge(Scurrent), First, Last);
+      C = new Geom_TrimmedCurve(C, First, Last);
+      Section.AddCurve(C);
+      i++;
+    }
+
+    /* a 'tolerance' is used to compare 2 knots : see GeomFill_Generator.cdl */
+    Section.Perform(Precision::Confusion());
+    Handle(GeomFill_Line) Line = new GeomFill_Line(i);
+    
+    GeomFill_AppSurf App (mindeg, maxdeg, tol3d, tol2d, nbiter); /* user parameters */
+    App.Perform(Line, Section);
+    
+    if (!App.IsDone()) return 0;
+    Standard_Integer UDegree, VDegree, NbUPoles, NbVPoles, NbUKnots, NbVKnots;
+    App.SurfShape(UDegree, VDegree, NbUPoles, NbVPoles, NbUKnots, NbVKnots);
+    Handle(Geom_BSplineSurface) GBS = new Geom_BSplineSurface
+      (App.SurfPoles(), App.SurfWeights(), App.SurfUKnots(), App.SurfVKnots(),
+       App.SurfUMults(), App.SurfVMults(), App.UDegree(), App.VDegree());
+    
+    if (GBS.IsNull()) return 0;
+    aShape = BRepBuilderAPI_MakeFace(GBS);
+  }    
+  else {
+    // implemented by skl 20.03.2008 for bug 16568
+    // make approximation - try to create bspline surface
+    // using GeomAPI_PointsToBSplineSurface
+    TColGeom_SequenceOfCurve aSeq;
+    int MaxNbPoles = 0;
+    // add curves from edges to sequence and find maximal
+    // number of poles if some of them are bsplines
+    for (Ex.Init(aShape, TopAbs_EDGE); Ex.More(); Ex.Next()) {
+      Scurrent = Ex.Current();
+      if (Scurrent.IsNull() || Scurrent.ShapeType() != TopAbs_EDGE) return 0;
+      if (BRep_Tool::Degenerated(TopoDS::Edge(Scurrent))) continue;
+      C = BRep_Tool::Curve(TopoDS::Edge(Scurrent), First, Last);
+      Handle(Geom_TrimmedCurve) TC = Handle(Geom_TrimmedCurve)::DownCast(C);
+      if(TC.IsNull()) {
+        Handle(Geom_BSplineCurve) BC = Handle(Geom_BSplineCurve)::DownCast(C);
+        if(!BC.IsNull()) {
+          MaxNbPoles = Max(MaxNbPoles,BC->NbPoles());
+        }
+      }
+      else {
+        Handle(Geom_BSplineCurve) BC = Handle(Geom_BSplineCurve)::DownCast(TC->BasisCurve());
+        if(BC.IsNull()) {
+          Handle(Geom_TrimmedCurve) TC1 = Handle(Geom_TrimmedCurve)::DownCast(TC->BasisCurve());
+          if(!TC1.IsNull()) {
+            BC = Handle(Geom_BSplineCurve)::DownCast(TC1->BasisCurve());
+          }
+        }
+        if(!BC.IsNull()) {
+          MaxNbPoles = Max(MaxNbPoles,BC->NbPoles());
+        }
+      }
+      aSeq.Append(C);
+    }
+    // prepare array of points for creation bspline surface
+    // size of this array: by U parameter - number of curves,
+    // by V parameter - determ using MaxNbPoles but it's
+    // value must be between 21(min) and 101(max)
+    int nbc = aSeq.Length();
+    int nbp = Max(21,2*MaxNbPoles-1);
+    if(nbp>101) nbp = 101;
+    TColgp_Array2OfPnt Points(1,nbc,1,nbp);
+    int ic = 1;
+    for(; ic<=nbc; ic++) {
+      Handle(Geom_Curve) C = aSeq.Value(ic);
+      double fp = C->FirstParameter();
+      double lp = C->LastParameter();
+      double dp = (lp-fp)/(nbp-1);
+      int j = 0;
+      gp_Pnt P;
+      for(; j<nbp; j++) {
+        C->D0(fp+dp*j,P);
+        Points.SetValue(ic,j+1,P);
+      }
+    }
+    GeomAPI_PointsToBSplineSurface PTB(Points,mindeg,maxdeg,GeomAbs_C2,tol3d);
+    Handle(Geom_BSplineSurface) BS = PTB.Surface();
+    BRepBuilderAPI_MakeFace BB(BS);
+    TopoDS_Face NewF = BB.Face();
+    Handle(ShapeFix_Face) sff = new ShapeFix_Face(NewF);
+    sff->Perform();
+    sff->FixOrientation();
+    aShape = sff->Face();
+  }
 
   /* We test the validity of resulting shape */
   if (!BRepAlgo::IsValid((aShape))) {
index 88eb0d8abd3bff567943f937c3a1cf11735e61c0..753439de2b2361e8d90fc18eefd29939a0f7361f 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_FillingDriver.hxx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_FillingDriver_HeaderFile
 #define _GEOMImpl_FillingDriver_HeaderFile
 
index ff5d2a26aeb47e77321f9d3d6864260db58ed13e..b01b3f88aa9087b87d6422f52f31c259486f2e2c 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 #ifdef WNT
 #pragma warning( disable:4786 )
 #include <GEOMImpl_PolylineDriver.hxx>
 #include <GEOMImpl_SplineDriver.hxx>
 #include <GEOMImpl_SketcherDriver.hxx>
+#include <GEOMImpl_3DSketcherDriver.hxx>
 #include <GEOMImpl_BoxDriver.hxx>
+#include <GEOMImpl_FaceDriver.hxx>
+#include <GEOMImpl_DiskDriver.hxx>
 #include <GEOMImpl_ConeDriver.hxx>
 #include <GEOMImpl_CylinderDriver.hxx>
 #include <GEOMImpl_PrismDriver.hxx>
@@ -57,6 +62,7 @@
 #include <GEOMImpl_BooleanDriver.hxx>
 #include <GEOMImpl_ChamferDriver.hxx>
 #include <GEOMImpl_FilletDriver.hxx>
+#include <GEOMImpl_Fillet2dDriver.hxx>
 #include <GEOMImpl_TranslateDriver.hxx>
 #include <GEOMImpl_RotateDriver.hxx>
 #include <GEOMImpl_MirrorDriver.hxx>
@@ -98,9 +104,12 @@ GEOMImpl_Gen::GEOMImpl_Gen()
    TFunction_DriverTable::Get()->AddDriver(GEOMImpl_PolylineDriver::GetID(), new GEOMImpl_PolylineDriver());
    TFunction_DriverTable::Get()->AddDriver(GEOMImpl_SplineDriver::GetID(), new GEOMImpl_SplineDriver());
    TFunction_DriverTable::Get()->AddDriver(GEOMImpl_SketcherDriver::GetID(), new GEOMImpl_SketcherDriver());
+   TFunction_DriverTable::Get()->AddDriver(GEOMImpl_3DSketcherDriver::GetID(), new GEOMImpl_3DSketcherDriver());
 
    // 3D Primitives
    TFunction_DriverTable::Get()->AddDriver(GEOMImpl_BoxDriver::GetID(), new GEOMImpl_BoxDriver());
+   TFunction_DriverTable::Get()->AddDriver(GEOMImpl_FaceDriver::GetID(), new GEOMImpl_FaceDriver());
+   TFunction_DriverTable::Get()->AddDriver(GEOMImpl_DiskDriver::GetID(), new GEOMImpl_DiskDriver());
    TFunction_DriverTable::Get()->AddDriver(GEOMImpl_ConeDriver::GetID(), new GEOMImpl_ConeDriver());
    TFunction_DriverTable::Get()->AddDriver(GEOMImpl_CylinderDriver::GetID(), new GEOMImpl_CylinderDriver());
    TFunction_DriverTable::Get()->AddDriver(GEOMImpl_PrismDriver::GetID(), new GEOMImpl_PrismDriver());
@@ -125,6 +134,7 @@ GEOMImpl_Gen::GEOMImpl_Gen()
    // Local Operations
    TFunction_DriverTable::Get()->AddDriver(GEOMImpl_ChamferDriver::GetID(), new GEOMImpl_ChamferDriver());
    TFunction_DriverTable::Get()->AddDriver(GEOMImpl_FilletDriver::GetID(), new GEOMImpl_FilletDriver());
+   TFunction_DriverTable::Get()->AddDriver(GEOMImpl_Fillet2dDriver::GetID(), new GEOMImpl_Fillet2dDriver());
    TFunction_DriverTable::Get()->AddDriver(GEOMImpl_ArchimedeDriver::GetID(), new GEOMImpl_ArchimedeDriver());
 
    // Geometrical Transformations, Offset, Scale
index f1a22a78523e624757ee5a001e736a6e66cd1744..c777a3a6bab70c0ec3001fefdf4983d157349122 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOMImpl_GEN_HXX_
 #define _GEOMImpl_GEN_HXX_
 
index ec18620ffdb16e1d45b213e626408cfc37312d28..cd6235466f679186621aa693d3d531e4f015f8e6 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_GlueDriver.hxx>
index e7c3befa849c93a28e0484cf4cec58044f01a348..1121c2f6dea8cd4951aeac31217ebd9734c0c5ba 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_GlueDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_GlueDriver_HeaderFile
 #define _GEOMImpl_GlueDriver_HeaderFile
 
index d4921d6483da67d0f96adb11f2a521ca319f988b..9516c613752cbf965c00584c9891873d7ce3f54a 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_HealingDriver.hxx>
index 3bc27c1a86663e71fee62ff65bf352c08ef7c4d2..d89f3e408b23007b97afe5166aba5fe3592ec951 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_HealingDriver.hxx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_HealingDriver_HeaderFile
 #define _GEOMImpl_HealingDriver_HeaderFile
 
index a1c554544528d6aa825ae2b810144f72ca162eb0..ffa7b4d3fd3297e2af21c36b6ffd0914403ae957 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
@@ -36,6 +38,8 @@
 #include <GEOMImpl_Types.hxx>
 
 #include <GEOMImpl_BoxDriver.hxx>
+#include <GEOMImpl_FaceDriver.hxx>
+#include <GEOMImpl_DiskDriver.hxx>
 #include <GEOMImpl_CylinderDriver.hxx>
 #include <GEOMImpl_ConeDriver.hxx>
 #include <GEOMImpl_SphereDriver.hxx>
@@ -48,6 +52,8 @@
 #include <GEOMImpl_ThruSectionsDriver.hxx>
 
 #include <GEOMImpl_IBox.hxx>
+#include <GEOMImpl_IFace.hxx>
+#include <GEOMImpl_IDisk.hxx>
 #include <GEOMImpl_ICylinder.hxx>
 #include <GEOMImpl_ICone.hxx>
 #include <GEOMImpl_ISphere.hxx>
@@ -60,6 +66,7 @@
 #include <GEOMImpl_IThruSections.hxx>
 #include <GEOMImpl_IPipeDiffSect.hxx>
 #include <GEOMImpl_IPipeShellSect.hxx>
+#include <GEOMImpl_IPipeBiNormal.hxx>
 
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
@@ -192,6 +199,281 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeBoxTwoPnt (Handle(GEOM_Objec
   return aBox;
 }
 
+//=============================================================================
+/*!
+ *  MakeFaceHW
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeFaceHW (double theH, double theW, int theOrientation)
+{
+  SetErrorCode(KO);
+
+  if (theH == 0 || theW == 0) return NULL;
+
+  //Add a new Face object
+  Handle(GEOM_Object) aFace = GetEngine()->AddObject(GetDocID(), GEOM_FACE);
+
+  //Add a new Box function for creation a box relatively to two points
+  Handle(GEOM_Function) aFunction = aFace->AddFunction(GEOMImpl_FaceDriver::GetID(), FACE_H_W);
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_FaceDriver::GetID()) return aFace;
+
+  GEOMImpl_IFace aFI (aFunction);
+
+  aFI.SetH(theH);
+  aFI.SetW(theW);
+  aFI.SetOrientation(theOrientation);
+
+  //Compute the Face
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Face 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) << aFace << " = geompy.MakeFaceHW("
+    << theH << ", " << theW << ", " << theOrientation << ")";
+
+  SetErrorCode(OK);
+  return aFace;
+}
+
+//=============================================================================
+/*!
+ *  MakeFaceObjHW
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeFaceObjHW (Handle(GEOM_Object) theObj,
+                                                              double theH, double theW)
+{
+  SetErrorCode(KO);
+
+  if (theObj.IsNull()) return NULL;
+
+  //Add a new Face object
+  Handle(GEOM_Object) aFace = GetEngine()->AddObject(GetDocID(), GEOM_FACE);
+
+  //Add a new Box function for creation a box relatively to two points
+  Handle(GEOM_Function) aFunction = aFace->AddFunction(GEOMImpl_FaceDriver::GetID(), FACE_OBJ_H_W);
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_FaceDriver::GetID()) return aFace;
+
+  GEOMImpl_IFace aFI (aFunction);
+
+  Handle(GEOM_Function) aRefFunction1 = theObj->GetLastFunction();
+
+  if (aRefFunction1.IsNull())
+    return aFace;
+
+  aFI.SetRef1(aRefFunction1);
+  aFI.SetH(theH);
+  aFI.SetW(theW);
+
+  //Compute the Face
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Face 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) << aFace << " = geompy.MakeFaceObjHW("
+    << theObj << ", " << theH << ", " << theW << ")";
+
+  SetErrorCode(OK);
+  return aFace;
+}
+
+//=============================================================================
+/*!
+ *  MakeDiskPntVecR
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeDiskPntVecR
+      (Handle(GEOM_Object) thePnt, Handle(GEOM_Object) theVec, double theR)
+{
+  SetErrorCode(KO);
+
+  if (thePnt.IsNull() || theVec.IsNull()) return NULL;
+
+  //Add a new Disk object
+  Handle(GEOM_Object) aDisk = GetEngine()->AddObject(GetDocID(), GEOM_FACE);
+
+  //Add a new Disk function for creation a disk relatively to point and vector
+  Handle(GEOM_Function) aFunction =
+    aDisk->AddFunction(GEOMImpl_DiskDriver::GetID(), DISK_PNT_VEC_R);
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_DiskDriver::GetID()) return NULL;
+
+  GEOMImpl_IDisk aCI (aFunction);
+
+  Handle(GEOM_Function) aRefPnt = thePnt->GetLastFunction();
+  Handle(GEOM_Function) aRefVec = theVec->GetLastFunction();
+
+  if (aRefPnt.IsNull() || aRefVec.IsNull()) return NULL;
+
+  aCI.SetCenter(aRefPnt);
+  aCI.SetVector(aRefVec);
+  aCI.SetRadius(theR);
+
+  //Compute the Disk value
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Disk 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) << aDisk << " = geompy.MakeDiskPntVecR("
+    << thePnt << ", " << theVec << ", " << theR << ")";
+
+  SetErrorCode(OK);
+  return aDisk;
+}
+
+//=============================================================================
+/*!
+ *  MakeDiskThreePnt
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeDiskThreePnt (Handle(GEOM_Object) thePnt1,
+                                                                 Handle(GEOM_Object) thePnt2,
+                                                                 Handle(GEOM_Object) thePnt3)
+{
+  SetErrorCode(KO);
+
+  if (thePnt1.IsNull() || thePnt2.IsNull() || thePnt3.IsNull()) return NULL;
+
+  //Add a new Disk object
+  Handle(GEOM_Object) aDisk = GetEngine()->AddObject(GetDocID(), GEOM_FACE);
+
+  //Add a new Disk function for creation a disk relatively to three points
+  Handle(GEOM_Function) aFunction =
+    aDisk->AddFunction(GEOMImpl_DiskDriver::GetID(), DISK_THREE_PNT);
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_DiskDriver::GetID()) return NULL;
+
+  GEOMImpl_IDisk aCI (aFunction);
+
+  Handle(GEOM_Function) aRefPnt1 = thePnt1->GetLastFunction();
+  Handle(GEOM_Function) aRefPnt2 = thePnt2->GetLastFunction();
+  Handle(GEOM_Function) aRefPnt3 = thePnt3->GetLastFunction();
+
+  if (aRefPnt1.IsNull() || aRefPnt2.IsNull() || aRefPnt3.IsNull()) return NULL;
+
+  aCI.SetPoint1(aRefPnt1);
+  aCI.SetPoint2(aRefPnt2);
+  aCI.SetPoint3(aRefPnt3);
+
+  //Compute the Disk value
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Disk 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) << aDisk << " = geompy.MakeDiskThreePnt("
+    << thePnt1 << ", " << thePnt2 << ", " << thePnt3 << ")";
+
+  SetErrorCode(OK);
+  return aDisk;
+}
+
+//=============================================================================
+/*!
+ *  MakeDiskR
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeDiskR (double theR, int theOrientation)
+{
+  SetErrorCode(KO);
+
+  if (theR == 0 ) return NULL;
+
+  //Add a new Disk object
+  Handle(GEOM_Object) aDisk = GetEngine()->AddObject(GetDocID(), GEOM_FACE);
+
+  //Add a new Box function for creation a box relatively to two points
+  Handle(GEOM_Function) aFunction = aDisk->AddFunction(GEOMImpl_DiskDriver::GetID(), DISK_R);
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_DiskDriver::GetID()) return aDisk;
+
+  GEOMImpl_IDisk aDI (aFunction);
+
+  aDI.SetRadius(theR);
+  aDI.SetOrientation(theOrientation);
+
+  //Compute the Disk
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Disk 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) << aDisk << " = geompy.MakeDiskR("
+    << theR << ", " << theOrientation << ")";
+
+  SetErrorCode(OK);
+  return aDisk;
+}
 
 //=============================================================================
 /*!
@@ -874,6 +1156,121 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismTwoPnt2Ways
   return aPrism;
 }
 
+//=============================================================================
+/*!
+ *  MakePrismDXDYDZ
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismDXDYDZ
+       (Handle(GEOM_Object) theBase, double theDX, double theDY, double theDZ)
+{
+  SetErrorCode(KO);
+
+  if (theBase.IsNull()) return NULL;
+
+  //Add a new Prism object
+  Handle(GEOM_Object) aPrism = GetEngine()->AddObject(GetDocID(), GEOM_PRISM);
+
+  //Add a new Prism function for creation a Prism by DXDYDZ
+  Handle(GEOM_Function) aFunction =
+    aPrism->AddFunction(GEOMImpl_PrismDriver::GetID(), PRISM_BASE_DXDYDZ);
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_PrismDriver::GetID()) return NULL;
+
+  GEOMImpl_IPrism aCI (aFunction);
+
+  Handle(GEOM_Function) aRefBase = theBase->GetLastFunction();
+
+  if (aRefBase.IsNull()) return NULL;
+
+  aCI.SetBase(aRefBase);
+  aCI.SetDX(theDX);
+  aCI.SetDY(theDY);
+  aCI.SetDZ(theDZ);
+
+  //Compute the Prism value
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Extrusion can not be created, check input data");
+      return NULL;
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return NULL;
+  }
+
+  //Make a Python command
+  GEOM::TPythonDump(aFunction) << aPrism << " = geompy.MakePrismDXDYDZ("
+    << theBase << ", " << theDX << ", " << theDY << ", " << theDZ << ")";
+
+  SetErrorCode(OK);
+  return aPrism;
+}
+
+//=============================================================================
+/*!
+ *  MakePrismDXDYDZ_2WAYS
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismDXDYDZ2Ways
+       (Handle(GEOM_Object) theBase, double theDX, double theDY, double theDZ)
+{
+  SetErrorCode(KO);
+
+  if (theBase.IsNull()) return NULL;
+
+  //Add a new Prism object
+  Handle(GEOM_Object) aPrism = GetEngine()->AddObject(GetDocID(), GEOM_PRISM);
+
+  //Add a new Prism function for creation a Prism by DXDYDZ
+  Handle(GEOM_Function) aFunction =
+    aPrism->AddFunction(GEOMImpl_PrismDriver::GetID(), PRISM_BASE_DXDYDZ_2WAYS);
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_PrismDriver::GetID()) return NULL;
+
+  GEOMImpl_IPrism aCI (aFunction);
+
+  Handle(GEOM_Function) aRefBase = theBase->GetLastFunction();
+
+  if (aRefBase.IsNull()) return NULL;
+
+  aCI.SetBase(aRefBase);
+  aCI.SetDX(theDX);
+  aCI.SetDY(theDY);
+  aCI.SetDZ(theDZ);
+
+  //Compute the Prism value
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Extrusion can not be created, check input data");
+      return NULL;
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return NULL;
+  }
+
+  //Make a Python command
+  GEOM::TPythonDump(aFunction) << aPrism << " = geompy.MakePrismDXDYDZ2Ways("
+    << theBase << ", " << theDX << ", " << theDY << ", " << theDZ << ")";
+
+  SetErrorCode(OK);
+  return aPrism;
+}
 
 //=============================================================================
 /*!
@@ -1728,3 +2125,64 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePipeShellsWithoutPath(
 
 }
 
+
+//=============================================================================
+/*!
+ *  MakePipeBiNormalAlongVector
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePipeBiNormalAlongVector (Handle(GEOM_Object) theBase,
+                                                                            Handle(GEOM_Object) thePath,
+                                                                            Handle(GEOM_Object) theVec)
+{
+  SetErrorCode(KO);
+
+  if (theBase.IsNull() || thePath.IsNull() || theVec.IsNull()) return NULL;
+
+  //Add a new Pipe object
+  Handle(GEOM_Object) aPipe = GetEngine()->AddObject(GetDocID(), GEOM_PIPE);
+
+  //Add a new Pipe function
+  Handle(GEOM_Function) aFunction =
+    aPipe->AddFunction(GEOMImpl_PipeDriver::GetID(), PIPE_BI_NORMAL_ALONG_VECTOR);
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_PipeDriver::GetID()) return NULL;
+
+  GEOMImpl_IPipeBiNormal aCI (aFunction);
+
+  Handle(GEOM_Function) aRefBase = theBase->GetLastFunction();
+  Handle(GEOM_Function) aRefPath = thePath->GetLastFunction();
+  Handle(GEOM_Function) aRefVec  = theVec->GetLastFunction();
+
+  if (aRefBase.IsNull() || aRefPath.IsNull() || aRefVec.IsNull()) return NULL;
+
+  aCI.SetBase(aRefBase);
+  aCI.SetPath(aRefPath);
+  aCI.SetVector(aRefVec);
+
+  //Compute the Pipe value
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Pipe 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) << aPipe << " = geompy.MakePipeBiNormalAlongVector("
+    << theBase << ", " << thePath << ", " << theVec << ")";
+
+  SetErrorCode(OK);
+  return aPipe;
+}
+
index 5f1f52f36411681bc3dcef256689134ea7fa8dfe..6f1295b41919829845a2256019ad856069f2b5fd 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOMImpl_I3DPrimOperations_HXX_
 #define _GEOMImpl_I3DPrimOperations_HXX_
 
@@ -35,8 +36,17 @@ class GEOMImpl_I3DPrimOperations : public GEOM_IOperations {
 
   Standard_EXPORT Handle(GEOM_Object) MakeBoxDXDYDZ (double theDX, double theDY, double theDZ);
   Standard_EXPORT Handle(GEOM_Object) MakeBoxTwoPnt (Handle(GEOM_Object) thePnt1,
-                                     Handle(GEOM_Object) thePnt2);
-
+                                                    Handle(GEOM_Object) thePnt2);
+  Standard_EXPORT Handle(GEOM_Object) MakeFaceHW (double theH, double theW, int theOrientation);
+  Standard_EXPORT Handle(GEOM_Object) MakeFaceObjHW (Handle(GEOM_Object) theObj,
+                                                    double theH, double theW);
+  Standard_EXPORT Handle(GEOM_Object) MakeDiskThreePnt (Handle(GEOM_Object) thePnt1,
+                                                       Handle(GEOM_Object) thePnt2,
+                                                       Handle(GEOM_Object) thePnt3);
+  Standard_EXPORT Handle(GEOM_Object) MakeDiskPntVecR (Handle(GEOM_Object) thePnt1,
+                                                      Handle(GEOM_Object) theVec,
+                                                      double theR);
+  Standard_EXPORT Handle(GEOM_Object) MakeDiskR (double theR, int theOrientation);
   Standard_EXPORT Handle(GEOM_Object) MakeCylinderRH       (double theR, double theH);
   Standard_EXPORT Handle(GEOM_Object) MakeCylinderPntVecRH (Handle(GEOM_Object) thePnt,
                                             Handle(GEOM_Object) theVec,
@@ -70,6 +80,12 @@ class GEOMImpl_I3DPrimOperations : public GEOM_IOperations {
                                        Handle(GEOM_Object) thePoint1,
                                        Handle(GEOM_Object) thePoint2);
 
+  Standard_EXPORT Handle(GEOM_Object) MakePrismDXDYDZ (Handle(GEOM_Object) theBase,
+                                     double theDX, double theDY, double theDZ);
+
+  Standard_EXPORT Handle(GEOM_Object) MakePrismDXDYDZ2Ways (Handle(GEOM_Object) theBase,
+                                     double theDX, double theDY, double theDZ);
+
   Standard_EXPORT Handle(GEOM_Object) MakePipe (Handle(GEOM_Object) theBase,
                                 Handle(GEOM_Object) thePath);
 
@@ -109,6 +125,10 @@ class GEOMImpl_I3DPrimOperations : public GEOM_IOperations {
                const Handle(TColStd_HSequenceOfTransient)& theBases,
                const Handle(TColStd_HSequenceOfTransient)& theLocations);
 
+  Standard_EXPORT Handle(GEOM_Object) MakePipeBiNormalAlongVector (Handle(GEOM_Object) theBase,
+                                                                  Handle(GEOM_Object) thePath,
+                                                                  Handle(GEOM_Object) theVec);
+
 };
 
 #endif
diff --git a/src/GEOMImpl/GEOMImpl_I3DSketcher.hxx b/src/GEOMImpl/GEOMImpl_I3DSketcher.hxx
new file mode 100755 (executable)
index 0000000..dc4ea30
--- /dev/null
@@ -0,0 +1,43 @@
+// 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
+//
+//NOTE: This is an interface to a function for the Sketcher creation.
+
+
+#include "GEOM_Function.hxx"
+
+#include <TColStd_HArray1OfReal.hxx>
+
+#define SKETCH_ARG_COORDS  1
+
+class GEOMImpl_I3DSketcher
+{
+ public:
+
+  GEOMImpl_I3DSketcher(Handle(GEOM_Function) theFunction): _func(theFunction) {}
+
+  void SetCoordinates(const Handle(TColStd_HArray1OfReal)& theValue)
+              { _func->SetRealArray(SKETCH_ARG_COORDS, theValue); }
+
+  Handle(TColStd_HArray1OfReal) GetCoordinates() { return _func->GetRealArray(SKETCH_ARG_COORDS); }
+
+ private:
+
+  Handle(GEOM_Function) _func;
+};
index dc7372cd5c0bb764fbf18a715f8756eebd6dcd89..8aecd206c2b789c1968235a5bab33eb1b37bd3b2 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Arc creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define ARC_ARG_PI  1
index ca31fa31b02dccaf1467418c7cdb9588340927a1..4b93c91f099c4fd3a4cebd04333da4b89599aadb 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Archimede operation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define ARG_WEIGHT   1  
index 08d1fde184e77359d8d50259c25305b2e53edaa6..1594f58279160e5ccf87bdf2360c30e67a66fdfd 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
@@ -231,6 +233,64 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePointOnCurve
   return aPoint;
 }
 
+
+//=============================================================================
+/*!
+ *  MakePointOnSurface
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePointOnSurface
+   (Handle(GEOM_Object) theSurface, double theUParameter, double theVParameter)
+{
+  SetErrorCode(KO);
+
+  if (theSurface.IsNull()) return NULL;
+
+  //Add a new Point object
+  Handle(GEOM_Object) aPoint = GetEngine()->AddObject(GetDocID(), GEOM_POINT);
+
+  //Add a new Point function for creation a point relativley another point
+  Handle(GEOM_Function) aFunction = aPoint->AddFunction(GEOMImpl_PointDriver::GetID(),
+                                                        POINT_SURFACE_PAR);
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_PointDriver::GetID()) return NULL;
+
+  GEOMImpl_IPoint aPI (aFunction);
+
+  Handle(GEOM_Function) aRefFunction = theSurface->GetLastFunction();
+  if (aRefFunction.IsNull()) return NULL;
+
+  aPI.SetSurface(aRefFunction);
+  aPI.SetParameter(theUParameter);
+  aPI.SetParameter2(theVParameter);
+
+  //Compute the point value
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Point 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) << aPoint << " = geompy.MakeVertexOnSurface("
+                               << theSurface << ", " << theUParameter 
+                               << ", " << theVParameter << ")";
+
+  SetErrorCode(OK);
+  return aPoint;
+}
+
+
 //=============================================================================
 /*!
  *  MakePointOnLinesIntersection
index e6155178bf89a67618f6cfdcce59bd0eec4e96f8..16c4af6ea93fa56c557b5271695dab8b2d9afa1c 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOMImpl_IBasicOperations_HXX_
 #define _GEOMImpl_IBasicOperations_HXX_
 
@@ -44,6 +45,10 @@ class GEOMImpl_IBasicOperations : public GEOM_IOperations {
   Standard_EXPORT Handle(GEOM_Object) MakePointOnLinesIntersection
                                       (Handle(GEOM_Object) theLine1, Handle(GEOM_Object) theLine2);
 
+  Standard_EXPORT Handle(GEOM_Object) MakePointOnSurface (Handle(GEOM_Object) theSurface,
+                                                          double theUParameter,
+                                                          double theVParameter);
+
   // Vector
   Standard_EXPORT Handle(GEOM_Object) MakeVectorDXDYDZ (double theDX, double theDY, double theDZ);
 
index 0c5eac84adccfb44c54e36827f1f5994b471f507..b6827133d114c111c0a48449ea0b32727854d4a3 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an interface to a function for the Blocks Multi-Transformations.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define TRSF_ORIGIN  1
index f32575c30ecc79f85868f5ac70e4c8445aa27670..dac943bd293a2b9ba5a1bc399a8e2143cf48a0f9 100644 (file)
@@ -1,26 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 // NOTE: This is an interface to a function for the Blocks
 // creation and transformation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #include "TColStd_HSequenceOfTransient.hxx"
index 22032807a8cc367a97c4cda8984925a06c45b4b8..590881408e83b6027f67cbfe951d44aabf988cc1 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 #ifdef WNT
 #pragma warning( disable:4786 )
 #endif
 
-using namespace std;
-
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_IBlocksOperations.hxx>
@@ -1925,7 +1925,7 @@ Standard_Boolean HasAnyConnection (const Standard_Integer         theBlockIndex,
 //=============================================================================
 Standard_Boolean GEOMImpl_IBlocksOperations::CheckCompoundOfBlocksOld
                                                 (Handle(GEOM_Object) theCompound,
-                                                 list<BCError>&      theErrors)
+                                                 std::list<BCError>&      theErrors)
 {
   SetErrorCode(KO);
 
@@ -2077,11 +2077,11 @@ Standard_Boolean GEOMImpl_IBlocksOperations::CheckCompoundOfBlocksOld
 //=============================================================================
 TCollection_AsciiString GEOMImpl_IBlocksOperations::PrintBCErrors
                                                 (Handle(GEOM_Object)  theCompound,
-                                                 const list<BCError>& theErrors)
+                                                 const std::list<BCError>& theErrors)
 {
   TCollection_AsciiString aDescr;
 
-  list<BCError>::const_iterator errIt = theErrors.begin();
+  std::list<BCError>::const_iterator errIt = theErrors.begin();
   int i = 0;
   for (; errIt != theErrors.end(); i++, errIt++) {
     BCError errStruct = *errIt;
@@ -2106,8 +2106,8 @@ TCollection_AsciiString GEOMImpl_IBlocksOperations::PrintBCErrors
       break;
     }
 
-    list<int> sshList = errStruct.incriminated;
-    list<int>::iterator sshIt = sshList.begin();
+    std::list<int> sshList = errStruct.incriminated;
+    std::list<int>::iterator sshIt = sshList.begin();
     int jj = 0;
     for (; sshIt != sshList.end(); jj++, sshIt++) {
       if (jj > 0)
@@ -2126,7 +2126,7 @@ TCollection_AsciiString GEOMImpl_IBlocksOperations::PrintBCErrors
 //=============================================================================
 Standard_Boolean GEOMImpl_IBlocksOperations::CheckCompoundOfBlocks
                                               (Handle(GEOM_Object) theCompound,
-                                               list<BCError>&      theErrors)
+                                               std::list<BCError>&      theErrors)
 {
   SetErrorCode(KO);
 
index 8248df00f512a1b63e35aa5f845fce4c7cf7b5b0..449c36f510261548a82189f8be197536a3a2f3b2 100644 (file)
@@ -1,28 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOMImpl_IBlocksOperations_HXX_
 #define _GEOMImpl_IBlocksOperations_HXX_
 
-using namespace std;
-
 #include "GEOM_IOperations.hxx"
 
 #include <TopTools_ListOfShape.hxx>
@@ -114,17 +113,17 @@ class GEOMImpl_IBlocksOperations : public GEOM_IOperations {
 
   struct BCError {
     BCErrorType error;
-    list<int>   incriminated;
+    std::list<int>   incriminated;
   };
 
   Standard_EXPORT Standard_Boolean CheckCompoundOfBlocksOld (Handle(GEOM_Object) theCompound,
-                                             list<BCError>&      theErrors);
+                                             std::list<BCError>&      theErrors);
 
   Standard_EXPORT Standard_Boolean CheckCompoundOfBlocks (Handle(GEOM_Object) theCompound,
-                                          list<BCError>&      theErrors);
+                                          std::list<BCError>&      theErrors);
 
   Standard_EXPORT TCollection_AsciiString PrintBCErrors (Handle(GEOM_Object)  theCompound,
-                                         const list<BCError>& theErrors);
+                                         const std::list<BCError>& theErrors);
 
   Standard_EXPORT Handle(GEOM_Object) RemoveExtraEdges (Handle(GEOM_Object) theShape);
 
index 302ecfc449868ff1c20a78206fbe728f201cba3e..871b58caa3ab93105ff887aa8a678f4f2ab7429d 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Common, Cut and Fuse creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define BOOL_ARG_SHAPE1  1
index f5c4040a17a8f10b759d8bfab3b383dc505c66f3..bae1dd0c6da1b260ed32db464ec7a57dcdb1263a 100644 (file)
@@ -1,23 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_IBooleanOperations.hxx>
index 6dc82d7be23d005e30b99069b6e4b5c2730b23c9..7e99fa82f11d31f7864c55a8ed391ac5dbd6dc0b 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOMImpl_IBooleanOperations_HXX_
 #define _GEOMImpl_IBooleanOperations_HXX_
 
index 7ce2152a8a9b69d78abeb5a1625ba4f87c37433a..81445ab6e6aa1dbc15456a5ece55ef21b2b691b3 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Box creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define BOX_ARG_DX   1
index 17f7e5afcd793e4e67bace07bdca3dadafadeefd..32f43fa17c0eb6cf85abd9656121c12998273a0e 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an interface to a function for the Chamfer and creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define CHAM_ARG_SH    1
index ab44ba5d77991c58bba633a39017a7cd7a1539f0..e5d466a8ae351bac47cb9783b7d55736a2b70a06 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Circle creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define CIRC_ARG_P1  1
index bce989a92c53d09775e557ead13ed7f8f8d376f6..f927a59c76260ef9ec27d8067ac766cc97b484f1 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Cone creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define CONE_ARG_R1  1
index 09b9ee001e617ac3884b9c8b066918979aa8fdee..a9c4ad25155d229f57d470c2e875ee5ab1ae60e8 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Copy operation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define COPY_ARG_REF  1
index d6628ca431256cdd69b6cb48a506255d165ca391..6a6b8f9ef257d21b2d4ee2100df8f92446718695 100644 (file)
@@ -1,26 +1,30 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_ICurvesOperations.hxx>
 
+#include <TColStd_HArray1OfReal.hxx>
+
 #include <GEOM_Function.hxx>
 #include <GEOM_PythonDump.hxx>
 
@@ -32,6 +36,7 @@
 #include <GEOMImpl_EllipseDriver.hxx>
 #include <GEOMImpl_ArcDriver.hxx>
 #include <GEOMImpl_SketcherDriver.hxx>
+#include <GEOMImpl_3DSketcherDriver.hxx>
 
 #include <GEOMImpl_IPolyline.hxx>
 #include <GEOMImpl_ICircle.hxx>
@@ -39,6 +44,7 @@
 #include <GEOMImpl_IEllipse.hxx>
 #include <GEOMImpl_IArc.hxx>
 #include <GEOMImpl_ISketcher.hxx>
+#include <GEOMImpl_I3DSketcher.hxx>
 
 #include "utilities.h"
 
@@ -266,7 +272,9 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCirclePntVecR
 {
   SetErrorCode(KO);
 
-  if (thePnt.IsNull() || theVec.IsNull()) return NULL;
+  // Not set thePnt means origin of global CS,
+  // Not set theVec means Z axis of global CS
+  //if (thePnt.IsNull() || theVec.IsNull()) return NULL;
 
   //Add a new Circle object
   Handle(GEOM_Object) aCircle = GetEngine()->AddObject(GetDocID(), GEOM_CIRCLE);
@@ -281,13 +289,18 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCirclePntVecR
 
   GEOMImpl_ICircle aCI (aFunction);
 
-  Handle(GEOM_Function) aRefPnt = thePnt->GetLastFunction();
-  Handle(GEOM_Function) aRefVec = theVec->GetLastFunction();
+  if (!thePnt.IsNull()) {
+    Handle(GEOM_Function) aRefPnt = thePnt->GetLastFunction();
+    if (aRefPnt.IsNull()) return NULL;
+    aCI.SetCenter(aRefPnt);
+  }
 
-  if (aRefPnt.IsNull() || aRefVec.IsNull()) return NULL;
+  if (!theVec.IsNull()) {
+    Handle(GEOM_Function) aRefVec = theVec->GetLastFunction();
+    if (aRefVec.IsNull()) return NULL;
+    aCI.SetVector(aRefVec);
+  }
 
-  aCI.SetCenter(aRefPnt);
-  aCI.SetVector(aRefVec);
   aCI.SetRadius(theR);
 
   //Compute the Circle value
@@ -325,7 +338,9 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeEllipse
 {
   SetErrorCode(KO);
 
-  if (thePnt.IsNull() || theVec.IsNull()) return NULL;
+  // Not set thePnt means origin of global CS,
+  // Not set theVec means Z axis of global CS
+  //if (thePnt.IsNull() || theVec.IsNull()) return NULL;
 
   //Add a new Ellipse object
   Handle(GEOM_Object) anEll = GetEngine()->AddObject(GetDocID(), GEOM_ELLIPSE);
@@ -340,13 +355,18 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeEllipse
 
   GEOMImpl_IEllipse aCI (aFunction);
 
-  Handle(GEOM_Function) aRefPnt = thePnt->GetLastFunction();
-  Handle(GEOM_Function) aRefVec = theVec->GetLastFunction();
+  if (!thePnt.IsNull()) {
+    Handle(GEOM_Function) aRefPnt = thePnt->GetLastFunction();
+    if (aRefPnt.IsNull()) return NULL;
+    aCI.SetCenter(aRefPnt);
+  }
 
-  if (aRefPnt.IsNull() || aRefVec.IsNull()) return NULL;
+  if (!theVec.IsNull()) {
+    Handle(GEOM_Function) aRefVec = theVec->GetLastFunction();
+    if (aRefVec.IsNull()) return NULL;
+    aCI.SetVector(aRefVec);
+  }
 
-  aCI.SetCenter(aRefPnt);
-  aCI.SetVector(aRefVec);
   aCI.SetRMajor(theRMajor);
   aCI.SetRMinor(theRMinor);
 
@@ -495,6 +515,67 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeArcCenter (Handle(GEOM_Objec
   return anArc;
 }
 
+//=============================================================================
+/*!
+ *  MakeArcOfEllipse
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeArcOfEllipse (Handle(GEOM_Object) thePnt1,
+                                                                 Handle(GEOM_Object) thePnt2,
+                                                                 Handle(GEOM_Object) thePnt3)
+{
+  SetErrorCode(KO);
+
+  if (thePnt1.IsNull() || thePnt2.IsNull() || thePnt3.IsNull()) return NULL;
+
+  //Add a new Circle Arc object
+  Handle(GEOM_Object) anArc = GetEngine()->AddObject(GetDocID(), GEOM_ELLIPSE_ARC);
+
+  //Add a new Circle Arc function
+  Handle(GEOM_Function) aFunction =
+      anArc->AddFunction(GEOMImpl_ArcDriver::GetID(), ELLIPSE_ARC_CENTER_TWO_PNT);
+
+  if (aFunction.IsNull()) return NULL;
+  
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_ArcDriver::GetID()) return NULL;
+  GEOMImpl_IArc aCI (aFunction);
+
+  Handle(GEOM_Function) aRefPnt1 = thePnt1->GetLastFunction();
+  Handle(GEOM_Function) aRefPnt2 = thePnt2->GetLastFunction();
+  Handle(GEOM_Function) aRefPnt3 = thePnt3->GetLastFunction();
+  
+
+  if (aRefPnt1.IsNull() || aRefPnt2.IsNull() || aRefPnt3.IsNull()) return NULL;
+
+  aCI.SetPoint1(aRefPnt1);
+  aCI.SetPoint2(aRefPnt2);
+  aCI.SetPoint3(aRefPnt3);
+  
+  //Compute the Arc value
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Arc 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) << anArc << " = geompy.MakeArcOfEllipse("
+    << thePnt1 << ", " << thePnt2 << ", " << thePnt3 << ")";
+
+  SetErrorCode(OK);
+  return anArc;
+}
+
 //=============================================================================
 /*!
  *  MakeSplineBezier
@@ -634,13 +715,12 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSplineInterpolation
  *  MakeSketcher
  */
 //=============================================================================
-Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcher
-                               (const TCollection_AsciiString& theCommand,
-                                list<double>                   theWorkingPlane)
+Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcher (const char* theCommand,
+                                                             list<double> theWorkingPlane)
 {
   SetErrorCode(KO);
 
-  if (theCommand.IsEmpty()) return NULL;
+  if (!theCommand || strcmp(theCommand, "") == 0) return NULL;
 
   //Add a new Sketcher object
   Handle(GEOM_Object) aSketcher = GetEngine()->AddObject(GetDocID(), GEOM_SKETCHER);
@@ -655,7 +735,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcher
 
   GEOMImpl_ISketcher aCI (aFunction);
 
-  aCI.SetCommand(theCommand);
+  TCollection_AsciiString aCommand((char*) theCommand);
+  aCI.SetCommand(aCommand);
 
   int ind = 1;
   list<double>::iterator it = theWorkingPlane.begin();
@@ -680,7 +761,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcher
 
   //Make a Python command
   GEOM::TPythonDump pd (aFunction);
-  pd << aSketcher << " = geompy.MakeSketcher(\"" << theCommand.ToCString() << "\", [";
+  pd << aSketcher << " = geompy.MakeSketcher(\"" << aCommand.ToCString() << "\", [";
 
   it = theWorkingPlane.begin();
   pd << (*it++);
@@ -693,18 +774,85 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcher
   return aSketcher;
 }
 
+//=============================================================================
+/*!
+ *  Make3DSketcher
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_ICurvesOperations::Make3DSketcher (list<double> theCoordinates)
+{
+  SetErrorCode(KO);
+
+  //Add a new Sketcher object
+  Handle(GEOM_Object) a3DSketcher = GetEngine()->AddObject(GetDocID(), GEOM_3DSKETCHER);
+
+  //Add a new Sketcher function
+  Handle(GEOM_Function) aFunction =
+    a3DSketcher->AddFunction(GEOMImpl_3DSketcherDriver::GetID(), GEOM_3DSKETCHER);
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_3DSketcherDriver::GetID()) return NULL;
+
+  GEOMImpl_I3DSketcher aCI (aFunction);
+
+  int nbOfCoords = 0;
+  list<double>::iterator it = theCoordinates.begin();
+  for (; it != theCoordinates.end(); it++)
+    nbOfCoords++;
+
+  Handle(TColStd_HArray1OfReal) aCoordsArray = new TColStd_HArray1OfReal (1, nbOfCoords);
+
+  it = theCoordinates.begin();
+  int ind = 1;
+  for (; it != theCoordinates.end(); it++, ind++)
+    aCoordsArray->SetValue(ind, *it);
+
+  aCI.SetCoordinates(aCoordsArray);
+    
+  //Compute the Sketcher value
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("3D Sketcher 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 pd (aFunction);
+  pd << a3DSketcher << " = geompy.Make3DSketcher([";
+
+  it = theCoordinates.begin();
+  pd << (*it++);
+  while (it != theCoordinates.end()) {
+    pd << ", " << (*it++);
+  }
+  pd << "])";
+
+  SetErrorCode(OK);
+  return a3DSketcher;
+}
+
 //=============================================================================
 /*!
  *  MakeSketcherOnPlane
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcherOnPlane
-                               (const TCollection_AsciiString& theCommand,
+                               (const char* theCommand,
                                 Handle(GEOM_Object)            theWorkingPlane)
 {
   SetErrorCode(KO);
 
-  if (theCommand.IsEmpty()) return NULL;
+  if (!theCommand || strcmp(theCommand, "") == 0) return NULL;
 
   //Add a new Sketcher object
   Handle(GEOM_Object) aSketcher = GetEngine()->AddObject(GetDocID(), GEOM_SKETCHER);
@@ -718,7 +866,9 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcherOnPlane
   if (aFunction->GetDriverGUID() != GEOMImpl_SketcherDriver::GetID()) return NULL;
 
   GEOMImpl_ISketcher aCI (aFunction);
-  aCI.SetCommand(theCommand);
+
+  TCollection_AsciiString aCommand((char*) theCommand);
+  aCI.SetCommand(aCommand);
 
   Handle(GEOM_Function) aRefPlane = theWorkingPlane->GetLastFunction();
   if (aRefPlane.IsNull()) return NULL;
@@ -742,7 +892,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcherOnPlane
 
   //Make a Python command
   GEOM::TPythonDump (aFunction) << aSketcher << " = geompy.MakeSketcherOnPlane(\""
-    << theCommand.ToCString() << "\", " << theWorkingPlane << " )";
+    << aCommand.ToCString() << "\", " << theWorkingPlane << " )";
 
   SetErrorCode(OK);
   return aSketcher;
index 34bb01148b69bdfbc849d39450086314b1edb93c..7380a097764ed8445018e5b1c7e197276b71971d 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 using namespace std;
 
@@ -60,12 +62,17 @@ class GEOMImpl_ICurvesOperations : public GEOM_IOperations {
                                                      Handle(GEOM_Object) thePnt3,
                                                      bool                theSense);
 
+  Standard_EXPORT Handle(GEOM_Object) MakeArcOfEllipse (Handle(GEOM_Object) thePnt1,
+                                                       Handle(GEOM_Object) thePnt2,
+                                                       Handle(GEOM_Object) thePnt3);
+
   Standard_EXPORT Handle(GEOM_Object) MakeSplineBezier        (list<Handle(GEOM_Object)> thePoints);
   Standard_EXPORT Handle(GEOM_Object) MakeSplineInterpolation (list<Handle(GEOM_Object)> thePoints);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeSketcher (const TCollection_AsciiString& theCommand,
+  Standard_EXPORT Handle(GEOM_Object) MakeSketcher (const char* theCommand,
                                                     list<double> theWorkingPlane);
-  Standard_EXPORT Handle(GEOM_Object) MakeSketcherOnPlane (const TCollection_AsciiString& theCommand,
+  Standard_EXPORT Handle(GEOM_Object) Make3DSketcher (list<double> theCoordinates);
+  Standard_EXPORT Handle(GEOM_Object) MakeSketcherOnPlane (const char* theCommand,
                                                            Handle(GEOM_Object) theWorkingPlane);
 };
 
index e71b4f5d5fb4f579c85e3ffc0d9f5de56cdc8ef6..735668007a35f988f5280d8213cf604bddd4a3e1 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Cylinder creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define CYL_ARG_R   1
diff --git a/src/GEOMImpl/GEOMImpl_IDisk.hxx b/src/GEOMImpl/GEOMImpl_IDisk.hxx
new file mode 100755 (executable)
index 0000000..3102ea4
--- /dev/null
@@ -0,0 +1,65 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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
+//
+//NOTE: This is an intreface to a function for the Disk creation.
+//
+#include "GEOM_Function.hxx"
+
+#define DISK_ARG_P1      1
+#define DISK_ARG_P2      2
+#define DISK_ARG_P3      3
+
+#define DISK_ARG_CC      4
+#define DISK_ARG_VV      5
+#define DISK_ARG_RR      6
+
+#define DISK_ARG_ORIENT  7
+
+class GEOMImpl_IDisk
+{
+ public:
+
+  GEOMImpl_IDisk(Handle(GEOM_Function) theFunction): _func(theFunction) {}
+
+  void SetPoint1(Handle(GEOM_Function) theP) { _func->SetReference(DISK_ARG_P1, theP); }
+  void SetPoint2(Handle(GEOM_Function) theP) { _func->SetReference(DISK_ARG_P2, theP); }
+  void SetPoint3(Handle(GEOM_Function) theP) { _func->SetReference(DISK_ARG_P3, theP); }
+
+  void SetCenter(Handle(GEOM_Function) theP) { _func->SetReference(DISK_ARG_CC, theP); }
+  void SetVector(Handle(GEOM_Function) theV) { _func->SetReference(DISK_ARG_VV, theV); }
+
+  void SetRadius(double theR) { _func->SetReal(DISK_ARG_RR, theR); }
+  void SetOrientation(double theO) { _func->SetReal(DISK_ARG_ORIENT, theO); }
+
+  Handle(GEOM_Function) GetPoint1() { return _func->GetReference(DISK_ARG_P1); }
+  Handle(GEOM_Function) GetPoint2() { return _func->GetReference(DISK_ARG_P2); }
+  Handle(GEOM_Function) GetPoint3() { return _func->GetReference(DISK_ARG_P3); }
+
+  Handle(GEOM_Function) GetCenter() { return _func->GetReference(DISK_ARG_CC); }
+  Handle(GEOM_Function) GetVector() { return _func->GetReference(DISK_ARG_VV); }
+
+  double GetRadius() { return _func->GetReal(DISK_ARG_RR); }
+  double GetOrientation() { return _func->GetReal(DISK_ARG_ORIENT); }
+
+ private:
+
+  Handle(GEOM_Function) _func;
+};
index a877135185176840d98f4d2b67e16c4fc563f369..8a199e7609e9d047ebf36481ada3331c250d89db 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Ellipse creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define ELLIPS_ARG_CC   1
diff --git a/src/GEOMImpl/GEOMImpl_IFace.hxx b/src/GEOMImpl/GEOMImpl_IFace.hxx
new file mode 100755 (executable)
index 0000000..6782c08
--- /dev/null
@@ -0,0 +1,54 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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
+//
+//NOTE: This is an intreface to a function for the Face creation.
+//
+#include "GEOM_Function.hxx"
+
+#define FACE_ARG_REF1    1
+#define FACE_ARG_ORIENT  2
+
+#define FACE_ARG_PLANE   4
+#define FACE_ARG_H       5
+#define FACE_ARG_W       6
+
+class GEOMImpl_IFace
+{
+ public:
+
+  GEOMImpl_IFace(Handle(GEOM_Function) theFunction): _func(theFunction) {}
+
+  void SetRef1(Handle(GEOM_Function) theRefPoint1) { _func->SetReference(FACE_ARG_REF1, theRefPoint1); }
+  Handle(GEOM_Function) GetRef1() { return _func->GetReference(FACE_ARG_REF1); }
+
+  void SetOrientation(int theOrientation) { _func->SetReal(FACE_ARG_ORIENT, theOrientation); }
+  int  GetOrientation() { return _func->GetReal(FACE_ARG_ORIENT); }
+
+  void SetH(double theH) { _func->SetReal(FACE_ARG_H, theH); }
+  void SetW(double theW) { _func->SetReal(FACE_ARG_W, theW); }
+
+  double GetH() { return _func->GetReal(FACE_ARG_H); }
+  double GetW() { return _func->GetReal(FACE_ARG_W); }
+
+ private:
+
+  Handle(GEOM_Function) _func;
+};
index f9deb9b8639bbb5603c38444da3b65de5c1a92f5..975670a8caf55369c69fd0e16d9c38b6737ba956 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an interface to a function for the Fillet and creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define FILLET_ARG_SH   1
diff --git a/src/GEOMImpl/GEOMImpl_IFillet2d.hxx b/src/GEOMImpl/GEOMImpl_IFillet2d.hxx
new file mode 100755 (executable)
index 0000000..ba67a6a
--- /dev/null
@@ -0,0 +1,51 @@
+// 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
+//
+//NOTE: This is an interface to a function for the Fillet2d and creation.
+
+
+#include "GEOM_Function.hxx"
+
+#define FILLET2D_ARG_SH   1
+#define FILLET2D_ARG_R    2
+#define FILLET2D_ARG_LENG 3
+#define FILLET2D_ARG_LAST 4
+
+class GEOMImpl_IFillet2d
+{
+ public:
+
+  GEOMImpl_IFillet2d(Handle(GEOM_Function) theFunction): _func(theFunction) {}
+
+  void SetShape(Handle(GEOM_Function) theRef) { _func->SetReference(FILLET2D_ARG_SH, theRef); }
+  Handle(GEOM_Function) GetShape() { return _func->GetReference(FILLET2D_ARG_SH); }
+
+  void SetR(double theR) { _func->SetReal(FILLET2D_ARG_R, theR); }
+  void SetLength(int theLen) { _func->SetInteger(FILLET2D_ARG_LENG, theLen); }
+  void SetVertex(int theInd, int theVertex)
+              { _func->SetInteger(FILLET2D_ARG_LAST + theInd, theVertex); }
+
+  double GetR() { return _func->GetReal(FILLET2D_ARG_R); }
+  int GetLength() { return _func->GetInteger(FILLET2D_ARG_LENG); }
+  int GetVertex(int theInd) { return _func->GetInteger(FILLET2D_ARG_LAST + theInd); }
+
+ private:
+
+  Handle(GEOM_Function) _func;
+};
index f8fbae6454f280a4780f855f5ca28210ac74fa81..491555e48c59a1b7bd53c9c8ef978f0ff5737b31 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Filling operation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define FILL_ARG_MINDEG   1
index e6e269221b7494f093bfc5894b327332d816b23d..1ee1515d0d2eb3537ad19ac85fccc8cd950d377d 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 // NOTE: This is an interface to a function for the Glueing of faces
-
-
+//
 #include "GEOM_Function.hxx"
 
 #include <TColStd_HSequenceOfTransient.hxx>
index f9c99baa182c34ce6241d04fc41f84f2fef93e59..1c0a5c1e6617bcc44c5636fe39789e92df6a8a25 100644 (file)
@@ -1,23 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_IGroupOperations.hxx>
index 9629b59128bbcfcf026d30f5f2d081525c30479f..272d2c5328ae1b648f3568ebe163f60a15fb7935 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOMImpl_IGroupOperations_HXX_
 #define _GEOMImpl_IGroupOperations_HXX_
 
index 8e52151ca8057122a89998b6e322be9a19969b6d..62e53e804c19327b26f0d189712a3d8f22b50590 100755 (executable)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Healing creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #include <TColStd_HArray1OfInteger.hxx>
index bf9a60316b8808847b0971909575b53186199174..6057b7a3731eecd000d58af708e3d791d97a015c 100644 (file)
@@ -1,31 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
-
-
-
 #ifdef WNT
 #pragma warning( disable:4786 )
 #endif
 
-using namespace std;
-
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_IHealingOperations.hxx>
@@ -192,9 +189,9 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::ShapeProcess (Handle(GEOM_Objec
  *  ShapeProcess
  */
 //=============================================================================
-void GEOMImpl_IHealingOperations::GetShapeProcessParameters (list<string>& theOperations,
-                                                             list<string>& theParams,
-                                                             list<string>& theValues)
+void GEOMImpl_IHealingOperations::GetShapeProcessParameters (std::list<std::string>& theOperations,
+                                                             std::list<std::string>& theParams,
+                                                             std::list<std::string>& theValues)
 {
   ShHealOper_ShapeProcess aHealer;
   TColStd_SequenceOfAsciiString anOperators;
@@ -203,7 +200,7 @@ void GEOMImpl_IHealingOperations::GetShapeProcessParameters (list<string>& theOp
   {
     for ( Standard_Integer i = 1; i <= anOperators.Length(); i++ )
     {
-      string anOperation = anOperators.Value( i ).ToCString();
+      std::string anOperation = anOperators.Value( i ).ToCString();
       if ( GetOperatorParameters( anOperation, theParams, theValues ) )
        theOperations.push_back( anOperation );
       else
@@ -227,15 +224,15 @@ void GEOMImpl_IHealingOperations::GetShapeProcessParameters (list<string>& theOp
  *  GetOperatorParameters
  */
 //=============================================================================
-bool GEOMImpl_IHealingOperations::GetOperatorParameters( const string theOperation, 
-                                                        list<string>& theParams,
-                                                        list<string>& theValues )
+bool GEOMImpl_IHealingOperations::GetOperatorParameters( const std::string theOperation, 
+                                                        std::list<std::string>& theParams,
+                                                        std::list<std::string>& theValues )
 {
   ShHealOper_ShapeProcess aHealer;
   int nbParamValueErrors( 0 );
-  list<string> aParams;
+  std::list<std::string> aParams;
   if ( GetParameters( theOperation, aParams ) ) {
-    for ( list<string>::iterator it = aParams.begin(); it != aParams.end(); ++it ) {
+    for ( std::list<std::string>::iterator it = aParams.begin(); it != aParams.end(); ++it ) {
       TCollection_AsciiString aParam( (Standard_CString)(*it).c_str() );
       TCollection_AsciiString aValue;
       if ( aHealer.GetParameter( aParam, aValue ) ) {
@@ -263,8 +260,8 @@ bool GEOMImpl_IHealingOperations::GetOperatorParameters( const string theOperati
  *  GetParameters
  */
 //=============================================================================
-bool GEOMImpl_IHealingOperations::GetParameters (const string theOperation,
-                                                 list<string>& theParams)
+bool GEOMImpl_IHealingOperations::GetParameters (const std::string theOperation,
+                                                 std::list<std::string>& theParams)
 {
   if ( theOperation == "SplitAngle" ) {
     theParams.push_back( "SplitAngle.Angle" );
index 119873d19a2bbf194fe718a94054151e6d2c3a11..9be4f44f56ba189697bfa21d0230ec7ee646ff20 100644 (file)
@@ -1,25 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
-
-using namespace std;
-
 #ifndef _GEOMImpl_IHealingOperations_HXX_
 #define _GEOMImpl_IHealingOperations_HXX_
 
@@ -44,17 +43,17 @@ class GEOMImpl_IHealingOperations : public GEOM_IOperations {
                                     const Handle(TColStd_HArray1OfExtendedString)& theValues );
 
   // Retrieve default Shape Process parameters (from resource file)
-  Standard_EXPORT void GetShapeProcessParameters( list<string>& theOperations,
-                                  list<string>& theParams,
-                                  list<string>& theValues );
+  Standard_EXPORT void GetShapeProcessParameters( std::list<std::string>& theOperations,
+                                                  std::list<std::string>& theParams,
+                                                  std::list<std::string>& theValues );
 
   // Retrieve default Shape Process parameters for given operator
-  Standard_EXPORT bool GetOperatorParameters( const string theOperation, 
-                              list<string>& theParams,
-                              list<string>& theValues );
+  Standard_EXPORT bool GetOperatorParameters( const std::string theOperation, 
+                                              std::list<std::string>& theParams,
+                                              std::list<std::string>& theValues );
 
   // returns all parameters that are valid for the given operation (Shape Process operator)
-  Standard_EXPORT static bool GetParameters( const string theOperation, list<string>& theParams );                                      
+  Standard_EXPORT static bool GetParameters( const std::string theOperation, std::list<std::string>& theParams );
 
   Standard_EXPORT Handle(GEOM_Object) SuppressFaces( Handle(GEOM_Object) theObject,
                                      const Handle(TColStd_HArray1OfInteger)& theFaces);
index 3ead285314cc8b7000a9bc2e35e4922318d6e3f7..731e637eccc73c83cca50ca8a341eebd64b069d1 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Import Export operation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define EXP_ARG_REF  1
index 9339f4a4721fc4d1702d9e6538a064345c647027..5fb461ff7d4e13310675a14bab77cac0d4682737 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
@@ -163,7 +165,7 @@ void GEOMImpl_IInsertOperations::Export
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
-      SetErrorCode("Export driver failed");
+      SetErrorCode("Not enough space on disk, or you haven't permissions to write this directory");
       return;
     }
   }
index 7660da21eb14bd3ea0a5d7abacecb3ff70e42a0e..aba0c227f6e57d602c9f5dc1315e042c787232f3 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOMImpl_IInsertOperations_HXX_
 #define _GEOMImpl_IInsertOperations_HXX_
 
index 99a60b7780b5e3e1e301d7478a78519169c2a33e..faa1d462c30ee10be2315b215b7f30b7cd0c324d 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the vector creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define LINE_ARG_PNT1  1
index 2ec4e5e397e89baef23af36cabb8831a5d4ea966..9e552229a7d34601bab584af1dbd96c1bd0c41f1 100644 (file)
@@ -1,25 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
-
-using namespace std;
-
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_ILocalOperations.hxx>
@@ -30,9 +29,11 @@ using namespace std;
 #include <GEOMImpl_Types.hxx>
 
 #include <GEOMImpl_FilletDriver.hxx>
+#include <GEOMImpl_Fillet2dDriver.hxx>
 #include <GEOMImpl_ChamferDriver.hxx>
 
 #include <GEOMImpl_IFillet.hxx>
+#include <GEOMImpl_IFillet2d.hxx>
 #include <GEOMImpl_IChamfer.hxx>
 
 #include <GEOMImpl_IArchimede.hxx>
@@ -138,7 +139,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletAll
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdges
-       (Handle(GEOM_Object) theShape, double theR, list<int> theEdges)
+       (Handle(GEOM_Object) theShape, double theR, std::list<int> theEdges)
 {
   SetErrorCode(KO);
 
@@ -164,7 +165,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdges
   aCI.SetLength(aLen);
 
   int ind = 1;
-  list<int>::iterator it = theEdges.begin();
+  std::list<int>::iterator it = theEdges.begin();
   for (; it != theEdges.end(); it++, ind++) {
     aCI.SetEdge(ind, (*it));
   }
@@ -207,7 +208,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdges
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdgesR1R2
-       (Handle(GEOM_Object) theShape, double theR1, double theR2, list<int> theEdges)
+       (Handle(GEOM_Object) theShape, double theR1, double theR2, std::list<int> theEdges)
 {
   SetErrorCode(KO);
 
@@ -234,7 +235,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdgesR1R2
   aCI.SetLength(aLen);
 
   int ind = 1;
-  list<int>::iterator it = theEdges.begin();
+  std::list<int>::iterator it = theEdges.begin();
   for (; it != theEdges.end(); it++, ind++) {
     aCI.SetEdge(ind, (*it));
   }
@@ -278,7 +279,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdgesR1R2
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFaces
-       (Handle(GEOM_Object) theShape, double theR, list<int> theFaces)
+       (Handle(GEOM_Object) theShape, double theR, std::list<int> theFaces)
 {
   SetErrorCode(KO);
 
@@ -304,7 +305,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFaces
   aCI.SetLength(aLen);
 
   int ind = 1;
-  list<int>::iterator it = theFaces.begin();
+  std::list<int>::iterator it = theFaces.begin();
   for (; it != theFaces.end(); it++, ind++) {
     aCI.SetFace(ind, (*it));
   }
@@ -347,7 +348,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFaces
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFacesR1R2
-       (Handle(GEOM_Object) theShape, double theR1, double theR2, list<int> theFaces)
+       (Handle(GEOM_Object) theShape, double theR1, double theR2, std::list<int> theFaces)
 {
   SetErrorCode(KO);
 
@@ -374,7 +375,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFacesR1R2
   aCI.SetLength(aLen);
 
   int ind = 1;
-  list<int>::iterator it = theFaces.begin();
+  std::list<int>::iterator it = theFaces.begin();
   for (; it != theFaces.end(); it++, ind++) {
     aCI.SetFace(ind, (*it));
   }
@@ -411,6 +412,75 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFacesR1R2
   return aFillet;
 }
 
+//=============================================================================
+/*!
+ *  MakeFillet2D
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFillet2D
+       (Handle(GEOM_Object) theShape, double theR, std::list<int> theVertexes)
+{
+  SetErrorCode(KO);
+
+  //Add a new Fillet object
+  Handle(GEOM_Object) aFillet2D = GetEngine()->AddObject(GetDocID(), GEOM_FILLET_2D);
+
+  //Add a new Fillet function
+  Handle(GEOM_Function) aFunction =
+    aFillet2D->AddFunction(GEOMImpl_Fillet2dDriver::GetID(), FILLET_2D_SHAPE_VERTEXES);
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_Fillet2dDriver::GetID()) return NULL;
+
+  GEOMImpl_IFillet2d aCI (aFunction);
+
+  Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
+  if (aRefShape.IsNull()) return NULL;
+
+  aCI.SetShape(aRefShape);
+  aCI.SetR(theR);
+  int aLen = theVertexes.size();
+  aCI.SetLength(aLen);
+
+  int ind = 1;
+  std::list<int>::iterator it = theVertexes.begin();
+  for (; it != theVertexes.end(); it++, ind++) {
+    aCI.SetVertex(ind, (*it));
+  }
+
+  //Compute the Fillet value
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("2D Fillet 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 pd (aFunction);
+  pd << aFillet2D << " = geompy.MakeFillet2D(" << theShape
+    << ", " << theR << ", [";
+
+  it = theVertexes.begin();
+  pd << (*it++);
+  while (it != theVertexes.end()) {
+    pd << ", " << (*it++);
+  }
+  pd << "])";
+
+  SetErrorCode(OK);
+  return aFillet2D;
+}
+
 //=============================================================================
 /*!
  *  MakeChamferAll
@@ -585,7 +655,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgeAD
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFaces
                             (Handle(GEOM_Object) theShape, double theD1, double theD2,
-                             list<int> theFaces)
+                             std::list<int> theFaces)
 {
   SetErrorCode(KO);
 
@@ -612,7 +682,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFaces
   aCI.SetLength(aLen);
 
   int ind = 1;
-  list<int>::iterator it = theFaces.begin();
+  std::list<int>::iterator it = theFaces.begin();
   for (; it != theFaces.end(); it++, ind++) {
     aCI.SetFace(ind, (*it));
   }
@@ -656,7 +726,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFaces
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFacesAD
                             (Handle(GEOM_Object) theShape, double theD, double theAngle,
-                             list<int> theFaces)
+                             std::list<int> theFaces)
 {
   SetErrorCode(KO);
 
@@ -683,7 +753,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFacesAD
   aCI.SetLength(aLen);
 
   int ind = 1;
-  list<int>::iterator it = theFaces.begin();
+  std::list<int>::iterator it = theFaces.begin();
   for (; it != theFaces.end(); it++, ind++) {
     aCI.SetFace(ind, (*it));
   }
@@ -727,7 +797,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFacesAD
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdges
                             (Handle(GEOM_Object) theShape, double theD1, double theD2,
-                             list<int> theEdges)
+                             std::list<int> theEdges)
 {
   SetErrorCode(KO);
 
@@ -737,16 +807,16 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdges
   //Add a new Chamfer function
   Handle(GEOM_Function) aFunction =
     aChamfer->AddFunction(GEOMImpl_ChamferDriver::GetID(), CHAMFER_SHAPE_EDGES);
-  if (aFunction.IsNull()) { return NULL; cout << "Edges Function is NULL!!!" << endl; }
+  if (aFunction.IsNull()) { MESSAGE ( "Edges Function is NULL!!!" ); return NULL;}
 
   //Check if the function is set correctly
   if (aFunction->GetDriverGUID() != GEOMImpl_ChamferDriver::GetID())
-       { return NULL; cout << "Chamfer Driver is NULL!!!" << endl; }
+       { MESSAGE ( "Chamfer Driver is NULL!!!" ); return NULL; }
 
   GEOMImpl_IChamfer aCI (aFunction);
 
   Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
-  if (aRefShape.IsNull()) { return NULL; cout << "Shape is NULL!!!" << endl; }
+  if (aRefShape.IsNull()) { MESSAGE ("Shape is NULL!!!"); return NULL;}
 
   aCI.SetShape(aRefShape);
   aCI.SetD1(theD1);
@@ -755,7 +825,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdges
   aCI.SetLength(aLen);
 
   int ind = 1;
-  list<int>::iterator it = theEdges.begin();
+  std::list<int>::iterator it = theEdges.begin();
   for (; it != theEdges.end(); it++, ind++) {
     aCI.SetEdge(ind, (*it));
   }
@@ -799,7 +869,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdges
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgesAD
                             (Handle(GEOM_Object) theShape, double theD, double theAngle,
-                             list<int> theEdges)
+                             std::list<int> theEdges)
 {
   SetErrorCode(KO);
 
@@ -809,16 +879,16 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgesAD
   //Add a new Chamfer function
   Handle(GEOM_Function) aFunction =
     aChamfer->AddFunction(GEOMImpl_ChamferDriver::GetID(), CHAMFER_SHAPE_EDGES_AD);
-  if (aFunction.IsNull()) { return NULL; cout << "Edges Function is NULL!!!" << endl; }
+  if (aFunction.IsNull()) { MESSAGE ( "Edges Function is NULL!!!" ); return NULL; }
 
   //Check if the function is set correctly
   if (aFunction->GetDriverGUID() != GEOMImpl_ChamferDriver::GetID())
-       { return NULL; cout << "Chamfer Driver is NULL!!!" << endl; }
+       { MESSAGE("Chamfer Driver is NULL!!!"); return NULL;}
 
   GEOMImpl_IChamfer aCI (aFunction);
 
   Handle(GEOM_Function) aRefShape = theShape->GetLastFunction();
-  if (aRefShape.IsNull()) { return NULL; cout << "Shape is NULL!!!" << endl; }
+  if (aRefShape.IsNull()) { MESSAGE ("Shape is NULL!!!"); return NULL;}
 
   aCI.SetShape(aRefShape);
   aCI.SetD(theD);
@@ -827,7 +897,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgesAD
   aCI.SetLength(aLen);
 
   int ind = 1;
-  list<int>::iterator it = theEdges.begin();
+  std::list<int>::iterator it = theEdges.begin();
   for (; it != theEdges.end(); it++, ind++) {
     aCI.SetEdge(ind, (*it));
   }
index ba1972e3763b35ae92a674fccd76bfe715efa6b3..15acc6eaf06ef275a2ccfbea974b3dd52f04463b 100644 (file)
@@ -1,28 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOMImpl_ILocalOperations_HXX_
 #define _GEOMImpl_ILocalOperations_HXX_
 
-using namespace std;
-
 #include "Utils_SALOME_Exception.hxx"
 #include "GEOM_IOperations.hxx"
 #include "GEOM_Engine.hxx"
@@ -38,15 +37,17 @@ class GEOMImpl_ILocalOperations : public GEOM_IOperations {
 
   Standard_EXPORT Handle(GEOM_Object) MakeFilletAll   (Handle(GEOM_Object) theShape, double theR);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletEdges (Handle(GEOM_Object) theShape, double theR,
-                                       list<int> theEdges);
+                                                       std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletEdgesR1R2 (Handle(GEOM_Object) theShape,
                                                            double theR1, double theR2,
-                                                           list<int> theEdges);
+                                                           std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletFaces (Handle(GEOM_Object) theShape, double theR,
-                                       list<int> theFaces);
+                                                       std::list<int> theFaces);
   Standard_EXPORT Handle(GEOM_Object) MakeFilletFacesR1R2 (Handle(GEOM_Object) theShape,
                                                            double theR1, double theR2,
-                                                           list<int> theFaces);
+                                                           std::list<int> theFaces);
+  Standard_EXPORT Handle(GEOM_Object) MakeFillet2D (Handle(GEOM_Object) theShape, double theR,
+                                                    std::list<int> theVertexes);
 
   Standard_EXPORT Handle(GEOM_Object) MakeChamferAll   (Handle(GEOM_Object) theShape, double theD);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferEdge  (Handle(GEOM_Object) theShape,
@@ -56,27 +57,27 @@ class GEOMImpl_ILocalOperations : public GEOM_IOperations {
                                         double theD, double theAngle,
                                         int theFace1, int theFace2);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferFaces (Handle(GEOM_Object) theShape,
-                                        double theD1, double theD2,
-                                        list<int> theFaces);
+                                                        double theD1, double theD2,
+                                                        std::list<int> theFaces);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferFacesAD (Handle(GEOM_Object) theShape,
-                                        double theD, double theAngle,
-                                        list<int> theFaces);
+                                                          double theD, double theAngle,
+                                                          std::list<int> theFaces);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferEdges (Handle(GEOM_Object) theShape,
-                                        double theD1, double theD2,
-                                        list<int> theEdges);
+                                                        double theD1, double theD2,
+                                                        std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeChamferEdgesAD (Handle(GEOM_Object) theShape,
-                                        double theD, double theAngle,
-                                        list<int> theEdges);
+                                                          double theD, double theAngle,
+                                                          std::list<int> theEdges);
   Standard_EXPORT Handle(GEOM_Object) MakeArchimede (Handle(GEOM_Object) theShape,
-                                     double theWeight, double theWaterDensity,
-                                     double theMeshingDeflection);
-
+                                                     double theWeight, double theWaterDensity,
+                                                     double theMeshingDeflection);
+  
   Standard_EXPORT Standard_Integer GetSubShapeIndex (Handle(GEOM_Object) theShape,
-                                     Handle(GEOM_Object) theSubShape);
-
+                                                     Handle(GEOM_Object) theSubShape);
+  
   Standard_EXPORT static bool GetSubShape (const TopoDS_Shape& theShape,
-                           const int theIndex,
-                           TopoDS_Shape& theSubShape);
+                                           const int theIndex,
+                                           TopoDS_Shape& theSubShape);
 };
 
 #endif
index 1fa2f49d5f8c30e3847b30f349bfd2ec919d350b..54265314f20f58e8552c5592ece4b3dd5cdf48c9 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an interface to a function for the local coordinate system creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define CS_ARG_O_X   1
index db615f1f309e4100cbdb2ece9fee860f1eea779d..c6c8ab74e263feb892a17204038e82158a942a45 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 // NOTE: This is an interface to a functions for the Measurement
-
-
+//
 #include "GEOM_Function.hxx"
 
 //#define MEASURE_ARG_BASE  1
index 67e26c014cc29827521856b05b77f591594396f0..d772458387e1e2c5d1f9a07b09452c558b428978 100644 (file)
@@ -1,23 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_IMeasureOperations.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Lin.hxx>
 
+#include <GeomAPI_ProjectPointOnCurve.hxx>
+#include <ShapeAnalysis.hxx>
+#include <ShapeAnalysis_Surface.hxx>
+#include <GeomLProp_CLProps.hxx>
+#include <GeomLProp_SLProps.hxx>
+
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
+#include <GeomAPI_IntSS.hxx>
+#include <Geom_SphericalSurface.hxx>
+#include <Geom_ToroidalSurface.hxx>
+#include <Geom_Circle.hxx>
+#include <BRep_Builder.hxx>
+#include <TopoDS_Compound.hxx>
+#include <ShapeFix_Shape.hxx>
+
+
 //=============================================================================
 /*!
  *  Constructor
@@ -1296,6 +1312,306 @@ TCollection_AsciiString GEOMImpl_IMeasureOperations::WhatIs (Handle(GEOM_Object)
   return Astr;
 }
 
+
+//=======================================================================
+//function : CheckSingularCase
+//purpose  : auxilary for GetMinDistance()
+//           workaround for bugs 19899, 19908 and 19910 from Mantis
+//=======================================================================
+static double CheckSingularCase(const TopoDS_Shape& aSh1,
+                                const TopoDS_Shape& aSh2,
+                                gp_Pnt& Ptmp1, gp_Pnt& Ptmp2)
+{
+  bool IsChange1 = false;
+  double AddDist1 = 0.0;
+  TopExp_Explorer anExp;
+  TopoDS_Shape tmpSh1, tmpSh2;
+  int nbf = 0;
+  for ( anExp.Init( aSh1, TopAbs_FACE ); anExp.More(); anExp.Next() ) {
+    nbf++;
+    tmpSh1 = anExp.Current();
+  }
+  if(nbf==1) {
+    TopoDS_Shape sh = aSh1;
+    while(sh.ShapeType()==TopAbs_COMPOUND) {
+      TopoDS_Iterator it(sh);
+      sh = it.Value();
+    }
+    Handle(Geom_Surface) S = BRep_Tool::Surface(TopoDS::Face(tmpSh1));
+    if( S->IsKind(STANDARD_TYPE(Geom_SphericalSurface)) ||
+        S->IsKind(STANDARD_TYPE(Geom_ToroidalSurface)) ) {
+      if( sh.ShapeType()==TopAbs_SHELL || sh.ShapeType()==TopAbs_FACE ) {
+        // non solid case
+        double U1,U2,V1,V2;
+        S->Bounds(U1,U2,V1,V2);
+        Handle(Geom_RectangularTrimmedSurface) TrS1 = 
+          new Geom_RectangularTrimmedSurface(S,U1,(U1+U2)/2.,V1,V2);
+        Handle(Geom_RectangularTrimmedSurface) TrS2 = 
+          new Geom_RectangularTrimmedSurface(S,(U1+U2)/2.,U2,V1,V2);
+        BRep_Builder B;
+        TopoDS_Face F1,F2;
+        TopoDS_Compound Comp;
+        B.MakeCompound(Comp);
+        B.MakeFace(F1,TrS1,1.e-7);
+        B.Add(Comp,F1);
+        B.MakeFace(F2,TrS2,1.e-7);
+        B.Add(Comp,F2);
+        Handle(ShapeFix_Shape) sfs = new ShapeFix_Shape;
+        sfs->Init(Comp);
+        sfs->SetPrecision(1.e-6);
+        sfs->SetMaxTolerance(1.0);
+        sfs->Perform();
+        tmpSh1 = sfs->Shape();
+        IsChange1 = true;
+      }
+      else {
+        if( S->IsKind(STANDARD_TYPE(Geom_SphericalSurface)) ) {
+          Handle(Geom_SphericalSurface) SS = Handle(Geom_SphericalSurface)::DownCast(S);
+          gp_Pnt PC = SS->Location();
+          BRep_Builder B;
+          TopoDS_Vertex V;
+          B.MakeVertex(V,PC,1.e-7);
+          tmpSh1 = V;
+          AddDist1 = SS->Radius();
+          IsChange1 = true;
+        }
+        else {
+          Handle(Geom_ToroidalSurface) TS = Handle(Geom_ToroidalSurface)::DownCast(S);
+          gp_Ax3 ax3 = TS->Position();
+          Handle(Geom_Circle) C = new Geom_Circle(ax3.Ax2(),TS->MajorRadius());
+          BRep_Builder B;
+          TopoDS_Edge E;
+          B.MakeEdge(E,C,1.e-7);
+          tmpSh1 = E;
+          AddDist1 = TS->MinorRadius();
+          IsChange1 = true;
+        }
+      }
+    }
+    else
+      tmpSh1 = aSh1;
+  }
+  else
+    tmpSh1 = aSh1;
+  bool IsChange2 = false;
+  double AddDist2 = 0.0;
+  nbf = 0;
+  for ( anExp.Init( aSh2, TopAbs_FACE ); anExp.More(); anExp.Next() ) {
+    nbf++;
+    tmpSh2 = anExp.Current();
+  }
+  if(nbf==1) {
+    TopoDS_Shape sh = aSh2;
+    while(sh.ShapeType()==TopAbs_COMPOUND) {
+      TopoDS_Iterator it(sh);
+      sh = it.Value();
+    }
+    Handle(Geom_Surface) S = BRep_Tool::Surface(TopoDS::Face(tmpSh2));
+    if( S->IsKind(STANDARD_TYPE(Geom_SphericalSurface)) ||
+        S->IsKind(STANDARD_TYPE(Geom_ToroidalSurface)) ) {
+      if( sh.ShapeType()==TopAbs_SHELL || sh.ShapeType()==TopAbs_FACE ) {
+        // non solid case
+        double U1,U2,V1,V2;
+        S->Bounds(U1,U2,V1,V2);
+        Handle(Geom_RectangularTrimmedSurface) TrS1 = 
+          new Geom_RectangularTrimmedSurface(S,U1,(U1+U2)/2.,V1,V2);
+        Handle(Geom_RectangularTrimmedSurface) TrS2 = 
+          new Geom_RectangularTrimmedSurface(S,(U1+U2)/2.,U2,V1,V2);
+        BRep_Builder B;
+        TopoDS_Face F1,F2;
+        TopoDS_Compound Comp;
+        B.MakeCompound(Comp);
+        B.MakeFace(F1,TrS1,1.e-7);
+        B.Add(Comp,F1);
+        B.MakeFace(F2,TrS2,1.e-7);
+        B.Add(Comp,F2);
+        Handle(ShapeFix_Shape) sfs = new ShapeFix_Shape;
+        sfs->Init(Comp);
+        sfs->SetPrecision(1.e-6);
+        sfs->SetMaxTolerance(1.0);
+        sfs->Perform();
+        tmpSh2 = sfs->Shape();
+        IsChange2 = true;
+      }
+      else {
+        if( S->IsKind(STANDARD_TYPE(Geom_SphericalSurface)) ) {
+          Handle(Geom_SphericalSurface) SS = Handle(Geom_SphericalSurface)::DownCast(S);
+          gp_Pnt PC = SS->Location();
+          BRep_Builder B;
+          TopoDS_Vertex V;
+          B.MakeVertex(V,PC,1.e-7);
+          tmpSh2 = V;
+          AddDist2 = SS->Radius();
+          IsChange2 = true;
+        }
+        else if( S->IsKind(STANDARD_TYPE(Geom_ToroidalSurface)) ) {
+          Handle(Geom_ToroidalSurface) TS = Handle(Geom_ToroidalSurface)::DownCast(S);
+          gp_Ax3 ax3 = TS->Position();
+          Handle(Geom_Circle) C = new Geom_Circle(ax3.Ax2(),TS->MajorRadius());
+          BRep_Builder B;
+          TopoDS_Edge E;
+          B.MakeEdge(E,C,1.e-7);
+          tmpSh2 = E;
+          AddDist2 = TS->MinorRadius();
+          IsChange2 = true;
+        }
+      }
+    }
+    else
+      tmpSh2 = aSh2;
+  }
+  else
+    tmpSh2 = aSh2;
+
+  if( !IsChange1 && !IsChange2 )
+    return -2.0;
+
+  BRepExtrema_DistShapeShape dst(tmpSh1,tmpSh2);
+  if (dst.IsDone()) {
+    double MinDist = 1.e9;
+    gp_Pnt PMin1, PMin2, P1, P2;
+    for (int i = 1; i <= dst.NbSolution(); i++) {
+      P1 = dst.PointOnShape1(i);
+      P2 = dst.PointOnShape2(i);
+      Standard_Real Dist = P1.Distance(P2);
+      if (MinDist > Dist) {
+        MinDist = Dist;
+        PMin1 = P1;
+        PMin2 = P2;
+      }
+    }
+    if(MinDist<1.e-7) {
+      Ptmp1 = PMin1;
+      Ptmp2 = PMin2;
+    }
+    else {
+      gp_Dir aDir(gp_Vec(PMin1,PMin2));
+      if( MinDist > (AddDist1+AddDist2) ) {
+        Ptmp1 = gp_Pnt( PMin1.X() + aDir.X()*AddDist1,
+                        PMin1.Y() + aDir.Y()*AddDist1,
+                        PMin1.Z() + aDir.Z()*AddDist1 );
+        Ptmp2 = gp_Pnt( PMin2.X() - aDir.X()*AddDist2,
+                        PMin2.Y() - aDir.Y()*AddDist2,
+                        PMin2.Z() - aDir.Z()*AddDist2 );
+        return (MinDist - AddDist1 - AddDist2);
+      }
+      else {
+        if( AddDist1 > 0 ) {
+          Ptmp1 = gp_Pnt( PMin1.X() + aDir.X()*AddDist1,
+                          PMin1.Y() + aDir.Y()*AddDist1,
+                          PMin1.Z() + aDir.Z()*AddDist1 );
+          Ptmp2 = Ptmp1;
+        }
+        else {
+          Ptmp2 = gp_Pnt( PMin2.X() - aDir.X()*AddDist2,
+                          PMin2.Y() - aDir.Y()*AddDist2,
+                          PMin2.Z() - aDir.Z()*AddDist2 );
+          Ptmp1 = Ptmp2;
+        }
+      }
+    }
+    double res = MinDist - AddDist1 - AddDist2;
+    if(res<0.) res = 0.0;
+    return res;
+  }
+  return -2.0;
+}
+/* old variant
+static bool CheckSingularCase(const TopoDS_Shape& aSh1,
+                              const TopoDS_Shape& aSh2,
+                              gp_Pnt& Ptmp)
+{
+  TopExp_Explorer anExp;
+  TopoDS_Shape tmpSh1, tmpSh2;
+  int nbf = 0;
+  for ( anExp.Init( aSh1, TopAbs_FACE ); anExp.More(); anExp.Next() ) {
+    nbf++;
+    tmpSh1 = anExp.Current();
+  }
+  if(nbf==1) {
+    Handle(Geom_Surface) S1 = BRep_Tool::Surface(TopoDS::Face(tmpSh1));
+    if( S1->IsKind(STANDARD_TYPE(Geom_SphericalSurface)) ||
+        S1->IsKind(STANDARD_TYPE(Geom_ToroidalSurface)) ) {
+      nbf = 0;
+      for ( anExp.Init( aSh2, TopAbs_FACE ); anExp.More(); anExp.Next() ) {
+        nbf++;
+        tmpSh2 = anExp.Current();
+        Handle(Geom_Surface) S2 = BRep_Tool::Surface(TopoDS::Face(tmpSh2));
+        GeomAPI_IntSS ISS(S1,S2,1.e-7);
+        if(ISS.IsDone()) {
+          for(int i=1; i<=ISS.NbLines(); i++) {
+            Handle(Geom_Curve) C3d = ISS.Line(i);
+            BRep_Builder B;
+            TopoDS_Edge E;
+            B.MakeEdge(E,C3d,1.e-7);
+            BRepExtrema_DistShapeShape dst(tmpSh2,E);
+            if (dst.IsDone()) {
+              gp_Pnt PMin1, PMin2, P1, P2;
+              double MinDist = 1.e9;
+              for (int i = 1; i <= dst.NbSolution(); i++) {
+                P1 = dst.PointOnShape1(i);
+                P2 = dst.PointOnShape2(i);
+                Standard_Real Dist = P1.Distance(P2);
+                if (MinDist > Dist) {
+                  MinDist = Dist;
+                  Ptmp = P1;
+                }
+              }
+              if(MinDist<1.e-7)
+                return true;
+            }
+          }
+        }
+      }
+    }
+  }
+  nbf = 0;
+  for ( anExp.Init( aSh2, TopAbs_FACE ); anExp.More(); anExp.Next() ) {
+    nbf++;
+    tmpSh1 = anExp.Current();
+  }
+  if(nbf==1) {
+    Handle(Geom_Surface) S1 = BRep_Tool::Surface(TopoDS::Face(tmpSh1));
+    if( S1->IsKind(STANDARD_TYPE(Geom_SphericalSurface)) ||
+        S1->IsKind(STANDARD_TYPE(Geom_ToroidalSurface)) ) {
+      nbf = 0;
+      for ( anExp.Init( aSh1, TopAbs_FACE ); anExp.More(); anExp.Next() ) {
+        nbf++;
+        tmpSh2 = anExp.Current();
+        Handle(Geom_Surface) S2 = BRep_Tool::Surface(TopoDS::Face(tmpSh2));
+        GeomAPI_IntSS ISS(S1,S2,1.e-7);
+        if(ISS.IsDone()) {
+          for(int i=1; i<=ISS.NbLines(); i++) {
+            Handle(Geom_Curve) C3d = ISS.Line(i);
+            BRep_Builder B;
+            TopoDS_Edge E;
+            B.MakeEdge(E,C3d,1.e-7);
+            BRepExtrema_DistShapeShape dst(tmpSh2,E);
+            if (dst.IsDone()) {
+              gp_Pnt P1,P2;
+              double MinDist = 1.e9;
+              for (int i = 1; i <= dst.NbSolution(); i++) {
+                P1 = dst.PointOnShape1(i);
+                P2 = dst.PointOnShape2(i);
+                Standard_Real Dist = P1.Distance(P2);
+                if (MinDist > Dist) {
+                  MinDist = Dist;
+                  Ptmp = P1;
+                }
+              }
+              if(MinDist<1.e-7)
+                return true;
+            }
+          }
+        }
+      }
+    }
+  }
+  return false;
+}
+*/
+
+
 //=============================================================================
 /*!
  *  GetMinDistance
@@ -1327,6 +1643,18 @@ Standard_Real GEOMImpl_IMeasureOperations::GetMinDistance
 #if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
     OCC_CATCH_SIGNALS;
 #endif
+
+    // skl 30.06.2008
+    // additional workaround for bugs 19899, 19908 and 19910 from Mantis
+    gp_Pnt Ptmp1, Ptmp2;
+    double dist = CheckSingularCase(aShape1, aShape2, Ptmp1, Ptmp2);
+    if(dist>-1.0) {
+      Ptmp1.Coord(X1, Y1, Z1);
+      Ptmp2.Coord(X2, Y2, Z2);
+      SetErrorCode(OK);
+      return dist;
+    }
+
     BRepExtrema_DistShapeShape dst (aShape1, aShape2);
     if (dst.IsDone()) {
       gp_Pnt PMin1, PMin2, P1, P2;
@@ -1440,7 +1768,8 @@ Standard_Real GEOMImpl_IMeasureOperations::GetAngle (Handle(GEOM_Object) theLine
     Handle(Geom_Curve) C1 = BRep_Tool::Curve(E1,fp,lp);
     Handle(Geom_Curve) C2 = BRep_Tool::Curve(E2,fp,lp);
 
-    if (!C1->IsKind(STANDARD_TYPE(Geom_Line)) ||
+    if ( C1.IsNull() || C2.IsNull() ||
+       !C1->IsKind(STANDARD_TYPE(Geom_Line)) ||
         !C2->IsKind(STANDARD_TYPE(Geom_Line)))
     {
       SetErrorCode("The edges must be linear");
@@ -1467,6 +1796,317 @@ Standard_Real GEOMImpl_IMeasureOperations::GetAngle (Handle(GEOM_Object) theLine
   return anAngle;
 }
 
+
+//=============================================================================
+/*!
+ *  CurveCurvatureByParam
+ */
+//=============================================================================
+Standard_Real GEOMImpl_IMeasureOperations::CurveCurvatureByParam
+                        (Handle(GEOM_Object) theCurve, Standard_Real& theParam)
+{
+  SetErrorCode(KO);
+  Standard_Real aRes = -1.0;
+
+  if(theCurve.IsNull()) return aRes;
+
+  Handle(GEOM_Function) aRefShape = theCurve->GetLastFunction();
+  if(aRefShape.IsNull()) return aRes;
+
+  TopoDS_Shape aShape = aRefShape->GetValue();
+  if(aShape.IsNull()) {
+    SetErrorCode("One of Objects has NULL Shape");
+    return aRes;
+  }
+
+  Standard_Real aFP, aLP, aP;
+  Handle(Geom_Curve) aCurve = BRep_Tool::Curve(TopoDS::Edge(aShape), aFP, aLP);
+  aP = aFP + (aLP - aFP) * theParam;
+
+  if(aCurve.IsNull()) return aRes;
+
+  //Compute curvature
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    GeomLProp_CLProps Prop = GeomLProp_CLProps 
+      (aCurve, aP, 2, Precision::Confusion());
+    aRes = fabs(Prop.Curvature());
+    SetErrorCode(OK);
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return aRes;
+  }
+
+  if( aRes > Precision::Confusion() )
+    aRes = 1/aRes;
+  else
+    aRes = RealLast();
+  
+  return aRes;
+}
+
+
+//=============================================================================
+/*!
+ *  CurveCurvatureByPoint
+ */
+//=============================================================================
+Standard_Real GEOMImpl_IMeasureOperations::CurveCurvatureByPoint
+                   (Handle(GEOM_Object) theCurve, Handle(GEOM_Object) thePoint)
+{
+  SetErrorCode(KO);
+  Standard_Real aRes = -1.0;
+
+  if( theCurve.IsNull() || thePoint.IsNull() ) return aRes;
+
+  Handle(GEOM_Function) aRefCurve = theCurve->GetLastFunction();
+  Handle(GEOM_Function) aRefPoint = thePoint->GetLastFunction();
+  if( aRefCurve.IsNull() || aRefPoint.IsNull() ) return aRes;
+
+  TopoDS_Edge anEdge = TopoDS::Edge(aRefCurve->GetValue());
+  TopoDS_Vertex aPnt = TopoDS::Vertex(aRefPoint->GetValue());
+  if( anEdge.IsNull() || aPnt.IsNull() ) {
+    SetErrorCode("One of Objects has NULL Shape");
+    return aRes;
+  }
+
+  Standard_Real aFP, aLP;
+  Handle(Geom_Curve) aCurve = BRep_Tool::Curve(anEdge, aFP, aLP);
+  if(aCurve.IsNull()) return aRes;
+  gp_Pnt aPoint = BRep_Tool::Pnt(aPnt);
+
+  //Compute curvature
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    GeomAPI_ProjectPointOnCurve PPC(aPoint, aCurve, aFP, aLP);
+    if(PPC.NbPoints()>0) {
+      GeomLProp_CLProps Prop = GeomLProp_CLProps 
+        (aCurve, PPC.LowerDistanceParameter(), 2, Precision::Confusion());
+      aRes = fabs(Prop.Curvature());
+      SetErrorCode(OK);
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return aRes;
+  }
+
+  if( aRes > Precision::Confusion() )
+    aRes = 1/aRes;
+  else
+    aRes = RealLast();
+  
+  return aRes;
+}
+
+
+//=============================================================================
+/*!
+ *  getSurfaceCurvatures
+ */
+//=============================================================================
+Standard_Real GEOMImpl_IMeasureOperations::getSurfaceCurvatures
+                                          (const Handle(Geom_Surface)& aSurf,
+                                           Standard_Real theUParam,
+                                           Standard_Real theVParam,
+                                           Standard_Boolean theNeedMaxCurv)
+{
+  SetErrorCode(KO);
+  Standard_Real aRes = 1.0;
+
+  if (aSurf.IsNull()) return aRes;
+
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    GeomLProp_SLProps Prop = GeomLProp_SLProps 
+      (aSurf, theUParam, theVParam, 2, Precision::Confusion());
+    if(Prop.IsCurvatureDefined()) {
+      if(Prop.IsUmbilic()) {
+        //cout<<"is umbilic"<<endl;
+        aRes = fabs(Prop.MeanCurvature());
+      }
+      else {
+        //cout<<"is not umbilic"<<endl;
+        double c1 = fabs(Prop.MaxCurvature());
+        double c2 = fabs(Prop.MinCurvature());
+        if(theNeedMaxCurv)
+          aRes = Max(c1,c2);
+        else
+          aRes = Min(c1,c2);
+      }
+      SetErrorCode(OK);
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return aRes;
+  }
+
+  if( fabs(aRes) > Precision::Confusion() )
+    aRes = 1/aRes;
+  else
+    aRes = RealLast();
+  
+  return aRes;
+}
+
+
+//=============================================================================
+/*!
+ *  MaxSurfaceCurvatureByParam
+ */
+//=============================================================================
+Standard_Real GEOMImpl_IMeasureOperations::MaxSurfaceCurvatureByParam
+                                                  (Handle(GEOM_Object) theSurf,
+                                                   Standard_Real& theUParam,
+                                                   Standard_Real& theVParam)
+{
+  SetErrorCode(KO);
+  Standard_Real aRes = -1.0;
+
+  if (theSurf.IsNull()) return aRes;
+
+  Handle(GEOM_Function) aRefShape = theSurf->GetLastFunction();
+  if(aRefShape.IsNull()) return aRes;
+
+  TopoDS_Shape aShape = aRefShape->GetValue();
+  if(aShape.IsNull()) {
+    SetErrorCode("One of Objects has NULL Shape");
+    return aRes;
+  }
+
+  TopoDS_Face F = TopoDS::Face(aShape);
+  Handle(Geom_Surface) aSurf = BRep_Tool::Surface(F);
+
+  //Compute the parameters
+  Standard_Real U1,U2,V1,V2;
+  ShapeAnalysis::GetFaceUVBounds(F,U1,U2,V1,V2);
+  Standard_Real U = U1 + (U2-U1)*theUParam;
+  Standard_Real V = V1 + (V2-V1)*theVParam;
+  
+  return getSurfaceCurvatures(aSurf, U, V, true);
+}
+
+
+//=============================================================================
+/*!
+ *  MaxSurfaceCurvatureByPoint
+ */
+//=============================================================================
+Standard_Real GEOMImpl_IMeasureOperations::MaxSurfaceCurvatureByPoint
+                    (Handle(GEOM_Object) theSurf, Handle(GEOM_Object) thePoint)
+{
+  SetErrorCode(KO);
+  Standard_Real aRes = -1.0;
+
+  if( theSurf.IsNull() || thePoint.IsNull() ) return aRes;
+
+  Handle(GEOM_Function) aRefShape = theSurf->GetLastFunction();
+  Handle(GEOM_Function) aRefPoint = thePoint->GetLastFunction();
+  if( aRefShape.IsNull() || aRefPoint.IsNull() ) return aRes;
+
+  TopoDS_Face aFace = TopoDS::Face(aRefShape->GetValue());
+  TopoDS_Vertex aPnt = TopoDS::Vertex(aRefPoint->GetValue());
+  if( aFace.IsNull() || aPnt.IsNull() ) {
+    SetErrorCode("One of Objects has NULL Shape");
+    return 0;
+  }
+
+  Handle(Geom_Surface) aSurf = BRep_Tool::Surface(aFace);
+  if(aSurf.IsNull()) return aRes;
+  gp_Pnt aPoint = BRep_Tool::Pnt(aPnt);
+
+  //Compute the parameters
+  ShapeAnalysis_Surface sas(aSurf);
+  gp_Pnt2d UV = sas.ValueOfUV(aPoint,Precision::Confusion());
+
+  return getSurfaceCurvatures(aSurf, UV.X(), UV.Y(), true);
+}
+
+
+//=============================================================================
+/*!
+ *  MinSurfaceCurvatureByParam
+ */
+//=============================================================================
+Standard_Real GEOMImpl_IMeasureOperations::MinSurfaceCurvatureByParam
+                                                  (Handle(GEOM_Object) theSurf,
+                                                   Standard_Real& theUParam,
+                                                   Standard_Real& theVParam)
+{
+  SetErrorCode(KO);
+  Standard_Real aRes = -1.0;
+
+  if (theSurf.IsNull()) return aRes;
+
+  Handle(GEOM_Function) aRefShape = theSurf->GetLastFunction();
+  if(aRefShape.IsNull()) return aRes;
+
+  TopoDS_Shape aShape = aRefShape->GetValue();
+  if(aShape.IsNull()) {
+    SetErrorCode("One of Objects has NULL Shape");
+    return aRes;
+  }
+
+  TopoDS_Face F = TopoDS::Face(aShape);
+  Handle(Geom_Surface) aSurf = BRep_Tool::Surface(F);
+
+  //Compute the parameters
+  Standard_Real U1,U2,V1,V2;
+  ShapeAnalysis::GetFaceUVBounds(F,U1,U2,V1,V2);
+  Standard_Real U = U1 + (U2-U1)*theUParam;
+  Standard_Real V = V1 + (V2-V1)*theVParam;
+  
+  return getSurfaceCurvatures(aSurf, U, V, false);
+}
+
+
+//=============================================================================
+/*!
+ *  MinSurfaceCurvatureByPoint
+ */
+//=============================================================================
+Standard_Real GEOMImpl_IMeasureOperations::MinSurfaceCurvatureByPoint
+                    (Handle(GEOM_Object) theSurf, Handle(GEOM_Object) thePoint)
+{
+  SetErrorCode(KO);
+  Standard_Real aRes = -1.0;
+
+  if( theSurf.IsNull() || thePoint.IsNull() ) return aRes;
+
+  Handle(GEOM_Function) aRefShape = theSurf->GetLastFunction();
+  Handle(GEOM_Function) aRefPoint = thePoint->GetLastFunction();
+  if( aRefShape.IsNull() || aRefPoint.IsNull() ) return aRes;
+
+  TopoDS_Face aFace = TopoDS::Face(aRefShape->GetValue());
+  TopoDS_Vertex aPnt = TopoDS::Vertex(aRefPoint->GetValue());
+  if( aFace.IsNull() || aPnt.IsNull() ) {
+    SetErrorCode("One of Objects has NULL Shape");
+    return 0;
+  }
+
+  Handle(Geom_Surface) aSurf = BRep_Tool::Surface(aFace);
+  if(aSurf.IsNull()) return aRes;
+  gp_Pnt aPoint = BRep_Tool::Pnt(aPnt);
+
+  //Compute the parameters
+  ShapeAnalysis_Surface sas(aSurf);
+  gp_Pnt2d UV = sas.ValueOfUV(aPoint,Precision::Confusion());
+
+  return getSurfaceCurvatures(aSurf, UV.X(), UV.Y(), false);
+}
+
+
 //=======================================================================
 //function : StructuralDump
 //purpose  : Structural (data exchange) style of output.
@@ -1709,6 +2349,7 @@ void GEOMImpl_IMeasureOperations::StructuralDump (const BRepCheck_Analyzer& theA
   }
 }
 
+
 //=======================================================================
 //function : GetProblemShapes
 // purpose : for StructuralDump
index 24f6e52537e682ecdb602c6e918bd698cf505fb8..8d484b7168c15754efd5bf94a32b496749a23709 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOMImpl_IMeasureOperations_HXX_
 #define _GEOMImpl_IMeasureOperations_HXX_
 
@@ -31,6 +32,7 @@
 #include <TColStd_HSequenceOfInteger.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
 #include <gp_Ax3.hxx>
+#include <Geom_Surface.hxx>
 
 class GEOM_Engine;
 class Handle(GEOM_Object);
@@ -130,6 +132,24 @@ class GEOMImpl_IMeasureOperations : public GEOM_IOperations {
 
   Standard_EXPORT Standard_Real GetAngle (Handle(GEOM_Object) theLine1, Handle(GEOM_Object) theLine2);
 
+
+  // Methods for recieving radiuses of curvature of curves and surfaces
+  // in the given point
+  Standard_EXPORT Standard_Real CurveCurvatureByParam (Handle(GEOM_Object) theCurve,
+                                                       Standard_Real& theParam);
+  Standard_EXPORT Standard_Real CurveCurvatureByPoint (Handle(GEOM_Object) theCurve,
+                                                       Handle(GEOM_Object) thePoint);
+  Standard_EXPORT Standard_Real MaxSurfaceCurvatureByParam (Handle(GEOM_Object) theSurf,
+                                                            Standard_Real& theUParam,
+                                                            Standard_Real& theVParam);
+  Standard_EXPORT Standard_Real MaxSurfaceCurvatureByPoint (Handle(GEOM_Object) theSurf,
+                                                            Handle(GEOM_Object) thePoint);
+  Standard_EXPORT Standard_Real MinSurfaceCurvatureByParam (Handle(GEOM_Object) theSurf,
+                                                            Standard_Real& theUParam,
+                                                            Standard_Real& theVParam);
+  Standard_EXPORT Standard_Real MinSurfaceCurvatureByPoint (Handle(GEOM_Object) theSurf,
+                                                            Handle(GEOM_Object) thePoint);
+
  public:
   Standard_EXPORT static gp_Ax3 GetPosition (const TopoDS_Shape& theShape);
 
@@ -150,6 +170,11 @@ class GEOMImpl_IMeasureOperations : public GEOM_IOperations {
                       Handle(TColStd_HArray1OfInteger)&   NbProblems,
                       const TopAbs_ShapeEnum              Subtype,
                       TopTools_DataMapOfShapeListOfShape& theMap);
+
+  Standard_Real getSurfaceCurvatures (const Handle(Geom_Surface)& aSurf,
+                                      Standard_Real theUParam,
+                                      Standard_Real theVParam,
+                                      Standard_Boolean theNeedMaxCurv);
 };
 
 #endif
index 4475216a23c09cd12e7e7d85bf687799fe7b6e77..513d81a30d8a1801edf8f05e3ba5c39c62e05daa 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Mirror creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define MIRROR_ARG_ORIGINAL 1
index 6533324b77e7c51dc67a1a8afa4e215e4c681187..eb8821589c4d09e7a757e65522346962660090e6 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Offset creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define OFF_ARG_SHAPE 1
index bf1ff4d7c59e3629e81bfb076dbd91c0798095c2..ae5d9e2a737363723f3f8ae940b0f5a76354393d 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Partition creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #include "TColStd_HSequenceOfTransient.hxx"
index 7982d8614656034c857fb55a1b973a511212404e..5b56e245466a80a2516c7eb1e48281be3ed5450c 100644 (file)
@@ -1,24 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Pipe creation.
-
+//
 #ifndef _GEOMImpl_IPIPE_HXX_
 #define _GEOMImpl_IPIPE_HXX_
 
diff --git a/src/GEOMImpl/GEOMImpl_IPipeBiNormal.hxx b/src/GEOMImpl/GEOMImpl_IPipeBiNormal.hxx
new file mode 100644 (file)
index 0000000..04ccfd3
--- /dev/null
@@ -0,0 +1,49 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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
+//
+//NOTE: This is an interface to a function for the Pipe creation.
+//
+#ifndef _GEOMImpl_IPIPEBINORMAL_HXX_
+#define _GEOMImpl_IPIPEBINORMAL_HXX_
+
+#include "GEOM_Function.hxx"
+
+#ifndef _GEOMImpl_IPIPE_HXX_
+#include "GEOMImpl_IPipe.hxx"
+#endif
+
+#define PIPE_ARG_BASE 1
+#define PIPE_ARG_PATH 2
+#define PIPE_ARG_VEC  3
+
+class GEOMImpl_IPipeBiNormal : public GEOMImpl_IPipe
+{
+ public:
+
+  GEOMImpl_IPipeBiNormal(Handle(GEOM_Function)& theFunction):GEOMImpl_IPipe(theFunction) {}
+  
+  void SetVector(Handle(GEOM_Function) theVec) { _func->SetReference(PIPE_ARG_VEC, theVec); }
+
+  Handle(GEOM_Function) GetVector() { return _func->GetReference(PIPE_ARG_VEC); }
+
+};
+
+#endif
index 711348b97ef503cc50895dcae73076a4c1c80712..3b51e624c8c3a1e4e14559bd12bb080c9998349c 100644 (file)
@@ -1,24 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Pipe creation.
-
+//
 #ifndef _GEOMImpl_IPIPEDIFFSECT_HXX_
 #define _GEOMImpl_IPIPEDIFFSECT_HXX_
 
index 590e8369796332ad5b1e74300e9a10c18bd4b5ea..0afb7506f47e159dbddff838b388fadb3d3770de 100644 (file)
@@ -1,24 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Pipe creation.
-
+//
 #ifndef _GEOMImpl_IPIPESHELLSECT_HXX_
 #define _GEOMImpl_IPIPESHELLSECT_HXX_
 
index bf328a80f5157ad96b3355fb07ca9ab5943424fe..fbd97d70548194d9c0936d6df2e515165afade41 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the vector creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define PLN_ARG_SIZE 1
index b796a51f5f2a9a58623a2b2d5459fd6f4e1bf635..61b2ae8bc73008ae973309c9445726216d0224bb 100755 (executable)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the point creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define ARG_X     1
@@ -33,6 +34,9 @@
 #define ARG_LINE1 7
 #define ARG_LINE2 8 
 
+#define ARG_SURFACE 9
+#define ARG_PARAM2 10
+
 class GEOMImpl_IPoint
 {
  public:
@@ -52,16 +56,20 @@ class GEOMImpl_IPoint
   Handle(GEOM_Function) GetRef() { return _func->GetReference(ARG_REF); }
 
   void SetCurve(Handle(GEOM_Function) theRef) { _func->SetReference(ARG_CURVE, theRef); }
+  void SetSurface(Handle(GEOM_Function) theRef) { _func->SetReference(ARG_SURFACE, theRef); }
   void SetLine1(Handle(GEOM_Function) theRef) { _func->SetReference(ARG_LINE1, theRef); }
   void SetLine2(Handle(GEOM_Function) theRef) { _func->SetReference(ARG_LINE2, theRef); }
 
   Handle(GEOM_Function) GetCurve() { return _func->GetReference(ARG_CURVE); }
+  Handle(GEOM_Function) GetSurface() { return _func->GetReference(ARG_SURFACE); }
   Handle(GEOM_Function) GetLine1() { return _func->GetReference(ARG_LINE1); }
   Handle(GEOM_Function) GetLine2() { return _func->GetReference(ARG_LINE2); }
 
   void SetParameter(double theParam) { _func->SetReal(ARG_PARAM, theParam); }
+  void SetParameter2(double theParam) { _func->SetReal(ARG_PARAM2, theParam); }
 
   double GetParameter() { return _func->GetReal(ARG_PARAM); }
+  double GetParameter2() { return _func->GetReal(ARG_PARAM2); }
 
  private:
 
index 800795a4bf8751e005da58b4d77a0db6adc8362e..5c0c80ad30b72f5fd8ea24d7eb32ce6d26ce402f 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Polyline creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define POLY_ARG_LENG 1
index 77a0e358a065fedb11cb1508cb280c14c0c23c74..5d42d5d92b17e945229809c30aba4b6e256a8c5c 100644 (file)
@@ -1,30 +1,34 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Setting In Position.
-
-
+//
 #include "GEOM_Function.hxx"
 
-#define POSITION_ARG_SHAPE 1
+#define POSITION_ARG_SHAPE     1
 #define POSITION_ARG_START_LCS 2
-#define POSITION_ARG_END_LCS 3
+#define POSITION_ARG_END_LCS   3
+#define POSITION_ARG_PATH      5
+#define POSITION_ARG_DISTANCE  6
+#define POSITION_ARG_REVERSE   7
 
 class GEOMImpl_IPosition
 {
@@ -46,6 +50,17 @@ class GEOMImpl_IPosition
 
   Handle(GEOM_Function) GetEndLCS() { return _func->GetReference(POSITION_ARG_END_LCS); }
 
+  void SetPath(Handle(GEOM_Function) thePath) { _func->SetReference(POSITION_ARG_PATH, thePath); }
+
+  Handle(GEOM_Function) GetPath() { return _func->GetReference(POSITION_ARG_PATH); }
+
+  void SetDistance(double theDistance) { _func->SetReal(POSITION_ARG_DISTANCE, theDistance); }
+
+  double GetDistance() { return _func->GetReal(POSITION_ARG_DISTANCE); }
+
+  void SetReverse(bool theReverse) { _func->SetReal(POSITION_ARG_REVERSE, theReverse); }
+  bool GetReverse() { return _func->GetReal(POSITION_ARG_REVERSE); }
+
  private:
 
   Handle(GEOM_Function) _func;
index 14c01864e8fa8c0fe26baa74519528eecb8dc7e6..f3496f0d980400702c36dc79beaf609b5aadd935 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Prism creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define PRISM_ARG_H     1
@@ -27,6 +28,9 @@
 #define PRISM_ARG_BASE  3
 #define PRISM_ARG_PNT_F 4
 #define PRISM_ARG_PNT_L 5
+#define PRISM_ARG_DX    6
+#define PRISM_ARG_DY    7
+#define PRISM_ARG_DZ    8
 
 class GEOMImpl_IPrism
 {
@@ -39,6 +43,14 @@ class GEOMImpl_IPrism
   void SetFirstPoint(Handle(GEOM_Function) thePoint) { _func->SetReference(PRISM_ARG_PNT_F, thePoint); }
   void SetLastPoint (Handle(GEOM_Function) thePoint) { _func->SetReference(PRISM_ARG_PNT_L, thePoint); }
 
+  void SetDX(double theDX) { _func->SetReal(PRISM_ARG_DX, theDX); }
+  void SetDY(double theDY) { _func->SetReal(PRISM_ARG_DY, theDY); }
+  void SetDZ(double theDZ) { _func->SetReal(PRISM_ARG_DZ, theDZ); }
+
+  double GetDX() { return _func->GetReal(PRISM_ARG_DX); }
+  double GetDY() { return _func->GetReal(PRISM_ARG_DY); }
+  double GetDZ() { return _func->GetReal(PRISM_ARG_DZ); }
+
   Handle(GEOM_Function) GetBase  () { return _func->GetReference(PRISM_ARG_BASE); }
   Handle(GEOM_Function) GetVector() { return _func->GetReference(PRISM_ARG_VEC ); }
   Handle(GEOM_Function) GetFirstPoint() { return _func->GetReference(PRISM_ARG_PNT_F ); }
index c0d551b3486fcb82ab79283f911bbfa2bbc72051..a02b7ad737daccf7ee56de0bb090721ea937601b 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Revolution creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define REVOL_ARG_ANGLE 1
index 2cdad4d5a31b7535cb7b3cfa8e20ffb7041eec7b..e4a60307088c7f18d711e933b4866a979fa8a039 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Rotate operation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define ROTATE_ANGLE    1  
index 9a7e904a279cf43e743c74fb41fb25a71ef70fa3..bcbd0493e370544cfd20c0c5717f6e098f02ebf7 100644 (file)
@@ -1,30 +1,33 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Scale creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define SCALE_ARG_SHAPE 1
 #define SCALE_ARG_VALUE 2
 #define SCALE_ARG_POINT 3
+#define SCALE_ARG_VALUE_Y 4
+#define SCALE_ARG_VALUE_Z 5
 
 class GEOMImpl_IScale
 {
@@ -44,6 +47,14 @@ class GEOMImpl_IScale
 
   Handle(GEOM_Function) GetPoint() { return _func->GetReference(SCALE_ARG_POINT); }
 
+  void SetFactorX(double theValue) { _func->SetReal(SCALE_ARG_VALUE  , theValue); }
+  void SetFactorY(double theValue) { _func->SetReal(SCALE_ARG_VALUE_Y, theValue); }
+  void SetFactorZ(double theValue) { _func->SetReal(SCALE_ARG_VALUE_Z, theValue); }
+
+  double GetFactorX() { return _func->GetReal(SCALE_ARG_VALUE  ); }
+  double GetFactorY() { return _func->GetReal(SCALE_ARG_VALUE_Y); }
+  double GetFactorZ() { return _func->GetReal(SCALE_ARG_VALUE_Z); }
+
  private:
 
   Handle(GEOM_Function) _func;
index 25c3796d368cddf4fa7a6866eb53c81b8b26ef48..a4efd51612e83568343fa2e7f431cd3ec61d2352 100644 (file)
@@ -1,26 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 // NOTE: This is an intreface to a function for the Shapes
 // (Wire, Face, Shell, Solid and Compound) creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #include "TColStd_HSequenceOfTransient.hxx"
index 0890728999854162e0ee27f45eadefd3ceacb457..09a2477a7446a6b17d0922569c47f38b0c3aa79c 100644 (file)
@@ -1,30 +1,30 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File      : GEOMImpl_IShapesOperations.cxx
-// Created   : 
+// Created   :
 // Author    : modified by Lioka RAZAFINDRAZAKA (CEA) 22/06/2007
 // Project   : SALOME
 // $Header$
-
-using namespace std;
-
+//
 #include <Standard_Stream.hxx>
 
 #include "GEOMImpl_IShapesOperations.hxx"
@@ -50,6 +50,7 @@ using namespace std;
 #include "GEOMAlgo_FinderShapeOnQuad.hxx"
 #include "GEOMAlgo_FinderShapeOn2.hxx"
 #include "GEOMAlgo_ClsfBox.hxx"
+#include "GEOMAlgo_ClsfSolid.hxx"
 #include "GEOMAlgo_Gluer1.hxx"
 #include "GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx"
 #include "GEOMAlgo_CoupleOfShapes.hxx"
@@ -67,6 +68,7 @@ using namespace std;
 #include <TDF_Tool.hxx>
 
 #include <BRepExtrema_ExtCF.hxx>
+#include <BRepExtrema_DistShapeShape.hxx>
 
 #include <BRep_Tool.hxx>
 #include <BRep_Builder.hxx>
@@ -116,6 +118,7 @@ using namespace std;
 
 #include <vector>
 
+#include <Standard_NullObject.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
@@ -150,7 +153,6 @@ GEOMImpl_IShapesOperations::~GEOMImpl_IShapesOperations()
   MESSAGE("GEOMImpl_IShapesOperations::~GEOMImpl_IShapesOperations");
 }
 
-
 //=============================================================================
 /*!
  *  MakeEdge
@@ -212,7 +214,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeEdge
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeWire
-                             (list<Handle(GEOM_Object)> theShapes)
+                             (std::list<Handle(GEOM_Object)> theShapes)
 {
   return MakeShape(theShapes, GEOM_WIRE, WIRE_EDGES, "MakeWire");
 }
@@ -279,7 +281,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFace (Handle(GEOM_Object) th
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFaceWires
-                             (list<Handle(GEOM_Object)> theShapes,
+                             (std::list<Handle(GEOM_Object)> theShapes,
                               const bool isPlanarWanted)
 {
   SetErrorCode(KO);
@@ -300,7 +302,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFaceWires
   Handle(TColStd_HSequenceOfTransient) aShapesSeq = new TColStd_HSequenceOfTransient;
 
   // Shapes
-  list<Handle(GEOM_Object)>::iterator it = theShapes.begin();
+  std::list<Handle(GEOM_Object)>::iterator it = theShapes.begin();
   for (; it != theShapes.end(); it++) {
     Handle(GEOM_Function) aRefSh = (*it)->GetLastFunction();
     if (aRefSh.IsNull()) {
@@ -353,7 +355,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFaceWires
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeShell
-                             (list<Handle(GEOM_Object)> theShapes)
+                             (std::list<Handle(GEOM_Object)> theShapes)
 {
   return MakeShape(theShapes, GEOM_SHELL, SHELL_FACES, "MakeShell");
 }
@@ -364,7 +366,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeShell
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeSolidShells
-                             (list<Handle(GEOM_Object)> theShapes)
+                             (std::list<Handle(GEOM_Object)> theShapes)
 {
   return MakeShape(theShapes, GEOM_SOLID, SOLID_SHELLS, "MakeSolid");
 }
@@ -429,7 +431,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeSolidShell (Handle(GEOM_Obje
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeCompound
-                             (list<Handle(GEOM_Object)> theShapes)
+                             (std::list<Handle(GEOM_Object)> theShapes)
 {
   return MakeShape(theShapes, GEOM_COMPOUND, COMPOUND_SHAPES, "MakeCompound");
 }
@@ -440,7 +442,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeCompound
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeShape
-                             (list<Handle(GEOM_Object)>      theShapes,
+                             (std::list<Handle(GEOM_Object)>      theShapes,
                               const Standard_Integer         theObjectType,
                               const Standard_Integer         theFunctionType,
                               const TCollection_AsciiString& theMethodName)
@@ -463,7 +465,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeShape
   Handle(TColStd_HSequenceOfTransient) aShapesSeq = new TColStd_HSequenceOfTransient;
 
   // Shapes
-  list<Handle(GEOM_Object)>::iterator it = theShapes.begin();
+  std::list<Handle(GEOM_Object)>::iterator it = theShapes.begin();
   for (; it != theShapes.end(); it++) {
     Handle(GEOM_Function) aRefSh = (*it)->GetLastFunction();
     if (aRefSh.IsNull()) {
@@ -647,7 +649,6 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::GetGlueFaces
   return aSeq;
 }
 
-
 //=============================================================================
 /*!
  *  MakeGlueFacesByList
@@ -656,7 +657,7 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::GetGlueFaces
 Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeGlueFacesByList
                                                 (Handle(GEOM_Object) theShape,
                                                  const Standard_Real theTolerance,
-                                                list<Handle(GEOM_Object)> theFaces,
+                                                std::list<Handle(GEOM_Object)> theFaces,
                                                  const Standard_Boolean doKeepNonSolids)
 {
   SetErrorCode(KO);
@@ -684,7 +685,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeGlueFacesByList
   aCI.SetKeepNonSolids(doKeepNonSolids);
 
   Handle(TColStd_HSequenceOfTransient) aFaces = new TColStd_HSequenceOfTransient;
-  list<Handle(GEOM_Object)>::iterator it = theFaces.begin();
+  std::list<Handle(GEOM_Object)>::iterator it = theFaces.begin();
   for (; it != theFaces.end(); it++) {
     Handle(GEOM_Function) aRefSh = (*it)->GetLastFunction();
     if (aRefSh.IsNull()) {
@@ -718,7 +719,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeGlueFacesByList
   }
 
   //Make a Python command
-  
+
   GEOM::TPythonDump pd(aFunction);
   pd << aGlued << " = geompy.MakeGlueFacesByList("
      << theShape << ", " << theTolerance << ", [";
@@ -732,14 +733,11 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeGlueFacesByList
   }
   pd << "])";
 
-
   // to provide warning
   if (!isWarning) SetErrorCode(OK);
   return aGlued;
 }
 
-
-
 //=============================================================================
 /*!
  *  MakeExplode
@@ -796,8 +794,6 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::MakeExplode
   TopExp::MapShapes(aShape, anIndices);
   Handle(TColStd_HArray1OfInteger) anArray;
 
-  Standard_Integer nbAllSubShape = anIndices.Extent();
-
   TopTools_ListIteratorOfListOfShape itSub (listShape);
   TCollection_AsciiString anAsciiList, anEntry;
   for (int index = 1; itSub.More(); itSub.Next(), ++index)
@@ -1081,7 +1077,7 @@ TCollection_AsciiString GEOMImpl_IShapesOperations::GetShapeTypeString (Handle(G
             (Abs(curv.LastParameter()) >= 1E6))
           aTypeName = "Line";
        else
-         aTypeName = "Edge" ;
+         aTypeName = "Edge";
       } else if (curv.GetType() == GeomAbs_Circle) {
        if (curv.IsClosed())
           aTypeName = "Circle";
@@ -1105,7 +1101,6 @@ TCollection_AsciiString GEOMImpl_IShapesOperations::GetShapeTypeString (Handle(G
   return aTypeName;
 }
 
-
 //=============================================================================
 /*!
  *  NumberOfFaces
@@ -1264,7 +1259,6 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetFreeFacesIDs
 //function : GetSharedShapes
 //purpose  :
 //=======================================================================
-
 Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::GetSharedShapes
                                                 (Handle(GEOM_Object)    theShape1,
                                                  Handle(GEOM_Object)    theShape2,
@@ -1364,7 +1358,6 @@ static GEOM::TPythonDump& operator<< (GEOM::TPythonDump&   theDump,
  * \retval bool  - result of the check
  */
 //=======================================================================
-
 bool GEOMImpl_IShapesOperations::checkTypeShapesOn(const Standard_Integer theShapeType)
 {
   if (theShapeType != TopAbs_VERTEX &&
@@ -1385,7 +1378,6 @@ bool GEOMImpl_IShapesOperations::checkTypeShapesOn(const Standard_Integer theSha
     * \retval Handle(Geom_Surface) - resulting surface
    */
 //=======================================================================
-
 Handle(Geom_Surface) GEOMImpl_IShapesOperations::makePlane(const TopoDS_Shape& anAx1)
 {
   if (anAx1.ShapeType() != TopAbs_EDGE) return NULL;
@@ -1414,7 +1406,6 @@ Handle(Geom_Surface) GEOMImpl_IShapesOperations::makePlane(const TopoDS_Shape& a
     * \retval Handle(Geom_Surface) - resulting surface
    */
 //=======================================================================
-
 Handle(Geom_Surface) GEOMImpl_IShapesOperations::makeCylinder(const TopoDS_Shape& anAxis,
                                                               const Standard_Real theRadius)
 {
@@ -1441,7 +1432,6 @@ Handle(Geom_Surface) GEOMImpl_IShapesOperations::makeCylinder(const TopoDS_Shape
   return new Geom_CylindricalSurface(anAx3, theRadius);
 }
 
-
 //=======================================================================
 //function : getShapesOnBoxIDs
   /*!
@@ -1453,7 +1443,6 @@ Handle(Geom_Surface) GEOMImpl_IShapesOperations::makeCylinder(const TopoDS_Shape
     * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
    */
 //=======================================================================
-
 Handle(TColStd_HSequenceOfInteger)
   GEOMImpl_IShapesOperations::getShapesOnBoxIDs(const Handle(GEOM_Object)& theBox,
                                                const Handle(GEOM_Object)& theShape,
@@ -1524,7 +1513,6 @@ Handle(TColStd_HSequenceOfInteger)
   return aSeqOfIDs;
 }
 
-
 //=======================================================================
 //function : GetShapesOnBoxIDs
 /*!
@@ -1536,7 +1524,6 @@ Handle(TColStd_HSequenceOfInteger)
     * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
  */
 //=======================================================================
-
 Handle(TColStd_HSequenceOfInteger)
     GEOMImpl_IShapesOperations::GetShapesOnBoxIDs(const Handle(GEOM_Object)& theBox,
                                                  const Handle(GEOM_Object)& theShape,
@@ -1554,7 +1541,7 @@ Handle(TColStd_HSequenceOfInteger)
 
   // Make a Python command
   GEOM::TPythonDump(aFunction)
-    << "listShapesOnBoxIDs = geompy.GetShapesOnQuadrangleIDs("
+    << "listShapesOnBoxIDs = geompy.GetShapesOnBoxIDs("
     << theBox << ", "
     << theShape << ", "
     << TopAbs_ShapeEnum(theShapeType) << ", "
@@ -1575,7 +1562,6 @@ Handle(TColStd_HSequenceOfInteger)
     * \retval Handle(TColStd_HSequenceOfTransient) - found subshapes
  */
 //=======================================================================
-
 Handle(TColStd_HSequenceOfTransient)
     GEOMImpl_IShapesOperations::GetShapesOnBox(const Handle(GEOM_Object)& theBox,
                                               const Handle(GEOM_Object)&  theShape,
@@ -1611,6 +1597,225 @@ Handle(TColStd_HSequenceOfTransient)
   return aSeq;
 }
 
+//=======================================================================
+//function : getShapesOnShapeIDs
+/*!
+ * \brief Find IDs of subshapes complying with given status about surface
+ * \param theCheckShape - the shape to check state of subshapes against
+ * \param theShape - the shape to explore
+ * \param theShapeType - type of subshape of theShape
+ * \param theState - required state
+ * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
+ */
+//=======================================================================
+Handle(TColStd_HSequenceOfInteger)
+  GEOMImpl_IShapesOperations::getShapesOnShapeIDs
+                                 (const Handle(GEOM_Object)& theCheckShape,
+                                  const Handle(GEOM_Object)& theShape,
+                                  const Standard_Integer theShapeType,
+                                  GEOMAlgo_State theState)
+{
+  Handle(TColStd_HSequenceOfInteger) aSeqOfIDs;
+
+  TopoDS_Shape aCheckShape = theCheckShape->GetValue();
+  TopoDS_Shape aShape = theShape->GetValue();
+  TopTools_ListOfShape res;
+
+  // Check presence of triangulation, build if need
+  if (!CheckTriangulation(aShape)) {
+    SetErrorCode("Cannot build triangulation on the shape");
+    return aSeqOfIDs;
+  }
+
+  // Call algo
+  GEOMAlgo_FinderShapeOn2 aFinder;
+  Standard_Real aTol = 0.0001; // default value
+
+  Handle(GEOMAlgo_ClsfSolid) aClsfSolid = new GEOMAlgo_ClsfSolid;
+  aClsfSolid->SetShape(aCheckShape);
+
+  aFinder.SetShape(aShape);
+  aFinder.SetTolerance(aTol);
+  aFinder.SetClsf(aClsfSolid);
+  aFinder.SetShapeType( (TopAbs_ShapeEnum)theShapeType );
+  aFinder.SetState(theState);
+  aFinder.Perform();
+
+  // Interprete results
+  Standard_Integer iErr = aFinder.ErrorStatus();
+  // the detailed description of error codes is in GEOMAlgo_FinderShapeOn1.cxx
+  if (iErr) {
+    MESSAGE(" iErr : " << iErr);
+    TCollection_AsciiString aMsg (" iErr : ");
+    aMsg += TCollection_AsciiString(iErr);
+    SetErrorCode(aMsg);
+    return aSeqOfIDs;
+  }
+  Standard_Integer iWrn = aFinder.WarningStatus();
+  // the detailed description of warning codes is in GEOMAlgo_FinderShapeOn1.cxx
+  if (iWrn) {
+    MESSAGE(" *** iWrn : " << iWrn);
+  }
+
+  const TopTools_ListOfShape& listSS = aFinder.Shapes(); // the result
+
+  if (listSS.Extent() < 1) {
+    //SetErrorCode("Not a single sub-shape of the requested type found on the given surface");
+    SetErrorCode(NOT_FOUND_ANY); // NPAL18017
+  }
+
+  // Fill sequence of object IDs
+  aSeqOfIDs = new TColStd_HSequenceOfInteger;
+
+  TopTools_IndexedMapOfShape anIndices;
+  TopExp::MapShapes(aShape, anIndices);
+
+  TopTools_ListIteratorOfListOfShape itSub (listSS);
+  for (int index = 1; itSub.More(); itSub.Next(), ++index) {
+    int id = anIndices.FindIndex(itSub.Value());
+    aSeqOfIDs->Append(id);
+  }
+
+  return aSeqOfIDs;
+}
+
+//=======================================================================
+//function : GetShapesOnShapeIDs
+/*!
+ * \brief Find subshapes complying with given status about surface
+ * \param theCheckShape - the shape to check state of subshapes against
+ * \param theShape - the shape to explore
+ * \param theShapeType - type of subshape of theShape
+ * \param theState - required state
+ * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
+ */
+//=======================================================================
+Handle(TColStd_HSequenceOfInteger)
+    GEOMImpl_IShapesOperations::GetShapesOnShapeIDs
+                            (const Handle(GEOM_Object)& theCheckShape,
+                             const Handle(GEOM_Object)& theShape,
+                             const Standard_Integer theShapeType,
+                             GEOMAlgo_State theState)
+{
+  Handle(TColStd_HSequenceOfInteger) aSeqOfIDs =
+    getShapesOnShapeIDs (theCheckShape, theShape, theShapeType, theState);
+
+  if ( aSeqOfIDs.IsNull()  || aSeqOfIDs->Length() == 0 )
+    return NULL;
+
+  // The GetShapesOnShape() doesn't change object so no new function is required.
+  Handle(GEOM_Function) aFunction =
+    GEOM::GetCreatedLast(theShape,theCheckShape)->GetLastFunction();
+
+  // Make a Python command
+  GEOM::TPythonDump(aFunction)
+    << "listShapesOnBoxIDs = geompy.GetShapesOnShapeIDs("
+    << theCheckShape << ", "
+    << theShape << ", "
+    << TopAbs_ShapeEnum(theShapeType) << ", "
+    << theState << ")";
+
+  SetErrorCode(OK);
+  return aSeqOfIDs;
+}
+
+//=======================================================================
+//function : GetShapesOnShape
+/*!
+ * \brief Find subshapes complying with given status about surface
+ * \param theCheckShape - the shape to check state of subshapes against
+ * \param theShape - the shape to explore
+ * \param theShapeType - type of subshape of theShape
+ * \param theState - required state
+ * \retval Handle(TColStd_HSequenceOfTransient) - found subshapes
+ */
+//=======================================================================
+Handle(TColStd_HSequenceOfTransient)
+  GEOMImpl_IShapesOperations::GetShapesOnShape
+                             (const Handle(GEOM_Object)& theCheckShape,
+                              const Handle(GEOM_Object)&  theShape,
+                              const Standard_Integer theShapeType,
+                              GEOMAlgo_State theState)
+{
+  Handle(TColStd_HSequenceOfInteger) aSeqOfIDs =
+    getShapesOnShapeIDs (theCheckShape, theShape, theShapeType, theState);
+  if ( aSeqOfIDs.IsNull()  || aSeqOfIDs->Length() == 0 )
+    return NULL;
+
+  // Find objects by indices
+  TCollection_AsciiString anAsciiList;
+  Handle(TColStd_HSequenceOfTransient) aSeq;
+  aSeq = getObjectsShapesOn( theShape, aSeqOfIDs, anAsciiList );
+
+  if ( aSeq.IsNull() || aSeq->IsEmpty() )
+    return NULL;
+
+  // Make a Python command
+
+  Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast( aSeq->Value( 1 ));
+  Handle(GEOM_Function) aFunction = anObj->GetLastFunction();
+
+  GEOM::TPythonDump(aFunction)
+    << "[" << anAsciiList.ToCString() << "] = geompy.GetShapesOnShape("
+    << theCheckShape << ", "
+    << theShape << ", "
+    << TopAbs_ShapeEnum(theShapeType) << ", "
+    << theState << ")";
+
+  SetErrorCode(OK);
+  return aSeq;
+}
+
+//=======================================================================
+//function : GetShapesOnShapeAsCompound
+//=======================================================================
+Handle(GEOM_Object) GEOMImpl_IShapesOperations::GetShapesOnShapeAsCompound
+                             (const Handle(GEOM_Object)& theCheckShape,
+                              const Handle(GEOM_Object)&  theShape,
+                              const Standard_Integer theShapeType,
+                              GEOMAlgo_State theState)
+{
+  Handle(TColStd_HSequenceOfInteger) aSeqOfIDs =
+    getShapesOnShapeIDs (theCheckShape, theShape, theShapeType, theState);
+
+  if ( aSeqOfIDs.IsNull()  || aSeqOfIDs->Length() == 0 )
+    return NULL;
+
+  // Find objects by indices
+  TCollection_AsciiString anAsciiList;
+  Handle(TColStd_HSequenceOfTransient) aSeq;
+  aSeq = getObjectsShapesOn( theShape, aSeqOfIDs, anAsciiList );
+
+  if ( aSeq.IsNull() || aSeq->IsEmpty() )
+    return NULL;
+
+  TopoDS_Compound aCompound;
+  BRep_Builder B;
+  B.MakeCompound(aCompound);
+  int i = 1;
+  for(; i<=aSeq->Length(); i++) {
+    Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(aSeq->Value(i));
+    TopoDS_Shape aShape_i = anObj->GetValue();
+    B.Add(aCompound,aShape_i);
+  }
+
+  //Add a new result object
+  Handle(GEOM_Object) aRes = GetEngine()->AddObject(GetDocID(), GEOM_SHAPES_ON_SHAPE);
+  Handle(GEOM_Function) aFunction =
+    aRes->AddFunction(GEOMImpl_ShapeDriver::GetID(), SHAPES_ON_SHAPE);
+  aFunction->SetValue(aCompound);
+
+  GEOM::TPythonDump(aFunction)
+    << aRes << " = geompy.GetShapesOnShapeAsCompound("
+    << theCheckShape << ", "
+    << theShape << ", "
+    << TopAbs_ShapeEnum(theShapeType) << ", "
+    << theState << ")";
+
+  SetErrorCode(OK);
+
+  return aRes;
+}
 
 //=======================================================================
 //function : getShapesOnSurfaceIDs
@@ -1623,7 +1828,6 @@ Handle(TColStd_HSequenceOfTransient)
     * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
    */
 //=======================================================================
-
 Handle(TColStd_HSequenceOfInteger)
   GEOMImpl_IShapesOperations::getShapesOnSurfaceIDs(const Handle(Geom_Surface)& theSurface,
                                                     const TopoDS_Shape&         theShape,
@@ -1708,7 +1912,6 @@ Handle(TColStd_HSequenceOfInteger)
  * \retval Handle(TColStd_HSequenceOfTransient) - found shape objects
  */
 //=======================================================================
-
 Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::
  getObjectsShapesOn(const Handle(GEOM_Object)&                theShape,
                     const Handle(TColStd_HSequenceOfInteger)& theShapeIDs,
@@ -1747,7 +1950,6 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::
     * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
  */
 //=======================================================================
-
 Handle(TColStd_HSequenceOfTransient)
     GEOMImpl_IShapesOperations::getShapesOnSurface(const Handle(Geom_Surface)& theSurface,
                                                    const Handle(GEOM_Object)&  theShape,
@@ -2213,7 +2415,6 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetShapesOnSphere
     * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
    */
 //=======================================================================
-
 Handle(TColStd_HSequenceOfInteger)
   GEOMImpl_IShapesOperations::getShapesOnQuadrangleIDs (const Handle(GEOM_Object)& theShape,
                                                         const Standard_Integer     theShapeType,
@@ -2340,7 +2541,6 @@ Handle(TColStd_HSequenceOfInteger)
     * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
    */
 //=======================================================================
-
 Handle(TColStd_HSequenceOfTransient)
     GEOMImpl_IShapesOperations::GetShapesOnQuadrangle (const Handle(GEOM_Object)& theShape,
                                                        const Standard_Integer     theShapeType,
@@ -2402,7 +2602,6 @@ Handle(TColStd_HSequenceOfTransient)
     * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
    */
 //=======================================================================
-
 Handle(TColStd_HSequenceOfInteger)
   GEOMImpl_IShapesOperations::GetShapesOnQuadrangleIDs (const Handle(GEOM_Object)& theShape,
                                                         const Standard_Integer     theShapeType,
@@ -2447,7 +2646,6 @@ Handle(TColStd_HSequenceOfInteger)
   return aSeqOfIDs;
 }
 
-
 //=============================================================================
 /*!
  *  GetInPlaceOfShape
@@ -2577,23 +2775,20 @@ static bool GetInPlaceOfShape (const Handle(GEOM_Function)& theWhereFunction,
  *  GetShapeProperties
  */
 //=============================================================================
-
 void GEOMImpl_IShapesOperations::GetShapeProperties( const TopoDS_Shape aShape, Standard_Real tab[],
                                                      gp_Pnt & aVertex )
 {
-  GProp_GProps SProps, VProps;
+  GProp_GProps theProps;
   gp_Pnt aCenterMass;
   TopoDS_Shape aPntShape;
   Standard_Real aShapeSize;
 
-  BRepGProp::VolumeProperties(aShape, VProps);
-  aCenterMass = VProps.CentreOfMass();
-  aShapeSize  = VProps.Mass();
-  if (aShape.ShapeType() == TopAbs_FACE) {
-    BRepGProp::SurfaceProperties(aShape, SProps);
-    aCenterMass = SProps.CentreOfMass();
-    aShapeSize  = SProps.Mass();
-  }
+  if      (aShape.ShapeType() == TopAbs_EDGE) BRepGProp::LinearProperties(aShape,  theProps);
+  else if (aShape.ShapeType() == TopAbs_FACE) BRepGProp::SurfaceProperties(aShape, theProps);
+  else                                        BRepGProp::VolumeProperties(aShape,  theProps);
+
+  aCenterMass = theProps.CentreOfMass();
+  aShapeSize  = theProps.Mass();
 
   aPntShape = BRepBuilderAPI_MakeVertex(aCenterMass).Shape();
   aVertex   = BRep_Tool::Pnt( TopoDS::Vertex( aPntShape ) );
@@ -2618,6 +2813,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::GetInPlace (Handle(GEOM_Object)
 
   TopoDS_Shape aWhere = theShapeWhere->GetValue();
   TopoDS_Shape aWhat  = theShapeWhat->GetValue();
+  TopoDS_Shape aPntShape;
+  TopoDS_Vertex aVertex;
 
   if (aWhere.IsNull() || aWhat.IsNull()) {
     SetErrorCode("Error: aWhere and aWhat TopoDS_Shape are Null.");
@@ -2640,32 +2837,54 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::GetInPlace (Handle(GEOM_Object)
 
   bool isFound = false;
   Standard_Integer iType = TopAbs_SOLID;
+  Standard_Integer compType = TopAbs_SOLID;
   Standard_Real    aWhat_Mass = 0., aWhere_Mass = 0.;
   Standard_Real    tab_aWhat[4],    tab_aWhere[4];
   Standard_Real    dl_l = 1e-3;
   Standard_Real    min_l, Tol_1D, Tol_2D, Tol_3D, Tol_Mass;
-  gp_Pnt           aPnt, aPnt_aWhat;
+  Standard_Real    aXmin, aYmin, aZmin, aXmax, aYmax, aZmax;
+  Bnd_Box          BoundingBox;
+  gp_Pnt           aPnt, aPnt_aWhat, tab_Pnt[2];
   GProp_GProps     aProps;
 
-  // 2D or 3D shapes
-  if ( aWhat.ShapeType() == TopAbs_COMPOUND  ||
-       aWhat.ShapeType() == TopAbs_SHELL     ||
-       aWhat.ShapeType() == TopAbs_COMPSOLID ) {
-    TopExp_Explorer Exp( aWhat, TopAbs_ShapeEnum( iType ) );
-    if ( ! Exp.More() ) iType = TopAbs_FACE;
+  // Find the iType of the aWhat shape
+  if      ( aWhat.ShapeType() == TopAbs_EDGE  || aWhat.ShapeType() == TopAbs_WIRE )      iType = TopAbs_EDGE;
+  else if ( aWhat.ShapeType() == TopAbs_FACE  || aWhat.ShapeType() == TopAbs_SHELL )     iType = TopAbs_FACE;
+  else if ( aWhat.ShapeType() == TopAbs_SOLID || aWhat.ShapeType() == TopAbs_COMPSOLID ) iType = TopAbs_SOLID;
+  else if ( aWhat.ShapeType() == TopAbs_COMPOUND ) {
+    // Only the iType of the first shape in the compound is taken into account
+    TopoDS_Iterator It (aWhat, Standard_True, Standard_True);
+    compType = It.Value().ShapeType();
+    if      ( compType == TopAbs_EDGE  || compType == TopAbs_WIRE )     iType = TopAbs_EDGE;
+    else if ( compType == TopAbs_FACE  || compType == TopAbs_SHELL)     iType = TopAbs_FACE;
+    else if ( compType == TopAbs_SOLID || compType == TopAbs_COMPSOLID) iType = TopAbs_SOLID;
+  }
+  else {
+    SetErrorCode("Error: An attempt to extract a shape of not supported type.");
+    return NULL;
   }
-  else if ( aWhat.ShapeType() == TopAbs_FACE )
-    iType = TopAbs_FACE;
 
   TopExp_Explorer Exp_aWhat( aWhat,   TopAbs_ShapeEnum( iType ) );
   TopExp_Explorer Exp_aWhere( aWhere, TopAbs_ShapeEnum( iType ) );
   TopExp_Explorer Exp_Edge( aWhere,   TopAbs_EDGE );
 
   // Find the shortest edge in theShapeWhere shape
+  BRepBndLib::Add(aWhere, BoundingBox);
+  BoundingBox.Get(aXmin, aYmin, aZmin, aXmax, aYmax, aZmax);
+  min_l = fabs(aXmax - aXmin);
+  if( min_l < fabs(aYmax - aYmin) ) min_l = fabs(aYmax - aYmin);
+  if( min_l < fabs(aZmax - aZmin) ) min_l = fabs(aZmax - aZmin);
+  min_l /= dl_l;
   for ( Standard_Integer nbEdge = 0; Exp_Edge.More(); Exp_Edge.Next(), nbEdge++ ) {
-    BRepGProp::LinearProperties(Exp_Edge.Current(), aProps);
-    if ( ! nbEdge ) min_l = aProps.Mass();
-    if ( aProps.Mass() < min_l ) min_l = aProps.Mass();
+    TopExp_Explorer Exp_Vertex( Exp_Edge.Current(), TopAbs_VERTEX);
+    for ( Standard_Integer nbVertex = 0; Exp_Vertex.More(); Exp_Vertex.Next(), nbVertex++ ) {
+      aPnt = BRep_Tool::Pnt( TopoDS::Vertex( Exp_Vertex.Current() ) );
+      tab_Pnt[nbVertex] = aPnt;
+    }
+    if ( ! tab_Pnt[0].IsEqual(tab_Pnt[1], dl_l) ) {
+      BRepGProp::LinearProperties(Exp_Edge.Current(), aProps);
+      if ( aProps.Mass() < min_l ) min_l = aProps.Mass();
+    }
   }
 
   // Compute tolerances
@@ -2673,30 +2892,41 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::GetInPlace (Handle(GEOM_Object)
   Tol_2D = dl_l * ( min_l * min_l) * ( 2. + dl_l);
   Tol_3D = dl_l * ( min_l * min_l * min_l ) * ( 3. + (3 * dl_l) + (dl_l * dl_l) );
 
+  if (Tol_1D < Precision::Confusion()) Tol_1D = Precision::Confusion();
+  if (Tol_2D < Precision::Confusion()) Tol_2D = Precision::Confusion();
+  if (Tol_3D < Precision::Confusion()) Tol_3D = Precision::Confusion();
+
   Tol_Mass = Tol_3D;
-  if ( iType == TopAbs_FACE ) Tol_Mass = Tol_2D;
+  if      ( iType == TopAbs_EDGE ) Tol_Mass = Tol_1D;
+  else if ( iType == TopAbs_FACE ) Tol_Mass = Tol_2D;
 
   // Compute the ShapeWhat Mass
   for ( ; Exp_aWhat.More(); Exp_aWhat.Next() ) {
-    if      ( iType == TopAbs_SOLID ) BRepGProp::VolumeProperties(Exp_aWhat.Current(), aProps);
-    else if ( iType == TopAbs_FACE )  BRepGProp::SurfaceProperties(Exp_aWhat.Current(), aProps);
+    if      ( iType == TopAbs_EDGE ) BRepGProp::LinearProperties(Exp_aWhat.Current(),  aProps);
+    else if ( iType == TopAbs_FACE ) BRepGProp::SurfaceProperties(Exp_aWhat.Current(), aProps);
+    else                             BRepGProp::VolumeProperties(Exp_aWhat.Current(),  aProps);
     aWhat_Mass += aProps.Mass();
   }
 
-  // Finding the Sub-ShapeWhere
+  // Searching for the sub-shapes inside the ShapeWhere shape
+  TopTools_MapOfShape map_aWhere;
   for ( Exp_aWhere.ReInit(); Exp_aWhere.More(); Exp_aWhere.Next() ) {
+    if (!map_aWhere.Add(Exp_aWhere.Current()))
+      continue; // skip repeated shape to avoid mass addition
     GetShapeProperties( Exp_aWhere.Current(), tab_aWhere, aPnt );
     for ( Exp_aWhat.ReInit(); Exp_aWhat.More(); Exp_aWhat.Next() ) {
       GetShapeProperties( Exp_aWhat.Current(), tab_aWhat, aPnt_aWhat );
       if ( fabs(tab_aWhat[3] - tab_aWhere[3]) <= Tol_Mass && aPnt_aWhat.Distance(aPnt) <= Tol_1D )
         isFound = true;
-      else if ( tab_aWhat[3] - ( tab_aWhere[3] > Tol_Mass) ) {
-        BRepClass3d_SolidClassifier SC_aWhere (Exp_aWhere.Current(), aPnt, Precision::Confusion());
-        BRepClass3d_SolidClassifier SC_aWhat  (Exp_aWhat.Current(),  aPnt, Precision::Confusion());
-        // Block construction 3D
-        if      ( SC_aWhere.State() == TopAbs_IN && SC_aWhat.State() == TopAbs_IN ) isFound = true;
-        // Block construction 2D
-        else if ( SC_aWhere.State() == TopAbs_ON && SC_aWhat.State() == TopAbs_ON ) isFound = true;
+      else {
+        if ( (tab_aWhat[3] - tab_aWhere[3]) > Tol_Mass ) {
+          aPntShape = BRepBuilderAPI_MakeVertex( aPnt ).Shape();
+          aVertex   = TopoDS::Vertex( aPntShape );
+          BRepExtrema_DistShapeShape aWhereDistance ( aVertex, Exp_aWhere.Current() );
+          BRepExtrema_DistShapeShape aWhatDistance  ( aVertex, Exp_aWhat.Current() );
+          if ( fabs(aWhereDistance.Value() - aWhatDistance.Value()) <= Tol_1D )
+            isFound = true;
+        }
       }
       if ( isFound ) {
         aWhereIndex = aWhereIndices.FindIndex(Exp_aWhere.Current());
@@ -2709,6 +2939,11 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::GetInPlace (Handle(GEOM_Object)
     if ( fabs( aWhat_Mass - aWhere_Mass ) <= Tol_Mass ) break;
   }
 
+  if (aModifiedList.Extent() == 0) { // Not found any Results
+    SetErrorCode(NOT_FOUND_ANY);
+    return NULL;
+  }
+
   aModifiedArray = new TColStd_HArray1OfInteger (1, aModifiedList.Extent());
   TColStd_ListIteratorOfListOfInteger anIterModif (aModifiedList);
   for (Standard_Integer imod = 1; anIterModif.More(); anIterModif.Next(), imod++)
@@ -2805,7 +3040,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::GetInPlaceByHistory
   //Make a Python command
   Handle(GEOM_Function) aFunction = aResult->GetFunction(1);
 
-  GEOM::TPythonDump(aFunction) << aResult << " = geompy.GetInPlace("
+  GEOM::TPythonDump(aFunction) << aResult << " = geompy.GetInPlaceByHistory("
     << theShapeWhere << ", " << theShapeWhat << ")";
 
   SetErrorCode(OK);
@@ -2860,6 +3095,7 @@ void GEOMImpl_IShapesOperations::SortShapes(TopTools_ListOfShape& SL)
     Sort = Standard_False;
     for (Index=1; Index < MaxShapes; Index++)
     {
+      exchange = Standard_False;
       Standard_Real dMidXYZ = MidXYZ(OrderInd(Index)) - MidXYZ(OrderInd(Index+1));
       Standard_Real dLength = Length(OrderInd(Index)) - Length(OrderInd(Index+1));
       if ( dMidXYZ >= tol ) {
@@ -2892,13 +3128,14 @@ void GEOMImpl_IShapesOperations::SortShapes(TopTools_ListOfShape& SL)
           val1 = (aXmin+aXmax)*999 + (aYmin+aYmax)*99 + (aZmin+aZmax)*0.9;
           box2.Get(aXmin, aYmin, aZmin, aXmax, aYmax, aZmax);
           val2 = (aXmin+aXmax)*999 + (aYmin+aYmax)*99 + (aZmin+aZmax)*0.9;
-          exchange = val1 > val2;
-//           cout << "box: " << val1<<" > "<<val2 << endl;
+          //exchange = val1 > val2;
+          if ((val1 - val2) >= tol) {
+            exchange = Standard_True;
+          }
+          //cout << "box: " << val1<<" > "<<val2 << endl;
         }
       }
-      else {
-       exchange = Standard_False;
-      }
+
       if (exchange)
       {
 //         cout << "exchange " << Index << " & " << Index+1 << endl;
@@ -2909,7 +3146,7 @@ void GEOMImpl_IShapesOperations::SortShapes(TopTools_ListOfShape& SL)
       }
     }
   }
-    
+
   for (Index=1; Index <= MaxShapes; Index++)
     SL.Append( aShapes( OrderInd(Index) ));
 }
@@ -2993,7 +3230,6 @@ bool GEOMImpl_IShapesOperations::CheckTriangulation (const TopoDS_Shape& aShape)
 
 #define MAX_TOLERANCE 1.e-7
 
-
 //=======================================================================
 //function : isSameEdge
 //purpose  : Returns True if two edges coincide
@@ -3019,6 +3255,12 @@ static bool isSameEdge(const TopoDS_Edge& theEdge1, const TopoDS_Edge& theEdge2)
 
   if(!coincide) return false;
 
+  if (BRep_Tool::Degenerated(theEdge1))
+    if (BRep_Tool::Degenerated(theEdge2)) return true;
+    else return false;
+  else
+    if (BRep_Tool::Degenerated(theEdge2)) return false;
+
   double U11, U12, U21, U22;
   Handle(Geom_Curve) C1 = BRep_Tool::Curve(theEdge1, U11, U12);
   Handle(Geom_Curve) C2 = BRep_Tool::Curve(theEdge2, U21, U22);
@@ -3085,7 +3327,6 @@ static bool isSameFace(const TopoDS_Face& theFace1, const TopoDS_Face& theFace2)
     if(P.Z() > zmaxB2) zmaxB2 = P.Z();
   }
 
-
   //Compare the bounding boxes of both faces
   if(gp_Pnt(xminB1, yminB1, zminB1).Distance(gp_Pnt(xminB2, yminB2, zminB2)) > MAX_TOLERANCE)
     return false;
@@ -3109,16 +3350,16 @@ static bool isSameFace(const TopoDS_Face& theFace1, const TopoDS_Face& theFace2)
   U = U11+rangeU*2.0/3.0;
   V = V11+rangeV*2.0/3.0;
   gp_Pnt P2 = S1->Value(U, V);
-  
-  if(!GeomLib_Tool::Parameters(S2, P1, MAX_TOLERANCE, U, V) || U < U21 || U > U22 || V < V21 || V > V22)
+
+  if (!GeomLib_Tool::Parameters(S2, P1, MAX_TOLERANCE, U, V) || U < U21 || U > U22 || V < V21 || V > V22)
     return false;
-  
-  if(P1.Distance(S2->Value(U,V)) > MAX_TOLERANCE) return false;
-  
-  if(!GeomLib_Tool::Parameters(S2, P2, MAX_TOLERANCE, U, V) || U < U21 || U > U22 || V < V21 || V > V22)
+
+  if (P1.Distance(S2->Value(U,V)) > MAX_TOLERANCE) return false;
+
+  if (!GeomLib_Tool::Parameters(S2, P2, MAX_TOLERANCE, U, V) || U < U21 || U > U22 || V < V21 || V > V22)
     return false;
-  
-  if(P2.Distance(S2->Value(U, V)) > MAX_TOLERANCE) return false;
+
+  if (P2.Distance(S2->Value(U, V)) > MAX_TOLERANCE) return false;
 
   //Check that each edge of the Face1 has a counterpart in the Face2
   TopTools_MapOfOrientedShape aMap;
index 6506de36e55fc3b7db8c78c3ec5697c2eb27a86f..3deb09d0abdd2e9712d944b729d5fb8356fa3124 100644 (file)
@@ -1,35 +1,35 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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      : GEOMImpl_IShapesOperations.hxx
 // Created   : 
 // Author    : modified by Lioka RAZAFINDRAZAKA (CEA) 22/06/2007
 // Project   : SALOME
-// Copyright : CEA 2003
 // $Header$
 //=============================================================================
+//
 #ifndef _GEOMImpl_IShapesOperations_HXX_
 #define _GEOMImpl_IShapesOperations_HXX_
 
-using namespace std;
-
 #include "GEOM_IOperations.hxx"
 
 #include "GEOMAlgo_State.hxx"
@@ -56,20 +56,20 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
   Standard_EXPORT Handle(GEOM_Object) MakeEdge (Handle(GEOM_Object) thePoint1,
                                 Handle(GEOM_Object) thePoint2);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeWire (list<Handle(GEOM_Object)> theEdgesAndWires);
+  Standard_EXPORT Handle(GEOM_Object) MakeWire (std::list<Handle(GEOM_Object)> theEdgesAndWires);
 
   Standard_EXPORT Handle(GEOM_Object) MakeFace (Handle(GEOM_Object) theWire, const bool isPlanarWanted);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (list<Handle(GEOM_Object)> theWires,
+  Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (std::list<Handle(GEOM_Object)> theWires,
                                      const bool isPlanarWanted);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeShell (list<Handle(GEOM_Object)> theShapes);
+  Standard_EXPORT Handle(GEOM_Object) MakeShell (std::list<Handle(GEOM_Object)> theShapes);
 
   Standard_EXPORT Handle(GEOM_Object) MakeSolidShell (Handle(GEOM_Object) theShell);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (list<Handle(GEOM_Object)> theShells);
+  Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (std::list<Handle(GEOM_Object)> theShells);
 
-  Standard_EXPORT Handle(GEOM_Object) MakeCompound (list<Handle(GEOM_Object)> theShapes);
+  Standard_EXPORT Handle(GEOM_Object) MakeCompound (std::list<Handle(GEOM_Object)> theShapes);
 
   Standard_EXPORT Handle(GEOM_Object) MakeGlueFaces (Handle(GEOM_Object) theShape,
                                                     const Standard_Real theTolerance,
@@ -80,7 +80,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
 
   Standard_EXPORT Handle(GEOM_Object) MakeGlueFacesByList (Handle(GEOM_Object) theShape,
                                                           const Standard_Real theTolerance,
-                                                          list<Handle(GEOM_Object)> theFaces,
+                                                          std::list<Handle(GEOM_Object)> theFaces,
                                                            const Standard_Boolean doKeepNonSolids);
 
   Standard_EXPORT Handle(TColStd_HSequenceOfTransient) MakeExplode (Handle(GEOM_Object)    theShape,
@@ -254,13 +254,46 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
    * \param theShape - the shape to explore
    * \param theShapeType - type of subshape of theShape
    * \param theState - required state
+   * \retval Handle(TColStd_HSequenceOfTransient) - found shape objects
+   */
+  Standard_EXPORT Handle(TColStd_HSequenceOfTransient)
+                             GetShapesOnBox(const Handle(GEOM_Object)& theBox,
+                                            const Handle(GEOM_Object)& theShape,
+                                            const Standard_Integer theShapeType,
+                                            GEOMAlgo_State theState);
+
+  /*!
+   * \brief Find IDs of subshapes complying with given status about surface
+   * \param theCheckShape - the shape to check state of subshapes against
+   * \param theShape - the shape to explore
+   * \param theShapeType - type of subshape of theShape
+   * \param theState - required state
    * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
    */
+  Standard_EXPORT Handle(TColStd_HSequenceOfInteger)
+                   GetShapesOnShapeIDs(const Handle(GEOM_Object)& theCheckShape,
+                                       const Handle(GEOM_Object)& theShape,
+                                       const Standard_Integer theShapeType,
+                                       GEOMAlgo_State theState);
+
+  /*!
+   * \brief Find subshapes complying with given status about surface
+   * \param theCheckShape - the shape to check state of subshapes against
+   * \param theShape - the shape to explore
+   * \param theShapeType - type of subshape of theShape
+   * \param theState - required state
+   * \retval Handle(TColStd_HSequenceOfTransient) - found shape objects
+   */
   Standard_EXPORT Handle(TColStd_HSequenceOfTransient)
-                                GetShapesOnBox(const Handle(GEOM_Object)& theBox,
-                                               const Handle(GEOM_Object)& theShape,
-                                               const Standard_Integer theShapeType,
-                                               GEOMAlgo_State theState);
+                      GetShapesOnShape(const Handle(GEOM_Object)& theCheckShape,
+                                       const Handle(GEOM_Object)& theShape,
+                                       const Standard_Integer theShapeType,
+                                       GEOMAlgo_State theState);
+  Standard_EXPORT Handle(GEOM_Object)
+            GetShapesOnShapeAsCompound(const Handle(GEOM_Object)& theCheckShape,
+                                       const Handle(GEOM_Object)& theShape,
+                                       const Standard_Integer theShapeType,
+                                       GEOMAlgo_State theState);
 
  public:
   /*!
@@ -287,7 +320,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
   Standard_EXPORT static bool CheckTriangulation (const TopoDS_Shape& theShape);
 
  private:
-  Handle(GEOM_Object) MakeShape (list<Handle(GEOM_Object)>      theShapes,
+  Handle(GEOM_Object) MakeShape (std::list<Handle(GEOM_Object)>      theShapes,
                                  const Standard_Integer         theObjectType,
                                  const Standard_Integer         theFunctionType,
                                  const TCollection_AsciiString& theMethodName);
@@ -298,34 +331,34 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
 
   /*!
    * \brief Checks if theShapeType parameter of GetShapesOnXXX() is OK
-    * \param theShapeType - the shape type to check
-    * \retval bool  - result of the check
+   * \param theShapeType - the shape type to check
+   * \retval bool  - result of the check
    */
   bool checkTypeShapesOn(const Standard_Integer theShapeType);
 
   /*!
    * \brief Creates Geom_Plane
-    * \param theAx1 - edge defining plane normal
-    * \retval Handle(Geom_Surface) - resulting surface
+   * \param theAx1 - edge defining plane normal
+   * \retval Handle(Geom_Surface) - resulting surface
    */
   Handle(Geom_Surface) makePlane(const TopoDS_Shape& theAx1);
 
   /*!
    * \brief Creates Geom_CylindricalSurface
-    * \param theAx1 - edge defining cylinder axis
-    * \param theRadius - cylinder radius
-    * \retval Handle(Geom_Surface) - resulting surface
+   * \param theAx1 - edge defining cylinder axis
+   * \param theRadius - cylinder radius
+   * \retval Handle(Geom_Surface) - resulting surface
    */
   Handle(Geom_Surface) makeCylinder(const TopoDS_Shape& theAx1,
                                     const Standard_Real theRadius);
 
   /*!
    * \brief Find IDs of subshapes complying with given status about surface
-    * \param theSurface - the surface to check state of subshapes against
-    * \param theShape - the shape to explore
-    * \param theShapeType - type of subshape of theShape
-    * \param theState - required state
-    * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
+   * \param theSurface - the surface to check state of subshapes against
+   * \param theShape - the shape to explore
+   * \param theShapeType - type of subshape of theShape
+   * \param theState - required state
+   * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
    */
   Handle(TColStd_HSequenceOfInteger)
     getShapesOnSurfaceIDs(const Handle(Geom_Surface)& theSurface,
@@ -335,12 +368,12 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
 
   /*!
    * \brief Find subshapes complying with given status about surface
-    * \param theSurface - the surface to check state of subshapes against
-    * \param theShape - the shape to explore
-    * \param theShapeType - type of subshape of theShape
-    * \param theState - required state
-    * \param theShapeEntries - outgoing entries like "entry1, entry2, ..."
-    * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
+   * \param theSurface - the surface to check state of subshapes against
+   * \param theShape - the shape to explore
+   * \param theShapeType - type of subshape of theShape
+   * \param theState - required state
+   * \param theShapeEntries - outgoing entries like "entry1, entry2, ..."
+   * \retval Handle(TColStd_HSequenceOfTransient) - found shape objects
    */
   Handle(TColStd_HSequenceOfTransient)
     getShapesOnSurface(const Handle(Geom_Surface)& theSurface,
@@ -351,14 +384,14 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
 
   /*!
    * \brief Find IDs of subshapes complying with given status about quadrangle
-    * \param theShape - the shape to explore
-    * \param theShapeType - type of subshape of theShape
-    * \param theTopLeftPoint - top left quadrangle corner
-    * \param theTopRigthPoint - top right quadrangle corner
-    * \param theBottomLeftPoint - bottom left quadrangle corner
-    * \param theBottomRigthPoint - bottom right quadrangle corner
-    * \param theState - required state
-    * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
+   * \param theShape - the shape to explore
+   * \param theShapeType - type of subshape of theShape
+   * \param theTopLeftPoint - top left quadrangle corner
+   * \param theTopRigthPoint - top right quadrangle corner
+   * \param theBottomLeftPoint - bottom left quadrangle corner
+   * \param theBottomRigthPoint - bottom right quadrangle corner
+   * \param theState - required state
+   * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
    */
   Handle(TColStd_HSequenceOfInteger)
     getShapesOnQuadrangleIDs (const Handle(GEOM_Object)& theShape,
@@ -371,23 +404,37 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
 
   /*!
    * \brief Find IDs of subshapes complying with given status about surface
-    * \param theBox - the box to check state of subshapes against
-    * \param theShape - the shape to explore
-    * \param theShapeType - type of subshape of theShape
-    * \param theState - required state
-    * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
+   * \param theBox - the box to check state of subshapes against
+   * \param theShape - the shape to explore
+   * \param theShapeType - type of subshape of theShape
+   * \param theState - required state
+   * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
    */
   Handle(TColStd_HSequenceOfInteger) getShapesOnBoxIDs(const Handle(GEOM_Object)& theBox,
                                                        const Handle(GEOM_Object)& theShape,
                                                        const Standard_Integer theShapeType,
                                                        GEOMAlgo_State theState);
 
+  /*!
+   * \brief Find IDs of subshapes complying with given status about surface
+   * \param theCheckShape - the shape to check state of subshapes against
+   * \param theShape - the shape to explore
+   * \param theShapeType - type of subshape of theShape
+   * \param theState - required state
+   * \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
+   */
+  Handle(TColStd_HSequenceOfInteger) getShapesOnShapeIDs
+                                      (const Handle(GEOM_Object)& theCheckShape,
+                                       const Handle(GEOM_Object)& theShape,
+                                       const Standard_Integer theShapeType,
+                                       GEOMAlgo_State theState);
+
   /*!
    * \brief Find shape objects and their entries by their ids
-    * \param theShape - the main shape
-    * \param theShapeIDs - theShapeIDs - incoming shape ids
-    * \param theShapeEntries - outgoing entries like "entry1, entry2, ..."
-    * \retval Handle(TColStd_HSequenceOfTransient) - found shape objects
+   * \param theShape - the main shape
+   * \param theShapeIDs - theShapeIDs - incoming shape ids
+   * \param theShapeEntries - outgoing entries like "entry1, entry2, ..."
+   * \retval Handle(TColStd_HSequenceOfTransient) - found shape objects
    */
   Handle(TColStd_HSequenceOfTransient)
     getObjectsShapesOn(const Handle(GEOM_Object)&                theShape,
@@ -396,9 +443,9 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
 
   /*!
    * \brief Select the object created last
-    * \param theObj1 - Object 1
-    * \param theObj2 - Object 2
-    * \retval Handle(GEOM_Object) - selected object
+   * \param theObj1 - Object 1
+   * \param theObj2 - Object 2
+   * \retval Handle(GEOM_Object) - selected object
    */
   static Handle(GEOM_Object) getCreatedLast(const Handle(GEOM_Object)& theObj1,
                                             const Handle(GEOM_Object)& theObj2);
index cf2d46f215da91bb35a08d097d92e8243b49a755..2cec2cb61396055db519462b62b601b534035a6f 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an interface to a function for the Sketcher creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define SKETCH_ARG_CMD 1
index 23ee4c245645045142e3710180dc13ea769fc5f4..785af6fd735fd0fa26471e083c98413e63207eed 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Sphere creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define SPH_ARG_R   1
index 75d5ea6d0ab9a7dd8b05972d63cb8bdd9df625a8..3694a556d21912c977867f2c33cb5ded441a254e 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Spline creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define SPL_ARG_LENG 1
index 330d83c96b7e23ca036fc75cd65a04487b8d87ad..f2e2a55e25af89118034c1bf89b13d4022cb2423 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Pipe creation.
-
-
+//
 #include "GEOM_Function.hxx"
 #include <TColStd_HSequenceOfTransient.hxx>
 
index 86909ac8cf4d5dea7e1c307957fc6fbe01687b15..9edc7e3590826f350e4211270c7015f34a8d2d47 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Torus creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define TORUS_ARG_CC   1
index 9bf0da1bfd9e0194c80496d62ed93db602f76151..5150f0a1c7450b91cfa7cf58cb247fed5e38555c 100644 (file)
@@ -1,21 +1,23 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #include <Standard_Stream.hxx>
 
@@ -178,7 +180,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateDXDYDZ
   }
 
   //Make a Python command
-  GEOM::TPythonDump(aFunction) << "geompy.TrsfOp.TranslateDXDYDZ("
+  GEOM::TPythonDump(aFunction) << "geompy.TranslateDXDYDZ("
     << theObject << ", " << theX << ", " << theY << ", " << theZ << ")";
 
   SetErrorCode(OK);
@@ -350,7 +352,6 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateVector
   SetErrorCode(OK);
   return theObject;
 }
-
 //=============================================================================
 /*!
  *  TranslateVectorCopy
@@ -405,6 +406,73 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateVectorCopy
   return aCopy;
 }
 
+//=============================================================================
+/*!
+ *  TranslateVectorDistance
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateVectorDistance
+       (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theVector, double theDistance, bool theCopy)
+{
+  SetErrorCode(KO);
+
+  if (theObject.IsNull() || theVector.IsNull()) return NULL;
+
+  Handle(GEOM_Function) aLastFunction = theObject->GetLastFunction();
+  if (aLastFunction.IsNull()) return NULL; //There is no function which creates an object to be moved
+
+  Handle(GEOM_Object) aCopy;   //Add a new Copy object
+  Handle(GEOM_Function) aFunction;
+
+  //Add a translate function
+  if (theCopy) {
+    aCopy = GetEngine()->AddObject(GetDocID(), theObject->GetType());
+    aFunction = aCopy->AddFunction(GEOMImpl_TranslateDriver::GetID(), TRANSLATE_VECTOR_DISTANCE);
+  }
+  else {
+    aFunction = theObject->AddFunction(GEOMImpl_TranslateDriver::GetID(), TRANSLATE_VECTOR_DISTANCE);
+  }
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_TranslateDriver::GetID()) return NULL;
+
+  GEOMImpl_ITranslate aTI(aFunction);
+  aTI.SetVector(theVector->GetLastFunction());
+  aTI.SetDistance(theDistance);
+//  aTI.SetShape(theObject->GetValue());
+  aTI.SetOriginal(aLastFunction);
+
+  //Compute the translation
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Translation driver failed");
+      return NULL;
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return NULL;
+  }
+
+  //Make a Python command
+  if (theCopy) {
+    GEOM::TPythonDump(aFunction) << aCopy << " = geompy.MakeTranslationVectorDistance("
+                                << theObject << ", " << theVector << ", " << theDistance << ")";
+    SetErrorCode(OK);
+    return aCopy;
+  }
+
+  GEOM::TPythonDump(aFunction) << "geompy.TranslateVectorDistance("
+                              << theObject << ", " << theVector << ", " << theDistance << ", " << theCopy << ")";
+  SetErrorCode(OK);
+  return theObject;
+}
+
 //=============================================================================
 /*!
  *  Translate1D
@@ -964,14 +1032,11 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShape
 {
   SetErrorCode(KO);
 
-  if (theObject.IsNull() || thePoint.IsNull()) return NULL;
+  if (theObject.IsNull()) return NULL;
 
   Handle(GEOM_Function) anOriginal = theObject->GetLastFunction();
   if (anOriginal.IsNull()) return NULL; //There is no function which creates an object to be scaled
 
-  // Get last functions of the arguments
-  Handle(GEOM_Function) aPF = thePoint->GetLastFunction();
-
   //Add a scale function
   Handle(GEOM_Function) aFunction =
     theObject->AddFunction(GEOMImpl_ScaleDriver::GetID(), SCALE_SHAPE);
@@ -980,11 +1045,17 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShape
   //Check if the function is set correctly
   if (aFunction->GetDriverGUID() != GEOMImpl_ScaleDriver::GetID()) return NULL;
 
+  // Set arguments
   GEOMImpl_IScale aTI (aFunction);
   aTI.SetShape(anOriginal);
-  aTI.SetPoint(aPF);
   aTI.SetFactor(theFactor);
 
+  // Set point argument
+  if (!thePoint.IsNull()) {
+    Handle(GEOM_Function) aPF = thePoint->GetLastFunction();
+    aTI.SetPoint(aPF);
+  }
+
   //Compute the scale
   try {
 #if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
@@ -1019,7 +1090,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShapeCopy
 {
   SetErrorCode(KO);
 
-  if (theObject.IsNull() || thePoint.IsNull()) return NULL;
+  if (theObject.IsNull()) return NULL;
 
   Handle(GEOM_Function) anOriginal = theObject->GetLastFunction();
   if (anOriginal.IsNull()) return NULL; //There is no function which creates an object to be scaled
@@ -1035,11 +1106,17 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShapeCopy
   //Check if the function is set correctly
   if (aFunction->GetDriverGUID() != GEOMImpl_ScaleDriver::GetID()) return NULL;
 
+  // Set arguments
   GEOMImpl_IScale aTI (aFunction);
   aTI.SetShape(anOriginal);
-  aTI.SetPoint(thePoint->GetLastFunction());
   aTI.SetFactor(theFactor);
 
+  // Set point argument
+  if (!thePoint.IsNull()) {
+    Handle(GEOM_Function) aPF = thePoint->GetLastFunction();
+    aTI.SetPoint(aPF);
+  }
+
   //Compute the scale
   try {
 #if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
@@ -1064,6 +1141,85 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShapeCopy
   return aCopy;
 }
 
+//=============================================================================
+/*!
+ *  ScaleShapeAlongAxes
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShapeAlongAxes (Handle(GEOM_Object) theObject,
+                                                                        Handle(GEOM_Object) thePoint,
+                                                                        double theFactorX,
+                                                                        double theFactorY,
+                                                                        double theFactorZ,
+                                                                        bool   doCopy)
+{
+  SetErrorCode(KO);
+
+  if (theObject.IsNull()) return NULL;
+
+  Handle(GEOM_Function) anOriginal = theObject->GetLastFunction();
+  if (anOriginal.IsNull()) return NULL; //There is no function which creates an object to be scaled
+
+  //Add a scale function
+  Handle(GEOM_Object) aCopy;   //Add a new Copy object
+  Handle(GEOM_Function) aFunction;
+  if (doCopy) {
+    aCopy = GetEngine()->AddObject(GetDocID(), theObject->GetType());
+    aFunction = aCopy->AddFunction(GEOMImpl_ScaleDriver::GetID(), SCALE_SHAPE_AXES_COPY);
+  }
+  else {
+    aFunction = theObject->AddFunction(GEOMImpl_ScaleDriver::GetID(), SCALE_SHAPE_AXES);
+  }
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_ScaleDriver::GetID()) return NULL;
+
+  // Set arguments
+  GEOMImpl_IScale aTI (aFunction);
+  aTI.SetShape(anOriginal);
+  aTI.SetFactorX(theFactorX);
+  aTI.SetFactorY(theFactorY);
+  aTI.SetFactorZ(theFactorZ);
+
+  // Set point (optional argument)
+  if (!thePoint.IsNull()) {
+    Handle(GEOM_Function) aPF = thePoint->GetLastFunction();
+    aTI.SetPoint(aPF);
+  }
+
+  //Compute the scale
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Scale driver failed");
+      return NULL;
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return NULL;
+  }
+
+  SetErrorCode(OK);
+
+  //Make a Python command
+  if (doCopy) {
+    GEOM::TPythonDump(aFunction) << aCopy << " = geompy.MakeScaleAlongAxes("
+                                 << theObject << ", " << thePoint << ", "
+                                 << theFactorX << ", " << theFactorY << ", " << theFactorZ << ")";
+    return aCopy;
+  }
+
+  GEOM::TPythonDump(aFunction) << "geompy.TrsfOp.ScaleShapeAlongAxes("
+                               << theObject << ", " << thePoint << ", "
+                               << theFactorX << ", " << theFactorY << ", " << theFactorZ << ")";
+  return theObject;
+}
+
 //=============================================================================
 /*!
  *  PositionShape
@@ -1180,6 +1336,75 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::PositionShapeCopy
   return aCopy;
 }
 
+//=============================================================================
+/*!
+ *  PositionAlongPath
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_ITransformOperations::PositionAlongPath
+       (Handle(GEOM_Object) theObject, Handle(GEOM_Object) thePath, 
+       double theDistance, bool theCopy, bool theReverse)
+{
+  SetErrorCode(KO);
+
+  if (theObject.IsNull() || thePath.IsNull()) return NULL;
+
+  Handle(GEOM_Function) anOriginal = theObject->GetLastFunction();
+  if (anOriginal.IsNull()) return NULL; //There is no function which creates an object to be set in position
+
+  //Add a position function
+  Handle(GEOM_Function) aFunction;
+  Handle(GEOM_Object) aCopy;
+
+  if (theCopy) {
+    aCopy = GetEngine()->AddObject(GetDocID(), theObject->GetType());
+    aFunction = aCopy->AddFunction(GEOMImpl_PositionDriver::GetID(), POSITION_ALONG_PATH);
+  }
+  else
+    aFunction = theObject->AddFunction(GEOMImpl_PositionDriver::GetID(), POSITION_ALONG_PATH);
+
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_PositionDriver::GetID()) return NULL;
+
+  GEOMImpl_IPosition aTI (aFunction);
+  aTI.SetShape(anOriginal);
+  aTI.SetPath(thePath->GetLastFunction());
+  aTI.SetDistance(theDistance);
+  aTI.SetReverse(theReverse);
+
+  //Compute the position
+  try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+    OCC_CATCH_SIGNALS;
+#endif
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Position driver failed");
+      return NULL;
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return NULL;
+  }
+
+  //Make a Python command
+  if (theCopy) {
+    GEOM::TPythonDump(aFunction) << aCopy << " = geompy.PositionAlongPath("
+                                << theObject << ", " << thePath << ", " << theDistance << ", " << theCopy << ", " << theReverse << ")";
+    SetErrorCode(OK);
+    return aCopy;
+  }
+
+  GEOM::TPythonDump(aFunction) << "geompy.TrsfOp.PositionAlongPath("
+    << theObject << ", " << thePath << ", " << theDistance << ", " << theCopy << ", " << theReverse << ")";
+
+  SetErrorCode(OK);
+  return theObject;
+}
+
 //=============================================================================
 /*!
  *  Rotate
@@ -1229,7 +1454,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate (Handle(GEOM_Object) t
   }
 
   //Make a Python command
-  GEOM::TPythonDump(aFunction) << "geompy.TrsfOp.Rotate(" << theObject
+  GEOM::TPythonDump(aFunction) << "geompy.Rotate(" << theObject
     << ", " << theAxis << ", " << theAngle * 180.0 / PI << "*math.pi/180.0)";
 
   SetErrorCode(OK);
index 843c8a12a4ff118e1b33ae114ac87f2ab99df394..99c52595e39a419c6b5731db6e323bdc962886ac 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOMImpl_ITransformOperations_HXX_
 #define _GEOMImpl_ITransformOperations_HXX_
 
 #include "GEOM_Object.hxx"
 #include <TDocStd_Document.hxx>
 
-class GEOMImpl_ITransformOperations : public GEOM_IOperations {
+class GEOMImpl_ITransformOperations : public GEOM_IOperations
+{
  public:
   Standard_EXPORT GEOMImpl_ITransformOperations(GEOM_Engine* theEngine, int theDocID);
   Standard_EXPORT ~GEOMImpl_ITransformOperations();
 
   Standard_EXPORT Handle(GEOM_Object) TranslateTwoPoints (Handle(GEOM_Object) theObject,
-                                          Handle(GEOM_Object) thePoint1,
-                                          Handle(GEOM_Object) thePoint2);
+                                                          Handle(GEOM_Object) thePoint1,
+                                                          Handle(GEOM_Object) thePoint2);
 
   Standard_EXPORT Handle(GEOM_Object) TranslateTwoPointsCopy (Handle(GEOM_Object) theObject,
-                                              Handle(GEOM_Object) thePoint1,
-                                              Handle(GEOM_Object) thePoint2);
+                                                              Handle(GEOM_Object) thePoint1,
+                                                              Handle(GEOM_Object) thePoint2);
 
-  Standard_EXPORT Handle(GEOM_Object) TranslateDXDYDZ (Handle(GEOM_Object) theObject, double theX, double theY,  double theZ);
+  Standard_EXPORT Handle(GEOM_Object) TranslateDXDYDZ (Handle(GEOM_Object) theObject,
+                                                       double theX, double theY,  double theZ);
 
-  Standard_EXPORT Handle(GEOM_Object) TranslateDXDYDZCopy (Handle(GEOM_Object) theObject, double theX, double theY,  double theZ);
+  Standard_EXPORT Handle(GEOM_Object) TranslateDXDYDZCopy (Handle(GEOM_Object) theObject,
+                                                           double theX, double theY,  double theZ);
 
   Standard_EXPORT Handle(GEOM_Object) TranslateVector (Handle(GEOM_Object) theObject,
-                                       Handle(GEOM_Object) theVector);
+                                                       Handle(GEOM_Object) theVector);
 
   Standard_EXPORT Handle(GEOM_Object) TranslateVectorCopy (Handle(GEOM_Object) theObject,
-                                           Handle(GEOM_Object) theVector);
-
-  Standard_EXPORT Handle(GEOM_Object) Translate1D (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theVector, double theStep, Standard_Integer theNbTimes);
-
-  Standard_EXPORT Handle(GEOM_Object) Translate2D (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theVector, double theStep1, Standard_Integer theNbTimes1,
-                                  Handle(GEOM_Object) theVector2, double theStep2, Standard_Integer theNbTimes2);
+                                                           Handle(GEOM_Object) theVector);
+
+  Standard_EXPORT Handle(GEOM_Object) TranslateVectorDistance (Handle(GEOM_Object) theObject,
+                                                               Handle(GEOM_Object) theVector,
+                                                               double theDistance,
+                                                               bool theCopy);
+
+  Standard_EXPORT Handle(GEOM_Object) Translate1D (Handle(GEOM_Object) theObject,
+                                                   Handle(GEOM_Object) theVector,
+                                                   double theStep,
+                                                   Standard_Integer theNbTimes);
+
+  Standard_EXPORT Handle(GEOM_Object) Translate2D (Handle(GEOM_Object) theObject,
+                                                   Handle(GEOM_Object) theVector,
+                                                   double theStep1,
+                                                   Standard_Integer theNbTimes1,
+                                                   Handle(GEOM_Object) theVector2,
+                                                   double theStep2,
+                                                   Standard_Integer theNbTimes2);
 
   Standard_EXPORT Handle(GEOM_Object) MirrorPlane (Handle(GEOM_Object) theObject,
-                                   Handle(GEOM_Object) thePlane);
+                                                   Handle(GEOM_Object) thePlane);
 
   Standard_EXPORT Handle(GEOM_Object) MirrorPlaneCopy (Handle(GEOM_Object) theObject,
-                                       Handle(GEOM_Object) thePlane);
+                                                       Handle(GEOM_Object) thePlane);
 
   Standard_EXPORT Handle(GEOM_Object) MirrorAxis (Handle(GEOM_Object) theObject,
-                                  Handle(GEOM_Object) theAxis);
+                                                  Handle(GEOM_Object) theAxis);
 
   Standard_EXPORT Handle(GEOM_Object) MirrorAxisCopy (Handle(GEOM_Object) theObject,
-                                      Handle(GEOM_Object) theAxis);
+                                                      Handle(GEOM_Object) theAxis);
 
   Standard_EXPORT Handle(GEOM_Object) MirrorPoint (Handle(GEOM_Object) theObject,
-                                   Handle(GEOM_Object) thePoint);
+                                                   Handle(GEOM_Object) thePoint);
 
   Standard_EXPORT Handle(GEOM_Object) MirrorPointCopy (Handle(GEOM_Object) theObject,
-                                       Handle(GEOM_Object) thePoint);
+                                                       Handle(GEOM_Object) thePoint);
 
   Standard_EXPORT Handle(GEOM_Object) OffsetShape (Handle(GEOM_Object) theObject,
-                                   double theOffset);
+                                                   double theOffset);
 
   Standard_EXPORT Handle(GEOM_Object) OffsetShapeCopy (Handle(GEOM_Object) theObject,
-                                       double theOffset);
+                                                       double theOffset);
 
   Standard_EXPORT Handle(GEOM_Object) ScaleShape (Handle(GEOM_Object) theObject,
-                                  Handle(GEOM_Object) thePoint,
-                                  double theFactor);
+                                                  Handle(GEOM_Object) thePoint,
+                                                  double theFactor);
 
   Standard_EXPORT Handle(GEOM_Object) ScaleShapeCopy (Handle(GEOM_Object) theObject,
-                                      Handle(GEOM_Object) thePoint,
-                                      double theFactor);
+                                                      Handle(GEOM_Object) thePoint,
+                                                      double theFactor);
+
+  Standard_EXPORT Handle(GEOM_Object) ScaleShapeAlongAxes (Handle(GEOM_Object) theObject,
+                                                           Handle(GEOM_Object) thePoint,
+                                                           double theFactorX,
+                                                           double theFactorY,
+                                                           double theFactorZ,
+                                                           bool doCopy);
 
   Standard_EXPORT Handle(GEOM_Object) PositionShape (Handle(GEOM_Object) theObject,
-                                    Handle(GEOM_Object) theStartLCS,
-                                    Handle(GEOM_Object) theEndLCS);
+                                                     Handle(GEOM_Object) theStartLCS,
+                                                     Handle(GEOM_Object) theEndLCS);
 
   Standard_EXPORT Handle(GEOM_Object) PositionShapeCopy (Handle(GEOM_Object) theObject,
-                                        Handle(GEOM_Object) theStartLCS,
-                                        Handle(GEOM_Object) theEndLCS);
-
-  Standard_EXPORT Handle(GEOM_Object) Rotate (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theAxis, double theAngle);
-
-  Standard_EXPORT Handle(GEOM_Object) RotateCopy (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theAxis, double theAngle);
-
-  Standard_EXPORT Handle(GEOM_Object) Rotate1D (Handle(GEOM_Object) theObject, Handle(GEOM_Object) theAxis, Standard_Integer theNbTimes);
-  
-  Standard_EXPORT Handle(GEOM_Object) Rotate2D (Handle(GEOM_Object) theObject, 
-                               Handle(GEOM_Object) theAxis, 
-                               double theAngle, 
-                               Standard_Integer theNbTimes1,
-                               double theStep, 
-                               Standard_Integer theNbTimes2);
+                                                         Handle(GEOM_Object) theStartLCS,
+                                                         Handle(GEOM_Object) theEndLCS);
+
+  Standard_EXPORT Handle(GEOM_Object) PositionAlongPath (Handle(GEOM_Object) theObject,
+                                                         Handle(GEOM_Object) thePath,
+                                                         double theDistance,
+                                                        bool   theCopy,
+                                                        bool   theReverse);
+
+  Standard_EXPORT Handle(GEOM_Object) Rotate (Handle(GEOM_Object) theObject,
+                                              Handle(GEOM_Object) theAxis,
+                                              double theAngle);
+
+  Standard_EXPORT Handle(GEOM_Object) RotateCopy (Handle(GEOM_Object) theObject,
+                                                  Handle(GEOM_Object) theAxis,
+                                                  double theAngle);
+
+  Standard_EXPORT Handle(GEOM_Object) Rotate1D (Handle(GEOM_Object) theObject,
+                                                Handle(GEOM_Object) theAxis,
+                                                Standard_Integer theNbTimes);
+
+  Standard_EXPORT Handle(GEOM_Object) Rotate2D (Handle(GEOM_Object) theObject,
+                                                Handle(GEOM_Object) theAxis,
+                                                double theAngle,
+                                                Standard_Integer theNbTimes1,
+                                                double theStep,
+                                                Standard_Integer theNbTimes2);
 
   Standard_EXPORT Handle(GEOM_Object) RotateThreePoints (Handle(GEOM_Object) theObject,
-                                                        Handle(GEOM_Object) theCentPoint, 
-                                                        Handle(GEOM_Object) thePoint1,
-                                                        Handle(GEOM_Object) thePoint2);
-
-  Standard_EXPORT Handle(GEOM_Object) RotateThreePointsCopy (Handle(GEOM_Object) theObject, 
-                                                        Handle(GEOM_Object) theCentPoint, 
-                                                        Handle(GEOM_Object) thePoint1,
-                                                        Handle(GEOM_Object) thePoint2);
+                                                         Handle(GEOM_Object) theCentPoint,
+                                                         Handle(GEOM_Object) thePoint1,
+                                                         Handle(GEOM_Object) thePoint2);
+
+  Standard_EXPORT Handle(GEOM_Object) RotateThreePointsCopy (Handle(GEOM_Object) theObject,
+                                                             Handle(GEOM_Object) theCentPoint,
+                                                             Handle(GEOM_Object) thePoint1,
+                                                             Handle(GEOM_Object) thePoint2);
 
 };
 
index 0ca4201e42abc0fe849f5535a5878f51a5006680..4c66924409d6e712f12b989c968a6c32dccf3e17 100755 (executable)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the Translate creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define TRANSLATE_ARG_POINT1   1  
@@ -33,7 +34,8 @@
 #define TRANSLATE_ARG_VECTOR2  11
 #define TRANSLATE_ARG_DX  12
 #define TRANSLATE_ARG_DY  13  
-#define TRANSLATE_ARG_DZ  14  
+#define TRANSLATE_ARG_DZ  14
+#define TRANSLATE_ARG_DISTANCE 15    
 
 class GEOMImpl_ITranslate
 {
@@ -81,6 +83,10 @@ class GEOMImpl_ITranslate
 
   double GetDX() { return _func->GetReal(TRANSLATE_ARG_DX); }
 
+  void SetDistance(double theDistance) { return _func->SetReal(TRANSLATE_ARG_DISTANCE, theDistance); }
+
+  double GetDistance() { return _func->GetReal(TRANSLATE_ARG_DISTANCE); }
+
   void SetDY(double theDY) { return _func->SetReal(TRANSLATE_ARG_DY, theDY); }
 
   double GetDY() { return _func->GetReal(TRANSLATE_ARG_DY); }
index 63b72f3708206091b3f2eb1efae8377b65cbe4c1..fc63787ac2a09de39340174427daf1faee3c9a23 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //NOTE: This is an intreface to a function for the vector creation.
-
-
+//
 #include "GEOM_Function.hxx"
 
 #define VEC_ARG_DX   1
index 3249a485e69142bcbe322576659cb9eb685e243f..4a309a0b67cbe59611416787defa8dd0edd980d7 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_ImportDriver.hxx>
index 318ade68eea1bb2e24675f168f47c216174744b9..c165d1aabb84b4c55f8b45232469fdaf838f2002 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_ImportDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_ImportDriver_HeaderFile
 #define _GEOMImpl_ImportDriver_HeaderFile
 
index 4f7b9263c7ba1f0464bea707051609fa0d389fbc..9e9a18e0538d266a0b0957e611db19e1e5c1e224 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_LineDriver.hxx>
index 72041a016ae3433960ce54cb35108658f4accb92..4f5d8e2c508be8b97b4772eb2008ef86087031dd 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_LineDriver.hxx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_LineDriver_HeaderFile
 #define _GEOMImpl_LineDriver_HeaderFile
 
index b4d6053404a0ed310bbd580e551479637eab8fbb..bbe8a5f3898d9d04a16a5309467dfc66f17580f0 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_MarkerDriver.hxx>
index d9529569244225325b6b1bc3b8b979f1c45dc6c6..90222bdd952b6996838555504c29632d308818ac 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_MarkerDriver.hxx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_MarkerDriver_HeaderFile
 #define _GEOMImpl_MarkerDriver_HeaderFile
 
index 69ffeabd874f4aa2a154569c45a43785ba6ed031..b9dff3e14f03911794749499f0215316a24a04ae 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_MeasureDriver.hxx>
index cceeb6df0c4de7bc7b2e65cac5a629c6e8e09f93..9463fed63c42a30fbeaf7ea9121b67b69a02dd7a 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_MeasureDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_MeasureDriver_HeaderFile
 #define _GEOMImpl_MeasureDriver_HeaderFile
 
index 218e1fee21266bfffcb0a5332c5704ad1a73b5cf..69a8c599d83d6ee956fc98402752edb068044635 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_MirrorDriver.hxx>
index f8dfd767638fee4f3d2a4bbb6d101fffaf85806c..3fafbd3aa42feefb04cdcaa0f982ab5f355a1a90 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_MirrorDriver.hxx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_MirrorDriver_HeaderFile
 #define _GEOMImpl_MirrorDriver_HeaderFile
 
index 42d437e71a7f7c3c97255b85ea2cca51a1c23f93..ff68f7e8d6908cf3fa1c058302d55a37009f6efc 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_OffsetDriver.hxx>
index b9ea5c6415f3be38781929e0563204f2ac5fe1b6..b171523fe86d697a7ee13b85be9577a438c76f93 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_OffsetDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_OffsetDriver_HeaderFile
 #define _GEOMImpl_OffsetDriver_HeaderFile
 
index b681770981346109afa803f8a847d5c356b30871..40d68aa88ae85a41808f911b5798cf52135f5f39 100644 (file)
@@ -1,23 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_PartitionDriver.hxx>
@@ -46,6 +47,9 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
+#include <ShapeFix_ShapeTolerance.hxx>
+#include <ShapeFix_Shape.hxx>
+
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 #include <TColStd_ListOfInteger.hxx>
 #include <Standard_NullObject.hxx>
@@ -258,7 +262,15 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(TFunction_Logbook& log) const
   if (aShape.IsNull()) return 0;
 
   if (!BRepAlgo::IsValid(aShape)) {
-    Standard_ConstructionError::Raise("Partition aborted : non valid shape result");
+    // 08.07.2008 added by skl during fixing bug 19761 from Mantis
+    ShapeFix_ShapeTolerance aSFT;
+    aSFT.LimitTolerance(aShape, Precision::Confusion(),
+                        Precision::Confusion(), TopAbs_SHAPE);
+    Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
+    aSfs->Perform();
+    aShape = aSfs->Shape();
+    if (!BRepAlgo::IsValid(aShape))
+      Standard_ConstructionError::Raise("Partition aborted : non valid shape result");
   }
 
   aFunction->SetValue(aShape);
index 095d3c1e5dd14e88ee4f877c19c6a2d8d5218bbe..4c0e0d6847b10ea5728a3aaeb2ec41b77ee64106 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_PartitionDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_PartitionDriver_HeaderFile
 #define _GEOMImpl_PartitionDriver_HeaderFile
 
index df73fdb802de16c2b3c2e7b25336e2b404948d18..430cb0ef9b99047fdacd5930c5bcb8de2be3d4ac 100644 (file)
@@ -1,23 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_PipeDriver.hxx>
@@ -25,6 +26,7 @@
 #include <GEOMImpl_IShapesOperations.hxx>
 #include <GEOMImpl_IPipeDiffSect.hxx>
 #include <GEOMImpl_IPipeShellSect.hxx>
+#include <GEOMImpl_IPipeBiNormal.hxx>
 #include <GEOMImpl_IPipe.hxx>
 #include <GEOMImpl_Types.hxx>
 #include <GEOM_Function.hxx>
@@ -146,7 +148,7 @@ static bool FillForOtherEdges(const TopoDS_Shape& F1,
   ShapeAnalysis_Edge sae;
   while(1) {
     if(!aMapVertEdge1.Contains(VS1))
-      cout<<"    FillForOtherEdges: map aMapVertEdge1 not contains key VS1"<<endl;
+      MESSAGE ("    FillForOtherEdges: map aMapVertEdge1 not contains key VS1");
     const TopTools_ListOfShape& aList1 = aMapVertEdge1.FindFromKey(VS1);
     //TopoDS_Shape E1next;
     TopTools_ListIteratorOfListOfShape anIter1(aList1);
@@ -155,7 +157,7 @@ static bool FillForOtherEdges(const TopoDS_Shape& F1,
     }
     //E1next = anIter1.Value();
     if(!aMapVertEdge2.Contains(VS2))
-      cout<<"    FillForOtherEdges: map aMapVertEdge2 not contains key VS2"<<endl;
+      MESSAGE ("    FillForOtherEdges: map aMapVertEdge2 not contains key VS2");
     const TopTools_ListOfShape& aList2 = aMapVertEdge2.FindFromKey(VS2);
     //TopoDS_Shape E2next;
     TopTools_ListIteratorOfListOfShape anIter2(aList2);
@@ -444,7 +446,7 @@ static void FindNextPairOfFaces(const TopoDS_Shape& aCurFace,
       Standard_ConstructionError::Raise("FindNextPairOfFaces: Can not find edge in map");
     }
     if(!FF.Contains(E1))
-      cout<<"    FindNextPairOfFaces: map FF not contains key E1"<<endl;
+      MESSAGE ("    FindNextPairOfFaces: map FF not contains key E1");
     const TopoDS_Shape& E2 = FF.FindFromKey(E1);
     TopExp_Explorer anExpV;
     anExpV.Init( E1, TopAbs_VERTEX );
@@ -455,7 +457,7 @@ static void FindNextPairOfFaces(const TopoDS_Shape& aCurFace,
     }
 
     if(!aMapEdgeFaces1.Contains(E1))
-      cout<<"    FindNextPairOfFaces: map aMapEdgeFaces1 not contains key E1"<<endl;
+      MESSAGE ("    FindNextPairOfFaces: map aMapEdgeFaces1 not contains key E1");
     const TopTools_ListOfShape& aList1 = aMapEdgeFaces1.FindFromKey(E1);
     if(aList1.Extent()<2)
       continue;
@@ -468,10 +470,10 @@ static void FindNextPairOfFaces(const TopoDS_Shape& aCurFace,
       continue;
 
     if(!FF.Contains(aCurFace))
-      cout<<"    FindNextPairOfFaces: map FF not contains key aCurFace"<<endl;
+      MESSAGE ("    FindNextPairOfFaces: map FF not contains key aCurFace");
     const TopoDS_Shape& F2 = FF.FindFromKey(aCurFace);
     if(!aMapEdgeFaces2.Contains(E2))
-      cout<<"    FindNextPairOfFaces: map aMapEdgeFaces2 not contains key E2"<<endl;
+      MESSAGE ("    FindNextPairOfFaces: map aMapEdgeFaces2 not contains key E2");
     const TopTools_ListOfShape& aList2 = aMapEdgeFaces2.FindFromKey(E2);
     if(aList2.Extent()<2) {
       if(aCI) delete aCI;
@@ -543,17 +545,17 @@ static void FindFirstPairFaces(const TopoDS_Shape& S1, const TopoDS_Shape& S2,
   if(!V1.IsSame(V1new)) {
     V1 = V1new;
     P1 = BRep_Tool::Pnt(V1);
-    cout<<"  replace V1"<<endl;
+    MESSAGE ("  replace V1");
   }
   else
-    cout<<"  not replace V1"<<endl;
+    MESSAGE ("  not replace V1");
   if(!V2.IsSame(V2new)) {
     V2 = V2new;
     P2 = BRep_Tool::Pnt(V2);
-    cout<<"  replace V2"<<endl;
+    MESSAGE ("  replace V2");
   }
   else
-    cout<<"  not replace V2"<<endl;
+    MESSAGE ("  not replace V2");
 
   TopTools_IndexedDataMapOfShapeListOfShape aMapVertFaces1;
   TopExp::MapShapesAndAncestors(S1, TopAbs_VERTEX, TopAbs_FACE, aMapVertFaces1);
@@ -561,7 +563,7 @@ static void FindFirstPairFaces(const TopoDS_Shape& S1, const TopoDS_Shape& S2,
   TopExp::MapShapesAndAncestors(S2, TopAbs_VERTEX, TopAbs_FACE, aMapVertFaces2);
 
   if(!aMapVertFaces1.Contains(V1))
-    cout<<"    FindFirstPairFaces: map aMapVertFaces1 not contains key V1"<<endl;
+    MESSAGE ("    FindFirstPairFaces: map aMapVertFaces1 not contains key V1");
   const TopTools_ListOfShape& aList1 = aMapVertFaces1.FindFromKey(V1);
   TopTools_ListIteratorOfListOfShape anIter1(aList1);
   FS1 = anIter1.Value();
@@ -581,7 +583,7 @@ static void FindFirstPairFaces(const TopoDS_Shape& S1, const TopoDS_Shape& S2,
   TColgp_SequenceOfPnt Ps;
   TopTools_SequenceOfShape Fs;
   if(!aMapVertFaces2.Contains(V2))
-    cout<<"    FindFirstPairFaces: map aMapVertFaces2 not contains key V2"<<endl;
+    MESSAGE ("    FindFirstPairFaces: map aMapVertFaces2 not contains key V2");
   const TopTools_ListOfShape& aList2 = aMapVertFaces2.FindFromKey(V2);
   TopTools_ListIteratorOfListOfShape anIter2(aList2);
   for(; anIter2.More(); anIter2.Next()) {
@@ -1437,7 +1439,7 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
   B.MakeCompound(aComp);
 
   for(i=1 ; i<nbBases; i++) {
-    cout<<"Make pipe between sections "<<i<<" and "<<i+1<<endl;
+    MESSAGE ("Make pipe between sections "<<i<<" and "<<i+1);
     TopoDS_Shape aShBase1 = Bases.Value(i);
     TopoDS_Shape aShBase2 = Bases.Value(i+1);
     TopExp_Explorer anExp;
@@ -1478,7 +1480,7 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
     FindFirstPairFaces(aShBase1, aShBase2, V1, V2, FS1, FS2);
 
     FF.Add(FS1,FS2);
-    cout<<"  first pair of corresponding faces is found"<<endl;
+    MESSAGE ("  first pair of corresponding faces is found");
 
     // add pairs of edges and vertexes to FF
     bool stat =  FillCorrespondingEdges(FS1, FS2, V1, V2, FF);
@@ -1486,10 +1488,10 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
       if(aCI) delete aCI;
       Standard_ConstructionError::Raise("Can not create correct pipe");
     }
-    cout<<"  correspondences for subshapes of first pair of faces is found"<<endl;
+    MESSAGE ("  correspondences for subshapes of first pair of faces is found");
 
     FindNextPairOfFaces(FS1, aMapEdgeFaces1, aMapEdgeFaces2, FF, aCI);
-    cout<<"  other correspondences is found, make pipe for all pairs of faces"<<endl;
+    MESSAGE ("  other correspondences is found, make pipe for all pairs of faces");
 
     // make pipe for each pair of faces
     // auxilary map vertex->edge for created pipe edges
@@ -1506,7 +1508,7 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
 
       //if(nbff!=3) continue;
 
-      cout<<"    make pipe for "<<nbff<<" face"<<endl;
+      MESSAGE ("    make pipe for "<<nbff<<" face");
 
       Handle(Geom_Surface) S1 = BRep_Tool::Surface(TopoDS::Face(F1));
       if(S1->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface))) {
@@ -1550,12 +1552,12 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
        TopoDS_Edge E1 = TopoDS::Edge(anExpE.Current());
        //nbee++;
        if(!FF.Contains(E1))
-         cout<<"map FF not contains key E1"<<endl;
+         MESSAGE ("map FF not contains key E1");
 
        if(VPE.Contains(E1)) {
          aNewFs.Append(VPE.FindFromKey(E1));
 #ifdef _DEBUG_
-         cout<<"    using existed face"<<endl;
+         MESSAGE ("    using existed face");
 #endif
          continue;
        }
@@ -1564,9 +1566,9 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
        TopoDS_Vertex V1 = sae.FirstVertex(E1);
        TopoDS_Vertex V2 = sae.LastVertex(E1);
        if(!FF.Contains(V1))
-         cout<<"map FF not contains key V1"<<endl;
+         MESSAGE ("map FF not contains key V1");
        if(!FF.Contains(V2))
-         cout<<"map FF not contains key V2"<<endl;
+         MESSAGE ("map FF not contains key V2");
        TopoDS_Vertex V3 = TopoDS::Vertex(FF.FindFromKey(V2));
        TopoDS_Vertex V4 = TopoDS::Vertex(FF.FindFromKey(V1));
        TopoDS_Vertex Vtmp = sae.FirstVertex(E3);
@@ -1683,7 +1685,7 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
          BS = GF.Surface();
        }
        catch(...) {
-         cout<<"      can not create BSplineSurface - create Bezier"<<endl;
+         MESSAGE ("      can not create BSplineSurface - create Bezier");
          int NbP=26;
          TColgp_Array2OfPnt Points(1,NbP,1,NbP);
          double fp1,lp1,fp2,lp2;
@@ -1794,7 +1796,7 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
        aSewing->Add(anExp.Current());
       }
       aSewing->Perform();
-      cout<<"    shell for face "<<nbff<<" is created"<<endl;
+      MESSAGE ("    shell for face "<<nbff<<" is created");
       const TopoDS_Shape aSewShape = aSewing->SewedShape();
       //BRepTools::Write(aSewShape,"/dn02/users_Linux/skl/work/Bugs/14857/sew.brep");
       if( aSewShape.ShapeType() == TopAbs_SHELL ) {
@@ -1810,16 +1812,16 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
          B.MakeSolid(aSolid);
          B.Add(aSolid,aShell);
          B.Add(aComp,aSolid);
-         cout<<"    solid for face "<<nbff<<" is created"<<endl;
+         MESSAGE ("    solid for face "<<nbff<<" is created");
        }
        else {
          B.Add(aComp,aShell);
-         cout<<"    solid for face "<<nbff<<" is not created"<<endl;
+         MESSAGE ("    solid for face "<<nbff<<" is not created");
        }
       }
       else {
        B.Add(aComp,aShell);
-       cout<<"    solid for face "<<nbff<<" is not created"<<endl;
+       MESSAGE ("    solid for face "<<nbff<<" is not created");
       }
       //cout<<"    solid for face "<<nbff<<" is created"<<endl;
 
@@ -1851,6 +1853,72 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
 }
 
 
+//=======================================================================
+//function : CreatePipeBiNormalAlongVector
+//purpose  : auxilary for Execute()
+//=======================================================================
+static TopoDS_Shape CreatePipeBiNormalAlongVector(const TopoDS_Wire& aWirePath,
+                                                 GEOMImpl_IPipe* aCI)
+{
+  GEOMImpl_IPipeBiNormal* aCIBN = (GEOMImpl_IPipeBiNormal*)aCI;
+
+  Handle(GEOM_Function) aRefBase = aCIBN->GetBase();
+  Handle(GEOM_Function) aRefVec = aCIBN->GetVector();
+  TopoDS_Shape aShapeBase = aRefBase->GetValue();
+  TopoDS_Shape aShapeVec = aRefVec->GetValue();
+
+  if (aShapeBase.IsNull()) {
+    if(aCIBN) delete aCIBN;
+    Standard_NullObject::Raise("MakePipe aborted : null base argument");
+  }
+
+  TopoDS_Shape aProf;
+  if( aShapeBase.ShapeType() == TopAbs_VERTEX ) {
+    aProf = aShapeBase;
+  }
+  else if( aShapeBase.ShapeType() == TopAbs_EDGE) {
+    aProf = BRepBuilderAPI_MakeWire(TopoDS::Edge(aShapeBase)).Shape();
+  }
+  else if( aShapeBase.ShapeType() == TopAbs_WIRE) {
+    aProf = aShapeBase;
+  }
+  else if( aShapeBase.ShapeType() == TopAbs_FACE) {
+    TopExp_Explorer wexp(aShapeBase,TopAbs_WIRE);
+    aProf = wexp.Current();
+  }
+  else {
+    Standard_TypeMismatch::Raise
+      ("MakePipe aborted : invalid type of base");
+  }
+  BRepOffsetAPI_MakePipeShell PipeBuilder(aWirePath);
+  PipeBuilder.Add(aProf);
+
+  if (aShapeVec.IsNull()) {
+    if(aCIBN) delete aCIBN;
+    Standard_NullObject::Raise
+      ("MakePipe aborted : null vector argument");
+  }
+  if (aShapeVec.ShapeType() != TopAbs_EDGE)
+    Standard_TypeMismatch::Raise
+      ("MakePipe aborted: invalid type of vector");
+  TopoDS_Edge anEdge = TopoDS::Edge(aShapeVec);
+  TopoDS_Vertex V1, V2;
+  TopExp::Vertices(anEdge, V1, V2, Standard_True);
+  if (V1.IsNull() || V2.IsNull())
+    Standard_NullObject::Raise
+      ("MakePipe aborted: vector is not defined");
+  gp_Vec aVec(BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
+  gp_Dir BiNormal(aVec);
+  PipeBuilder.SetMode(BiNormal);
+  PipeBuilder.Build();
+  if( aShapeBase.ShapeType() == TopAbs_FACE) {
+      PipeBuilder.MakeSolid();
+  }
+
+  return PipeBuilder.Shape();
+}
+
+
 //=======================================================================
 //function : Execute
 //purpose  :
@@ -1870,6 +1938,8 @@ Standard_Integer GEOMImpl_PipeDriver::Execute(TFunction_Logbook& log) const
     aCI = new GEOMImpl_IPipeShellSect(aFunction);
   else if(aType == PIPE_SHELLS_WITHOUT_PATH)
     aCI = new GEOMImpl_IPipeShellSect(aFunction);
+  else if(aType == PIPE_BI_NORMAL_ALONG_VECTOR)
+    aCI = new GEOMImpl_IPipeBiNormal(aFunction);
   else
     return 0;
 
@@ -1880,7 +1950,7 @@ Standard_Integer GEOMImpl_PipeDriver::Execute(TFunction_Logbook& log) const
     TopoDS_Shape aShapePath = aRefPath->GetValue();
 
     if (aShapePath.IsNull()) {
-      cout<<"Driver : path is null"<<endl;
+      MESSAGE ("Driver : path is null");
       if(aCI) delete aCI;
       Standard_NullObject::Raise("MakePipe aborted : null path argument");
     }
@@ -2293,6 +2363,11 @@ Standard_Integer GEOMImpl_PipeDriver::Execute(TFunction_Logbook& log) const
     aShape = CreatePipeShellsWithoutPath(aCI);
   }
 
+  //building a pipe with constant bi-normal along given vector
+  else if (aType == PIPE_BI_NORMAL_ALONG_VECTOR) {
+    aShape = CreatePipeBiNormalAlongVector(aWirePath, aCI);
+  }
+
   if (aCI) {
     delete aCI;
     aCI = 0;
index b57defc89988bff0d3040bf0168c7a1fdcccaa63..041027786137c791467f9bae2fb56928e1afe8e3 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_PipeDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_PipeDriver_HeaderFile
 #define _GEOMImpl_PipeDriver_HeaderFile
 
index 1f3e28c77ee873ecd2c5b7f8f9b34b57b6d3c67c..534fc8565e498115de8cd1b098f1b51112c7069a 100644 (file)
@@ -1,23 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_PlaneDriver.hxx>
index 926d1e905536109ac2f369373f742ad441cbda93..8eb27642afd256f11f93c489553c69a743d21b49 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_PlaneDriver.hxx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_PlaneDriver_HeaderFile
 #define _GEOMImpl_PlaneDriver_HeaderFile
 
index a511c53ea6cc30977f2bafb1c7e5b7238b3d965a..accc93779831f70536f256e6681b999134903a69 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_PointDriver.hxx>
 #include <TopoDS_Vertex.hxx>
 
 #include <Geom_Curve.hxx>
+#include <Geom_Surface.hxx>
 #include <gp_Pnt.hxx>
+#include <TopoDS_Face.hxx>
+#include <ShapeAnalysis.hxx>
+
 
 //=======================================================================
 //function : GetID
@@ -57,6 +62,7 @@ GEOMImpl_PointDriver::GEOMImpl_PointDriver()
 {
 }
 
+
 //=======================================================================
 //function : Execute
 //purpose  :
@@ -74,7 +80,8 @@ Standard_Integer GEOMImpl_PointDriver::Execute(TFunction_Logbook& log) const
   if (aType == POINT_XYZ) {
     aPnt = gp_Pnt(aPI.GetX(), aPI.GetY(), aPI.GetZ());
 
-  } else if (aType == POINT_XYZ_REF) {
+  }
+  else if (aType == POINT_XYZ_REF) {
 
     Handle(GEOM_Function) aRefPoint = aPI.GetRef();
     TopoDS_Shape aRefShape = aRefPoint->GetValue();
@@ -85,8 +92,8 @@ Standard_Integer GEOMImpl_PointDriver::Execute(TFunction_Logbook& log) const
     gp_Pnt P = BRep_Tool::Pnt(TopoDS::Vertex(aRefShape));
     aPnt = gp_Pnt(P.X() + aPI.GetX(), P.Y() + aPI.GetY(), P.Z() + aPI.GetZ());
 
-  } else if (aType == POINT_CURVE_PAR) {
-
+  }
+  else if (aType == POINT_CURVE_PAR) {
     Handle(GEOM_Function) aRefCurve = aPI.GetCurve();
     TopoDS_Shape aRefShape = aRefCurve->GetValue();
     if (aRefShape.ShapeType() != TopAbs_EDGE) {
@@ -97,8 +104,24 @@ Standard_Integer GEOMImpl_PointDriver::Execute(TFunction_Logbook& log) const
     Handle(Geom_Curve) aCurve = BRep_Tool::Curve(TopoDS::Edge(aRefShape), aFP, aLP);
     aP = aFP + (aLP - aFP) * aPI.GetParameter();
     aPnt = aCurve->Value(aP);
-
-  } else if (aType == POINT_LINES_INTERSECTION) {
+  }
+  else if (aType == POINT_SURFACE_PAR) {
+    Handle(GEOM_Function) aRefCurve = aPI.GetSurface();
+    TopoDS_Shape aRefShape = aRefCurve->GetValue();
+    if (aRefShape.ShapeType() != TopAbs_FACE) {
+      Standard_TypeMismatch::Raise
+        ("Point On Surface creation aborted : surface shape is not a face");
+    }
+    TopoDS_Face F = TopoDS::Face(aRefShape);
+    Handle(Geom_Surface) aSurf = BRep_Tool::Surface(F);
+    Standard_Real U1,U2,V1,V2;
+    //aSurf->Bounds(U1,U2,V1,V2);
+    ShapeAnalysis::GetFaceUVBounds(F,U1,U2,V1,V2);
+    Standard_Real U = U1 + (U2-U1) * aPI.GetParameter();
+    Standard_Real V = V1 + (V2-V1) * aPI.GetParameter2();
+    aPnt = aSurf->Value(U,V);
+  }
+  else if (aType == POINT_LINES_INTERSECTION) {
     Handle(GEOM_Function) aRef1 = aPI.GetLine1();
     Handle(GEOM_Function) aRef2 = aPI.GetLine2();
 
index 50f098be7678601cedd664aaf04d4ecf364fdfc7..acffa01965d05283c94d975b5d12cc47f7760cb4 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_PointDriver.hxx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_PointDriver_HeaderFile
 #define _GEOMImpl_PointDriver_HeaderFile
 
index a079f608c19f195ac2ae739dec9db7e759df7bce..5a295e43b63eddf899bdc23a921fff540c99de4d 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_PolylineDriver.hxx>
index 0f9b7a6a8011a9fe77da8b8b1d8cf2df2133ebcd..197087d66871cc084b2792d985ee961d72f596ec 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_PolylineDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_PolylineDriver_HeaderFile
 #define _GEOMImpl_PolylineDriver_HeaderFile
 
index 789575c793936553e7571ac78aeeaf8174ed8a83..2bdec65f328213645945bc3aa30723bae7a75590 100644 (file)
@@ -1,25 +1,26 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //#include <Standard_Stream.hxx>
-
+//
 #include <GEOMImpl_PositionDriver.hxx>
 #include <GEOMImpl_IPosition.hxx>
 #include <GEOMImpl_Types.hxx>
 
 // OCCT Includes
 #include <BRepBuilderAPI_Transform.hxx>
+#include <GCPnts_AbscissaPoint.hxx>
+#include <ShHealOper_EdgeDivide.hxx>
 #include <BRep_Tool.hxx>
+#include <BRepTools.hxx>
+#include <BRepTools_WireExplorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Wire.hxx>
 #include <TopAbs.hxx>
 #include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
 #include <gp_Pln.hxx>
 #include <Geom_Plane.hxx>
+#include <Geom_Curve.hxx>
 #include <GProp_GProps.hxx>
 #include <BRepGProp.hxx>
+#include <ShapeAnalysis_Edge.hxx>
+#include <GeomAdaptor_Curve.hxx>
+#include <BRepGProp.hxx>
+#include <ShapeFix_Wire.hxx>
 
 #include <Precision.hxx>
 #include <gp_Pnt.hxx>
+#include <gp_Vec.hxx>
+#include <TopExp.hxx>
 
 //=======================================================================
 //function : GetID
@@ -130,6 +145,183 @@ Standard_Integer GEOMImpl_PositionDriver::Execute(TFunction_Logbook& log) const
     BRepBuilderAPI_Transform aBRepTrsf (aShapeBase, aTrsf, Standard_False);
     aShape = aBRepTrsf.Shape();
   }
+  else if (aType == POSITION_ALONG_PATH) {
+    Handle(GEOM_Function) aRefShape = aCI.GetShape();
+    Handle(GEOM_Function) aPathShape = aCI.GetPath();
+    double aValue = aCI.GetDistance();
+    bool aReversed = aCI.GetReverse();
+
+    TopoDS_Shape aShapeBase = aRefShape->GetValue();
+    TopoDS_Shape aPath = aPathShape->GetValue();
+
+    if (aShapeBase.IsNull() || aPath.IsNull())
+      return 0;
+
+    //Get a Center Of Mass Of Base Object
+    GProp_GProps aSystem;
+    gp_Pnt aCenterMass;
+    if (aShapeBase.ShapeType() == TopAbs_VERTEX) {
+      aCenterMass = BRep_Tool::Pnt(TopoDS::Vertex(aShapeBase));
+    } else if (aShapeBase.ShapeType() == TopAbs_EDGE || aShapeBase.ShapeType() == TopAbs_WIRE) {
+      BRepGProp::LinearProperties(aShapeBase, aSystem);
+      aCenterMass = aSystem.CentreOfMass();
+    } else if (aShapeBase.ShapeType() == TopAbs_FACE || aShapeBase.ShapeType() == TopAbs_SHELL) {
+      BRepGProp::SurfaceProperties(aShapeBase, aSystem);
+      aCenterMass = aSystem.CentreOfMass();
+    } else {
+      BRepGProp::VolumeProperties(aShapeBase, aSystem);
+      aCenterMass = aSystem.CentreOfMass();
+    }
+
+    TopoDS_Shape aTrimmedPath;
+    gp_Trsf aTrsf;
+    Handle(Geom_Curve) aCurve;    
+    Standard_Real aFirst =0.,aLast=0.;
+    Standard_Real aParam = 0.;
+    Standard_Real aLength = 0.;
+
+    gp_Pnt aPFirst, aPLast;
+   
+    if ( aPath.ShapeType() == TopAbs_EDGE ) { // The Path is Edge
+      TopoDS_Edge anEdge = TopoDS::Edge(aPath);
+
+      BRep_Tool::Range(anEdge,aFirst,aLast);
+      aCurve = BRep_Tool::Curve(anEdge,aFirst,aLast);
+      if (aReversed)
+       aCurve = aCurve->Reversed();
+
+      aCurve->D0(aFirst, aPFirst);
+      aCurve->D0(aLast, aPLast);
+
+      // Translate a CenterMass of Base Shape to the start of the path
+      if ( !aPFirst.IsEqual(aCenterMass, gp::Resolution()) ) {
+       gp_Trsf aCurTrsf;
+       aCurTrsf.SetTranslation(aCenterMass, aPFirst);
+       aTrsf.PreMultiply(aCurTrsf);
+      }
+      aParam = aFirst + aValue*(aLast - aFirst); // Calculate parameter
+    } else if ( aPath.ShapeType() == TopAbs_WIRE ) { // The  path Shape is Wire
+      TopoDS_Wire aWire = TopoDS::Wire(aPath);
+
+     // fix edges order
+      Handle(ShapeFix_Wire) aFixWire = new ShapeFix_Wire;
+      aFixWire->Load(aWire);
+      aFixWire->FixReorder();
+      aWire = aFixWire->Wire();
+      
+      TopExp_Explorer ex;
+      TopTools_SequenceOfShape Edges;
+      Standard_Real nbEdges = 0.;
+      BRepTools_WireExplorer aWE (aWire);
+      for (; aWE.More(); aWE.Next(), nbEdges++) // Explore a Wire on Edges
+       Edges.Append(aWE.Current());
+
+      Standard_Real aSummOfLen =0.;
+      Standard_Real aCurLen =0.;
+      GeomAdaptor_Curve aAdC;
+
+      for(int i=1; i<=Edges.Length(); i++) { // Calculate summary Lenght of edges
+       TopoDS_Edge anEdge = TopoDS::Edge(Edges.Value(i));
+       BRep_Tool::Range(anEdge,aFirst,aLast);
+       aCurve = BRep_Tool::Curve(anEdge,aFirst,aLast);
+       aAdC.Load(aCurve,aFirst,aLast);
+       aCurLen = GCPnts_AbscissaPoint::Length(aAdC,aFirst,aLast); 
+       aSummOfLen += aCurLen;
+      }
+
+      // Move BaseShape to the Start Of the Curve
+      TopoDS_Edge anEdge;
+      if (!aReversed)
+       anEdge = TopoDS::Edge(Edges.Value(1));
+      else
+       anEdge = TopoDS::Edge(Edges.Value(Edges.Length()));
+
+      BRep_Tool::Range(anEdge,aFirst,aLast);
+      aCurve = BRep_Tool::Curve(anEdge,aFirst,aLast);
+      aCurve->D0(aFirst, aPFirst);
+      aCurve->D0(aLast, aPLast);
+      if ( !aPFirst.IsEqual(aCenterMass, gp::Resolution()) ) {
+       gp_Trsf aCurTrsf;
+       if (aReversed && anEdge.Orientation() == TopAbs_FORWARD)
+         aPFirst = aPLast;
+
+       aCurTrsf.SetTranslation(aCenterMass, aPFirst);
+       aTrsf.PreMultiply(aCurTrsf);
+      }
+
+      Standard_Real aWireLen = aSummOfLen*aValue;
+      aSummOfLen = 0;
+      for(int i=1; i<=Edges.Length(); i++) {
+       TopoDS_Edge anEdge;
+       if (!aReversed)
+         anEdge = TopoDS::Edge(Edges.Value(i));
+       else
+         anEdge = TopoDS::Edge(Edges.Value(Edges.Length() - i + 1));
+
+       aCurve = BRep_Tool::Curve(anEdge,aFirst,aLast);
+       BRep_Tool::Range(anEdge,aFirst,aLast);
+
+       if (!aReversed && anEdge.Orientation() == TopAbs_REVERSED)
+         aCurve = aCurve->Reversed();
+
+       if (aReversed && anEdge.Orientation() == TopAbs_FORWARD)
+         aCurve = aCurve->Reversed();
+
+       aAdC.Load(aCurve,aFirst,aLast);
+       aCurLen = GCPnts_AbscissaPoint::Length(aAdC,aFirst,aLast);
+
+       if ( aWireLen > (aSummOfLen + aCurLen) ) { // Transform a Base object along this Edge
+         aSummOfLen += aCurLen;
+         gp_Pnt aP1, aP2;
+         gp_Vec aStartVec1, aStartVec2, aDestVec1, aDestVec2;
+         aCurve->D2(aFirst, aP1, aStartVec1, aStartVec2 );
+         aCurve->D2(aLast, aP2, aDestVec1, aDestVec2 );
+         gp_Trsf aCurTrsf;
+         if (aStartVec2.Magnitude() > gp::Resolution() && aDestVec2.Magnitude() > gp::Resolution()) {
+           gp_Ax3 aStartAx3(aP1, aStartVec1, aStartVec2);
+           gp_Ax3 aDestAx3(aP2, aDestVec1, aDestVec2);
+           aCurTrsf.SetDisplacement(aStartAx3, aDestAx3);
+         } else
+           aCurTrsf.SetTranslation(aP1, aP2);
+
+         aTrsf.PreMultiply(aCurTrsf);
+       }
+       else {
+         aLength = aWireLen - aSummOfLen;
+         GCPnts_AbscissaPoint anAbsc(aAdC,aLength,aFirst);
+         if(anAbsc.IsDone()) 
+           aParam = anAbsc.Parameter();
+         break;
+       }
+      }
+    } else
+      return 0; // Unknown Type
+
+    gp_Trsf aCurTrsf;
+    gp_Pnt aP1, aP2;
+    gp_Vec aStartVec1, aStartVec2, aDestVec1, aDestVec2;
+    aCurve->D2(aFirst, aP1, aStartVec1, aStartVec2 );
+    aCurve->D2(aParam, aP2, aDestVec1, aDestVec2 );
+
+    if (aStartVec2.Magnitude() > gp::Resolution() && aDestVec2.Magnitude() > gp::Resolution()) {
+      gp_Ax3 aStartAx3(aP1, aStartVec1, aStartVec2);
+      gp_Ax3 aDestAx3(aP2, aDestVec1, aDestVec2);
+      aCurTrsf.SetDisplacement(aStartAx3, aDestAx3);
+    } else
+      aCurTrsf.SetTranslation(aP1, aP2);
+
+    aTrsf.PreMultiply(aCurTrsf);
+    
+    if ( !aPFirst.IsEqual(aCenterMass, gp::Resolution()) ) {
+      gp_Trsf aCurTrsf;
+      aCurTrsf.SetTranslation(aPFirst, aCenterMass);
+      aTrsf.PreMultiply(aCurTrsf);
+    }
+
+    // Perform transformation
+    BRepBuilderAPI_Transform aBRepTrsf (aShapeBase, aTrsf, Standard_False);
+    aShape = aBRepTrsf.Shape();
+  }
   else
     return 0;
 
index 64d2a19d116a01cdef9efc9811e5694b1faeafee..96d147fa7d8a9937dce7a5381514a956aafad652 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_PositionDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_PositionDriver_HeaderFile
 #define _GEOMImpl_PositionDriver_HeaderFile
 
index 11bb15ad6418bd5ee07977c8e4f49020c33e556a..0cd63b150135d10caf34534f8993537c5c317ba8 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_PrismDriver.hxx>
@@ -129,7 +130,21 @@ Standard_Integer GEOMImpl_PrismDriver::Execute(TFunction_Logbook& log) const
         }
       }
     }
-  } else {
+  } else if (aType == PRISM_BASE_DXDYDZ || aType == PRISM_BASE_DXDYDZ_2WAYS) {
+    Handle(GEOM_Function) aRefBase = aCI.GetBase();
+    TopoDS_Shape aShapeBase = aRefBase->GetValue();
+    gp_Vec aV (aCI.GetDX(), aCI.GetDY(), aCI.GetDZ());
+    if (aV.Magnitude() > gp::Resolution()) {
+      if (aType == PRISM_BASE_DXDYDZ_2WAYS)
+       {
+         gp_Trsf aTrsf;
+         aTrsf.SetTranslation(-aV);
+         BRepBuilderAPI_Transform aTransformation(aShapeBase, aTrsf, Standard_False);
+         aShapeBase = aTransformation.Shape();
+         aV = aV * 2;
+       }
+      aShape = BRepPrimAPI_MakePrism(aShapeBase, aV, Standard_False).Shape();
+    }
   }
 
   if (aShape.IsNull()) return 0;
index 27ce618c9c2200ab7d0d49196a92add1d0f4e85c..a1f890d9fd76388290080158a3bbb19244506f7f 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_PrismDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_PrismDriver_HeaderFile
 #define _GEOMImpl_PrismDriver_HeaderFile
 
index 9d3d91ca39a462037ca96e69a39d0fd75b7e2396..f4e8026b14515b3a38d01565a1cbe82e3de3404a 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_RevolutionDriver.hxx>
index 1290b83399c9d4b6b8d3100d0a5bed986514796c..b1e7b15ad8be2c920c986176a7ce268e50d59fc1 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_RevolutionDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_RevolutionDriver_HeaderFile
 #define _GEOMImpl_RevolutionDriver_HeaderFile
 
index c6655fa58abc42fb8b13a8c46cad6fffed55b021..cff3a9b51c1762c762469411e479e111a746230c 100644 (file)
@@ -1,23 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_RotateDriver.hxx>
@@ -98,6 +99,7 @@ Standard_Integer GEOMImpl_RotateDriver::Execute(TFunction_Logbook& log) const
     gp_Dir aDir(gp_Vec(aP1, aP2));
     gp_Ax1 anAx1(aP1, aDir);
     Standard_Real anAngle = RI.GetAngle();
+    if (fabs(anAngle) < Precision::Angular()) anAngle += 2*PI; // NPAL19665,19769
     aTrsf.SetRotation(anAx1, anAngle);
 
     //NPAL18620: performance problem: multiple locations are accumulated
@@ -106,7 +108,9 @@ Standard_Integer GEOMImpl_RotateDriver::Execute(TFunction_Logbook& log) const
     //aShape = aTransformation.Shape();
     TopLoc_Location aLocOrig = anOriginal.Location();
     gp_Trsf aTrsfOrig = aLocOrig.Transformation();
-    TopLoc_Location aLocRes (aTrsf * aTrsfOrig);
+    //TopLoc_Location aLocRes (aTrsf * aTrsfOrig); // gp_Trsf::Multiply() has a bug
+    aTrsfOrig.PreMultiply(aTrsf);
+    TopLoc_Location aLocRes (aTrsfOrig);
     aShape = anOriginal.Located(aLocRes);
   }
   else if (aType ==  ROTATE_THREE_POINTS || aType == ROTATE_THREE_POINTS_COPY) {
@@ -125,11 +129,12 @@ Standard_Integer GEOMImpl_RotateDriver::Execute(TFunction_Logbook& log) const
     aP1 = BRep_Tool::Pnt(TopoDS::Vertex(aV1));
     aP2 = BRep_Tool::Pnt(TopoDS::Vertex(aV2));
 
-    gp_Vec aVec1(aCP, aP1);
-    gp_Vec aVec2(aCP, aP2);
-    gp_Dir aDir(aVec1 ^ aVec2);
-    gp_Ax1 anAx1(aCP, aDir);
+    gp_Vec aVec1 (aCP, aP1);
+    gp_Vec aVec2 (aCP, aP2);
+    gp_Dir aDir (aVec1 ^ aVec2);
+    gp_Ax1 anAx1 (aCP, aDir);
     Standard_Real anAngle = aVec1.Angle(aVec2);
+    if (fabs(anAngle) < Precision::Angular()) anAngle += 2*PI; // NPAL19665
     aTrsf.SetRotation(anAx1, anAngle);
     //NPAL18620: performance problem: multiple locations are accumulated
     //           in shape and need a great time to process
@@ -137,7 +142,9 @@ Standard_Integer GEOMImpl_RotateDriver::Execute(TFunction_Logbook& log) const
     //aShape = aTransformation.Shape();
     TopLoc_Location aLocOrig = anOriginal.Location();
     gp_Trsf aTrsfOrig = aLocOrig.Transformation();
-    TopLoc_Location aLocRes (aTrsf * aTrsfOrig);
+    //TopLoc_Location aLocRes (aTrsf * aTrsfOrig); // gp_Trsf::Multiply() has a bug
+    aTrsfOrig.PreMultiply(aTrsf);
+    TopLoc_Location aLocRes (aTrsfOrig);
     aShape = anOriginal.Located(aLocRes);
   }
   else if (aType == ROTATE_1D) {
@@ -165,20 +172,26 @@ Standard_Integer GEOMImpl_RotateDriver::Execute(TFunction_Logbook& log) const
     gp_Trsf aTrsfOrig = aLocOrig.Transformation();
 
     for (int i = 0; i < nbtimes; i++ ) {
-      aTrsf.SetRotation(AX1, i*angle*PI180);
+      if (i == 0) { // NPAL19665
+        B.Add(aCompound, anOriginal);
+      }
+      else {
+        aTrsf.SetRotation(AX1, i*angle*PI180);
+        //TopLoc_Location aLocRes (aTrsf * aTrsfOrig); // gp_Trsf::Multiply() has a bug
+        gp_Trsf aTrsfNew (aTrsfOrig);
+        aTrsfNew.PreMultiply(aTrsf);
+        TopLoc_Location aLocRes (aTrsfNew);
+        B.Add(aCompound, anOriginal.Located(aLocRes));
+      }
       //NPAL18620: performance problem: multiple locations are accumulated
       //           in shape and need a great time to process
       //BRepBuilderAPI_Transform aBRepTransformation(anOriginal, aTrsf, Standard_False);
       //B.Add(aCompound, aBRepTransformation.Shape());
-      TopLoc_Location aLocRes (aTrsf * aTrsfOrig);
-      B.Add(aCompound, anOriginal.Located(aLocRes));
     }
 
     aShape = aCompound;
   }
   else if (aType == ROTATE_2D) {
-    Standard_Real DX, DY, DZ;
-
     //Get direction
     Handle(GEOM_Function) anAxis = RI.GetAxis();
     if(anAxis.IsNull()) return 0;
@@ -219,7 +232,7 @@ Standard_Integer GEOMImpl_RotateDriver::Execute(TFunction_Logbook& log) const
 
     if ( P1.IsEqual(P2, Precision::Confusion() ) ) return 0;
 
-    gp_Vec Vec(P1.X()-P2.X(), P1.Y()-P2.Y(), P1.Z()-P2.Z());
+    gp_Vec Vec (P1.X()-P2.X(), P1.Y()-P2.Y(), P1.Z()-P2.Z());
     Vec.Normalize();
 
     Standard_Integer nbtimes2 = RI.GetNbIter2();
@@ -234,21 +247,35 @@ Standard_Integer GEOMImpl_RotateDriver::Execute(TFunction_Logbook& log) const
     TopoDS_Compound aCompound;
     BRep_Builder B;
     B.MakeCompound( aCompound );
+
+    Standard_Real DX, DY, DZ;
+
     for (int i = 0; i < nbtimes2; i++ ) {
+      DX = i * step * Vec.X();
+      DY = i * step * Vec.Y();
+      DZ = i * step * Vec.Z();
+      aVec.SetCoord( DX, DY, DZ );
+      aTrsf1.SetTranslation(aVec);
+
       for (int j = 0; j < nbtimes1; j++ ) {
-        DX = i * step * Vec.X();
-        DY = i * step * Vec.Y();
-        DZ = i * step * Vec.Z();
-        aVec.SetCoord( DX, DY, DZ );
-        aTrsf1.SetTranslation(aVec);
-        aTrsf2.SetRotation(AX1, j*ang*PI180);
+        if (j == 0) { // NPAL19665
+          TopLoc_Location aLocRes (aTrsf1 * aTrsfOrig);
+          B.Add(aCompound, anOriginal.Located(aLocRes));
+        }
+        else {
+          aTrsf2.SetRotation(AX1, j*ang*PI180);
+          //TopLoc_Location aLocRes (aTrsf2 * aTrsf1 * aTrsfOrig); // gp_Trsf::Multiply() has a bug
+          gp_Trsf aTrsfNew (aTrsfOrig);
+          aTrsfNew.PreMultiply(aTrsf1);
+          aTrsfNew.PreMultiply(aTrsf2);
+          TopLoc_Location aLocRes (aTrsfNew);
+          B.Add(aCompound, anOriginal.Located(aLocRes));
+        }
         //NPAL18620: performance problem: multiple locations are accumulated
         //           in shape and need a great time to process
         //BRepBuilderAPI_Transform aBRepTrsf1 (anOriginal, aTrsf1, Standard_False);
         //BRepBuilderAPI_Transform aBRepTrsf2 (aBRepTrsf1.Shape(), aTrsf2, Standard_False);
         //B.Add(aCompound, aBRepTrsf2.Shape());
-        TopLoc_Location aLocRes (aTrsf2 * aTrsf1 * aTrsfOrig);
-        B.Add(aCompound, anOriginal.Located(aLocRes));
       }
     }
 
index e88b65697f7b61d4f068277f102f2290d394dcec..5b94668ba9d9f9d03c170d6957c1b4d41847b0fd 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_RotateDriver.hxx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_RotateDriver_HeaderFile
 #define _GEOMImpl_RotateDriver_HeaderFile
 
index 88342f057d4803f9a3257a24260ae1a4361ee44d..0c4dea8f4ce0fa6920afdeced84808ad3e0b7743 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_ScaleDriver.hxx>
 #include <GEOMImpl_Types.hxx>
 #include <GEOM_Function.hxx>
 
+#include <ShapeFix_Shape.hxx>
+#include <ShapeFix_ShapeTolerance.hxx>
+
 #include <BRepBuilderAPI_Transform.hxx>
+#include <BRepBuilderAPI_GTransform.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAlgo.hxx>
+#include <BRepCheck_Analyzer.hxx>
+
 #include <TopAbs.hxx>
 #include <TopExp.hxx>
 #include <TopoDS.hxx>
@@ -37,6 +44,8 @@
 
 #include <Precision.hxx>
 #include <gp_Pnt.hxx>
+#include <gp_Trsf.hxx>
+#include <gp_GTrsf.hxx>
 
 //=======================================================================
 //function : GetID
@@ -73,11 +82,17 @@ Standard_Integer GEOMImpl_ScaleDriver::Execute(TFunction_Logbook& log) const
 
   if (aType == SCALE_SHAPE || aType == SCALE_SHAPE_COPY) {
     Handle(GEOM_Function) aRefShape = aCI.GetShape();
-    Handle(GEOM_Function) aRefPoint = aCI.GetPoint();
     TopoDS_Shape aShapeBase = aRefShape->GetValue();
-    TopoDS_Shape aShapePnt  = aRefPoint->GetValue();
-    if (aShapeBase.IsNull() || aShapePnt.IsNull()) return 0;
-    if (aShapePnt.ShapeType() != TopAbs_VERTEX) return 0;
+    if (aShapeBase.IsNull()) return 0;
+
+    gp_Pnt aP (0,0,0);
+    Handle(GEOM_Function) aRefPoint = aCI.GetPoint();
+    if (!aRefPoint.IsNull()) {
+      TopoDS_Shape aShapePnt = aRefPoint->GetValue();
+      if (aShapePnt.IsNull()) return 0;
+      if (aShapePnt.ShapeType() != TopAbs_VERTEX) return 0;
+      aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
+    }
 
     // Bug 6839: Check for standalone (not included in faces) degenerated edges
     TopTools_IndexedDataMapOfShapeListOfShape aEFMap;
@@ -94,18 +109,84 @@ Standard_Integer GEOMImpl_ScaleDriver::Execute(TFunction_Logbook& log) const
     }
 
     // Perform Scaling
-    gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
     gp_Trsf aTrsf;
     aTrsf.SetScale(aP, aCI.GetFactor());
     BRepBuilderAPI_Transform aBRepTrsf (aShapeBase, aTrsf, Standard_False);
     aShape = aBRepTrsf.Shape();
-  } else {
+  }
+  else if (aType == SCALE_SHAPE_AXES || aType == SCALE_SHAPE_AXES_COPY) {
+    Handle(GEOM_Function) aRefShape = aCI.GetShape();
+    TopoDS_Shape aShapeBase = aRefShape->GetValue();
+    if (aShapeBase.IsNull()) return 0;
+
+    bool isP = false;
+    gp_Pnt aP (0,0,0);
+    Handle(GEOM_Function) aRefPoint = aCI.GetPoint();
+    if (!aRefPoint.IsNull()) {
+      TopoDS_Shape aShapePnt = aRefPoint->GetValue();
+      if (aShapePnt.IsNull()) return 0;
+      if (aShapePnt.ShapeType() != TopAbs_VERTEX) return 0;
+      aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
+      isP = true;
+    }
+
+    // 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_GTrsf aGTrsf;
+    gp_Mat rot (aCI.GetFactorX(), 0, 0,
+                0, aCI.GetFactorY(), 0,
+                0, 0, aCI.GetFactorZ());
+    aGTrsf.SetVectorialPart(rot);
+
+    if (isP) {
+      gp_Pnt anO (0,0,0);
+      if (anO.Distance(aP) > Precision::Confusion()) {
+        gp_GTrsf aGTrsfP0;
+        aGTrsfP0.SetTranslationPart(anO.XYZ() - aP.XYZ());
+        gp_GTrsf aGTrsf0P;
+        aGTrsf0P.SetTranslationPart(aP.XYZ());
+        //aGTrsf = aGTrsf0P * aGTrsf * aGTrsfP0;
+        aGTrsf = aGTrsf0P.Multiplied(aGTrsf);
+        aGTrsf = aGTrsf.Multiplied(aGTrsfP0);
+      }
+    }
+
+    BRepBuilderAPI_GTransform aBRepGTrsf (aShapeBase, aGTrsf, Standard_False);
+    if (!aBRepGTrsf.IsDone())
+      Standard_ConstructionError::Raise("Scaling not done");
+    aShape = aBRepGTrsf.Shape();
+  }
+  else {
   }
 
   if (aShape.IsNull()) return 0;
 
-  if (!BRepAlgo::IsValid(aShape))
-    Standard_ConstructionError::Raise("Scaling aborted : non valid shape result");
+  BRepCheck_Analyzer ana (aShape, Standard_False);
+  if (!ana.IsValid()) {
+    ShapeFix_ShapeTolerance aSFT;
+    aSFT.LimitTolerance(aShape,Precision::Confusion(),Precision::Confusion());
+    Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
+    aSfs->SetPrecision(Precision::Confusion());
+    aSfs->Perform();
+    aShape = aSfs->Shape();
+
+    ana.Init(aShape, Standard_False);
+    if (!ana.IsValid())
+      Standard_ConstructionError::Raise("Scaling aborted : algorithm has produced an invalid shape result");
+  }
 
   aFunction->SetValue(aShape);
 
index bbc2f7c9c161c9c586d5719b0a0945e5b8214688..9aca8232334808aaec1ed5023a65551f91ac1502 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_ScaleDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_ScaleDriver_HeaderFile
 #define _GEOMImpl_ScaleDriver_HeaderFile
 
index 349b59f09a25e0e321d5c60e29051a1d16c275a2..43af2ed5cc6cde367c3441321ddbf31788695119 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <GEOMImpl_ShapeDriver.hxx>
 
 #include <GEOMImpl_IShapes.hxx>
index fa0a0023d0b57b4b878091e8a1bc4567382a3ab5..45bc5e65b43ae521e76ebb7224eac25170bd4d1c 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_ShapeDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_ShapeDriver_HeaderFile
 #define _GEOMImpl_ShapeDriver_HeaderFile
 
index 2a6eb0a7bb7185c8cbdc2b3cac985604aaa68035..6642592d15f208330405e4fa44c5555a7af29708 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_SketcherDriver.hxx>
index 6d84a4d06fd4754fba92cbde9f063454074e3461..5d5362b2581c818b1ab0ca8dc85383fbf0fdca55 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_SketcherDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_SketcherDriver_HeaderFile
 #define _GEOMImpl_SketcherDriver_HeaderFile
 
index c8d175adc02b0eee9fcc9aa7c4685db6ec3d3c2a..9bc4f0e8dbd7fedc519f86f70b60c10ae4c2286f 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_SphereDriver.hxx>
index 065fcb22c2c0e28b42a5c44d2a6558876b89d85f..e80729ca0a9a0425a466dd72cdf934c76cd985c1 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_SphereDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_SphereDriver_HeaderFile
 #define _GEOMImpl_SphereDriver_HeaderFile
 
index 4f5832006a47c695c8a226124098412b00a6a09b..11aaea41f3d1964a72a203aad4a565959eff1c78 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_SplineDriver.hxx>
index e09a0446af81547d7942bd7aa55309269a616645..c615207c1e66f4076e9d991df03e7f18e94988b9 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_SplineDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_SplineDriver_HeaderFile
 #define _GEOMImpl_SplineDriver_HeaderFile
 
diff --git a/src/GEOMImpl/GEOMImpl_Template.cxx b/src/GEOMImpl/GEOMImpl_Template.cxx
deleted file mode 100644 (file)
index ccfb705..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-// 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 <Standard_Stream.hxx>
-
-#include <GEOMImpl_Template.hxx>
-#include <GEOM_Function.hxx>
-#include <TopoDS_Shape.hxx>
-
-//=======================================================================
-//function : GetID
-//purpose  :
-//======================================================================= 
-const Standard_GUID& GEOMImpl_Template::GetID()
-{
-  static Standard_GUID aTemplate("Insert the correct GUID here");
-  return aTemplate; 
-}
-
-
-//=======================================================================
-//function : GEOMImpl_Template
-//purpose  : 
-//=======================================================================
-
-GEOMImpl_Template::GEOMImpl_Template() 
-{
-}
-
-//=======================================================================
-//function : Execute
-//purpose  :
-//======================================================================= 
-Standard_Integer GEOMImpl_Template::Execute(TFunction_Logbook& log) const
-{
-  if (Label().IsNull()) return 0;
-  Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); 
-  if(aFunction.IsNull()) return 0;
-  
-  //Add implemetation here
-  
-  log.SetTouched(Label());
-  return 1;    
-}
-
-
-//=======================================================================
-//function :  GEOMImpl_Template_Type_
-//purpose  :
-//======================================================================= 
-Standard_EXPORT Handle_Standard_Type& GEOMImpl_Template_Type_()
-{
-
-  static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver);
-  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver);
-  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared); 
-  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
-  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
-
-  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
-  static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_Template",
-                                                        sizeof(GEOMImpl_Template),
-                                                        1,
-                                                        (Standard_Address)_Ancestors,
-                                                        (Standard_Address)NULL);
-
-  return _aType;
-}
-
-//=======================================================================
-//function : DownCast
-//purpose  :
-//======================================================================= 
-
-const Handle(GEOMImpl_Template) Handle(GEOMImpl_Template)::DownCast(const Handle(Standard_Transient)& AnObject)
-{
-  Handle(GEOMImpl_Template) _anOtherObject;
-
-  if (!AnObject.IsNull()) {
-     if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_Template))) {
-       _anOtherObject = Handle(GEOMImpl_Template)((Handle(GEOMImpl_Template)&)AnObject);
-     }
-  }
-
-  return _anOtherObject ;
-}
-
-
diff --git a/src/GEOMImpl/GEOMImpl_Template.hxx b/src/GEOMImpl/GEOMImpl_Template.hxx
deleted file mode 100644 (file)
index 866b7fe..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-// 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   : GEOMImpl_Template.hxx
-//  Module : GEOMImpl
-
-#ifndef _GEOMImpl_Template_HeaderFile
-#define _GEOMImpl_Template_HeaderFile
-
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif 
-
-#ifndef _Handle_TFunction_Driver_HeaderFile
-#include <Handle_TFunction_Driver.hxx>
-#endif
-
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(TFunction_Driver);
-class GEOMImpl_Template;
-
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMImpl_Template);
-
-class Handle(GEOMImpl_Template) : public Handle(TFunction_Driver) {
-  public:
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-
-    Handle(GEOMImpl_Template)():Handle(TFunction_Driver)() {} 
-    Handle(GEOMImpl_Template)(const Handle(GEOMImpl_Template)& aHandle) : Handle(TFunction_Driver)(aHandle) 
-     {
-     }
-
-    Handle(GEOMImpl_Template)(const GEOMImpl_Template* anItem) : Handle(TFunction_Driver)((TFunction_Driver *)anItem) 
-     {
-     }
-
-    Handle(GEOMImpl_Template)& operator=(const Handle(GEOMImpl_Template)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOMImpl_Template)& operator=(const GEOMImpl_Template* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOMImpl_Template* operator->() 
-     {
-      return (GEOMImpl_Template *)ControlAccess();
-     }
-
-    GEOMImpl_Template* operator->() const 
-     {
-      return (GEOMImpl_Template *)ControlAccess();
-     }
-
-   Standard_EXPORT ~Handle(GEOMImpl_Template)() {};
-   Standard_EXPORT static const Handle(GEOMImpl_Template) DownCast(const Handle(Standard_Transient)& AnObject);
-};
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-class GEOMImpl_Template : public TFunction_Driver {
-
-public:
-
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-
- // Methods PUBLIC
- // 
-Standard_EXPORT GEOMImpl_Template();
-Standard_EXPORT virtual  Standard_Integer Execute(TFunction_Logbook& log) const; 
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_Template() {};
-
-
- // Type management
- //
-Standard_EXPORT friend Handle_Standard_Type& GEOMImpl_Template_Type_();
-Standard_EXPORT const Handle(Standard_Type)& DynamicType() const  { return STANDARD_TYPE(GEOMImpl_Template) ; }
-Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)& AType) const { return (STANDARD_TYPE(GEOMImpl_Template) == AType || TFunction_Driver::IsKind(AType)); } 
-
-
-};
-
-#endif
index 07855fdcc0bc5a8c1a97664026fdde610acbc6be..2f99b25809a574597b9278d2fad07fbcb025a66a 100644 (file)
@@ -1,23 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,F
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_ThruSectionsDriver.hxx>
index b0b25d9c568888a0ee9160bbef59a343608f43e9..2aacffe9a17cd58113032b444136c7052cbd3edf 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_ThruSectionsDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_ThruSectionsDriver_HeaderFile
 #define _GEOMImpl_ThruSectionsDriver_HeaderFile
 
index 810757b7408df2539b6f8f9707053d60bd55bf68..7ccffe4bd4aa0a14b2780e5727b2d89846eb1dc6 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
 #include <GEOMImpl_TorusDriver.hxx>
index f27520ed13e46c00ec61a27e2d1159c5311d30c7..56db37230896138d377727065789028466f08bef 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_TorusDriver.ixx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_TorusDriver_HeaderFile
 #define _GEOMImpl_TorusDriver_HeaderFile
 
index ad967865bd9c016b4aaba7fd45c6adc7a3bf8f1b..57689ec57ef03d4bc7818bdc5e798bfb984e2672 100644 (file)
@@ -1,34 +1,39 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_TranslateDriver.hxx>
 #include <GEOMImpl_ITranslate.hxx>
 #include <GEOMImpl_Types.hxx>
 #include <GEOM_Function.hxx>
-#include <gp_Trsf.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
-#include <BRepBuilderAPI_Transform.hxx>
+
+#include <ShapeFix_Shape.hxx>
+#include <ShapeFix_ShapeTolerance.hxx>
+
+#include <BRep_Tool.hxx>
 #include <BRep_Builder.hxx>
+#include <BRepCheck_Analyzer.hxx>
+#include <BRepBuilderAPI_Transform.hxx>
+
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopExp.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Edge.hxx>
-#include <BRep_Tool.hxx>
+
+#include <gp_Trsf.hxx>
+#include <gp_Pnt.hxx>
+#include <gp_Vec.hxx>
 
 //=======================================================================
 //function : GetID
@@ -122,6 +130,26 @@ Standard_Integer GEOMImpl_TranslateDriver::Execute(TFunction_Logbook& log) const
     TopLoc_Location aLocRes (aTrsf * aTrsfOrig);
     aShape = anOriginal.Located(aLocRes);
   }
+  else if (aType == TRANSLATE_VECTOR_DISTANCE) {
+    Handle(GEOM_Function) aVector = TI.GetVector();
+    double aDistance = TI.GetDistance();
+    if(aVector.IsNull()) return 0;
+    TopoDS_Shape aV = aVector->GetValue();
+    if(aV.IsNull() || aV.ShapeType() != TopAbs_EDGE) return 0;
+    TopoDS_Edge anEdge = TopoDS::Edge(aV);
+
+    aP1 = BRep_Tool::Pnt(TopExp::FirstVertex(anEdge));
+    aP2 = BRep_Tool::Pnt(TopExp::LastVertex(anEdge));
+
+    gp_Vec aVec (aP1, aP2);
+    aVec.Normalize();
+    aTrsf.SetTranslation(aVec * aDistance);
+
+    TopLoc_Location aLocOrig = anOriginal.Location();
+    gp_Trsf aTrsfOrig = aLocOrig.Transformation();
+    TopLoc_Location aLocRes (aTrsf * aTrsfOrig);
+    aShape = anOriginal.Located(aLocRes);
+  }
   else if (aType == TRANSLATE_XYZ || aType == TRANSLATE_XYZ_COPY) {
     gp_Vec aVec (TI.GetDX(), TI.GetDY(), TI.GetDZ());
     aTrsf.SetTranslation(aVec);
@@ -217,9 +245,22 @@ Standard_Integer GEOMImpl_TranslateDriver::Execute(TFunction_Logbook& log) const
   }
   else return 0;
 
-
   if (aShape.IsNull()) return 0;
 
+  BRepCheck_Analyzer ana (aShape, Standard_True);
+  if (!ana.IsValid()) {
+    ShapeFix_ShapeTolerance aSFT;
+    aSFT.LimitTolerance(aShape,Precision::Confusion(),Precision::Confusion());
+    Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
+    aSfs->SetPrecision(Precision::Confusion());
+    aSfs->Perform();
+    aShape = aSfs->Shape();
+
+    ana.Init(aShape, Standard_False);
+    if (!ana.IsValid())
+      Standard_ConstructionError::Raise("Scaling aborted : algorithm has produced an invalid shape result");
+  }
+
   aFunction->SetValue(aShape);
 
   log.SetTouched(Label());
index d8294a2d3b9109416986744089586a4b3e6fa560..d8875696bdac831491ab934784d1b877ea83607c 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_TranslateDriver.hxx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_TranslateDriver_HeaderFile
 #define _GEOMImpl_TranslateDriver_HeaderFile
 
index be924b3f7d9eed2a21c2f86671ceef0e91a25573..49cf5542f0b0474d29f23f5342877efcd9575a81 100755 (executable)
@@ -1,24 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 //GEOM_Object types
-
+//
 #define GEOM_COPY    0
 #define GEOM_IMPORT  1
 
@@ -45,8 +47,9 @@
 #define GEOM_ELLIPSE  18
 #define GEOM_CIRC_ARC 19
 
-#define GEOM_FILLET  20
-#define GEOM_CHAMFER 21
+#define GEOM_FILLET    20
+#define GEOM_FILLET_2D 45
+#define GEOM_CHAMFER   21
 
 #define GEOM_EDGE  22
 #define GEOM_WIRE  23
 
 #define GEOM_THRUSECTIONS 40
 
+#define GEOM_COMPOUNDFILTER 41
+
+#define GEOM_SHAPES_ON_SHAPE 42
+
+#define GEOM_ELLIPSE_ARC 43
+
+#define GEOM_3DSKETCHER 44
+
 //GEOM_Function types
 
 #define COPY_WITH_REF    1
 #define POINT_XYZ_REF            2
 #define POINT_CURVE_PAR          3
 #define POINT_LINES_INTERSECTION 4
+#define POINT_SURFACE_PAR        5
 //#define POINT_FACE_PAR 5
 
 #define VECTOR_TWO_PNT  1
 
 #define TRANSLATE_TWO_POINTS      1
 #define TRANSLATE_VECTOR          2
+#define TRANSLATE_VECTOR_DISTANCE 9
 #define TRANSLATE_TWO_POINTS_COPY 3
 #define TRANSLATE_VECTOR_COPY     4
 #define TRANSLATE_1D              5
 
 #define SCALE_SHAPE      1
 #define SCALE_SHAPE_COPY 2
+#define SCALE_SHAPE_AXES      3
+#define SCALE_SHAPE_AXES_COPY 4
 
 #define POSITION_SHAPE      1
 #define POSITION_SHAPE_COPY 2
 #define POSITION_SHAPE_FROM_GLOBAL      3
 #define POSITION_SHAPE_FROM_GLOBAL_COPY 4
+#define POSITION_ALONG_PATH 5
 
 #define TORUS_RR         1
 #define TORUS_PNT_VEC_RR 2
 #define BOX_DX_DY_DZ  1
 #define BOX_TWO_PNT   2
 
+#define FACE_OBJ_H_W  1
+#define FACE_H_W        2
+
+#define DISK_PNT_VEC_R    1
+#define DISK_THREE_PNT    2
+#define DISK_R            3
+
 #define CYLINDER_R_H         1
 #define CYLINDER_PNT_VEC_R_H 2
 
 #define PRISM_BASE_TWO_PNT       2
 #define PRISM_BASE_VEC_H_2WAYS   3
 #define PRISM_BASE_TWO_PNT_2WAYS 4
+#define PRISM_BASE_DXDYDZ        5
+#define PRISM_BASE_DXDYDZ_2WAYS  6
 
 #define REVOLUTION_BASE_AXIS_ANGLE       1
 #define REVOLUTION_BASE_AXIS_ANGLE_2WAYS 2
 #define PIPE_DIFFERENT_SECTIONS 2
 #define PIPE_SHELL_SECTIONS 3
 #define PIPE_SHELLS_WITHOUT_PATH 4
+#define PIPE_BI_NORMAL_ALONG_VECTOR 5
 
 #define THRUSECTIONS_RULED 1
 #define THRUSECTIONS_SMOOTHED 2
 
 #define ELLIPSE_PNT_VEC_RR 1
 
-#define CIRC_ARC_THREE_PNT 1
-#define CIRC_ARC_CENTER    2
+#define CIRC_ARC_THREE_PNT         1
+#define CIRC_ARC_CENTER            2
+#define ELLIPSE_ARC_CENTER_TWO_PNT 3
 
 #define FILLET_SHAPE_ALL      1
 #define FILLET_SHAPE_EDGES    2
 #define FILLET_SHAPE_EDGES_2R 4
 #define FILLET_SHAPE_FACES_2R 5
 
+#define FILLET_2D_SHAPE_VERTEXES      1
+
 #define CHAMFER_SHAPE_ALL      1
 #define CHAMFER_SHAPE_EDGE     2
 #define CHAMFER_SHAPE_FACES    3
 
 #define GROUP_FUNCTION 1
 
+#define SHAPES_ON_SHAPE 1
+
 // Blocks
 #define BLOCK_FACE_FOUR_PNT       1
 #define BLOCK_FACE_FOUR_EDGES     2
index 0be03473399d21f32d2c9b03be387b8fdfb6f14c..e925d0e8b593c1387fa11a1233fa50fc1e31cae6 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
index 38c92fd52c986fc76cd56adbe9de79e0a934f272..7bf4a469fd241e5d8dd7171bc76668d61bb9cbe6 100644 (file)
@@ -1,25 +1,27 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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   : GEOMImpl_VectorDriver.hxx
 //  Module : GEOMImpl
-
+//
 #ifndef _GEOMImpl_VectorDriver_HeaderFile
 #define _GEOMImpl_VectorDriver_HeaderFile
 
index a8f4a439f40435347232c378c4a9d8522caf76c8..b101bae15770b293aa23706f3cc565c08bd4d0f1 100755 (executable)
@@ -1,28 +1,28 @@
-//  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 
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
+//  Copyright (C) 2003-2007  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_GEOMImpl.hxx
 //  Author : Alexander A. BORODIN
 //  Module : GEOM
-
+//
 #ifndef _GEOM_GEOMImpl_HXX_
 #define _GEOM_GEOMImpl_HXX_
 
index 0c025b8b75de5ecafa4539f18c8fcaeae8f606a7..eb02b29291bdecdeea79bf337b8382b7d7a7ca7d 100644 (file)
@@ -1,30 +1,31 @@
-#  GEOM GEOM : implementaion of GEOM_Gen.idl
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
-
+#  Copyright (C) 2003-2007  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
+#
+#  GEOM GEOM : implementaion of GEOM_Gen.idl
 #  File   : Makefile.in
 #  Author : Damien COQUERET (OCC)
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header: 
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
@@ -32,103 +33,203 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 lib_LTLIBRARIES = libGEOMimpl.la
 
 # header files 
-salomeinclude_HEADERS = \
-       GEOMImpl_Gen.hxx \
-       GEOMImpl_IBasicOperations.hxx \
-       GEOMImpl_ITransformOperations.hxx \
-       GEOMImpl_IHealingOperations.hxx \
-       GEOMImpl_I3DPrimOperations.hxx \
-       GEOMImpl_IShapesOperations.hxx \
-       GEOMImpl_IBlocksOperations.hxx \
-       GEOMImpl_IBooleanOperations.hxx \
-       GEOMImpl_ICurvesOperations.hxx \
-       GEOMImpl_ILocalOperations.hxx \
-       GEOMImpl_IInsertOperations.hxx \
-       GEOMImpl_IMeasureOperations.hxx \
-       GEOMImpl_IGroupOperations.hxx \
-       GEOMImpl_CopyDriver.hxx \
-       GEOMImpl_Types.hxx \
+salomeinclude_HEADERS =                                \
+       GEOMImpl_Gen.hxx                        \
+       GEOMImpl_IBasicOperations.hxx           \
+       GEOMImpl_ITransformOperations.hxx       \
+       GEOMImpl_IHealingOperations.hxx         \
+       GEOMImpl_I3DPrimOperations.hxx          \
+       GEOMImpl_IShapesOperations.hxx          \
+       GEOMImpl_IBlocksOperations.hxx          \
+       GEOMImpl_IBooleanOperations.hxx         \
+       GEOMImpl_ICurvesOperations.hxx          \
+       GEOMImpl_ILocalOperations.hxx           \
+       GEOMImpl_IInsertOperations.hxx          \
+       GEOMImpl_IMeasureOperations.hxx         \
+       GEOMImpl_IGroupOperations.hxx           \
+       GEOMImpl_IGlue.hxx                      \
+       GEOMImpl_Gen.hxx                        \
+       GEOMImpl_PointDriver.hxx                \
+       GEOMImpl_IPoint.hxx                     \
+       GEOMImpl_IPolyline.hxx                  \
+       GEOMImpl_ICircle.hxx                    \
+       GEOMImpl_ISpline.hxx                    \
+       GEOMImpl_IEllipse.hxx                   \
+       GEOMImpl_IFillet.hxx                    \
+       GEOMImpl_IFillet2d.hxx                  \
+       GEOMImpl_IChamfer.hxx                   \
+       GEOMImpl_ICopy.hxx                      \
+       GEOMImpl_IArchimede.hxx                 \
+       GEOMImpl_IArc.hxx                       \
+       GEOMImpl_ISketcher.hxx                  \
+       GEOMImpl_I3DSketcher.hxx                \
+       GEOMImpl_IVector.hxx                    \
+       GEOMImpl_IDisk.hxx                      \
+       GEOMImpl_IFace.hxx                      \
+       GEOMImpl_ILine.hxx                      \
+       GEOMImpl_IPlane.hxx                     \
+       GEOMImpl_IMarker.hxx                    \
+       GEOMImpl_ITranslate.hxx                 \
+       GEOMImpl_IMirror.hxx                    \
+       GEOMImpl_IOffset.hxx                    \
+       GEOMImpl_IScale.hxx                     \
+       GEOMImpl_IRotate.hxx                    \
+       GEOMImpl_IPosition.hxx                  \
+       GEOMImpl_IHealing.hxx                   \
+       GEOMImpl_IImportExport.hxx              \
+       GEOMImpl_IBox.hxx                       \
+       GEOMImpl_IBlocks.hxx                    \
+       GEOMImpl_IBlockTrsf.hxx                 \
+       GEOMImpl_IBoolean.hxx                   \
+       GEOMImpl_ICylinder.hxx                  \
+       GEOMImpl_ICone.hxx                      \
+       GEOMImpl_ISphere.hxx                    \
+       GEOMImpl_ITorus.hxx                     \
+       GEOMImpl_IPrism.hxx                     \
+       GEOMImpl_IPipe.hxx                      \
+       GEOMImpl_IRevolution.hxx                \
+       GEOMImpl_IMeasure.hxx                   \
+       GEOMImpl_IShapes.hxx                    \
+       GEOMImpl_IFilling.hxx                   \
+       GEOMImpl_IThruSections.hxx              \
+       GEOMImpl_IPartition.hxx                 \
+       GEOMImpl_IPipeDiffSect.hxx              \
+       GEOMImpl_IPipeShellSect.hxx             \
+       GEOMImpl_IPipeBiNormal.hxx              \
+       GEOMImpl_VectorDriver.hxx               \
+       GEOMImpl_LineDriver.hxx                 \
+       GEOMImpl_DiskDriver.hxx                 \
+       GEOMImpl_FaceDriver.hxx                 \
+       GEOMImpl_PlaneDriver.hxx                \
+       GEOMImpl_MarkerDriver.hxx               \
+       GEOMImpl_TranslateDriver.hxx            \
+       GEOMImpl_MirrorDriver.hxx               \
+       GEOMImpl_OffsetDriver.hxx               \
+       GEOMImpl_ScaleDriver.hxx                \
+       GEOMImpl_PositionDriver.hxx             \
+       GEOMImpl_BoxDriver.hxx                  \
+       GEOMImpl_ConeDriver.hxx                 \
+       GEOMImpl_CylinderDriver.hxx             \
+       GEOMImpl_SphereDriver.hxx               \
+       GEOMImpl_TorusDriver.hxx                \
+       GEOMImpl_PrismDriver.hxx                \
+       GEOMImpl_PipeDriver.hxx                 \
+       GEOMImpl_ThruSectionsDriver.hxx         \
+       GEOMImpl_RevolutionDriver.hxx           \
+       GEOMImpl_ShapeDriver.hxx                \
+       GEOMImpl_BlockDriver.hxx                \
+       GEOMImpl_Block6Explorer.hxx             \
+       GEOMImpl_MeasureDriver.hxx              \
+       GEOMImpl_PolylineDriver.hxx             \
+       GEOMImpl_CircleDriver.hxx               \
+       GEOMImpl_EllipseDriver.hxx              \
+       GEOMImpl_ArcDriver.hxx                  \
+       GEOMImpl_SplineDriver.hxx               \
+       GEOMImpl_SketcherDriver.hxx             \
+       GEOMImpl_3DSketcherDriver.hxx           \
+       GEOMImpl_FilletDriver.hxx               \
+       GEOMImpl_Fillet2dDriver.hxx             \
+       GEOMImpl_ChamferDriver.hxx              \
+       GEOMImpl_BooleanDriver.hxx              \
+       GEOMImpl_PartitionDriver.hxx            \
+       GEOMImpl_CopyDriver.hxx                 \
+       GEOMImpl_ExportDriver.hxx               \
+       GEOMImpl_ImportDriver.hxx               \
+       GEOMImpl_RotateDriver.hxx               \
+       GEOMImpl_ArchimedeDriver.hxx            \
+       GEOMImpl_HealingDriver.hxx              \
+       GEOMImpl_FillingDriver.hxx              \
+       GEOMImpl_GlueDriver.hxx                 \
+       GEOMImpl_CopyDriver.hxx                 \
+       GEOMImpl_Types.hxx                      \
        GEOM_GEOMImpl.hxx
 
-dist_libGEOMimpl_la_SOURCES = \
-       GEOMImpl_IBasicOperations.cxx \
-       GEOMImpl_ITransformOperations.cxx \
-        GEOMImpl_IHealingOperations.cxx \
-       GEOMImpl_I3DPrimOperations.cxx \
-       GEOMImpl_IShapesOperations.cxx \
-       GEOMImpl_IBlocksOperations.cxx \
-       GEOMImpl_IBooleanOperations.cxx \
-       GEOMImpl_ICurvesOperations.cxx \
-       GEOMImpl_ILocalOperations.cxx \
-       GEOMImpl_IInsertOperations.cxx \
-       GEOMImpl_IMeasureOperations.cxx \
-       GEOMImpl_IGroupOperations.cxx \
-       GEOMImpl_Gen.cxx \
-       GEOMImpl_PointDriver.cxx \
-       GEOMImpl_VectorDriver.cxx \
-       GEOMImpl_LineDriver.cxx \
-       GEOMImpl_PlaneDriver.cxx \
-       GEOMImpl_MarkerDriver.cxx \
-       GEOMImpl_TranslateDriver.cxx \
-       GEOMImpl_MirrorDriver.cxx \
-       GEOMImpl_OffsetDriver.cxx \
-       GEOMImpl_ScaleDriver.cxx \
-       GEOMImpl_PositionDriver.cxx \
-       GEOMImpl_BoxDriver.cxx \
-       GEOMImpl_ConeDriver.cxx \
-       GEOMImpl_CylinderDriver.cxx \
-       GEOMImpl_SphereDriver.cxx \
-       GEOMImpl_TorusDriver.cxx \
-       GEOMImpl_PrismDriver.cxx \
-       GEOMImpl_PipeDriver.cxx \
-       GEOMImpl_ThruSectionsDriver.cxx \
-       GEOMImpl_RevolutionDriver.cxx \
-       GEOMImpl_ShapeDriver.cxx \
-       GEOMImpl_BlockDriver.cxx \
-       GEOMImpl_Block6Explorer.cxx \
-       GEOMImpl_MeasureDriver.cxx \
-       GEOMImpl_PolylineDriver.cxx \
-       GEOMImpl_CircleDriver.cxx \
-       GEOMImpl_EllipseDriver.cxx \
-       GEOMImpl_ArcDriver.cxx \
-       GEOMImpl_SplineDriver.cxx \
-       GEOMImpl_SketcherDriver.cxx \
-       GEOMImpl_FilletDriver.cxx \
-       GEOMImpl_ChamferDriver.cxx \
-       GEOMImpl_BooleanDriver.cxx \
-       GEOMImpl_PartitionDriver.cxx \
-       GEOMImpl_CopyDriver.cxx \
-       GEOMImpl_ExportDriver.cxx \
-       GEOMImpl_ImportDriver.cxx \
-       GEOMImpl_RotateDriver.cxx \
-       GEOMImpl_ArchimedeDriver.cxx \
-       GEOMImpl_HealingDriver.cxx \
-       GEOMImpl_FillingDriver.cxx \
+dist_libGEOMimpl_la_SOURCES =                  \
+       GEOMImpl_IBasicOperations.cxx           \
+       GEOMImpl_ITransformOperations.cxx       \
+       GEOMImpl_IHealingOperations.cxx         \
+       GEOMImpl_I3DPrimOperations.cxx          \
+       GEOMImpl_IShapesOperations.cxx          \
+       GEOMImpl_IBlocksOperations.cxx          \
+       GEOMImpl_IBooleanOperations.cxx         \
+       GEOMImpl_ICurvesOperations.cxx          \
+       GEOMImpl_ILocalOperations.cxx           \
+       GEOMImpl_IInsertOperations.cxx          \
+       GEOMImpl_IMeasureOperations.cxx         \
+       GEOMImpl_IGroupOperations.cxx           \
+       GEOMImpl_Gen.cxx                        \
+       GEOMImpl_PointDriver.cxx                \
+       GEOMImpl_VectorDriver.cxx               \
+       GEOMImpl_LineDriver.cxx                 \
+       GEOMImpl_PlaneDriver.cxx                \
+       GEOMImpl_MarkerDriver.cxx               \
+       GEOMImpl_TranslateDriver.cxx            \
+       GEOMImpl_MirrorDriver.cxx               \
+       GEOMImpl_OffsetDriver.cxx               \
+       GEOMImpl_ScaleDriver.cxx                \
+       GEOMImpl_PositionDriver.cxx             \
+       GEOMImpl_BoxDriver.cxx                  \
+       GEOMImpl_FaceDriver.cxx                 \
+       GEOMImpl_DiskDriver.cxx                 \
+       GEOMImpl_ConeDriver.cxx                 \
+       GEOMImpl_CylinderDriver.cxx             \
+       GEOMImpl_SphereDriver.cxx               \
+       GEOMImpl_TorusDriver.cxx                \
+       GEOMImpl_PrismDriver.cxx                \
+       GEOMImpl_PipeDriver.cxx                 \
+       GEOMImpl_ThruSectionsDriver.cxx         \
+       GEOMImpl_RevolutionDriver.cxx           \
+       GEOMImpl_ShapeDriver.cxx                \
+       GEOMImpl_BlockDriver.cxx                \
+       GEOMImpl_Block6Explorer.cxx             \
+       GEOMImpl_MeasureDriver.cxx              \
+       GEOMImpl_PolylineDriver.cxx             \
+       GEOMImpl_CircleDriver.cxx               \
+       GEOMImpl_EllipseDriver.cxx              \
+       GEOMImpl_ArcDriver.cxx                  \
+       GEOMImpl_SplineDriver.cxx               \
+       GEOMImpl_SketcherDriver.cxx             \
+       GEOMImpl_3DSketcherDriver.cxx           \
+       GEOMImpl_FilletDriver.cxx               \
+       GEOMImpl_Fillet2dDriver.cxx             \
+       GEOMImpl_ChamferDriver.cxx              \
+       GEOMImpl_BooleanDriver.cxx              \
+       GEOMImpl_PartitionDriver.cxx            \
+       GEOMImpl_CopyDriver.cxx                 \
+       GEOMImpl_ExportDriver.cxx               \
+       GEOMImpl_ImportDriver.cxx               \
+       GEOMImpl_RotateDriver.cxx               \
+       GEOMImpl_ArchimedeDriver.cxx            \
+       GEOMImpl_HealingDriver.cxx              \
+       GEOMImpl_FillingDriver.cxx              \
        GEOMImpl_GlueDriver.cxx
 
-# additionnal information to compil and link file
-libGEOMimpl_la_CPPFLAGS = \
-       $(CORBA_CXXFLAGS) \
-        $(CORBA_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(BOOST_CPPFLAGS) \
-       -I$(srcdir)/../ShHealOper \
-       -I$(srcdir)/../NMTTools \
-       -I$(srcdir)/../GEOM \
-       -I$(srcdir)/../GEOMAlgo \
-       -I$(srcdir)/../SKETCHER \
-       -I$(srcdir)/../ARCHIMEDE \
-       -I$(top_builddir)/idl \
+# additional information to compile and link file
+
+libGEOMimpl_la_CPPFLAGS =              \
+       $(CORBA_CXXFLAGS)               \
+        $(CORBA_INCLUDES)              \
+       $(CAS_CPPFLAGS)                 \
+       $(KERNEL_CXXFLAGS)              \
+       $(BOOST_CPPFLAGS)               \
+       -I$(srcdir)/../ShHealOper       \
+       -I$(srcdir)/../NMTTools         \
+       -I$(srcdir)/../GEOM             \
+       -I$(srcdir)/../GEOMAlgo         \
+       -I$(srcdir)/../SKETCHER         \
+       -I$(srcdir)/../ARCHIMEDE        \
+       -I$(top_builddir)/idl           \
        -I$(top_builddir)/salome_adm/unix
 
-libGEOMimpl_la_LDFLAGS  = \
-       ../GEOM/libGEOMbasic.la \
-       ../GEOMAlgo/libGEOMAlgo.la \
-       ../ShHealOper/libShHealOper.la \
-       ../ARCHIMEDE/libGEOMArchimede.la \
-       ../SKETCHER/libGEOMSketcher.la \
-       $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
-       $(STDLIB) \
+libGEOMimpl_la_LDFLAGS  =                      \
+       ../GEOM/libGEOMbasic.la                 \
+       ../GEOMAlgo/libGEOMAlgo.la              \
+       ../ShHealOper/libShHealOper.la          \
+       ../ARCHIMEDE/libGEOMArchimede.la        \
+       ../SKETCHER/libGEOMSketcher.la          \
+       $(KERNEL_LDFLAGS) -lSALOMELocalTrace    \
+       $(STDLIB)                               \
        $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset
 
+# extra dist files
+EXTRA_DIST += GUID.txt
index ae6fb406e0f1a26887dc518548a205f53d56619a..4945b72e8406b7fced6c0fb982cea49eac02d761 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMBase_Tools.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//
-//  File   : GEOMBase_Tools.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "GEOMToolsGUI.h"
+#include "GEOMToolsGUI_DeleteDlg.h"
 
-#include "GeometryGUI.h"
-#include "GEOM_Actor.h"
-#include "GEOMBase.h"
-#include "GEOMBase_aWarningDlg.h"
-
-#include "GEOM_Operation.h"
-#include "GEOM_Displayer.h"
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+#include <GEOM_Operation.h>
+#include <GEOM_Displayer.h>
 
 #include <SUIT_Session.h>
-#include <SUIT_Application.h>
 #include <SUIT_OverrideCursor.h>
 #include <SUIT_MessageBox.h>
 #include <SUIT_Tools.h>
 #include <SUIT_FileDlg.h>
 #include <SUIT_Desktop.h>
 #include <SUIT_ViewModel.h>
+#include <SUIT_ViewManager.h>
 
 #include <SalomeApp_Application.h>
 #include <SalomeApp_Study.h>
 #include <LightApp_SelectionMgr.h>
 #include <GEOMImpl_Types.hxx>
 
+#include <SALOME_ListIO.hxx>
 #include <SALOME_ListIteratorOfListIO.hxx>
 #include <SALOME_Prs.h>
 
-#include "utilities.h"
-
 // QT Includes
-#include <qapplication.h>
-#include <qmap.h>
+#include <QApplication>
+#include <QMap>
+#include <QRegExp>
 
 // OCCT Includes
 #include <TCollection_AsciiString.hxx>
@@ -65,6 +60,7 @@
 using namespace std;
 
 typedef QMap<QString, QString> FilterMap;
+static QString lastUsedFilter;
 
 //=======================================================================
 // function : getFileName
@@ -74,48 +70,194 @@ typedef QMap<QString, QString> FilterMap;
 static QString getFileName( QWidget*           parent,
                            const QString&     initial,
                            const FilterMap&   filterMap,
-                            const QStringList  filters,
+                            const QStringList& filters,
                            const QString&     caption,
                            bool               open,
-                           QString&           format )
+                           QString&           format,
+                           bool               showCurrentDirInitially = false )
 {
-  static QString lastUsedFilter;
   //QStringList filters;
   QString aBrepFilter;
   for ( FilterMap::const_iterator it = filterMap.begin(); it != filterMap.end(); ++it ) {
     //filters.push_back( it.key() );
-
-    if (it.key().contains("BREP", false)) {
+    if ( it.key().contains( "BREP", Qt::CaseInsensitive ) )
       aBrepFilter = it.key();
-    }
   }
 
   SUIT_FileDlg* fd = new SUIT_FileDlg( parent, open, true, true );
   if ( !caption.isEmpty() )
-    fd->setCaption( caption );
+    fd->setWindowTitle( caption );
 
   if ( !initial.isEmpty() )
-    fd->setSelection( initial );
+    fd->selectFile( initial );
+  
+  if ( showCurrentDirInitially && SUIT_FileDlg::getLastVisitedPath().isEmpty() )
+    fd->setDirectory( QDir::currentPath() );
 
   fd->setFilters( filters );
+  
+  if ( !lastUsedFilter.isEmpty() && filterMap.contains( lastUsedFilter ) ) {
+    fd->selectFilter( lastUsedFilter );
+  }
+  else if ( !aBrepFilter.isEmpty() ) {
+    fd->selectFilter( aBrepFilter );
+  }
 
-  if ( !lastUsedFilter.isEmpty() && filterMap.contains( lastUsedFilter ) )
-    fd->setSelectedFilter( lastUsedFilter );
-  else {
-    if (!aBrepFilter.isEmpty()) {
-      fd->setSelectedFilter(aBrepFilter);
-    }
+  QString filename;
+  if ( fd->exec() == QDialog::Accepted ) {
+    filename = fd->selectedFile();
+    format = filterMap[fd->selectedFilter()];
+    lastUsedFilter = fd->selectedFilter();
   }
 
-  fd->exec();
-  QString filename = fd->selectedFile();
-  format = filterMap[fd->selectedFilter()];
-  lastUsedFilter = fd->selectedFilter();
   delete fd;
   qApp->processEvents();
   return filename;
 }
 
+//=======================================================================
+// function : getFileNames
+// purpose  : Select list of files for Import operation. Returns also
+//            the selected file type code through <format> argument.
+//=======================================================================
+static QStringList getFileNames( QWidget*           parent,
+                                const QString&     initial,
+                                const FilterMap&   filterMap,
+                                const QString&     caption,
+                                QString&           format,
+                                bool               showCurrentDirInitially = false)
+{
+  QString aBrepFilter;
+  QStringList allFilters;
+  QStringList filters;
+  QRegExp re( "\\((.*)\\)" );
+  re.setMinimal( true );
+  for ( FilterMap::const_iterator it = filterMap.begin(); it != filterMap.end(); ++it ) {
+    if ( it.value().contains( "BREP", Qt::CaseInsensitive ) && aBrepFilter.isEmpty() )
+      aBrepFilter = it.key();
+    filters.append( it.key() );
+    int pos = 0;
+    while ( re.indexIn( it.key(), pos ) >= 0 ) {
+      QString f = re.cap(1);
+      pos = re.pos() + f.length() + 2;
+      allFilters.append( f.simplified() );
+    }
+  }
+  filters.append( QObject::tr( "GEOM_ALL_IMPORT_FILES" ).arg( allFilters.join( " " ) ) );
+  
+  SUIT_FileDlg fd( parent, true, true, true );
+  fd.setFileMode( SUIT_FileDlg::ExistingFiles );     
+  if ( !caption.isEmpty() )
+    fd.setWindowTitle( caption );
+  if ( !initial.isEmpty() )
+    fd.selectFile( initial );
+  
+  if ( showCurrentDirInitially && SUIT_FileDlg::getLastVisitedPath().isEmpty() )
+    fd.setDirectory( QDir::currentPath() );
+  
+  fd.setFilters( filters );
+  
+  if ( !lastUsedFilter.isEmpty() && filterMap.contains( lastUsedFilter ) )
+    fd.selectFilter( lastUsedFilter );
+  else if ( !aBrepFilter.isEmpty() )
+    fd.selectFilter( aBrepFilter );
+
+  QStringList filenames;
+  if ( fd.exec() ) {
+    filenames = fd.selectedFiles();
+    format = filterMap.contains( fd.selectedFilter() ) ? filterMap[ fd.selectedFilter() ] : QString();
+    lastUsedFilter = fd.selectedFilter();
+  }
+  qApp->processEvents();
+  return filenames;
+}
+
+//=======================================================================
+// function : getParentComponent
+// purpose  : Get object's parent component entry
+//=======================================================================
+static QString getParentComponent( _PTR( SObject ) obj )
+{
+  if ( obj ) {
+    _PTR(SComponent) comp = obj->GetFatherComponent();
+    if ( comp )
+      return QString( comp->GetID().c_str() );
+  }
+  return QString();
+}
+
+//=====================================================================================
+// function : inUse
+// purpose  : check if the object(s) passed as the the second arguments are used
+//            by the other objects in the study
+//=====================================================================================
+static bool inUse( _PTR(Study) study, const QString& component, const QMap<QString,QString>& objects )
+{
+  _PTR(SObject) comp = study->FindObjectID( component.toLatin1().data() );
+  if ( !comp )
+    return false;
+
+  // collect all GEOM objects being deleted
+  QMap<QString, GEOM::GEOM_Object_var> gobjects;
+  QMap<QString, QString>::ConstIterator oit;
+  list<_PTR(SObject)> aSelectedSO;
+  for ( oit = objects.begin(); oit != objects.end(); ++oit ) {
+    _PTR(SObject) so = study->FindObjectID( oit.key().toLatin1().data() );
+    if ( !so )
+      continue;
+    aSelectedSO.push_back(so);
+    CORBA::Object_var corbaObj_rem = GeometryGUI::ClientSObjectToObject( so );
+    GEOM::GEOM_Object_var geomObj_rem = GEOM::GEOM_Object::_narrow( corbaObj_rem );
+    if( CORBA::is_nil( geomObj_rem ) ) 
+      continue;
+    gobjects.insert( oit.key(), geomObj_rem );
+  }
+
+  // Search References with other Modules
+  list< _PTR(SObject) >::iterator itSO = aSelectedSO.begin();
+  for ( ; itSO != aSelectedSO.end(); ++itSO ) {
+    std::vector<_PTR(SObject)> aReferences = study->FindDependances( *itSO  );    
+    int aRefLength = aReferences.size();
+    if (aRefLength) {
+      for (int i = 0; i < aRefLength; i++) {
+       _PTR(SObject) firstSO( aReferences[i] );
+       _PTR(SComponent) aComponent = firstSO->GetFatherComponent();
+       QString type = aComponent->ComponentDataType().c_str();
+       if ( type == "SMESH" )
+         return true;
+      }
+    }
+  }
+
+  // browse through all GEOM data tree
+  _PTR(ChildIterator) it ( study->NewChildIterator( comp ) );
+  for ( it->InitEx( true ); it->More(); it->Next() ) {
+    _PTR(SObject) child( it->Value() );
+    CORBA::Object_var corbaObj = GeometryGUI::ClientSObjectToObject( child );
+    GEOM::GEOM_Object_var geomObj = GEOM::GEOM_Object::_narrow( corbaObj );
+    if( CORBA::is_nil( geomObj ) ) 
+      continue;
+
+    GEOM::ListOfGO_var list = geomObj->GetDependency();
+    if( list->length() == 0 ) 
+      continue;
+
+    for( int i = 0; i < list->length(); i++ ) {
+      bool depends = false;
+      bool deleted = false;
+      QMap<QString, GEOM::GEOM_Object_var>::Iterator git;
+      for ( git = gobjects.begin(); git != gobjects.end() && ( !depends || !deleted ); ++git ) {
+       depends = depends || list[i]->_is_equivalent( *git );
+       deleted = deleted || git.key() == child->GetID().c_str() ;//geomObj->_is_equivalent( *git );
+      }
+      if ( depends && !deleted )
+       return true;
+    }
+  }
+  return false;
+}
+
+
 //=======================================================================
 // function : GEOMToolsGUI()
 // purpose  : Constructor
@@ -219,16 +361,6 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
        OnSettingsColor();
        break;
       }
-    case 413: // SETTINGS - ISOS
-      {
-       OnSettingsIsos();
-       break;
-      }
-    case 414: // SETTINGS : STEP VALUE FOR SPIN BOXES
-      {
-       OnSettingsStep();
-       break;
-      }
     case 804: // ADD IN STUDY - POPUP VIEWER
       {
        // SAN -- TO BE REMOVED !!!!
@@ -284,7 +416,6 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
 }
 
 
-
 //===============================================================================
 // function : OnEditDelete()
 // purpose  :
@@ -294,157 +425,145 @@ void GEOMToolsGUI::OnEditDelete()
   SALOME_ListIO selected;
   SalomeApp_Application* app =
     dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
-  if ( app ) {
-    LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
-    SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
-    if ( aSelMgr && appStudy ) {
-      aSelMgr->selectedObjects( selected, QString::null, false );
-      if ( !selected.IsEmpty() ) {
-       _PTR(Study) aStudy = appStudy->studyDS();
-
-       bool aLocked = (_PTR(AttributeStudyProperties)(aStudy->GetProperties()))->IsLocked();
-       if ( aLocked ) {
-         SUIT_MessageBox::warn1 ( app->desktop(),
-                                  QObject::tr("WRN_WARNING"),
-                                  QObject::tr("WRN_STUDY_LOCKED"),
-                                  QObject::tr("BUT_OK") );
-         return;
-       }
-
-       // VSR 17/11/04: check if all objects selected belong to GEOM component --> start
-       // modifications of ASV 01.06.05
-       QString parentComp = getParentComponent( aStudy, selected );
-        CORBA::String_var geomIOR = app->orb()->object_to_string( GeometryGUI::GetGeomGen() );
-       QString geomComp = getParentComponent( aStudy->FindObjectIOR( geomIOR.in() ) );
-
-       if ( parentComp != geomComp )  {
-         SUIT_MessageBox::warn1 ( app->desktop(),
-                                 QObject::tr("ERR_ERROR"),
-                                 QObject::tr("NON_GEOM_OBJECTS_SELECTED").arg( getGeometryGUI()->moduleName() ),
-                                 QObject::tr("BUT_OK") );
-         return;
-       }
-       // VSR 17/11/04: check if all objects selected belong to GEOM component <-- finish
-       QString aNameList;
-       int nbSel = 0;
-       //Get Main Objects Names
-       Handle(SALOME_InteractiveObject) anIObject;
-       for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() )
-         {
-           QString aName = It.Value()->getName();
-           if ( aName != "" && aName.ref(0) != '*') {
-             aNameList.append("    - " + aName + "\n");
-             nbSel++;
-           }
-           anIObject = It.Value();
-         }
-       // Append Child Names of Last Selected Object
-       _PTR(SObject) obj ( aStudy->FindObjectID( anIObject->getEntry() ) );
-       for (_PTR(ChildIterator) iit (aStudy->NewChildIterator(obj)); iit->More(); iit->Next()) {
-         _PTR(SObject) child (iit->Value());
-         QString aName = child->GetName();
-         if (aName != "" && aName.ref(0) != '*') {
-           aNameList.append("    - " +  aName + "\n");
-           nbSel++;
-           //append childs child
-           for (_PTR(ChildIterator) iitt(aStudy->NewChildIterator(child)); iitt->More(); iitt->Next()) {
-             _PTR(SObject) childchild(iitt->Value());
-             QString aName = childchild->GetName();
-             if (aName != "" && aName.ref(0) != '*') {
-              aNameList.append("    - " +  aName + "\n");
-              nbSel++;
-              for (_PTR(ChildIterator) itt(aStudy->NewChildIterator(childchild)); itt->More(); itt->Next())
-                {
-                  _PTR(SObject) childs(itt->Value());
-                  QString aName = childs->GetName();
-                  if (aName != "" && aName.ref(0) != '*') {
-                    aNameList.append("    - " +  aName + "\n");
-                    nbSel++;
-                  }
-                }
-             }
-           }
-         }
-       } //end of child append
-
-       GEOMBase_aWarningDlg* Dialog = new GEOMBase_aWarningDlg( app->desktop(),  QObject::tr( "GEOM_WRN_WARNING" ), aNameList, nbSel);
-       int r = Dialog->exec();
-
-       if (!r)
-        return;
-
-       //      QAD_Operation* op = new SALOMEGUI_ImportOperation(.....);
-       //      op->start();
-
-       // prepare list of SALOME_Views
-       QPtrList<SALOME_View> views;
-       SALOME_View* view;
-       // fill the list
-       ViewManagerList vmans = app->viewManagers();
-       SUIT_ViewManager* vman;
-       for ( vman = vmans.first(); vman; vman = vmans.next() ) {
-         SUIT_ViewModel* vmod = vman->getViewModel();
-         view = dynamic_cast<SALOME_View*> ( vmod ); // must work for OCC and VTK views
-         if ( view )
-           views.append( view );
-       }
-
-       _PTR(StudyBuilder) aStudyBuilder (aStudy->NewBuilder());
-       _PTR(GenericAttribute) anAttr;
-       GEOM_Displayer* disp = new GEOM_Displayer( appStudy );
-
-        _PTR(SComponent) aGeom ( aStudy->FindComponent("GEOM") );
-          if ( !aGeom )
-            return;    
-
-       // MAIN LOOP OF SELECTED OBJECTS
-       for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
-
-         Handle(SALOME_InteractiveObject) io = It.Value();
-         if ( !io->hasEntry() )
-           continue;
-
-         _PTR(SObject) obj ( aStudy->FindObjectID( io->getEntry() ) );
-
-         // disable removal of "Geometry" component object
-         if ( !strcmp( obj->GetIOR().c_str(), geomIOR ) )
-           continue;
-
-          //If the object has been used to create another one,then it can't be deleted 
-          _PTR(ChildIterator) it (aStudy->NewChildIterator(aGeom));
-          for ( it->InitEx( true ); it->More(); it->Next() ) {
-             _PTR(SObject) chobj (it->Value());
-            if(CheckSubObjectInUse(chobj, obj, aStudy)) return;
-            //check subobjects
-            for (_PTR(ChildIterator) it (aStudy->NewChildIterator(obj)); it->More(); it->Next()) {
-              _PTR(SObject) child (it->Value());
-              if(CheckSubObjectInUse( chobj, child, aStudy)) return;
-            }
-          }
-
-          RemoveObjectWithChildren(obj, aStudy, views, disp);
-
-         // Remove objects from Study
-         aStudyBuilder->RemoveObjectWithChildren( obj );
-
-         //deleted = true;
-       } // MAIN LOOP of selected
-
-       selected.Clear();
-       aSelMgr->setSelectedObjects( selected );
-       getGeometryGUI()->updateObjBrowser();
-      } // if ( selected not empty )
-    } // if ( selMgr && appStudy )
-
-    app->updateActions(); //SRN: To update a Save button in the toolbar
-
-  } // if ( app )
-
+  if ( !app )
+    return;
+
+  LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
+  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
+  if ( !aSelMgr || !appStudy )
+    return;
+
+  // get selection
+  aSelMgr->selectedObjects( selected, "ObjectBrowser", false );
+  if ( selected.IsEmpty() )
+    return;
+
+  _PTR(Study) aStudy = appStudy->studyDS();
+  
+  // check if study is locked
+  if ( _PTR(AttributeStudyProperties)( aStudy->GetProperties() )->IsLocked() ) {
+    SUIT_MessageBox::warning( app->desktop(),
+                             tr("WRN_WARNING"),
+                             tr("WRN_STUDY_LOCKED") );
+    return; // study is locked
+  }
+  
+  // get GEOM component
+  CORBA::String_var geomIOR = app->orb()->object_to_string( GeometryGUI::GetGeomGen() );
+  QString geomComp = getParentComponent( aStudy->FindObjectIOR( geomIOR.in() ) );
+
+  // check each selected object: if belongs to GEOM, if not reference...
+  QMap<QString,QString> toBeDeleted;
+  QMap<QString,QString> allDeleted;
+  bool isComponentSelected = false;
+  for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
+    Handle(SALOME_InteractiveObject) anIObject = It.Value();
+    if ( !anIObject->hasEntry() )
+      continue; // invalid object
+    // ...
+    QString entry = anIObject->getEntry();
+    _PTR(SObject) obj = aStudy->FindObjectID( entry.toLatin1().data() );
+    // check parent component
+    QString parentComp = getParentComponent( obj );
+    if ( parentComp != geomComp )  {
+      SUIT_MessageBox::warning( app->desktop(),
+                               QObject::tr("ERR_ERROR"),
+                               QObject::tr("NON_GEOM_OBJECTS_SELECTED").arg( getGeometryGUI()->moduleName() ) );
+      return; // not GEOM object selected
+    }
 
-  //  if ( deleted )
-  //    op->finish();
-  //  else
-  //    op->abort();
+    ///////////////////////////////////////////////////////
+    // if GEOM component is selected, so skip other checks
+    if ( isComponentSelected ) continue; 
+    ///////////////////////////////////////////////////////
+       
+    // check if object is reference
+    _PTR(SObject) refobj;
+    if ( obj && obj->ReferencedObject( refobj ) )
+      continue; // skip references
+    // ...
+    QString aName = obj->GetName().c_str();
+    if ( entry == geomComp ) {
+      // GEOM component is selected, skip other checks
+      isComponentSelected = true;
+      continue;
+    }
+    toBeDeleted.insert( entry, aName );
+    allDeleted.insert( entry, aName ); // skip GEOM component
+    // browse through all children recursively
+    _PTR(ChildIterator) it ( aStudy->NewChildIterator( obj ) );
+    for ( it->InitEx( true ); it->More(); it->Next() ) {
+      _PTR(SObject) child( it->Value() );
+      if ( child && child->ReferencedObject( refobj ) )
+       continue; // skip references
+      aName = child->GetName().c_str();
+      if ( !aName.isEmpty() )
+       allDeleted.insert( child->GetID().c_str(), aName );
+    }
+  }
+  
+  // is there is anything to delete?
+  if ( !isComponentSelected && allDeleted.count() <= 0 )
+    return; // nothing to delete
+
+  // show confirmation dialog box
+  GEOMToolsGUI_DeleteDlg dlg( app->desktop(), allDeleted, isComponentSelected );
+  if ( !dlg.exec() )
+    return; // operation is cancelled by user
+  
+  // get currently opened views
+  QList<SALOME_View*> views;
+  SALOME_View* view;
+  ViewManagerList vmans = app->viewManagers();
+  SUIT_ViewManager* vman;
+  foreach ( vman, vmans ) {
+    SUIT_ViewModel* vmod = vman->getViewModel();
+    view = dynamic_cast<SALOME_View*> ( vmod ); // must work for OCC and VTK views
+    if ( view )
+      views.append( view );
+  }
+  
+  _PTR(StudyBuilder) aStudyBuilder (aStudy->NewBuilder());
+  GEOM_Displayer* disp = new GEOM_Displayer( appStudy );
+  
+  if ( isComponentSelected ) {
+    // GEOM component is selected: delete all objects recursively
+    _PTR(SObject) comp = aStudy->FindObjectID( geomComp.toLatin1().data() );
+    if ( !comp )
+      return;
+    _PTR(ChildIterator) it ( aStudy->NewChildIterator( comp ) );
+    // remove top-level objects only
+    for ( it->InitEx( false ); it->More(); it->Next() ) {
+      _PTR(SObject) child( it->Value() );
+      // remove object from GEOM engine
+      removeObjectWithChildren( child, aStudy, views, disp );
+      // remove object from study
+      aStudyBuilder->RemoveObjectWithChildren( child );
+    }
+  }
+  else {
+    // GEOM component is not selected: check if selected objects are in use
+    if ( inUse( aStudy, geomComp, allDeleted ) ) {
+      SUIT_MessageBox::warning( app->desktop(),
+                               QObject::tr("WRN_WARNING"),
+                               QObject::tr("DEP_OBJECT") );
+      return; // object(s) in use
+    }
+    // ... and then delete all objects
+    QMap<QString, QString>::Iterator it;
+    for ( it = toBeDeleted.begin(); it != toBeDeleted.end(); ++it ) {
+      _PTR(SObject) obj ( aStudy->FindObjectID( it.key().toLatin1().data() ) );
+      // remove object from GEOM engine
+      removeObjectWithChildren( obj, aStudy, views, disp );
+      // remove objects from study
+      aStudyBuilder->RemoveObjectWithChildren( obj );
+    }
+  }
+  
+  selected.Clear();
+  aSelMgr->setSelectedObjects( selected );
+  getGeometryGUI()->updateObjBrowser();
+  app->updateActions(); //SRN: To update a Save button in the toolbar
 }
 
 
@@ -483,7 +602,6 @@ void GEOMToolsGUI::OnEditCopy()
 */
 }
 
-
 //=====================================================================================
 // function : Import
 // purpose  : BRep, Iges, Step
@@ -491,116 +609,141 @@ void GEOMToolsGUI::OnEditCopy()
 bool GEOMToolsGUI::Import()
 {
   SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( getGeometryGUI()->getApp() );
-  //SUIT_Application* app = getGeometryGUI()->getApp();
   if (! app) return false;
 
   SalomeApp_Study* stud = dynamic_cast<SalomeApp_Study*> ( app->activeStudy() );
   if ( !stud ) {
-    cout << "FAILED to cast active study to SalomeApp_Study" << endl;
+    MESSAGE ( "FAILED to cast active study to SalomeApp_Study" );
     return false;
   }
   _PTR(Study) aStudy = stud->studyDS();
 
+  // check if study is locked
   bool aLocked = (_PTR(AttributeStudyProperties)(aStudy->GetProperties()))->IsLocked();
   if ( aLocked ) {
-    SUIT_MessageBox::warn1 ( app->desktop(),
-                           QObject::tr("WRN_WARNING"),
-                           QObject::tr("WRN_STUDY_LOCKED"),
-                           QObject::tr("BUT_OK") );
+    SUIT_MessageBox::warning( app->desktop(),
+                             QObject::tr("WRN_WARNING"),
+                             QObject::tr("WRN_STUDY_LOCKED") );
     return false;
   }
 
+  // check if GEOM engine is available
   GEOM::GEOM_Gen_var eng = GeometryGUI::GetGeomGen();
   if ( CORBA::is_nil( eng ) ) {
-    SUIT_MessageBox::error1( app->desktop(),
-                           QObject::tr("WRN_WARNING"),
-                           QObject::tr( "GEOM Engine is not started" ),
-                           QObject::tr("BUT_OK") );
-      return false;
-    }
+    SUIT_MessageBox::critical( app->desktop(),
+                              QObject::tr("WRN_WARNING"),
+                              QObject::tr( "GEOM Engine is not started" ) );
+    return false;
+  }
 
   GEOM::GEOM_IInsertOperations_var aInsOp = eng->GetIInsertOperations( aStudy->StudyId() );
   if ( aInsOp->_is_nil() )
     return false;
 
-  GEOM::GEOM_Object_var anObj;
-
-  // Obtain a list of available import formats
+  // obtain a list of available import formats
   FilterMap aMap;
-  QStringList filters;
   GEOM::string_array_var aFormats, aPatterns;
   aInsOp->ImportTranslators( aFormats, aPatterns );
 
-  for ( int i = 0, n = aFormats->length(); i < n; i++ ) {
+  for ( int i = 0, n = aFormats->length(); i < n; i++ )
     aMap.insert( (char*)aPatterns[i], (char*)aFormats[i] );
-    filters.push_back( (char*)aPatterns[i] );
-  }
 
+  // select files to be imported
   QString fileType;
+  QStringList fileNames = getFileNames( app->desktop(), "", aMap,
+                                       tr( "GEOM_MEN_IMPORT" ), fileType, true );
 
-  QString fileName = getFileName(app->desktop(), "", aMap, filters,
-                                 tr("GEOM_MEN_IMPORT"), true, fileType);
+  // set Wait cursor
+  SUIT_OverrideCursor wc;
 
-  if (fileType.isEmpty() )
-    {
-      // Trying to detect file type
-      QFileInfo aFileInfo( fileName );
-      QString aPossibleType = (aFileInfo.extension(false)).upper() ;
+  if ( fileNames.count() == 0 )
+    return false; // nothing selected, return
 
-      if ( (aMap.values()).contains(aPossibleType) )
-       fileType = aPossibleType;
-    }
+  QStringList errors;
 
-  if (fileName.isEmpty() || fileType.isEmpty())
-    return false;
+  QList< GEOM::GEOM_Object_var > objsForDisplay;
+  
+  // iterate through all selected files
+  for ( QStringList::ConstIterator it = fileNames.begin(); it != fileNames.end(); ++it ) {
+    QString fileName = *it;
 
-  GEOM_Operation* anOp = new GEOM_Operation (app, aInsOp.in());
-  try {
-    SUIT_OverrideCursor wc;
-
-    app->putInfo(tr("GEOM_PRP_LOADING").arg(SUIT_Tools::file(fileName, /*withExten=*/true)));
-
-    anOp->start();
-
-    CORBA::String_var fileN = fileName.latin1();
-    CORBA::String_var fileT = fileType.latin1();
-    anObj = aInsOp->Import(fileN, fileT);
-
-    if ( !anObj->_is_nil() && aInsOp->IsDone() ) {
-      QString aPublishObjName =
-        GEOMBase::GetDefaultName(SUIT_Tools::file(fileName, /*withExten=*/true));
+    if ( fileName.isEmpty() )
+      continue;
 
-      SALOMEDS::Study_var aDSStudy = GeometryGUI::ClientStudyToStudy(aStudy);
-      GeometryGUI::GetGeomGen()->PublishInStudy(aDSStudy,
-                                               SALOMEDS::SObject::_nil(),
-                                               anObj,
-                                               aPublishObjName);
+    QString aCurrentType;
+    if ( fileType.isEmpty() ) {
+      // file type is not defined, try to detect
+      QString ext = QFileInfo( fileName ).suffix().toUpper();
+      QRegExp re( "\\*\\.(\\w+)" );
+      for ( FilterMap::const_iterator it = aMap.begin(); 
+           it != aMap.end() && aCurrentType.isEmpty(); ++it ) {
+       int pos = 0;
+       while ( re.indexIn( it.key(), pos ) >= 0 ) {
+         QString f = re.cap(1).trimmed().toUpper();
+         if ( ext == f ) { aCurrentType = it.value(); break; }
+         pos = re.pos() + re.cap(1).length() + 2;
+       }
+      }
+    }
+    else {
+      aCurrentType = fileType;
+    }
 
-      GEOM_Displayer( stud ).Display( anObj.in() );
+    if ( aCurrentType.isEmpty() ) {
+      errors.append( QString( "%1 : %2" ).arg( fileName ).arg( tr( "GEOM_UNSUPPORTED_TYPE" ) ) );
+      continue;
+    }
 
-      // update data model and object browser
-      getGeometryGUI()->updateObjBrowser( true );
+    GEOM_Operation* anOp = new GEOM_Operation( app, aInsOp.in() );
+    try {
+      app->putInfo( tr( "GEOM_PRP_LOADING" ).arg( SUIT_Tools::file( fileName, /*withExten=*/true ) ) );
+      anOp->start();
 
-      anOp->commit();
+      CORBA::String_var fileN = fileName.toLatin1().constData();
+      CORBA::String_var fileT = aCurrentType.toLatin1().constData();
+      GEOM::GEOM_Object_var anObj = aInsOp->Import( fileN, fileT );
+
+      if ( !anObj->_is_nil() && aInsOp->IsDone() ) {
+       QString aPublishObjName = 
+         GEOMBase::GetDefaultName( SUIT_Tools::file( fileName, /*withExten=*/true ) );
+       
+       SALOMEDS::Study_var aDSStudy = GeometryGUI::ClientStudyToStudy( aStudy );
+       GeometryGUI::GetGeomGen()->PublishInStudy( aDSStudy,
+                                                  SALOMEDS::SObject::_nil(),
+                                                  anObj,
+                                                  aPublishObjName.toLatin1().constData() );
+
+       objsForDisplay.append( anObj );
+       
+       anOp->commit();
+      }
+      else {
+       anOp->abort();
+       errors.append( QString( "%1 : %2" ).arg( fileName ).arg( aInsOp->GetErrorCode() ) );
+      }
     }
-    else {
+    catch( const SALOME::SALOME_Exception& S_ex ) {
       anOp->abort();
-      wc.suspend();
-      SUIT_MessageBox::error1( app->desktop(),
-                             QObject::tr( "GEOM_ERROR" ),
-                             QObject::tr("GEOM_PRP_ABORT") + "\n" + QString( aInsOp->GetErrorCode() ),
-                             QObject::tr("BUT_OK") );
+      errors.append( QString( "%1 : %2" ).arg( fileName ).arg( tr( "GEOM_UNKNOWN_IMPORT_ERROR" ) ) );
     }
   }
-  catch( const SALOME::SALOME_Exception& S_ex ) {
-    //QtCatchCorbaException(S_ex);
-    anOp->abort();
-    return false;
+
+  // update object browser
+  getGeometryGUI()->updateObjBrowser( true );
+
+  // display imported model (if only one file is selected)
+  if ( objsForDisplay.count() == 1 )
+    GEOM_Displayer( stud ).Display( objsForDisplay[0].in() );
+
+  if ( errors.count() > 0 ) {
+    SUIT_MessageBox::critical( app->desktop(),
+                              QObject::tr( "GEOM_ERROR" ),
+                              QObject::tr( "GEOM_IMPORT_ERRORS" ) + "\n" + errors.join( "\n" ) );
   }
 
   app->updateActions(); //SRN: To update a Save button in the toolbar
 
-  return true;
+  return objsForDisplay.count() > 0;
 }
 
 
@@ -615,17 +758,16 @@ bool GEOMToolsGUI::Export()
 
   SalomeApp_Study* stud = dynamic_cast<SalomeApp_Study*> ( app->activeStudy() );
   if ( !stud ) {
-    cout << "FAILED to cast active study to SalomeApp_Study" << endl;
+    MESSAGE ( "FAILED to cast active study to SalomeApp_Study" );
     return false;
   }
   _PTR(Study) aStudy = stud->studyDS();
 
   GEOM::GEOM_Gen_var eng = GeometryGUI::GetGeomGen();
   if ( CORBA::is_nil( eng ) ) {
-    SUIT_MessageBox::error1( app->desktop(),
-                            QObject::tr("WRN_WARNING"),
-                            QObject::tr( "GEOM Engine is not started" ),
-                            QObject::tr("BUT_OK") );
+    SUIT_MessageBox::critical( app->desktop(),
+                              QObject::tr("WRN_WARNING"),
+                              QObject::tr( "GEOM Engine is not started" ) );
     return false;
   }
 
@@ -650,6 +792,7 @@ bool GEOMToolsGUI::Export()
 
   SALOME_ListIO selectedObjects;
   sm->selectedObjects( selectedObjects );
+  bool appropriateObj = false;
 
   SALOME_ListIteratorOfListIO It( selectedObjects );
   for(;It.More();It.Next()) {
@@ -662,7 +805,7 @@ bool GEOMToolsGUI::Export()
 
     QString fileType;
     QString file = getFileName(app->desktop(), QString( IObject->getName() ), aMap, filters,
-                              tr("GEOM_MEN_EXPORT"), false, fileType);
+                              tr("GEOM_MEN_EXPORT"), false, fileType, true);
 
     // User has pressed "Cancel" --> stop the operation
     if ( file.isEmpty() || fileType.isEmpty() )
@@ -677,7 +820,7 @@ bool GEOMToolsGUI::Export()
       anOp->start();
 
 
-      aInsOp->Export( anObj, file, fileType.latin1() );
+      aInsOp->Export( anObj, file.toStdString().c_str(), fileType.toLatin1().constData() );
 
       if ( aInsOp->IsDone() )
        anOp->commit();
@@ -685,10 +828,9 @@ bool GEOMToolsGUI::Export()
        {
          anOp->abort();
          wc.suspend();
-         SUIT_MessageBox::error1( app->desktop(),
-                                  QObject::tr( "GEOM_ERROR" ),
-                                  QObject::tr("GEOM_PRP_ABORT") + "\n" + QString( aInsOp->GetErrorCode() ),
-                                  QObject::tr("BUT_OK") );
+         SUIT_MessageBox::critical( app->desktop(),
+                                    QObject::tr( "GEOM_ERROR" ),
+                                    QObject::tr("GEOM_PRP_ABORT") + "\n" + QString( aInsOp->GetErrorCode() ) );
          return false;
        }
     }
@@ -697,63 +839,29 @@ bool GEOMToolsGUI::Export()
       anOp->abort();
       return false;
     }
+    appropriateObj = true;
   }
 
+  if ( !appropriateObj )
+    SUIT_MessageBox::warning( app->desktop(),
+                             QObject::tr("WRN_WARNING"),
+                             QObject::tr("GEOM_WRN_NO_APPROPRIATE_SELECTION") );
   return true;
 }
 
-
-QString GEOMToolsGUI::getParentComponent( _PTR( Study ) study, const SALOME_ListIO& iobjs )
-{
-  QString parentComp;
-
-  for ( SALOME_ListIteratorOfListIO it( iobjs ); it.More(); it.Next() ) {
-
-    Handle(SALOME_InteractiveObject) io = it.Value();
-    if ( !io->hasEntry() )
-      continue;
-
-    QString compName = getParentComponent( study->FindObjectID( io->getEntry() ) );
-
-    if ( parentComp.isNull() )
-      parentComp = compName;
-    else if ( parentComp.compare( compName) != 0 ) { // objects belonging to different components are selected
-      parentComp = QString::null;
-      break;
-    }
-  }
-
-  return parentComp;
-}
-
-QString GEOMToolsGUI::getParentComponent( _PTR( SObject ) obj )
-{
-  if ( obj ) {
-    _PTR(SComponent) comp = obj->GetFatherComponent();
-    if ( comp ) {
-      _PTR(GenericAttribute) anAttr;
-      if ( comp->FindAttribute( anAttr, "AttributeName") ) {
-       _PTR(AttributeName) aName( anAttr );
-       return QString( aName->Value().c_str() );
-      }
-    }
-  }
-  return QString();
-}
-
 //=====================================================================================
 // function : RemoveObjectWithChildren
 // purpose  : to be used by OnEditDelete() method
 //=====================================================================================
-void GEOMToolsGUI::RemoveObjectWithChildren(_PTR(SObject) obj,
+void GEOMToolsGUI::removeObjectWithChildren(_PTR(SObject) obj,
                                             _PTR(Study) aStudy,
-                                            QPtrList<SALOME_View> views,
+                                            QList<SALOME_View*> views,
                                             GEOM_Displayer* disp)
 {
   // iterate through all children of obj
   for (_PTR(ChildIterator) it (aStudy->NewChildIterator(obj)); it->More(); it->Next()) {
     _PTR(SObject) child (it->Value());
-    RemoveObjectWithChildren(child, aStudy, views, disp);
+    removeObjectWithChildren(child, aStudy, views, disp);
   }
 
   // erase object and remove it from engine
@@ -769,50 +877,17 @@ void GEOMToolsGUI::RemoveObjectWithChildren(_PTR(SObject) obj,
     GEOM::GEOM_Object_var geomObj = GEOM::GEOM_Object::_narrow( corbaObj );
     if (!CORBA::is_nil(geomObj)) {
       // Erase graphical object
-      SALOME_View* view = views.first();
-      for (; view; view = views.next()) {
-        disp->Erase(geomObj, true, view);
-      }
-
+      QListIterator<SALOME_View*> it( views );
+      while ( it.hasNext() )
+       if ( SALOME_View* view = it.next() )
+         disp->Erase(geomObj, true, view);
+      
       // Remove object from Engine
       GeometryGUI::GetGeomGen()->RemoveObject( geomObj );
     }
   }
 }
 
-//=====================================================================================
-// function : CheckSubObjectInUse
-// purpose  : to be used by OnEditDelete() method
-//=====================================================================================
-bool GEOMToolsGUI::CheckSubObjectInUse(_PTR(SObject) checkobj,
-                                      _PTR(SObject) remobj,
-                                       _PTR(Study) aStudy)
-{
-  CORBA::Object_var corbaObj = GeometryGUI::ClientSObjectToObject(checkobj);
-  GEOM::GEOM_Object_var geomObj = GEOM::GEOM_Object::_narrow( corbaObj );
-  if( CORBA::is_nil(geomObj) ) 
-    return false;
-
-  GEOM::ListOfGO_var list = geomObj->GetDependency();
-  if( list->length() > 1 )
-    for(int i = 0; i < list->length(); i++ ){
-      CORBA::Object_var corbaObj_rem = GeometryGUI::ClientSObjectToObject(remobj);
-      GEOM::GEOM_Object_var geomObj_rem = GEOM::GEOM_Object::_narrow( corbaObj_rem );
-      if( list[i]->_is_equivalent( geomObj_rem ) ){
-       SalomeApp_Application* app =
-         dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
-
-       SUIT_MessageBox::warn1 ( app->desktop(),
-                                QObject::tr("WRN_WARNING"),
-                                QObject::tr("DEP_OBJECT"),
-                                QObject::tr("BUT_OK") );
-       return true;
-      }
-    }
-
-  return false;
-}
-
 //=================================================================================
 // function : deactivate()
 // purpose  : Called when GEOM component is deactivated
@@ -833,7 +908,9 @@ void GEOMToolsGUI::deactivate()
 //=====================================================================================
 extern "C"
 {
-GEOMTOOLSGUI_EXPORT
+#ifdef WIN32
+  __declspec( dllexport )
+#endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
     return new GEOMToolsGUI( parent );
index 69ad114d10b9fe86f575b909aed24cbd1cea44d2..3ae7e7808f01e88b20c24adaf7b26c89b57260c3 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMToolsGUI.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//
-//  File   : GEOMToolsGUI.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #ifndef GEOMTOOLSGUI_H
 #define GEOMTOOLSGUI_H
 
 #include "GEOM_ToolsGUI.hxx"
 
-#include "GEOMGUI.h"
-#include "GEOM_Displayer.h"
-
-#include <SALOME_Prs.h>
+#include <GEOMGUI.h>
 
 #include <SALOMEDSClient.hxx>
-#include <SALOME_ListIO.hxx>
 
-#include <CORBA.h>
+class GEOM_Displayer;
+class SALOME_View;
+class SALOME_ListIO;
 
-#include <qptrlist.h>
+#include <QList>
 
 //=================================================================================
 // class    : GEOMToolsGUI
 //=================================================================================
 class GEOMTOOLSGUI_EXPORT GEOMToolsGUI : public GEOMGUI
 {
-public :
+public:
   GEOMToolsGUI( GeometryGUI* ); // hide constructor to avoid direct creation
   ~GEOMToolsGUI();
 
-  bool OnGUIEvent( int theCommandID, SUIT_Desktop* parent );
+  bool         OnGUIEvent( int, SUIT_Desktop* );
   virtual void deactivate();
 
 private:
   // Import and export topology methods
-  bool Import();
-  bool Export();
+  bool         Import();
+  bool         Export();
 
-  void OnEditCopy();
-  void OnEditDelete();
+  void         OnEditCopy();
+  void         OnEditDelete();
 
-  void OnSettingsColor();
-  void OnSettingsIsos();
-  void OnSettingsStep();
-  void OnRename();
-  void OnCheckGeometry();
+  void         OnSettingsColor();
+  void         OnRename();
+  void         OnCheckGeometry();
 
   // Popup commands
-  void OnAutoColor();
-  void OnDisableAutoColor();
-  void OnColor();
-  void OnTransparency();
-  void OnNbIsos();
-  void OnOpen();
-  void OnSelectOnly(int mode);
+  void         OnAutoColor();
+  void         OnDisableAutoColor();
+  void         OnColor();
+  void         OnTransparency();
+  void         OnNbIsos();
+  void         OnOpen();
+  void         OnSelectOnly(int mode);
   
-  // returns name of Module (Component) of given objects (usually selected objects)
-  // if objects belong to different Components, a NULL string is returned.
-  QString getParentComponent( _PTR( Study ), const SALOME_ListIO& );
-  QString getParentComponent( _PTR(SObject) );
-
   // Recursive deletion of object with children
-  void RemoveObjectWithChildren(_PTR(SObject) obj,
-                               _PTR(Study) aStudy,
-                               QPtrList<SALOME_View> views,
-                               GEOM_Displayer* disp);
-
-  //checks if the object passed as the first argument depends on the second arguments
-  bool CheckSubObjectInUse(_PTR(SObject) checkobj,
-                          _PTR(SObject) remobj,
-                          _PTR(Study) aStudy);
+  void         removeObjectWithChildren( _PTR(SObject),
+                                        _PTR(Study),
+                                        QList<SALOME_View*>,
+                                        GEOM_Displayer* );
 };
 
-#endif
+#endif // GEOMTOOLSGUI_H
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.pro b/src/GEOMToolsGUI/GEOMToolsGUI.pro
new file mode 100644 (file)
index 0000000..3ab591e
--- /dev/null
@@ -0,0 +1,65 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = GEOMToolsGUI
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+GUI_LDFLAGS = -L$$(GUI_ROOT_DIR)/lib/salome
+
+INCLUDEPATH += $${QT_INCLUDES} $${VTK_INCLUDES} $${CAS_CPPFLAGS} $${PYTHON_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} $${CORBA_INCLUDES} ../OBJECT ../GEOMBase ../GEOMClient ../GEOMImpl ../GEOMGUI $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lGEOMBase -lGEOM $${GUI_LDFLAGS} -lVTKViewer -lOCCViewer -lsuit -lSalomeApp
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += GEOMTOOLSGUI_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+SOURCES  = GEOMToolsGUI.cxx
+SOURCES += GEOMToolsGUI_1.cxx
+SOURCES += GEOMToolsGUI_TransparencyDlg.cxx
+SOURCES += GEOMToolsGUI_NbIsosDlg.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index 1396305634a9dba53fa8652a3da2a69f401e6f2e..a996e25ef5c3c9ddcd7de2f0e8a33d5a542106c6 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2004  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMToolsGUI_1.cxx
+// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
 //
-//
-//  File   : GEOMToolsGUI_1.cxx
-//  Author : Sergey ANIKIN
-//  Module : GEOM
-//  $Header$
-
-#include <PythonConsole_PyConsole.h>
+#include <PyConsole_Console.h>
 
 #include "GEOMToolsGUI.h"
-
-#include "GeometryGUI.h"
 #include "GEOMToolsGUI_TransparencyDlg.h"
-#include "GEOMToolsGUI_NbIsosDlg.h"        // Method ISOS adjustement
+#include "GEOMToolsGUI_NbIsosDlg.h"
 
-#include "GEOM_Actor.h"
-#include "GEOMBase.h"
+#include <GeometryGUI.h>
+#include <GEOM_Displayer.h>
 
-#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <GEOMBase.h>
+#include <GEOM_Actor.h>
+
+#include <SALOME_ListIO.hxx>
+#include <SALOME_ListIteratorOfListIO.hxx>
 
 #include <SOCC_Prs.h>
 
 #include <SVTK_View.h>
 
 #include <OCCViewer_ViewModel.h>
-#include <OCCViewer_ViewWindow.h>
 
 #include <SUIT_ViewManager.h>
-#include <SUIT_Application.h>
 #include <SUIT_Desktop.h>
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
 
 #include <GEOMImpl_Types.hxx>
 
-#include "SALOMEDSClient.hxx"
-
 #include "utilities.h"
 
 // OCCT Includes
 #include <AIS_Drawer.hxx>
-#include <AIS_ListOfInteractive.hxx>
-#include <AIS_ListIteratorOfListOfInteractive.hxx>
 #include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_PointAspect.hxx>
 #include <Graphic3d_AspectMarker3d.hxx>
 
-// VTK Includes
-#include <vtkBMPReader.h>
-#include <vtkTexture.h>
-#include <vtkTextureMapToPlane.h>
-#include <vtkTransformTextureCoords.h>
-#include <vtkDataSetMapper.h>
-#include <vtkRenderer.h>
-
 // QT Includes
-#include <qfileinfo.h>
-#include <qcolordialog.h>
-#include <qspinbox.h>
-#include <qapplication.h>
-#include <qptrlist.h>
-
-using namespace std;
+#include <QColorDialog>
+#include <QList>
 
+// VTK includes
+#include <vtkRenderer.h>
 
 void GEOMToolsGUI::OnSettingsColor()
 {
@@ -116,68 +97,11 @@ void GEOMToolsGUI::OnSettingsColor()
   }
 }
 
-void GEOMToolsGUI::OnSettingsIsos()
-{
-/*
-  SUIT_Session* sess = SUIT_Session::session();
-  SUIT_ResourceMgr* resMgr = sess->resourceMgr();
-  SUIT_Desktop* desk = sess->activeApplication()->desktop();
-
-  SUIT_ViewManager* vman = desk->activeWindow()->getViewManager();
-  QString type = vman->getType();
-
-  if ( type != OCCViewer_Viewer::Type() )
-    return;
-
-  OCCViewer_Viewer* vm = (OCCViewer_Viewer*)vman->getViewModel();
-  Handle (AIS_InteractiveContext) ic = vm->getAISContext();
-
-  int IsoU = resMgr->integerValue( "Geometry:SettingsIsoU", 1 );
-  int IsoV = resMgr->integerValue( "Geometry:SettingsIsoV", 1 );
-
-  ic->DefaultDrawer()->UIsoAspect()->SetNumber( IsoU );
-  ic->DefaultDrawer()->VIsoAspect()->SetNumber( IsoV );
-
-  GEOMBase_NbIsosDlg* NbIsosDlg = new GEOMBase_NbIsosDlg(desk, tr("GEOM_MEN_ISOS"), TRUE);
-
-  NbIsosDlg->SpinBoxU->setValue(IsoU);
-  NbIsosDlg->SpinBoxV->setValue(IsoV);
-
-  if(NbIsosDlg->exec()) {
-    IsoU = NbIsosDlg->SpinBoxU->text().toInt();
-    IsoV = NbIsosDlg->SpinBoxV->text().toInt();
-
-    ic->DefaultDrawer()->UIsoAspect()->SetNumber(UIso);
-    ic->DefaultDrawer()->VIsoAspect()->SetNumber(VIso);
-    resMgr->setValue("Geometry:SettingsIsoU", isoU);
-    resMgr->setValue("Geometry:SettingsIsoV", isoV);
-  }
-*/
-}
-
-void GEOMToolsGUI::OnSettingsStep()
-{
-  SUIT_Session* sess = SUIT_Session::session();
-  SUIT_ResourceMgr* resMgr = sess->resourceMgr();
-
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100. );
-
-  Standard_Boolean res = false;
-  double dd = GEOMBase::Parameter( res, QString("%1").arg(step), tr("GEOM_MEN_STEP_LABEL"), tr("GEOM_STEP_TITLE"), 0.001, 10000.0, 3);
-  if(res) {
-    resMgr->setValue( "Geometry", "SettingsGeomStep", dd );
-
-    /* Emit signal to GeometryGUI_SpinBoxes */
-    getGeometryGUI()->EmitSignalDefaultStepValueChanged( dd );
-  }
-  else
-    sess->activeApplication()->putInfo(tr("GEOM_PRP_ABORT"));
-}
-
 void GEOMToolsGUI::OnRename()
 {
   SALOME_ListIO selected;
-  SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
+  SalomeApp_Application* app =
+    dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
   if ( app ) {
     LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
     SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
@@ -188,35 +112,44 @@ void GEOMToolsGUI::OnRename()
 
        bool aLocked = (_PTR(AttributeStudyProperties)(aStudy->GetProperties()))->IsLocked();
        if ( aLocked ) {
-         SUIT_MessageBox::warn1 ( app->desktop(),
-                                  QObject::tr("WRN_WARNING"),
-                                  QObject::tr("WRN_STUDY_LOCKED"),
-                                  QObject::tr("BUT_OK") );
+         SUIT_MessageBox::warning ( app->desktop(),
+                                    QObject::tr("WRN_WARNING"),
+                                    QObject::tr("WRN_STUDY_LOCKED") );
          return;
        }
 
+        bool isAny = false; // is there any appropriate object selected
        for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
          Handle(SALOME_InteractiveObject) IObject = It.Value();
 
          _PTR(SObject) obj ( aStudy->FindObjectID(IObject->getEntry()) );
          _PTR(GenericAttribute) anAttr;
          if ( obj ) {
-           if( obj->FindAttribute(anAttr, "AttributeName") ) {
+           if ( obj->FindAttribute(anAttr, "AttributeName") ) {
              _PTR(AttributeName) aName (anAttr);
 
-             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
-               // Rename the corresponding GEOM_Object
-               GEOM::GEOM_Object_var anObj =  GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(obj));
-               if (!CORBA::is_nil( anObj ))
-                 anObj->SetName( newName.latin1() );
-               (dynamic_cast<SalomeApp_Module*>(app->activeModule()))->updateObjBrowser( false );
-             }
+              GEOM::GEOM_Object_var anObj =
+                GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(obj));
+              if (!CORBA::is_nil(anObj)) {
+                isAny = true;
+                QString newName = LightApp_NameDlg::getName( app->desktop(), aName->Value().c_str() );
+                if (!newName.isEmpty()) {
+                  aName->SetValue( newName.toLatin1().data() ); // rename the SObject
+                  IObject->setName( newName.toLatin1().data() );// rename the InteractiveObject
+                  anObj->SetName( newName.toLatin1().data() );  // Rename the corresponding GEOM_Object
+                  (dynamic_cast<SalomeApp_Module*>(app->activeModule()))->updateObjBrowser( false );
+                }
+              } // if ( anObj )
            } // if ( name attribute )
          } // if ( obj )
        } // iterator
+
+        if (!isAny) {
+         SUIT_MessageBox::warning( app->desktop(),
+                                   QObject::tr("WRN_WARNING"),
+                                   QObject::tr("GEOM_WRN_NO_APPROPRIATE_SELECTION") );
+         return;
+        }
       }
     }
   }
@@ -227,7 +160,7 @@ void GEOMToolsGUI::OnRename()
 void GEOMToolsGUI::OnCheckGeometry()
 {
   SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
-  PythonConsole* pyConsole = app->pythonConsole();
+  PyConsole_Console* pyConsole = app->pythonConsole();
 
   if(pyConsole)
     pyConsole->exec("from GEOM_usinggeom import *");
@@ -235,8 +168,6 @@ void GEOMToolsGUI::OnCheckGeometry()
 
 void GEOMToolsGUI::OnAutoColor()
 {
-  QPtrList<SALOME_Prs> aListOfGroups;
-
   SALOME_ListIO selected;
   SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
   if( !app )
@@ -261,7 +192,7 @@ void GEOMToolsGUI::OnAutoColor()
 
   aMainObject->SetAutoColor( true );
 
-  QValueList<SALOMEDS::Color> aReservedColors;
+  QList<SALOMEDS::Color> aReservedColors;
 
   GEOM_Displayer aDisp (appStudy);
 
@@ -461,10 +392,9 @@ void GEOMToolsGUI::OnNbIsos()
   SUIT_ViewWindow* window = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
   
   bool isOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() );
-  const bool isVTK = ( window && window->getViewManager()->getType() == SVTK_Viewer::Type() );
+  bool isVTK = ( window && window->getViewManager()->getType() == SVTK_Viewer::Type() );
 
-  // if is OCCViewer
-  if(isOCC){
+  if(isOCC){ // if is OCCViewer
 
     OCCViewer_Viewer* vm = dynamic_cast<OCCViewer_Viewer*>( window->getViewManager()->getViewModel() );
     Handle (AIS_InteractiveContext) ic = vm->getAISContext();
@@ -500,8 +430,8 @@ void GEOMToolsGUI::OnNbIsos()
        }
       }
     }
-  } else if(isVTK){ // if is VTKViewer
-
+  }
+  else if(isVTK){ // if is VTKViewer
     //
     // Warning. It's works incorrect. must be recheked.
     //
@@ -516,50 +446,61 @@ void GEOMToolsGUI::OnNbIsos()
     if ( selected.IsEmpty() )
       return;
     
-    Handle(SALOME_InteractiveObject) FirstIOS =  selected.First();
-    if ( FirstIOS.IsNull() )
-      return;
-    
     SVTK_ViewWindow* vtkVW = dynamic_cast<SVTK_ViewWindow*>( window );
     if ( !vtkVW )
       return;
+
+    SALOME_View* view = GEOM_Displayer::GetActiveView();
+
+    vtkActorCollection* aCollection = vtkActorCollection::New();
     
-    SVTK_View* aView = vtkVW->getView();
-    vtkActorCollection* aCollection = aView->getRenderer()->GetActors();
-    
+    for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
+      Handle(SALOME_InteractiveObject) anIObject = It.Value();
+      SALOME_Prs* aPrs = view->CreatePrs( anIObject->getEntry() ); 
+      SVTK_Prs* vtkPrs = dynamic_cast<SVTK_Prs*>( aPrs );
+      if ( vtkPrs ) {
+       vtkActorCollection* anActors = vtkPrs->GetObjects();
+       anActors->InitTraversal();
+       vtkActor* anAct = anActors->GetNextActor();
+       aCollection->AddItem(anAct);
+      }
+    }
+  
+    if(aCollection)
+      aCollection->InitTraversal();
+    else
+      return;
+   
     int UIso = 0;
     int VIso = 0;
-    if(aCollection){
-      aCollection->InitTraversal();
-    }
     
-    vtkActor *anAct = aCollection->GetNextActor();
-    if(GEOM_Actor *anActor = dynamic_cast<GEOM_Actor*>(anAct)){
+    vtkActoranAct = aCollection->GetNextActor();
+    if (GEOM_Actor* anActor = GEOM_Actor::SafeDownCast(anAct))
       anActor->GetNbIsos(UIso,VIso);
-    }
-    
+    else
+      return;
     
-    GEOMToolsGUI_NbIsosDlg * NbIsosDlg =
+    GEOMToolsGUI_NbIsosDlg* NbIsosDlg =
       new GEOMToolsGUI_NbIsosDlg( SUIT_Session::session()->activeApplication()->desktop() );
-    
+
     NbIsosDlg->setU( UIso );
     NbIsosDlg->setV( VIso );
-    
+
     if ( NbIsosDlg->exec() ) {
       SUIT_OverrideCursor();
       
-      while(anAct = aCollection->GetNextActor()) {
-       if(GEOM_Actor *anActor = dynamic_cast<GEOM_Actor*>(anAct)){
+      while( anAct!=NULL ) {
+       if(GEOM_Actor* anActor = GEOM_Actor::SafeDownCast(anAct)){
          // There are no casting to needed actor.
          UIso = NbIsosDlg->getU();
          VIso = NbIsosDlg->getV();
          int aIsos[2]={UIso,VIso};
          anActor->SetNbIsos(aIsos);
        }
+       anAct = aCollection->GetNextActor();
       }
     }
   } // end vtkviewer
-
 }
 
 void GEOMToolsGUI::OnOpen()
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx
new file mode 100644 (file)
index 0000000..9a35049
--- /dev/null
@@ -0,0 +1,132 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMToolsGUI_DeleteDlg.cxx
+// Author : Dmitry Matveitchev, Open CASCADE S.A.S.
+//
+#include "GEOMToolsGUI_DeleteDlg.h"
+
+#include <QLabel>
+#include <QPushButton>
+#include <QTextBrowser>
+#include <QStringList>
+#include <QGridLayout>
+#include <SUIT_MessageBox.h>
+static bool isEntryLess( const QString& e1, const QString& e2 )
+{
+  QStringList el1 = e1.split(":");
+  QStringList el2 = e2.split(":");
+  int e1c = el1.count(), e2c = el2.count();
+  for ( int i = 0; i < e1c && i < e2c; i++ ) {
+    int id1 = el1[i].toInt();
+    int id2 = el2[i].toInt();
+    if ( id1 < id2 ) return true;
+    else if ( id2 < id1 ) return false;
+  }
+  return el1.count() < el2.count();
+}
+
+static QStringList objectsToNames( const QMap<QString, QString>& objects )
+{
+  QStringList entries;
+  for ( QMap<QString, QString>::ConstIterator it = objects.begin(); it != objects.end(); ++it ) {
+    QString entry = it.key();
+    QStringList::Iterator iter;
+    bool added = false;
+    for ( iter = entries.begin(); iter != entries.end() && !added; ++iter ) {
+      if ( isEntryLess( entry, *iter ) ) {
+        entries.insert( iter, entry );
+        added = true;
+      }
+    }
+    if ( !added ) 
+      entries.append( entry );
+  }
+  QStringList names;
+  for ( int i = 0; i < entries.count(); i++ ) {
+    int level = entries[i].count(":")-3;
+    names.append( QString( level*2, ' ' ) + objects[ entries[i] ] );
+  }
+  return names;
+}
+
+/*!
+  \brief Constructor.
+  \param parent parent widget
+*/
+GEOMToolsGUI_DeleteDlg::GEOMToolsGUI_DeleteDlg( QWidget* parent, 
+                                               const QMap<QString, QString>& objects, 
+                                               bool deleteAll )
+: QDialog( parent )
+{
+  setModal( true );
+  setObjectName( "GEOMToolsGUI_DeleteDlg" );
+
+  setWindowTitle( tr( "GEOM_DELETE_OBJECTS" ) );
+  setSizeGripEnabled( true );
+
+  QGridLayout* topLayout = new QGridLayout( this );
+
+  topLayout->setSpacing( 6 );
+  topLayout->setMargin( 11 );
+
+  QLabel* pix = new QLabel( this );
+  pix->setPixmap( SUIT_MessageBox::standardIcon( QMessageBox::Question ) );
+  pix->setScaledContents( false );
+  pix->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) );
+  topLayout->addWidget( pix, 0, 0, 1, 1 );
+
+  QLabel* lab = new QLabel( this );
+  lab->setAlignment( Qt::AlignCenter );
+  topLayout->addWidget( lab, 0, 1, 1, 1 );
+
+  if ( !deleteAll ) {
+    lab->setText( tr( "GEOM_REALLY_DELETE" ).arg( objects.count() ) );
+    QTextBrowser* viewer = new QTextBrowser( this );
+    viewer->setText( QString( " - %1" ).arg( objectsToNames( objects ).join( "\n - " ) ) );
+    topLayout->addWidget( viewer,    1, 0, 1, 2 );
+  }
+  else {
+    lab->setText( tr( "GEOM_REALLY_DELETE_ALL" ) );
+  }
+
+  QPushButton* buttonYes = new QPushButton( tr( "GEOM_BUT_YES" ), this );
+  QPushButton* buttonNo  = new QPushButton( tr( "GEOM_BUT_NO" ),  this );
+  QHBoxLayout* btnLayout = new QHBoxLayout;
+  btnLayout->setMargin( 0 );
+  btnLayout->setSpacing( 6 );
+  btnLayout->addWidget( buttonYes );
+  btnLayout->addSpacing( 10 );
+  btnLayout->addStretch();
+  btnLayout->addWidget( buttonNo );
+  int rc = topLayout->rowCount();
+  topLayout->addLayout( btnLayout, rc, 0, 1, 2 );
+
+  /* signals and slots connections */
+  connect( buttonYes, SIGNAL( clicked() ), this, SLOT( accept() ) );
+  connect( buttonNo,  SIGNAL( clicked() ), this, SLOT( reject() ) );
+}
+
+GEOMToolsGUI_DeleteDlg::~GEOMToolsGUI_DeleteDlg()
+{
+}
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.h
new file mode 100644 (file)
index 0000000..2e5e906
--- /dev/null
@@ -0,0 +1,43 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMToolsGUI_DeleteDlg.h
+// Author : Dmitry Matveitchev, Open CASCADE S.A.S.
+//
+#ifndef GEOMTOOLSGUI_DELETEDLG_H
+#define GEOMTOOLSGUI_DELETEDLG_H
+
+#include "GEOM_ToolsGUI.hxx"
+
+#include <QDialog>
+#include <QMap>
+
+class GEOMTOOLSGUI_EXPORT GEOMToolsGUI_DeleteDlg : public QDialog
+{ 
+  Q_OBJECT
+
+public:
+  GEOMToolsGUI_DeleteDlg( QWidget*, const QMap<QString, QString>&, bool = false );
+  ~GEOMToolsGUI_DeleteDlg();
+};
+
+#endif // GEOMTOOLSGUI_DELETEDLG_H
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.h
deleted file mode 100644 (file)
index 050806d..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-//  SALOME GEOMToolsGUI : implementation of desktop and GUI kernel
-//
-//  Copyright (C) 2003  CEA/DEN, EDF R&D
-//
-//
-//
-//  File   : GEOMToolsGUI_NameDlg.h
-//  Author : Vadim SANDLER
-//  Module : SALOME
-//  $Header$
-
-#ifndef GEOMToolsGUI_NAMEDLG_H
-#define GEOMToolsGUI_NAMEDLG_H
-
-#include "GEOM_ToolsGUI.hxx"
-
-#include <qdialog.h>
-
-class QLineEdit;
-class QPushButton;
-
-//=================================================================================
-// class    : GEOMToolsGUI_NameDlg
-// purpose  : Common <Rename> dialog box class
-//=================================================================================
-class GEOMTOOLSGUI_EXPORT GEOMToolsGUI_NameDlg : public QDialog
-{ 
-  Q_OBJECT
-
-public:
-  GEOMToolsGUI_NameDlg( QWidget* parent = 0 );
-  ~GEOMToolsGUI_NameDlg();
-    
-  void            setName( const QString& name );
-  QString         name();
-    
-  static QString  getName( QWidget* parent = 0, const QString& oldName = QString::null );
-    
-protected slots:
-  void accept();
-  
-private:
-  QPushButton*    myButtonOk;
-  QPushButton*    myButtonCancel;
-  QLineEdit*      myLineEdit;
-};
-
-#endif // GEOMToolsGUI_NAMEDLG_H
index 3fad26e356887925dd632d673763500977d4f3f4..b8bc790bac936f438b3ccdf6dfa9c81c464e212e 100644 (file)
@@ -1,45 +1,42 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMToolsGUI_NbIsosDlg.cxx
+// Author : OCC Team
 //
-//  File   : GEOMBase_NbIsosDlg.cxx
-//  Author : 
-//  Module : GEOM
-//  $Header: 
-
-
 #include "GEOMToolsGUI_NbIsosDlg.h"
-#include "GeometryGUI.h"
+#include <GeometryGUI.h>
 #include <LightApp_Application.h>
 #include <SUIT_MessageBox.h>
+#include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
 #include <SUIT_Tools.h>
 
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qlayout.h>
-#include <qspinbox.h>
-//using namespace std;
+#include <QLabel>
+#include <QPushButton>
+#include <QGroupBox>
+#include <QGridLayout>
+#include <QSpinBox>
+#include <QKeyEvent>
 
 //=================================================================================
 // class    : GEOMToolsGUI_NbIsosDlg()
 //            TRUE to construct a modal dialog.
 //=================================================================================
 GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent )
-  :QDialog( parent, "GEOMToolsGUI_NbIsosDlg", true, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+  :QDialog( parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint )
 {
-  setCaption( tr( "GEOM_MEN_ISOS" ) );
+  setObjectName( "GEOMToolsGUI_NbIsosDlg" );
+  setModal( true );
+
+  setWindowTitle( tr( "GEOM_MEN_ISOS" ) );
   setSizeGripEnabled(TRUE);
   QGridLayout* MyDialogLayout = new QGridLayout(this); 
   MyDialogLayout->setSpacing(6);
   MyDialogLayout->setMargin(11);
   
   /***************************************************************/
-  QGroupBox* GroupC1 = new QGroupBox( this, "GroupC1" );
-  GroupC1->setColumnLayout(0, Qt::Vertical );
-  GroupC1->layout()->setSpacing( 0 );
-  GroupC1->layout()->setMargin( 0 );
-  QGridLayout* GroupC1Layout = new QGridLayout( GroupC1->layout() );
+  QGroupBox* GroupC1 = new QGroupBox( this );
+  GroupC1->setObjectName( "GroupC1" );
+  QGridLayout* GroupC1Layout = new QGridLayout( GroupC1 );
   GroupC1Layout->setAlignment( Qt::AlignTop );
   GroupC1Layout->setSpacing( 6 );
   GroupC1Layout->setMargin( 11 );
   
-  QLabel* TextLabel1 = new QLabel( GroupC1, "TextLabel1" );
+  QLabel* TextLabel1 = new QLabel( GroupC1 );
+  TextLabel1->setObjectName( "TextLabel1" );
   TextLabel1->setText( tr( "GEOM_MEN_ISOU") );
   GroupC1Layout->addWidget( TextLabel1, 0, 0 );
   
-  SpinBoxU = new QSpinBox( GroupC1, "SpinBoxU" );
+  SpinBoxU = new QSpinBox( GroupC1 );
+  SpinBoxU->setObjectName( "SpinBoxU" );
   SpinBoxU->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  SpinBoxU->setMinValue( 0 );
+  SpinBoxU->setMinimum( 0 );
   SpinBoxU->setValue( 1 );
   GroupC1Layout->addWidget( SpinBoxU, 0, 1 );
 
-  QLabel* TextLabel2 = new QLabel( GroupC1, "TextLabel2" );
+  QLabel* TextLabel2 = new QLabel( GroupC1 );
+  TextLabel2->setObjectName( "TextLabel2" );
   TextLabel2->setText( tr( "GEOM_MEN_ISOV") ) ;
   GroupC1Layout->addWidget( TextLabel2, 0, 2 );
 
-  SpinBoxV = new QSpinBox( GroupC1, "SpinBoxV");
+  SpinBoxV = new QSpinBox( GroupC1 );
+  SpinBoxV->setObjectName( "SpinBoxV");
   SpinBoxV->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
   SpinBoxV->setValue( 1 );
-  SpinBoxV->setMinValue( 0 );
+  SpinBoxV->setMinimum( 0 );
   GroupC1Layout->addWidget( SpinBoxV, 0, 3 );
   
   /***************************************************************/
-  QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" );
-  GroupButtons->setColumnLayout(0, Qt::Vertical );
-  GroupButtons->layout()->setSpacing( 0 );
-  GroupButtons->layout()->setMargin( 0 );
-  QGridLayout* GroupButtonsLayout = new QGridLayout( GroupButtons->layout() );
+  QGroupBox* GroupButtons = new QGroupBox( this );
+  GroupButtons->setObjectName( "GroupButtons" );
+  QGridLayout* GroupButtonsLayout = new QGridLayout( GroupButtons );
   GroupButtonsLayout->setAlignment( Qt::AlignTop );
   GroupButtonsLayout->setSpacing( 6 );
   GroupButtonsLayout->setMargin( 11 );
   
-  QPushButton* buttonOk = new QPushButton( GroupButtons, "buttonOk" );
+  QPushButton* buttonOk = new QPushButton( GroupButtons );
+  buttonOk->setObjectName( "buttonOk" );
   buttonOk->setText( tr( "GEOM_BUT_OK" ) ) ;
   buttonOk->setAutoDefault( TRUE );
   buttonOk->setDefault( TRUE );
@@ -105,12 +106,14 @@ GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent )
   
   GroupButtonsLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 );
   
-  QPushButton* buttonCancel = new QPushButton( GroupButtons, "buttonCancel" );
+  QPushButton* buttonCancel = new QPushButton( GroupButtons );
+  buttonCancel->setObjectName( "buttonCancel" );
   buttonCancel->setText( tr( "GEOM_BUT_CANCEL" ) ) ;
   buttonCancel->setAutoDefault( TRUE );
   GroupButtonsLayout->addWidget( buttonCancel, 0, 1 );
 
-  QPushButton* buttonHelp = new QPushButton( GroupButtons, "buttonHelp" );
+  QPushButton* buttonHelp = new QPushButton( GroupButtons );
+  buttonHelp->setObjectName( "buttonHelp" );
   buttonHelp->setText( tr( "GEOM_BUT_HELP" ) ) ;
   buttonHelp->setAutoDefault( TRUE );
   GroupButtonsLayout->addWidget( buttonHelp, 0, 2 );
@@ -177,10 +180,10 @@ void GEOMToolsGUI_NbIsosDlg::ClickOnHelp()
 #else
                platform = "application";
 #endif
-    SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"),
-                          QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
-                          arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName),
-                          QObject::tr("BUT_OK"));
+    SUIT_MessageBox::warning(0, QObject::tr("WRN_WARNING"),
+                            QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
+                            arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName),
+                            QObject::tr("BUT_OK"));
   }
 }
 
@@ -194,7 +197,7 @@ void GEOMToolsGUI_NbIsosDlg::keyPressEvent( QKeyEvent* e )
   if ( e->isAccepted() )
     return;
 
-  if ( e->key() == Key_F1 )
+  if ( e->key() == Qt::Key_F1 )
     {
       e->accept();
       ClickOnHelp();
index e93b1ded30a0d93e28b52cf0f33b159bbfb6c761..23beae1eacad0632169e76e3f6078e7d5b6ef416 100644 (file)
@@ -1,37 +1,34 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMToolsGUI_NbIsosDlg.h
+// Author : OCC Team
 //
-//  File   : GEOMToolsGUI_NbIsosDlg.h
-//  Author : 
-//  Module : GEOM
-//  $Header: 
-
 #ifndef GEOMTOOLSGUI_NBISOSDLG_H
 #define GEOMTOOLSGUI_NBISOSDLG_H
 
 #include "GEOM_ToolsGUI.hxx"
 
-#include <qdialog.h>
+#include <QDialog>
 
 class QSpinBox;
 
@@ -41,29 +38,28 @@ class QSpinBox;
 //=================================================================================
 class GEOMTOOLSGUI_EXPORT GEOMToolsGUI_NbIsosDlg : public QDialog
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    GEOMToolsGUI_NbIsosDlg( QWidget* parent );
-    ~GEOMToolsGUI_NbIsosDlg();
+  GEOMToolsGUI_NbIsosDlg( QWidget* );
+  ~GEOMToolsGUI_NbIsosDlg();
     
-    int       getU() const;
-    int       getV() const;
-
-    void      setU( const int );
-    void      setV( const int );
-
+  int       getU() const;
+  int       getV() const;
+  
+  void      setU( const int );
+  void      setV( const int );
+  
 private slots:
-    void      ClickOnHelp();
+  void      ClickOnHelp();
 
 private:
   void      keyPressEvent(QKeyEvent*);
void       keyPressEvent( QKeyEvent* );
 
 private:
-    QSpinBox* SpinBoxU;
-    QSpinBox* SpinBoxV;
-    QString   myHelpFileName;
-
+ QSpinBox*  SpinBoxU;
+ QSpinBox*  SpinBoxV;
+ QString    myHelpFileName;
 };
 
 #endif // GEOMTOOLSGUI_NBISOSDLG_H
index ad43b1bd070c90ac8f3c58b394f16435b9beb3f6..c3f06d704ce8775871699a2afe6b0841d5eb37e3 100644 (file)
@@ -1,48 +1,43 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GEOMToolsGUI_TransparencyDlg.cxx
+// Author : Lucien PIGNOLONI
 //
-//  File   : GEOMBase_TransparencyDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-
 #include "GEOMToolsGUI_TransparencyDlg.h"
-#include "GEOMBase.h"
-#include "GEOM_AISShape.hxx"
-#include "GeometryGUI.h"
+#include <GEOMBase.h>
+#include <GEOM_AISShape.hxx>
+#include <GeometryGUI.h>
 
-#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <SALOME_ListIO.hxx>
+#include <SALOME_ListIteratorOfListIO.hxx>
 
 #include <SVTK_ViewModel.h>
 #include <SVTK_ViewWindow.h>
 #include <SVTK_View.h>
 
 #include <OCCViewer_ViewModel.h>
-#include <OCCViewer_ViewWindow.h>
 
 #include <SUIT_ViewManager.h>
-#include <SUIT_Application.h>
 #include <SUIT_Desktop.h>
 #include <SUIT_MessageBox.h>
 #include <SUIT_ResourceMgr.h>
 #include <LightApp_Application.h>
 #include <LightApp_SelectionMgr.h>
 
-#include <qframe.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qslider.h>
-#include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qapplication.h>
-#include <qgroupbox.h>
+#include <QLabel>
+#include <QPushButton>
+#include <QSlider>
+#include <QGridLayout>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QGroupBox>
+#include <QKeyEvent>
 
 #include <AIS_InteractiveContext.hxx>
+
 using namespace std;
 
 //=================================================================================
@@ -76,82 +70,92 @@ using namespace std;
 //
 //=================================================================================
 GEOMToolsGUI_TransparencyDlg::GEOMToolsGUI_TransparencyDlg( QWidget* parent )
-  :QDialog( parent, "GEOMBase_TransparencyDlg", true, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
+  :QDialog( parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint )
 {
+  setModal( true );
+  
   resize(152, 107); 
-  setCaption(tr("GEOM_TRANSPARENCY_TITLE"));
-  setSizeGripEnabled(TRUE);
-  QGridLayout* lay = new QGridLayout(this); 
+  setWindowTitle(tr("GEOM_TRANSPARENCY_TITLE"));
+  setSizeGripEnabled(true);
+  QVBoxLayout* lay = new QVBoxLayout(this); 
   lay->setSpacing(6);
   lay->setMargin(11);
-
+  
   /*************************************************************************/
-  QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" );
-  GroupButtons->setColumnLayout(0, Qt::Vertical );
-  GroupButtons->layout()->setSpacing( 0 );
-  GroupButtons->layout()->setMargin( 0 );
-  QGridLayout* GroupButtonsLayout = new QGridLayout( GroupButtons->layout() );
+  QGroupBox* GroupButtons = new QGroupBox( this );
+  QHBoxLayout* GroupButtonsLayout = new QHBoxLayout( GroupButtons );
   GroupButtonsLayout->setAlignment( Qt::AlignTop );
   GroupButtonsLayout->setSpacing( 6 );
   GroupButtonsLayout->setMargin( 11 );
   
-  QPushButton* buttonOk = new QPushButton( GroupButtons, "buttonOk" );
-  buttonOk->setText( tr( "GEOM_BUT_OK" ) );
-  buttonOk->setAutoDefault( TRUE );
-  buttonOk->setDefault( TRUE );
-
-  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" );
-  GroupC1->setColumnLayout(0, Qt::Vertical );
-  GroupC1->layout()->setSpacing( 0 );
-  GroupC1->layout()->setMargin( 0 );
-  QGridLayout* GroupC1Layout = new QGridLayout( GroupC1->layout() );
+  QGroupBox* GroupC1 = new QGroupBox( this );
+  QGridLayout* GroupC1Layout = new QGridLayout( GroupC1 );
   GroupC1Layout->setAlignment( Qt::AlignTop );
   GroupC1Layout->setSpacing( 6 );
   GroupC1Layout->setMargin( 11 );
   
-  QLabel* TextLabelOpaque = new QLabel( GroupC1, "TextLabelOpaque" );
-  TextLabelOpaque->setText( tr( "GEOM_TRANSPARENCY_OPAQUE"  ) );
-  TextLabelOpaque->setAlignment( int( QLabel::AlignLeft ) );
-  GroupC1Layout->addWidget( TextLabelOpaque, 0, 0 );
-  GroupC1Layout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 );
+  QLabel* TextLabelTransparent = new QLabel( tr( "GEOM_TRANSPARENCY_TRANSPARENT" ), GroupC1 );
+  TextLabelTransparent->setAlignment( Qt::AlignRight );
+  GroupC1Layout->addWidget( TextLabelTransparent, 0, 0 );
   
-  QLabel* TextLabelTransparent = new QLabel( GroupC1, "TextLabelTransparent" );
-  TextLabelTransparent->setText( tr( "GEOM_TRANSPARENCY_TRANSPARENT"  ) );
-  TextLabelTransparent->setAlignment( int( QLabel::AlignRight ) );
-  GroupC1Layout->addWidget( TextLabelTransparent, 0, 2 );
+  myValueLab = new QLabel( GroupC1 );
+  myValueLab->setAlignment( Qt::AlignCenter );
+  myValueLab->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+  QFont fnt = myValueLab->font(); fnt.setBold( true ); myValueLab->setFont( fnt );
+  GroupC1Layout->addWidget( myValueLab, 0, 1 );
+
+  QLabel* TextLabelOpaque = new QLabel( tr( "GEOM_TRANSPARENCY_OPAQUE" ), GroupC1 );
+  TextLabelOpaque->setAlignment( Qt::AlignLeft );
+  GroupC1Layout->addWidget( TextLabelOpaque, 0, 2 );
+  //GroupC1Layout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 );
   
-  mySlider = new QSlider( 0, 10, 1, 5, Horizontal, GroupC1, "mySlider" );
+  mySlider = new QSlider( Qt::Horizontal, GroupC1 );
+  mySlider->setFocusPolicy( Qt::NoFocus );
   mySlider->setMinimumSize( 300, 0 );
-  mySlider->setTickmarks( QSlider::Left );
-  GroupC1Layout->addMultiCellWidget( mySlider, 1, 1, 0, 2 );
+  mySlider->setTickPosition( QSlider::TicksAbove );
+  mySlider->setTickInterval( 10 );
+  mySlider->setMinimum( 0 );
+  mySlider->setMaximum( 100 );
+  mySlider->setSingleStep( 1 );
+  mySlider->setPageStep( 10 );
+  //mySlider->setValue( 5 );
+
+  mySlider->setTickPosition( QSlider::TicksLeft );
+  GroupC1Layout->addWidget( mySlider, 1, 0, 1, 3 );
+
   /*************************************************************************/
+  QPushButton* buttonOk = new QPushButton( tr( "GEOM_BUT_OK" ), GroupButtons );
+  buttonOk->setAutoDefault( true );
+  buttonOk->setDefault( true );
+  
+  QPushButton* buttonHelp = new QPushButton( tr( "GEOM_BUT_HELP" ), GroupButtons );
+  buttonHelp->setAutoDefault( true );
+  buttonHelp->setDefault( true );
+  
+  GroupButtonsLayout->addWidget( buttonOk );
+  GroupButtonsLayout->addSpacing( 10 );
+  GroupButtonsLayout->addStretch();
+  GroupButtonsLayout->addWidget( buttonHelp );
   
-  lay->addWidget(GroupC1, 0,  0);
-  lay->addWidget(GroupButtons, 1, 0);
+  /*************************************************************************/
+  lay->addWidget(GroupC1);
+  lay->addWidget(GroupButtons);
     
   /* First call valueChanged() method for initialisation               */
   /* The default value of transparency will change with the selection  */
   myFirstInit = true;
   //  mySlider->setMaxValue( 10 );
   //  mySlider->setValue( 5 ) ;
-  ValueHasChanged(mySlider->value());
+  SetTransparency();
   
   myHelpFileName = "transparency_page.html";
 
   // signals and slots connections : after ValueHasChanged()
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonOk,   SIGNAL(clicked()), this, SLOT(ClickOnOk()));
   connect(buttonHelp, SIGNAL(clicked()), this, SLOT(ClickOnHelp()));
-  connect(mySlider, SIGNAL(valueChanged(int)), this, SLOT(ValueHasChanged(int)));
+  connect(mySlider,   SIGNAL(valueChanged(int)), this, SLOT(SetTransparency()));
+  connect(mySlider,   SIGNAL(sliderMoved(int)),  this, SLOT(ValueHasChanged()));
 }
 
 
@@ -204,20 +208,31 @@ void GEOMToolsGUI_TransparencyDlg::ClickOnHelp()
 #else
                platform = "application";
 #endif
-    SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"),
-                          QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
-                          arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName),
-                          QObject::tr("BUT_OK"));
+    SUIT_MessageBox::warning(0, QObject::tr("WRN_WARNING"),
+                            QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
+                            arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName),
+                            QObject::tr("BUT_OK"));
   }
 }
 
 //=================================================================================
 // function : ValueHasChanged()
 // purpose  : Called when value of slider change
+//=================================================================================
+void GEOMToolsGUI_TransparencyDlg::ValueHasChanged()
+{
+  myValueLab->setText( QString("%1%").arg( mySlider->value() ) );
+}
+
+//=================================================================================
+// function : SetTransparency()
+// purpose  : Called when value of slider change
 //          : or the first time as initilisation
 //=================================================================================
-void GEOMToolsGUI_TransparencyDlg::ValueHasChanged( int newValue )
+void GEOMToolsGUI_TransparencyDlg::SetTransparency()
 {
+  float newValue = ( 100 - mySlider->value() ) / 100.;
+
   SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
   if ( !app )
     return;
@@ -244,14 +259,15 @@ void GEOMToolsGUI_TransparencyDlg::ValueHasChanged( int newValue )
     SVTK_View* aView = vtkVW->getView();
     if ( myFirstInit ) {       
       myFirstInit = false;
-      float transp = (aView->GetTransparency(FirstIOS))*10.0;
-      mySlider->setValue(int(transp));
+      int transp = int (100 - ((aView->GetTransparency(FirstIOS))*100.0) + 0.5);
+      mySlider->setValue(transp);
+      ValueHasChanged();
       return;
     }
 
     SUIT_OverrideCursor();
     for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
-      aView->SetTransparency( It.Value(), newValue/10.0 );
+      aView->SetTransparency( It.Value(), newValue );
     }
     aView->Repaint();
   } // if ( isVTK )
@@ -265,8 +281,9 @@ void GEOMToolsGUI_TransparencyDlg::ValueHasChanged( int newValue )
       aisShape = gb->ConvertIOinGEOMAISShape( FirstIOS, found );
       if( !found )
        return;
-      float transp = (int(aisShape->Transparency() * 10.0 + 0.001));
-      mySlider->setValue(int(transp));
+      int transp = int( 100 - ( aisShape->Transparency() * 100.0 ) + 0.5);
+      mySlider->setValue(transp);
+      ValueHasChanged();
       return;
     }
     
@@ -278,12 +295,14 @@ void GEOMToolsGUI_TransparencyDlg::ValueHasChanged( int newValue )
     for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
       aisShape = gb->ConvertIOinGEOMAISShape( It.Value(), found );
       if ( found ) {
-       ic->SetTransparency( aisShape, newValue / 10.0, false );
+       ic->SetTransparency( aisShape, newValue, false );
        ic->Redisplay( aisShape, Standard_False, Standard_True );
       }
     } // for...
     ic->UpdateCurrentViewer();
   } // if ( isOCC )
+
+  ValueHasChanged();
 }
 
 //=================================================================================
@@ -296,7 +315,7 @@ void GEOMToolsGUI_TransparencyDlg::keyPressEvent( QKeyEvent* e )
   if ( e->isAccepted() )
     return;
 
-  if ( e->key() == Key_F1 )
+  if ( e->key() == Qt::Key_F1 )
     {
       e->accept();
       ClickOnHelp();
index 0b7aa869cad534dd62afd45cbc9d19c3e717ea68..96eda5d71ab2a9ed3ac249bdf9dc470841c7b971 100644 (file)
@@ -1,39 +1,37 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : GEOMBase_TransparencyDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
-#ifndef DIALOGBOX_TRANSPARENCYDLG_H
-#define DIALOGBOX_TRANSPARENCYDLG_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : GEOMToolsGUI_TransparencyDlg.h
+// Author : Lucien PIGNOLONI
+//
+#ifndef GEOMTOOLSGUI_TRANSPARENCYDLG_H
+#define GEOMTOOLSGUI_TRANSPARENCYDLG_H
 
 #include "GEOM_ToolsGUI.hxx"
 
-#include <qdialog.h>
+#include <QDialog>
 
 class QSlider;
+class QLabel;
 
 //=================================================================================
 // class    : GEOMBase_TransparencyDlg
@@ -42,27 +40,27 @@ class QSlider;
 //=================================================================================
 class GEOMTOOLSGUI_EXPORT GEOMToolsGUI_TransparencyDlg : public QDialog
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-  GEOMToolsGUI_TransparencyDlg( QWidget* parent );    
+  GEOMToolsGUI_TransparencyDlg( QWidget* );    
   ~GEOMToolsGUI_TransparencyDlg();
 
 private:
-  void      keyPressEvent(QKeyEvent*);
+  void      keyPressEvent( QKeyEvent* );
 
-private :
-  bool      myFirstInit ;   /* Inform for the first init  */
+private:
+  bool      myFirstInit;   /* Inform for the first init  */
   QSlider*  mySlider; 
+  QLabel*   myValueLab;
   QString   myHelpFileName;
 
 private slots: 
   void      ClickOnOk();
   void      ClickOnClose();
   void      ClickOnHelp();
-  void      ValueHasChanged( int ) ;
-    
+  void      ValueHasChanged();
+  void      SetTransparency();
 };
 
-#endif // DIALOGBOX_TRANSPARENCYDLG_H
-
+#endif // GEOMTOOLSGUI_TRANSPARENCYDLG_H
index db2c0ed563e2369738dfb3502902358665efe93c..97cc42ba31ae10ac80823f5beecf38c373e14e2f 100755 (executable)
@@ -1,28 +1,28 @@
-//  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 
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
+//  Copyright (C) 2003-2007  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_ToolsGUI.hxx
 //  Author : Alexander A. BORODIN
 //  Module : GEOM
-
+//
 #ifndef _GEOM_ToolsGUI_HXX_
 #define _GEOM_ToolsGUI_HXX_
 
index 45092979ad4fbd8f338f07ab6a7bca56983dbe2c..4f879990b88053d0ceec10131c4d0236df5ee79c 100644 (file)
@@ -1,80 +1,78 @@
-#  GEOM GEOMTOOLSGUI : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : GEOMToolsGUI
 #
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOMToolsGUI.la
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =                                \
+       GEOMToolsGUI.h                          \
+       GEOM_ToolsGUI.hxx                       \
+       GEOMToolsGUI_NbIsosDlg.h                \
+       GEOMToolsGUI_TransparencyDlg.h          \
+       GEOMToolsGUI_DeleteDlg.h                \
+       GEOMToolsGUI_NbIsosDlg.h
 
-dist_libGEOMToolsGUI_la_SOURCES = \
-       GEOMToolsGUI.cxx \
-       GEOMToolsGUI_1.cxx \
-       GEOMToolsGUI_TransparencyDlg.cxx \
-       GEOMToolsGUI_NbIsosDlg.cxx
+dist_libGEOMToolsGUI_la_SOURCES =              \
+       GEOMToolsGUI.cxx                        \
+       GEOMToolsGUI_1.cxx                      \
+       GEOMToolsGUI_TransparencyDlg.cxx        \
+       GEOMToolsGUI_NbIsosDlg.cxx              \
+       GEOMToolsGUI_DeleteDlg.cxx
 
-MOC_FILES = \
-       GEOMToolsGUI_TransparencyDlg_moc.cxx \
-       GEOMToolsGUI_NbIsosDlg_moc.cxx
+MOC_FILES =                                    \
+       GEOMToolsGUI_TransparencyDlg_moc.cxx    \
+       GEOMToolsGUI_NbIsosDlg_moc.cxx          \
+       GEOMToolsGUI_DeleteDlg_moc.cxx
 
-nodist_libGEOMToolsGUI_la_SOURCES= \
+nodist_libGEOMToolsGUI_la_SOURCES =            \
        $(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOMEDS_Attributes.idl \
-#               SALOME_GenericObj.idl \
-#               SALOME_Exception.idl \
-#               SALOME_Component.idl
-
-#LIB_SERVER_IDL = 
+# additional information to compile and link file
 
-# additionnal information to compile and link file
-libGEOMToolsGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(top_builddir)/idl \
+libGEOMToolsGUI_la_CPPFLAGS =          \
+       $(QT_INCLUDES)                  \
+       $(VTK_INCLUDES)                 \
+       $(CAS_CPPFLAGS)                 \
+       $(PYTHON_INCLUDES)              \
+       $(BOOST_CPPFLAGS)               \
+       $(KERNEL_CXXFLAGS)              \
+       $(GUI_CXXFLAGS)                 \
+       $(CORBA_CXXFLAGS)               \
+       $(CORBA_INCLUDES)               \
+       -I$(srcdir)/../OBJECT           \
+       -I$(srcdir)/../GEOMBase         \
+       -I$(srcdir)/../GEOMGUI          \
+       -I$(srcdir)/../GEOMClient       \
+       -I$(srcdir)/../GEOMImpl         \
+       -I$(top_builddir)/idl           \
        -I$(top_builddir)/salome_adm/unix
 
-libGEOMToolsGUI_la_LDFLAGS  = \
-       ../GEOMBase/libGEOMBase.la \
-       ../GEOMGUI/libGEOM.la \
+libGEOMToolsGUI_la_LDFLAGS  =          \
+       ../GEOMBase/libGEOMBase.la      \
+       ../GEOMGUI/libGEOM.la           \
        $(GUI_LDFLAGS) -lVTKViewer -lOCCViewer -lsuit -lSalomeApp
index 3fb087871c8b0cb48f78c150285fa6bf0e8bccef..82f5f5d4459c4a96b815d0dec3429b15990e93e6 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 #ifdef WNT
 #pragma warning( disable:4786 )
 #include <Standard_Stream.hxx>
 
 #include "GEOM_Gen_i.hh"
+
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <TColStd_HSequenceOfAsciiString.hxx>
 #include <Resource_DataMapOfAsciiStringAsciiString.hxx>
 
+#include <vector>
+#include <string>
+
 //=======================================================================
 //function : DumpPython
 //purpose  : 
@@ -48,6 +54,8 @@ Engines::TMPFile* GEOM_Gen_i::DumpPython(CORBA::Object_ptr theStudy,
 
   Resource_DataMapOfAsciiStringAsciiString aMap;
 
+  TVariablesList aVariableMap;
+
   SALOMEDS::ChildIterator_var Itr = aStudy->NewChildIterator(aSO);
   for(Itr->InitEx(true); Itr->More(); Itr->Next()) {
     SALOMEDS::SObject_var aValue = Itr->Value();
@@ -59,14 +67,47 @@ Engines::TMPFile* GEOM_Gen_i::DumpPython(CORBA::Object_ptr theStudy,
         CORBA::String_var aName = aValue->GetName();
         CORBA::String_var anEntry = GO->GetEntry();
        aMap.Bind( (char*)anEntry.in(), (char*)aName.in() );
+
+       //Find attribute with list of used notebook variables
+       SALOMEDS::GenericAttribute_var anAttr;
+       SALOMEDS::AttributeString_var anAttrStr;
+       if(aValue->FindAttribute(anAttr,"AttributeString")){
+         anAttrStr = SALOMEDS::AttributeString::_narrow(anAttr);
+         SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(anAttrStr->Value());
+         ObjectStates* aStates = new ObjectStates();
+         for(int i = 0; i < aSections->length(); i++) {
+           TState aState;
+           SALOMEDS::ListOfStrings aListOfVars = aSections[i];
+           for(int j = 0; j < aListOfVars.length(); j++) {
+             bool isVar = aStudy->IsVariable(aListOfVars[j].in());
+             TVariable aVar = TVariable( (char*)aListOfVars[j].in(), isVar );
+             aState.push_back(aVar);
+           }
+           aStates->AddState(aState);
+         }
+         aVariableMap.insert(pair<TCollection_AsciiString,ObjectStates*>(TCollection_AsciiString(anEntry),aStates));
+       }
       }
     }
   }
-
+  
   TCollection_AsciiString aScript =
     "### 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);
+  aScript += _impl->DumpPython(aStudy->StudyId(), aMap, aVariableMap, isPublished, isValidScript);
+
+  if (isPublished)
+  {
+    //Output the script that sets up the visual parameters.
+    char* script = aStudy->GetDefaultScript(ComponentDataType(), "\t");
+    if (script && strlen(script) > 0) {
+      aScript += "\n\t### Store presentation parameters of displayed objects\n";
+      aScript += script;
+      CORBA::string_free(script);
+    }
+  }
+
+  aScript += "\n\tpass\n";
 
   int aLen = aScript.Length(); 
   unsigned char* aBuffer = new unsigned char[aLen+1];
index 0d0d573965941a58903c5e1a05d0b4f60154c70b..b9ef2ed7556c6c2184692cf5de4defbc32a97997 100755 (executable)
@@ -1,28 +1,28 @@
-//  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 
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
+//  Copyright (C) 2003-2007  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_GEOM_I.hxx
 //  Author : Alexander A. BORODIN
 //  Module : GEOM
-
+//
 #ifndef _GEOM_GEOM_I_HXX_
 #define _GEOM_GEOM_I_HXX_
 
index 106ee9ef66c6c80bba21633cf6ec80fbfe8231c5..6e8e4e430dbed26d3beec114737a3439c129ec02 100644 (file)
@@ -1,21 +1,23 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifdef WNT
 #pragma warning( disable:4786 )
@@ -159,7 +161,6 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
   Unexpect aCatch(SALOME_SalomeException);
   SALOMEDS::SObject_var aResultSO;
   if(CORBA::is_nil(theObject) || theStudy->_is_nil()) return aResultSO;
-
   GEOM::GEOM_Object_var aShape = GEOM::GEOM_Object::_narrow(theObject);
   if(aShape->_is_nil()) return aResultSO;
 
@@ -272,7 +273,25 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
   anAttr = aStudyBuilder->FindOrCreateAttribute(aResultSO, "AttributeName");
   SALOMEDS::AttributeName_var aNameAttrib = SALOMEDS::AttributeName::_narrow(anAttr);
   aNameAttrib->SetValue(aShapeName.ToCString());
-  
+
+  //Set NoteBook variables used in the object creation
+  TCollection_AsciiString aVars;
+  SALOMEDS::ListOfListOfStrings_var aSections = theStudy->ParseVariables(aShape->GetParameters());
+  for(int i = 0, n = aSections->length(); i < n; i++) {
+    SALOMEDS::ListOfStrings aListOfVars = aSections[i];
+    for(int j = 0, m = aListOfVars.length(); j < m; j++) {
+      if(theStudy->IsVariable(aListOfVars[j].in()))
+       aVars += TCollection_AsciiString(aListOfVars[j].in());
+      if(j != m-1)
+       aVars += ":";
+    }
+    if(i != n-1)
+      aVars += "|";
+  }
+  anAttr = aStudyBuilder->FindOrCreateAttribute(aResultSO, "AttributeString");
+  SALOMEDS::AttributeString_var aStringAttrib = SALOMEDS::AttributeString::_narrow(anAttr);
+  aStringAttrib->SetValue(aVars.ToCString());
+
   //Set a name of the GEOM object
   aShape->SetName(theName);
 
@@ -313,7 +332,7 @@ SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
   // Build a full file name of temporary file
   TCollection_AsciiString aFullName = TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt;
   // Save GEOM component in this file
-  _impl->Save(theComponent->GetStudy()->StudyId(), aFullName.ToCString());
+  _impl->Save(theComponent->GetStudy()->StudyId(),(char*) aFullName.ToCString());
   // Conver a file to the byte stream
   aStreamFile = SALOMEDS_Tool::PutFilesToStream(aTmpDir.c_str(), aSeq.in(), isMultiFile);
   // Remove the created file and tmp directory
@@ -375,7 +394,7 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
   TCollection_AsciiString aFullName = (TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt);
 
   // Open document
-  if (!_impl->Load(theComponent->GetStudy()->StudyId(), aFullName.ToCString())) return false;
+  if (!_impl->Load(theComponent->GetStudy()->StudyId(),(char*) aFullName.ToCString())) return false;
 
   // Remove the created file and tmp directory
   if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.c_str(), aSeq.in(), true);
@@ -522,7 +541,10 @@ char* GEOM_Gen_i::ComponentDataType()
 // function : AddInStudy
 // purpose  :
 //============================================================================
-SALOMEDS::SObject_ptr GEOM_Gen_i::AddInStudy(SALOMEDS::Study_ptr theStudy, GEOM::GEOM_Object_ptr theObject, const char* theName, GEOM::GEOM_Object_ptr theFather)
+SALOMEDS::SObject_ptr GEOM_Gen_i::AddInStudy (SALOMEDS::Study_ptr theStudy,
+                                             GEOM::GEOM_Object_ptr theObject,
+                                             const char* theName,
+                                             GEOM::GEOM_Object_ptr theFather)
 {
   SALOMEDS::SObject_var aResultSO;
   if(theObject->_is_nil() || theStudy->_is_nil()) return aResultSO;
@@ -559,6 +581,393 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::AddInStudy(SALOMEDS::Study_ptr theStudy, GEOM:
   return aResultSO._retn();
 }
 
+//============================================================================
+// function : RestoreSubShapesO
+// purpose  : Publish sub-shapes, standing for arguments and sub-shapes of arguments.
+//            To be used from python scripts out of geompy.addToStudy (non-default usage)
+//============================================================================
+CORBA::Boolean GEOM_Gen_i::RestoreSubShapesO (SALOMEDS::Study_ptr     theStudy,
+                                             GEOM::GEOM_Object_ptr   theObject,
+                                             const GEOM::ListOfGO&   theArgs,
+                                             GEOM::find_shape_method theFindMethod,
+                                             CORBA::Boolean          theInheritFirstArg)
+{
+  if (CORBA::is_nil(theStudy) || CORBA::is_nil(theObject))
+    return false;
+
+  // find SObject in the study
+  CORBA::String_var anIORo = _orb->object_to_string(theObject);
+  SALOMEDS::SObject_var aSO = theStudy->FindObjectIOR(anIORo.in());
+  if (CORBA::is_nil(aSO))
+    return false;
+
+  return RestoreSubShapes(theStudy, theObject, aSO, theArgs, theFindMethod, theInheritFirstArg);
+}
+
+//============================================================================
+// function : RestoreSubShapesSO
+// purpose  : Publish sub-shapes, standing for arguments and sub-shapes of arguments.
+//            To be used from GUI and from geompy.addToStudy
+//============================================================================
+CORBA::Boolean GEOM_Gen_i::RestoreSubShapesSO (SALOMEDS::Study_ptr     theStudy,
+                                              SALOMEDS::SObject_ptr   theSObject,
+                                              const GEOM::ListOfGO&   theArgs,
+                                              GEOM::find_shape_method theFindMethod,
+                                              CORBA::Boolean          theInheritFirstArg)
+{
+  if (CORBA::is_nil(theStudy) || CORBA::is_nil(theSObject))
+    return false;
+
+  SALOMEDS::GenericAttribute_var anAttr;
+  if (!theSObject->FindAttribute(anAttr, "AttributeIOR"))
+    return false;
+
+  SALOMEDS::AttributeIOR_var anAttrIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+  CORBA::String_var anIORso = anAttrIOR->Value();
+
+  // get Object from SObject
+  GEOM::GEOM_Object_var anO = GEOM::GEOM_Object::_narrow(_orb->string_to_object(anIORso));
+  if (CORBA::is_nil(anO))
+    return false;
+
+  return RestoreSubShapes(theStudy, anO, theSObject, theArgs, theFindMethod, theInheritFirstArg);
+}
+
+//============================================================================
+// function : RestoreSubShapes
+// purpose  : Private method. Works only if both theObject and theSObject
+//            are defined, and does not check, if they correspond to each other.
+//============================================================================
+CORBA::Boolean GEOM_Gen_i::RestoreSubShapes (SALOMEDS::Study_ptr     theStudy,
+                                            GEOM::GEOM_Object_ptr   theObject,
+                                            SALOMEDS::SObject_ptr   theSObject,
+                                            const GEOM::ListOfGO&   theArgs,
+                                            GEOM::find_shape_method theFindMethod,
+                                            CORBA::Boolean          theInheritFirstArg)
+{
+  if (CORBA::is_nil(theStudy) || CORBA::is_nil(theObject) || CORBA::is_nil(theSObject))
+    return false;
+
+  // Arguments to be published
+  GEOM::ListOfGO_var aList;
+
+  // If theArgs list is empty, we try to publish all arguments,
+  // otherwise publish only passed args
+  Standard_Integer nbArgsActual = -1; // -1 means unknown
+  Standard_Integer aLength = theArgs.length();
+  if (aLength > 0) {
+    aList = new GEOM::ListOfGO;
+    aList->length(aLength);
+    for (int i = 0; i < aLength; i++) {
+      aList[i] = theArgs[i];
+    }
+  }
+  else {
+    // Get all arguments
+    aList = theObject->GetDependency();
+    aLength = aList->length();
+    nbArgsActual = aLength;
+  }
+
+  if (aLength < 1)
+    return false;
+
+  if (theInheritFirstArg || (nbArgsActual == 1)) {
+    // Do not publish argument's reflection,
+    // but only reconstruct its published sub-shapes
+
+    GEOM::GEOM_Object_var anArgO = aList[0];
+    CORBA::String_var anIOR = _orb->object_to_string(anArgO);
+    SALOMEDS::SObject_var anArgSO = theStudy->FindObjectIOR(anIOR.in());
+
+    GEOM::ListOfGO_var aParts =
+      RestoreSubShapesOneLevel(theStudy, anArgSO, theSObject, theObject, theFindMethod);
+
+    // set the color of the transformed shape to the color of initial shape
+    theObject->SetColor(aList[0]->GetColor());
+
+    return (aParts->length() > 0);
+  }
+
+  // Get interface, containing method, which we will use to reconstruct sub-shapes
+  GEOM::GEOM_IShapesOperations_var aShapesOp = GetIShapesOperations(theStudy->StudyId());
+  GEOM::GEOM_IGroupOperations_var  aGroupOp  = GetIGroupOperations(theStudy->StudyId());
+
+  // Reconstruct arguments and tree of sub-shapes of the arguments
+  CORBA::String_var anIOR;
+  SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
+  for (Standard_Integer i = 0; i < aLength; i++)
+  {
+    GEOM::GEOM_Object_var anArgO = aList[i];
+    if (!CORBA::is_nil(anArgO)) {
+      anIOR = _orb->object_to_string(anArgO);
+      SALOMEDS::SObject_var anArgSO = theStudy->FindObjectIOR(anIOR.in());
+      TCollection_AsciiString anArgName;
+      if (CORBA::is_nil(anArgSO)) {
+       anArgName = "arg_";
+       anArgName += TCollection_AsciiString(i);
+      }
+      else {
+       anArgName = anArgSO->GetName();
+      }
+
+      // Find a sub-shape of theObject in place of the argument
+      GEOM::GEOM_Object_var aSubO;
+      switch (theFindMethod) {
+      case GEOM::FSM_GetInPlace:
+       {
+         // Use GetInPlace
+         aSubO = aShapesOp->GetInPlace(theObject, anArgO);
+       }
+       break;
+      case GEOM::FSM_Transformed:
+       {
+         // transformation, cannot use GetInPlace, operate with indices
+         GEOM::ListOfLong_var anIDs = anArgO->GetSubShapeIndices();
+         if (anIDs->length() > 1) {
+           // group
+           aSubO = aGroupOp->CreateGroup(theObject, aGroupOp->GetType(anArgO));
+           if (!CORBA::is_nil(aSubO))
+             aGroupOp->UnionIDs(aSubO, anIDs);
+         }
+         else {
+           // single sub-shape
+           aSubO = aShapesOp->GetSubShape(theObject, anIDs[0]);
+         }
+       }
+       break;
+      case GEOM::FSM_GetSame:
+       {
+         // Use GetSame
+         aSubO = aShapesOp->GetSame(theObject, anArgO);
+       }
+       break;
+      case GEOM::FSM_GetShapesOnShape:
+       {
+         // Use GetShapesOnShape. Can work only on solids, so it has sense to search only solids
+         aSubO = aShapesOp->GetShapesOnShapeAsCompound(anArgO, theObject,
+                                                       (short)GEOM::SOLID, GEOM::ST_ONIN);
+       }
+       break;
+      case GEOM::FSM_GetInPlaceByHistory:
+       {
+         // Use GetInPlaceByHistory
+         aSubO = aShapesOp->GetInPlaceByHistory(theObject, anArgO);
+       }
+       break;
+      default:
+       {}
+      }
+
+      if (!CORBA::is_nil(aSubO)) {
+       // Publish the sub-shape
+       TCollection_AsciiString aSubName ("from_");
+       aSubName += anArgName;
+       SALOMEDS::SObject_var aSubSO = aStudyBuilder->NewObject(theSObject);
+       aSubSO = PublishInStudy(theStudy, aSubSO, aSubO, aSubName.ToCString());
+       // Restore color
+       aSubO->SetColor(anArgO->GetColor());
+
+       if (!CORBA::is_nil(anArgSO)) {
+         // Restore published sub-shapes of the argument
+         if (theFindMethod == GEOM::FSM_GetInPlaceByHistory)
+           // pass theObject, because only it has the history
+           RestoreSubShapesOneLevel(theStudy, anArgSO, aSubSO, theObject, theFindMethod);
+         else
+           RestoreSubShapesOneLevel(theStudy, anArgSO, aSubSO, aSubO, theFindMethod);
+       }
+      }
+      else { // GetInPlace failed, try to build from published parts
+       if (!CORBA::is_nil(anArgSO)) {
+         SALOMEDS::SObject_var aSubSO = aStudyBuilder->NewObject(theSObject);
+
+         // Restore published sub-shapes of the argument
+         GEOM::ListOfGO_var aParts =
+           RestoreSubShapesOneLevel(theStudy, anArgSO, aSubSO, theObject, theFindMethod);
+
+         if (aParts->length() > 0) {
+           // try to build an argument from a set of its sub-shapes,
+           // that published and will be reconstructed
+           if (aParts->length() > 1) {
+             aSubO = aShapesOp->MakeCompound(aParts);
+           }
+           else {
+             aSubO = aParts[0];
+           }
+           if (!CORBA::is_nil(aSubO)) {
+             // Publish the sub-shape
+             TCollection_AsciiString aSubName ("from_parts_of_");
+             aSubName += anArgName;
+             aSubSO = PublishInStudy(theStudy, aSubSO, aSubO, aSubName.ToCString());
+             // Restore color
+             aSubO->SetColor(anArgO->GetColor());
+           }
+         }
+         else {
+           // remove created aSubSO, because no parts have been found
+           aStudyBuilder->RemoveObject(aSubSO);
+         }
+       }
+      } // try to build from published parts
+    }
+  } // process arguments
+
+  return true;
+}
+
+//============================================================================
+// function : RestoreSubShapesOneLevel
+// purpose  : Private method
+//============================================================================
+GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesOneLevel (SALOMEDS::Study_ptr     theStudy,
+                                                     SALOMEDS::SObject_ptr   theOldSO,
+                                                     SALOMEDS::SObject_ptr   theNewSO,
+                                                     GEOM::GEOM_Object_ptr   theNewO,
+                                                     GEOM::find_shape_method theFindMethod)
+{
+  int i = 0;
+  GEOM::ListOfGO_var aParts = new GEOM::ListOfGO;
+  if (CORBA::is_nil(theStudy) || CORBA::is_nil(theOldSO) ||
+      CORBA::is_nil(theNewO) || CORBA::is_nil(theNewSO))
+    return aParts._retn();
+
+  SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
+
+  // Get interface, containing method, which we will use to reconstruct sub-shapes
+  GEOM::GEOM_IShapesOperations_var aShapesOp = GetIShapesOperations(theStudy->StudyId());
+  GEOM::GEOM_IGroupOperations_var  aGroupOp  = GetIGroupOperations(theStudy->StudyId());
+
+  // Reconstruct published sub-shapes
+  SALOMEDS::ChildIterator_var it = theStudy->NewChildIterator(theOldSO);
+
+  int aLen = 0;
+  for (it->Init(); it->More(); it->Next()) {
+    aLen++;
+  }
+  aParts->length(aLen);
+
+  for (it->Init(); it->More(); it->Next()) {
+    SALOMEDS::SObject_var anOldSubSO = it->Value();
+
+    TCollection_AsciiString anArgName = anOldSubSO->GetName();
+
+    SALOMEDS::GenericAttribute_var anAttr;
+    if (anOldSubSO->FindAttribute(anAttr, "AttributeIOR")) {
+      SALOMEDS::AttributeIOR_var anAttrIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+      GEOM::GEOM_Object_var anOldSubO =
+       GEOM::GEOM_Object::_narrow(_orb->string_to_object(anAttrIOR->Value()));
+      if (!CORBA::is_nil(anOldSubO)) {
+       // Find a sub-shape of theNewO in place of anOldSubO
+       GEOM::GEOM_Object_var aNewSubO;
+       switch (theFindMethod) {
+       case GEOM::FSM_GetInPlace:
+         {
+           // Use GetInPlace
+           aNewSubO = aShapesOp->GetInPlace(theNewO, anOldSubO);
+         }
+         break;
+       case GEOM::FSM_Transformed:
+         {
+           // transformation, cannot use GetInPlace, operate with indices
+           GEOM::ListOfLong_var anIDs = anOldSubO->GetSubShapeIndices();
+           if (anIDs->length() > 1) {
+             // group
+             aNewSubO = aGroupOp->CreateGroup(theNewO, aGroupOp->GetType(anOldSubO));
+             if (!CORBA::is_nil(aNewSubO))
+               aGroupOp->UnionIDs(aNewSubO, anIDs);
+           }
+           else {
+             // single sub-shape
+             aNewSubO = aShapesOp->GetSubShape(theNewO, anIDs[0]);
+           }
+         }
+         break;
+       case GEOM::FSM_GetSame:
+         {
+           // Use GetSame
+           aNewSubO = aShapesOp->GetSame(theNewO, anOldSubO);
+         }
+         break;
+       case GEOM::FSM_GetShapesOnShape:
+         {
+           // Use GetShapesOnShape. Can work only on solids, so it has sense to search only solids
+           aNewSubO = aShapesOp->GetShapesOnShapeAsCompound(anOldSubO, theNewO,
+                                                            (short)GEOM::SOLID, GEOM::ST_ONIN);
+         }
+         break;
+       case GEOM::FSM_GetInPlaceByHistory:
+         {
+           // Use GetInPlaceByHistory
+           aNewSubO = aShapesOp->GetInPlaceByHistory(theNewO, anOldSubO);
+         }
+         break;
+       default:
+         {}
+       }
+
+       if (!CORBA::is_nil(aNewSubO)) {
+         // add the part to the list
+         aParts[i] = aNewSubO;
+         i++;
+
+         // Publish the sub-shape
+         TCollection_AsciiString aSubName ("from_");
+         aSubName += anArgName;
+         SALOMEDS::SObject_var aNewSubSO = aStudyBuilder->NewObject(theNewSO);
+         aNewSubSO = PublishInStudy(theStudy, aNewSubSO, aNewSubO, aSubName.ToCString());
+         // Restore color
+         aNewSubO->SetColor(anOldSubO->GetColor());
+
+         // Restore published sub-shapes of the argument
+         if (theFindMethod == GEOM::FSM_GetInPlaceByHistory)
+           // pass the main shape as Object, because only it has the history
+           RestoreSubShapesOneLevel(theStudy, anOldSubSO, aNewSubSO, theNewO, theFindMethod);
+         else
+           RestoreSubShapesOneLevel(theStudy, anOldSubSO, aNewSubSO, aNewSubO, theFindMethod);
+       }
+       else { // GetInPlace failed, try to build from published parts
+         SALOMEDS::SObject_var aNewSubSO = aStudyBuilder->NewObject(theNewSO);
+
+         // Restore published sub-shapes of the argument
+         GEOM::ListOfGO_var aParts =
+           RestoreSubShapesOneLevel(theStudy, anOldSubSO, aNewSubSO, theNewO, theFindMethod);
+
+         if (aParts->length() > 0) {
+           // try to build an object from a set of its sub-shapes,
+           // that published and will be reconstructed
+           if (aParts->length() > 1) {
+             aNewSubO = aShapesOp->MakeCompound(aParts);
+           }
+           else {
+             aNewSubO = aParts[0];
+           }
+
+           if (!CORBA::is_nil(aNewSubO)) {
+             // add the part to the list
+             aParts[i] = aNewSubO;
+             i++;
+
+             // Publish the sub-shape
+             TCollection_AsciiString aSubName = "from_parts_of_";
+             aSubName += anArgName;
+             aNewSubSO = PublishInStudy(theStudy, aNewSubSO, aNewSubO, aSubName.ToCString());
+             // Restore color
+             aNewSubO->SetColor(anOldSubO->GetColor());
+           }
+         }
+         else {
+           // remove created aSubSO, because no parts have been found
+           aStudyBuilder->RemoveObject(aNewSubSO);
+         }
+       } // try to build from published parts
+      }
+    }
+  } // iterate on published sub-shapes
+
+  aParts->length(i);
+  return aParts._retn();
+}
+
 //============================================================================
 // function : register()
 // purpose  : register 'name' in 'name_service'
@@ -858,7 +1267,8 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::AddSubShape (GEOM::GEOM_Object_ptr theMainShap
 //=============================================================================
 void GEOM_Gen_i::RemoveObject(GEOM::GEOM_Object_ptr theObject)
 {
-  Handle(GEOM_Object) anObject = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+  CORBA::String_var anEntry = theObject->GetEntry();
+  Handle(GEOM_Object) anObject = _impl->GetObject(theObject->GetStudyID(), anEntry);
   if (anObject.IsNull()) return;
   _impl->RemoveObject(anObject);
   return;
@@ -915,6 +1325,157 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::GetObject (CORBA::Long theStudyID, const char*
   return obj._retn();
 }
 
+//=================================================================================
+// function : hasObjectInfo()
+// purpose  : shows if module provides information for its objects
+//=================================================================================
+bool GEOM_Gen_i::hasObjectInfo()
+{
+  return true;
+}
+
+//=================================================================================
+// function : getObjectInfo()
+// purpose  : returns an information for a given object by its entry
+//=================================================================================
+char* GEOM_Gen_i::getObjectInfo(CORBA::Long studyId, const char* entry)
+{
+  GEOM::GEOM_Object_var aGeomObject;
+  CORBA::Object_var aSMObject = name_service->Resolve( "/myStudyManager" );
+  SALOMEDS::StudyManager_var aStudyManager = SALOMEDS::StudyManager::_narrow( aSMObject );
+  SALOMEDS::Study_var aStudy = aStudyManager->GetStudyByID( studyId );
+  SALOMEDS::SObject_var aSObj = aStudy->FindObjectID( entry );
+  SALOMEDS::SObject_var aResultSObj;
+  if (aSObj->ReferencedObject(aResultSObj))
+    aSObj = aResultSObj;
+
+  SALOMEDS::GenericAttribute_var anAttr;
+  if (!aSObj->_is_nil() && aSObj->FindAttribute(anAttr, "AttributeIOR")) {
+    SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
+    CORBA::String_var aVal = anIOR->Value();
+    CORBA::Object_var anObject = aStudy->ConvertIORToObject(aVal);
+    aGeomObject = GEOM::GEOM_Object::_narrow(anObject);
+  }
+  
+  char* aTypeInfo = "Object";
+  if ( !aGeomObject->_is_nil() ) {
+    GEOM::GEOM_IKindOfShape::shape_kind aKind;
+    GEOM::ListOfLong_var anInts;
+    GEOM::ListOfDouble_var aDbls;
+
+    GEOM::GEOM_IMeasureOperations_var anOp = GetIMeasureOperations( studyId );
+    aKind = anOp->KindOfShape( aGeomObject, anInts, aDbls );
+
+    if ( anOp->IsDone() ) {
+      switch ( aKind ) {
+      case GEOM::GEOM_IKindOfShape::COMPOUND:
+       aTypeInfo = "Compound";
+       break;
+      case GEOM::GEOM_IKindOfShape::COMPSOLID:
+       aTypeInfo = "CompSolid";
+       break;
+      case GEOM::GEOM_IKindOfShape::SHELL:
+       aTypeInfo = "Shell";
+       break;
+      case GEOM::GEOM_IKindOfShape::WIRE:
+       if ( anInts[0] == 1 )
+         aTypeInfo = "Closed Wire";
+       else if ( anInts[0] == 2 )
+         aTypeInfo = "Opened Wire";
+       else
+         aTypeInfo = "Wire";
+       break;
+       // SOLIDs
+      case GEOM::GEOM_IKindOfShape::SPHERE:
+       aTypeInfo = "Sphere";
+       break;
+      case GEOM::GEOM_IKindOfShape::CYLINDER:
+       aTypeInfo = "Cylinder";
+       break;
+      case GEOM::GEOM_IKindOfShape::BOX:
+      case GEOM::GEOM_IKindOfShape::ROTATED_BOX:
+       aTypeInfo = "Box";
+       break;
+      case GEOM::GEOM_IKindOfShape::TORUS:
+       aTypeInfo = "Torus";
+       break;
+      case GEOM::GEOM_IKindOfShape::CONE:
+       aTypeInfo = "Cone";
+       break;
+      case GEOM::GEOM_IKindOfShape::POLYHEDRON:
+       aTypeInfo = "Polyhedron";
+       break;
+      case GEOM::GEOM_IKindOfShape::SOLID:
+       aTypeInfo = "Solid";
+       break;
+       // FACEs
+      case GEOM::GEOM_IKindOfShape::SPHERE2D:
+       aTypeInfo = "Spherical Face";
+       break;
+      case GEOM::GEOM_IKindOfShape::CYLINDER2D:
+       aTypeInfo = "Cylindrical Face";
+       break;
+      case GEOM::GEOM_IKindOfShape::TORUS2D:
+       aTypeInfo = "Toroidal Face";
+       break;
+      case GEOM::GEOM_IKindOfShape::CONE2D:
+       aTypeInfo = "Conical Face";
+       break;
+      case GEOM::GEOM_IKindOfShape::DISK_CIRCLE:
+       aTypeInfo = "Disk";
+       break;
+      case GEOM::GEOM_IKindOfShape::DISK_ELLIPSE:
+       aTypeInfo = "Elliptical Face";
+       break;
+      case GEOM::GEOM_IKindOfShape::POLYGON:
+       aTypeInfo = "Polygon";
+       break;
+      case GEOM::GEOM_IKindOfShape::PLANE:
+       aTypeInfo = "Plane";
+       break;
+      case GEOM::GEOM_IKindOfShape::PLANAR:
+       aTypeInfo = "Planar Face";
+       break;
+      case GEOM::GEOM_IKindOfShape::FACE:
+       aTypeInfo = "Face";
+       break;
+       // EDGEs
+      case GEOM::GEOM_IKindOfShape::CIRCLE:
+       aTypeInfo = "Circle";
+       break;
+      case GEOM::GEOM_IKindOfShape::ARC_CIRCLE:
+       aTypeInfo = "Ark";
+       break;
+      case GEOM::GEOM_IKindOfShape::ELLIPSE:
+       aTypeInfo = "Ellipse";
+       break;
+      case GEOM::GEOM_IKindOfShape::ARC_ELLIPSE:
+       aTypeInfo = "Arc Ellipse";
+       break;
+      case GEOM::GEOM_IKindOfShape::LINE:
+       aTypeInfo = "Line";
+       break;
+      case GEOM::GEOM_IKindOfShape::SEGMENT:
+       aTypeInfo = "Segment";
+       break;
+      case GEOM::GEOM_IKindOfShape::EDGE:
+       aTypeInfo = "Edge";
+       break;
+      case GEOM::GEOM_IKindOfShape::VERTEX:
+       aTypeInfo = "Vertex";
+       break;
+      default:
+       break;
+      }
+    }
+  }
+    
+  char anInfo [strlen("Module ") + strlen(ComponentDataType()) + strlen(", ") + strlen(aTypeInfo)];
+  sprintf(anInfo, "Module %s, %s", ComponentDataType(), aTypeInfo);
+  
+  return CORBA::string_dup(anInfo);
+}
 
 //=====================================================================================
 // EXPORTED METHODS
index 30188801f881fbf41ba1eeff98d1d91f9eeea735..aba3b6aa665cff56ee15f7eb15cc8f0d4fe76778 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 __GEOM_GEN_I_H__
 #define __GEOM_GEN_I_H__
@@ -133,6 +135,24 @@ class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual publi
                                    const char* theName,
                                    GEOM::GEOM_Object_ptr theFather);
 
+  /*! \brief Publish sub-shapes, standing for arguments and sub-shapes of arguments.
+   *         To be used from python scripts out of geompy.addToStudy (non-default usage)
+   */
+  CORBA::Boolean RestoreSubShapesO (SALOMEDS::Study_ptr     theStudy,
+                                   GEOM::GEOM_Object_ptr   theObject,
+                                   const GEOM::ListOfGO&   theArgs,
+                                   GEOM::find_shape_method theFindMethod,
+                                   CORBA::Boolean          theInheritFirstArg);
+
+  /*! \brief Publish sub-shapes, standing for arguments and sub-shapes of arguments.
+   *         To be used from GUI and from geompy.addToStudy
+   */
+  CORBA::Boolean RestoreSubShapesSO (SALOMEDS::Study_ptr     theStudy,
+                                    SALOMEDS::SObject_ptr   theSObject,
+                                    const GEOM::ListOfGO&   theArgs,
+                                    GEOM::find_shape_method theFindMethod,
+                                    CORBA::Boolean          theInheritFirstArg);
+
   //-----------------------------------------------------------------------//
   // Transaction methods                                                   //
   //-----------------------------------------------------------------------//
@@ -212,13 +232,31 @@ class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual publi
   char* GetDumpName (const char* theStudyEntry);
 
   GEOM::string_array* GetAllDumpNames();
-
+  
+  // Object information
+  virtual bool hasObjectInfo();
+  virtual char* getObjectInfo(CORBA::Long studyId, const char* entry);
+  
   //-----------------------------------------------------------------------//
   // Internal methods                                                      //
   //-----------------------------------------------------------------------//
 
   virtual GEOM::GEOM_Object_ptr GetObject(CORBA::Long theStudyID, const char* theEntry);
 
+ private:
+  GEOM::ListOfGO* RestoreSubShapesOneLevel (SALOMEDS::Study_ptr     theStudy,
+                                           SALOMEDS::SObject_ptr   theOldSO,
+                                           SALOMEDS::SObject_ptr   theNewSO,
+                                           GEOM::GEOM_Object_ptr   theNewO,
+                                           GEOM::find_shape_method theFindMethod);
+
+  CORBA::Boolean RestoreSubShapes (SALOMEDS::Study_ptr     theStudy,
+                                  GEOM::GEOM_Object_ptr   theObject,
+                                  SALOMEDS::SObject_ptr   theSObject,
+                                  const GEOM::ListOfGO&   theArgs,
+                                  GEOM::find_shape_method theFindMethod,
+                                  CORBA::Boolean          theInheritFirstArg);
+
  private:
 
    ::GEOMImpl_Gen* _impl;
diff --git a/src/GEOM_I/GEOM_I.pro b/src/GEOM_I/GEOM_I.pro
new file mode 100644 (file)
index 0000000..7b2cccd
--- /dev/null
@@ -0,0 +1,94 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = GEOMEngine
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+CAS_DATAEXCHANGE = -L$${CASROOT}/Linux/lib -lTKIGES -lTKSTEP
+
+STDLIB = -lstdc++
+
+CAS_LDPATH = -L$${CASROOT}/Linux/lib
+
+CORBA_LIBS = -L$$(OMNIORBDIR)/lib -lomniORB4 -lomniDynamic4 -lCOS4 -lCOSDynamic4 -lomnithread
+
+INCLUDEPATH += $${CORBA_INCLUDES} $${CAS_CPPFLAGS} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} ../SKETCHER ../ARCHIMEDE ../GEOMImpl ../GEOMAlgo ../GEOM $$(GEOM_ROOT_DIR)/idl ../../salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/idl -lSalomeIDLGEOM -L$$(GEOM_ROOT_DIR)/lib -lGEOMArchimede -lGEOMimpl -lGEOMSketcher -lGEOMbasic $${KERNEL_LDFLAGS} -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS $${CAS_DATAEXCHANGE} $${CAS_LDPATH} -lTKFillet -lTKOffset $${STDLIB} $${CORBA_LIBS}
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += GEOM_I_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+HEADERS  = GEOM_Object_i.hh
+HEADERS += GEOM_IOperations_i.hh
+HEADERS += GEOM_IBasicOperations_i.hh
+HEADERS += GEOM_IHealingOperations_i.hh
+HEADERS += GEOM_I3DPrimOperations_i.hh
+HEADERS += GEOM_IShapesOperations_i.hh
+HEADERS += GEOM_IBlocksOperations_i.hh
+HEADERS += GEOM_IBooleanOperations_i.hh
+HEADERS += GEOM_ICurvesOperations_i.hh
+HEADERS += GEOM_ILocalOperations_i.hh
+HEADERS += GEOM_IInsertOperations_i.hh
+HEADERS += GEOM_ITransformOperations_i.hh
+HEADERS += GEOM_IMeasureOperations_i.hh
+HEADERS += GEOM_IGroupOperations_i.hh
+HEADERS += GEOM_Gen_i.hh
+HEADERS += GEOM_GEOM_I.hxx
+
+SOURCES  = GEOM_Object_i.cc
+SOURCES += GEOM_IOperations_i.cc
+SOURCES += GEOM_IBasicOperations_i.cc
+SOURCES += GEOM_IHealingOperations_i.cc
+SOURCES += GEOM_I3DPrimOperations_i.cc
+SOURCES += GEOM_IShapesOperations_i.cc
+SOURCES += GEOM_IBlocksOperations_i.cc
+SOURCES += GEOM_IBooleanOperations_i.cc
+SOURCES += GEOM_ICurvesOperations_i.cc
+SOURCES += GEOM_ILocalOperations_i.cc
+SOURCES += GEOM_IInsertOperations_i.cc
+SOURCES += GEOM_ITransformOperations_i.cc
+SOURCES += GEOM_IMeasureOperations_i.cc
+SOURCES += GEOM_IGroupOperations_i.cc
+SOURCES += GEOM_Gen_i.cc
+SOURCES += GEOM_DumpPython.cc
+        
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index 55160f0fb836aaf88279c1fc7422fee5263b77f0..104bb85abf835d3e585ca16d5d6fbb95af5b6592 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
@@ -103,6 +105,156 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeBoxTwoPnt
   return GetObject(anObject);
 }
 
+//=============================================================================
+/*!
+ *  MakeFaceHW
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeFaceHW (CORBA::Double theH,
+                                                           CORBA::Double theW,
+                                                           CORBA::Short  theOrientation)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if (theH == 0 || theW == 0)
+    return aGEOMObject._retn();
+
+  //Create the Face
+  Handle(GEOM_Object) anObject = GetOperations()->MakeFaceHW(theH, theW, theOrientation);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}
+
+//=============================================================================
+/*!
+ *  MakeFaceObjHW
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeFaceObjHW
+                                               (GEOM::GEOM_Object_ptr theObj,
+                                               CORBA::Double theH,
+                                               CORBA::Double theW)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if (theObj == NULL || theH == 0 || theW == 0)
+    return aGEOMObject._retn();
+
+  //Get the reference points
+  Handle(GEOM_Object) anObj = GetOperations()->GetEngine()->GetObject
+    (theObj->GetStudyID(), theObj->GetEntry());
+
+  if (anObj.IsNull())
+    return aGEOMObject._retn();
+
+  //Create the Face
+  Handle(GEOM_Object) anObject = GetOperations()->MakeFaceObjHW(anObj, theH, theW);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}
+
+//=============================================================================
+/*!
+ *  MakeDiskPntVecR
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeDiskPntVecR
+                      (GEOM::GEOM_Object_ptr thePnt, GEOM::GEOM_Object_ptr theVec,
+                      CORBA::Double theR)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn();
+
+  //Get the reference points
+  Handle(GEOM_Object) aPnt = GetOperations()->GetEngine()->GetObject
+    (thePnt->GetStudyID(), thePnt->GetEntry());
+  Handle(GEOM_Object) aVec = GetOperations()->GetEngine()->GetObject
+    (theVec->GetStudyID(), theVec->GetEntry());
+
+  if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
+
+  // Make Disk
+  Handle(GEOM_Object) anObject =
+    GetOperations()->MakeDiskPntVecR(aPnt, aVec, theR);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}
+
+//=============================================================================
+/*!
+ *  MakeDiskThreePnt
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeDiskThreePnt
+                      (GEOM::GEOM_Object_ptr thePnt1, GEOM::GEOM_Object_ptr thePnt2,
+                      GEOM::GEOM_Object_ptr thePnt3)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if (thePnt1 == NULL || thePnt2 == NULL || thePnt3 == NULL) return aGEOMObject._retn();
+
+  //Get the reference points
+  Handle(GEOM_Object) aPnt1 = GetOperations()->GetEngine()->GetObject
+    (thePnt1->GetStudyID(), thePnt1->GetEntry());
+  Handle(GEOM_Object) aPnt2 = GetOperations()->GetEngine()->GetObject
+    (thePnt2->GetStudyID(), thePnt2->GetEntry());
+  Handle(GEOM_Object) aPnt3 = GetOperations()->GetEngine()->GetObject
+    (thePnt3->GetStudyID(), thePnt3->GetEntry());
+
+  if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
+
+  // Make Disk
+  Handle(GEOM_Object) anObject =
+      GetOperations()->MakeDiskThreePnt(aPnt1, aPnt2, aPnt3);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}
+
+//=============================================================================
+/*!
+ *  MakeDiskR
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeDiskR (CORBA::Double theR,
+                                                          CORBA::Short  theOrientation)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if (theR == 0)
+    return aGEOMObject._retn();
+
+  //Create the Face
+  Handle(GEOM_Object) anObject = GetOperations()->MakeDiskR(theR, theOrientation);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}
+
 //=============================================================================
 /*!
  *  MakeCylinderRH
@@ -459,6 +611,68 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismTwoPnt2Ways
   return GetObject(anObject);
 }
 
+//=============================================================================
+/*!
+ *  MakePrismDXDYDZ
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismDXDYDZ
+                      (GEOM::GEOM_Object_ptr theBase, CORBA::Double theDX,
+                      CORBA::Double theDY, CORBA::Double theDZ)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if (theBase == NULL) return aGEOMObject._retn();
+
+  //Get the reference objects
+  Handle(GEOM_Object) aBase = GetOperations()->GetEngine()->GetObject
+    (theBase->GetStudyID(), theBase->GetEntry());
+
+  if (aBase.IsNull()) return aGEOMObject._retn();
+
+  //Create the Prism
+  Handle(GEOM_Object) anObject =
+      GetOperations()->MakePrismDXDYDZ(aBase, theDX, theDY, theDZ);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}
+
+//=============================================================================
+/*!
+ *  MakePrismDXDYDZ2Ways
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismDXDYDZ2Ways
+                      (GEOM::GEOM_Object_ptr theBase, CORBA::Double theDX,
+                      CORBA::Double theDY, CORBA::Double theDZ)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if (theBase == NULL) return aGEOMObject._retn();
+
+  //Get the reference objects
+  Handle(GEOM_Object) aBase = GetOperations()->GetEngine()->GetObject
+    (theBase->GetStudyID(), theBase->GetEntry());
+
+  if (aBase.IsNull()) return aGEOMObject._retn();
+
+  //Create the Prism
+  Handle(GEOM_Object) anObject =
+      GetOperations()->MakePrismDXDYDZ2Ways(aBase, theDX, theDY, theDZ);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}
+
 //=============================================================================
 /*!
  *  MakePipe
@@ -819,3 +1033,40 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePipeShellsWithoutPath
 
   return GetObject(anObject);
 }
+
+
+//=============================================================================
+/*!
+ *  MakePipeBiNormalAlongVector
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePipeBiNormalAlongVector
+                 (GEOM::GEOM_Object_ptr theBase, 
+                 GEOM::GEOM_Object_ptr thePath, 
+                 GEOM::GEOM_Object_ptr theVec)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if (theBase == NULL || thePath == NULL || theVec == NULL) return aGEOMObject._retn();
+
+  //Get the reference objects
+  Handle(GEOM_Object) aBase = GetOperations()->GetEngine()->GetObject
+    (theBase->GetStudyID(), theBase->GetEntry());
+  Handle(GEOM_Object) aPath = GetOperations()->GetEngine()->GetObject
+    (thePath->GetStudyID(), thePath->GetEntry());
+  Handle(GEOM_Object) aVec = GetOperations()->GetEngine()->GetObject
+    (theVec->GetStudyID(), theVec->GetEntry());
+
+  if (aBase.IsNull() || aPath.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
+
+  //Create the Pipe
+  Handle(GEOM_Object) anObject =
+    GetOperations()->MakePipeBiNormalAlongVector(aBase, aPath, aVec);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}
index 330f4974b59b5300cb2d17321c46ed2b5da296be..e6574b8763f23d441cd880f4ae90d15f23f88c07 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_I3DPrimOperations_i_HeaderFile
 #define _GEOM_I3DPrimOperations_i_HeaderFile
 
@@ -46,6 +47,25 @@ class GEOM_I_EXPORT GEOM_I3DPrimOperations_i :
 
   GEOM::GEOM_Object_ptr MakeBoxTwoPnt (GEOM::GEOM_Object_ptr thePnt1,
                                       GEOM::GEOM_Object_ptr thePnt2);
+                                   
+  GEOM::GEOM_Object_ptr MakeFaceHW (CORBA::Double theH,
+                                   CORBA::Double theW,
+                                   CORBA::Short  theOrientation);
+
+  GEOM::GEOM_Object_ptr MakeFaceObjHW (GEOM::GEOM_Object_ptr theObj,
+                                      CORBA::Double theH,
+                                      CORBA::Double theW);
+
+  GEOM::GEOM_Object_ptr MakeDiskPntVecR (GEOM::GEOM_Object_ptr theCenter,
+                                        GEOM::GEOM_Object_ptr theVector,
+                                        double theR);
+
+  GEOM::GEOM_Object_ptr MakeDiskThreePnt (GEOM::GEOM_Object_ptr thePnt1,
+                                         GEOM::GEOM_Object_ptr thePnt2,
+                                         GEOM::GEOM_Object_ptr thePnt3);
+
+  GEOM::GEOM_Object_ptr MakeDiskR (CORBA::Double theR,
+                                  CORBA::Short  theOrientation);
 
   GEOM::GEOM_Object_ptr MakeCylinderRH (CORBA::Double theR,
                                        CORBA::Double theH);
@@ -94,6 +114,15 @@ class GEOM_I_EXPORT GEOM_I3DPrimOperations_i :
                                              GEOM::GEOM_Object_ptr thePoint1,
                                              GEOM::GEOM_Object_ptr thePoint2);
 
+  GEOM::GEOM_Object_ptr MakePrismDXDYDZ (GEOM::GEOM_Object_ptr theBase,
+                                        CORBA::Double         theDX,
+                                        CORBA::Double         theDY,
+                                        CORBA::Double         theDZ);
+  GEOM::GEOM_Object_ptr MakePrismDXDYDZ2Ways (GEOM::GEOM_Object_ptr theBase,
+                                             CORBA::Double         theDX,
+                                             CORBA::Double         theDY,
+                                             CORBA::Double         theDZ);
+
   GEOM::GEOM_Object_ptr MakePipe (GEOM::GEOM_Object_ptr theBase,
                                  GEOM::GEOM_Object_ptr thePath);
 
@@ -128,6 +157,10 @@ class GEOM_I_EXPORT GEOM_I3DPrimOperations_i :
   GEOM::GEOM_Object_ptr MakePipeShellsWithoutPath(const GEOM::ListOfGO& theBases,
                                                  const GEOM::ListOfGO& theLocations);
 
+  GEOM::GEOM_Object_ptr MakePipeBiNormalAlongVector (GEOM::GEOM_Object_ptr theBase,
+                                                    GEOM::GEOM_Object_ptr thePath,
+                                                    GEOM::GEOM_Object_ptr theVec);
+
   ::GEOMImpl_I3DPrimOperations* GetOperations()
   { return (::GEOMImpl_I3DPrimOperations*)GetImpl(); }
 };
index fe525509c27373495937fae0c32f2ba904f62d13..f475de827f6ea049caa991d573a4e17543d69d5a 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
@@ -138,6 +140,7 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnLinesIntersection
   return GetObject(anObject);
 }
 
+
 //=============================================================================
 /*!
  *  MakePointOnCurve
@@ -169,6 +172,39 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnCurve
   return GetObject(anObject);
 }
 
+
+//=============================================================================
+/*!
+ *  MakePointOnSurface
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnSurface
+                                             (GEOM::GEOM_Object_ptr theSurface,
+                                             CORBA::Double theUParameter,
+                                             CORBA::Double theVParameter)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if (theSurface == NULL) return aGEOMObject._retn();
+
+  //Get the reference surface
+  Handle(GEOM_Object) aRefernce = GetOperations()->GetEngine()->GetObject
+    (theSurface->GetStudyID(), theSurface->GetEntry());
+  if (aRefernce.IsNull()) return aGEOMObject._retn();
+
+  //Create the point
+  Handle(GEOM_Object) anObject =
+    GetOperations()->MakePointOnSurface(aRefernce, theUParameter, theVParameter);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}
+
+
 //=============================================================================
 /*!
  *  MakeTangentOnCurve
index 753e0df1660e088c10fab0cf7350e49434a2de80..cc44faafcb34fe5173cbb8fa8c5796a02e182d28 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_IBasicOperations_i_HeaderFile
 #define _GEOM_IBasicOperations_i_HeaderFile
 
@@ -53,6 +54,10 @@ class GEOM_I_EXPORT GEOM_IBasicOperations_i :
    GEOM::GEOM_Object_ptr MakePointOnCurve (GEOM::GEOM_Object_ptr theCurve,
                                           CORBA::Double theParameter);
 
+   GEOM::GEOM_Object_ptr MakePointOnSurface (GEOM::GEOM_Object_ptr theSurface,
+                                            CORBA::Double theUParameter,
+                                            CORBA::Double theVParameter);
+
    GEOM::GEOM_Object_ptr MakePointOnLinesIntersection (GEOM::GEOM_Object_ptr theLine1,
                                                       GEOM::GEOM_Object_ptr theLine2);
 
index f8a1d2a206f7b6ec412e5c2bbd6174792f12369e..093df705a393a052fb8027c449650a8143b106a7 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
index 701b374dc3d2915247ee7e45ea7406dede421f5e..ff6480f8b55f650534ac54e8c3e3298515d82e33 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_IBlocksOperations_i_HeaderFile
 #define _GEOM_IBlocksOperations_i_HeaderFile
 
index 57dabf6a6ce2e2f85d84bd0a775adba439fc4f65..cceef3727226aa55577f05f58f1f5ab3c65b82bf 100644 (file)
@@ -1,23 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <Standard_Stream.hxx>
 
 #include "GEOM_IBooleanOperations_i.hh"
index 7379d00b8d6089f5cd685245c1f21031319d552d..5be05a05e8845fee4ce3bb7c1232899149ca17fe 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_IBooleanOperations_i_HeaderFile
 #define _GEOM_IBooleanOperations_i_HeaderFile
 
index 3a15afb1b22a13b134b2db3fca8cd71ee8dae219..2b15af49fbb5819a0656a1eaaa7bdd206014759f 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
@@ -65,15 +67,22 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCirclePntVecR
   //Set a not done flag
   GetOperations()->SetNotDone();
 
-  if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn();
-
-  //Get the reference points
-  Handle(GEOM_Object) aPnt = GetOperations()->GetEngine()->GetObject
-    (thePnt->GetStudyID(), thePnt->GetEntry());
-  Handle(GEOM_Object) aVec = GetOperations()->GetEngine()->GetObject
-    (theVec->GetStudyID(), theVec->GetEntry());
+  // Not set thePnt means origin of global CS,
+  // Not set theVec means Z axis of global CS
+  //if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn();
 
-  if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
+  //Get the arguments
+  Handle(GEOM_Object) aPnt, aVec;
+  if (!CORBA::is_nil(thePnt)) {
+    aPnt = GetOperations()->GetEngine()->GetObject
+      (thePnt->GetStudyID(), thePnt->GetEntry());
+    if (aPnt.IsNull()) return aGEOMObject._retn();
+  }
+  if (!CORBA::is_nil(theVec)) {
+    aVec = GetOperations()->GetEngine()->GetObject
+      (theVec->GetStudyID(), theVec->GetEntry());
+    if (aVec.IsNull()) return aGEOMObject._retn();
+  }
 
   // Make Circle
   Handle(GEOM_Object) anObject =
@@ -167,15 +176,22 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeEllipse
   //Set a not done flag
   GetOperations()->SetNotDone();
 
-  if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn();
+  // Not set thePnt means origin of global CS,
+  // Not set theVec means Z axis of global CS
+  //if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn();
 
-  //Get the reference points
-  Handle(GEOM_Object) aPnt = GetOperations()->GetEngine()->GetObject
-    (thePnt->GetStudyID(), thePnt->GetEntry());
-  Handle(GEOM_Object) aVec = GetOperations()->GetEngine()->GetObject
-    (theVec->GetStudyID(), theVec->GetEntry());
-
-  if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn();
+  //Get the arguments
+  Handle(GEOM_Object) aPnt, aVec;
+  if (!CORBA::is_nil(thePnt)) {
+    aPnt = GetOperations()->GetEngine()->GetObject
+      (thePnt->GetStudyID(), thePnt->GetEntry());
+    if (aPnt.IsNull()) return aGEOMObject._retn();
+  }
+  if (!CORBA::is_nil(theVec)) {
+    aVec = GetOperations()->GetEngine()->GetObject
+      (theVec->GetStudyID(), theVec->GetEntry());
+    if (aVec.IsNull()) return aGEOMObject._retn();
+  }
 
   // Make Ellipse
   Handle(GEOM_Object) anObject =
@@ -259,6 +275,43 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeArcCenter
 
   return GetObject(anObject);
 }
+
+//=============================================================================
+/*!
+ *  MakeArc
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeArcOfEllipse
+                                                (GEOM::GEOM_Object_ptr thePnt1,
+                                                GEOM::GEOM_Object_ptr thePnt2,
+                                                GEOM::GEOM_Object_ptr thePnt3)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if (thePnt1 == NULL || thePnt2 == NULL || thePnt3 == NULL) return aGEOMObject._retn();
+
+  //Get the reference points
+  Handle(GEOM_Object) aPnt1 = GetOperations()->GetEngine()->GetObject
+    (thePnt1->GetStudyID(), thePnt1->GetEntry());
+  Handle(GEOM_Object) aPnt2 = GetOperations()->GetEngine()->GetObject
+    (thePnt2->GetStudyID(), thePnt2->GetEntry());
+  Handle(GEOM_Object) aPnt3 = GetOperations()->GetEngine()->GetObject
+    (thePnt3->GetStudyID(), thePnt3->GetEntry());
+
+  if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn();
+
+  // Make Arc
+  Handle(GEOM_Object) anObject =
+    GetOperations()->MakeArcOfEllipse(aPnt1, aPnt2, aPnt3);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}
+
 //=============================================================================
 /*!
  *  MakePolyline
@@ -386,13 +439,38 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeSketcher
 
   // Make Sketcher
   Handle(GEOM_Object) anObject =
-    GetOperations()->MakeSketcher((char*)theCommand, aWorkingPlane);
+    GetOperations()->MakeSketcher(theCommand, aWorkingPlane);
   if (!GetOperations()->IsDone() || anObject.IsNull())
     return GEOM::GEOM_Object::_nil();
 
   return GetObject(anObject);
 }
 
+//=============================================================================
+/*!
+ *  Make3DSketcher
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::Make3DSketcher
+            (const GEOM::ListOfDouble& theCoordinates)
+{
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  int ind = 0;
+  int aLen = theCoordinates.length();
+  list<double> aCoords;
+  for (; ind < aLen; ind++)
+    aCoords.push_back(theCoordinates[ind]);
+
+  // Make Sketcher
+  Handle(GEOM_Object) anObject =
+    GetOperations()->Make3DSketcher(aCoords);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return GEOM::GEOM_Object::_nil();
+
+  return GetObject(anObject);
+}
 
 //=============================================================================
 /*!
@@ -410,7 +488,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeSketcherOnPlane
 
   // Make Sketcher
   Handle(GEOM_Object) anObject =
-      GetOperations()->MakeSketcherOnPlane((char*)theCommand, aWorkingPlane);
+      GetOperations()->MakeSketcherOnPlane(theCommand, aWorkingPlane);
   if (!GetOperations()->IsDone() || anObject.IsNull())
     return GEOM::GEOM_Object::_nil();
 
index d341c457528365b0cc1dc49bb3d758c2cd8ed6c5..24179fc1f7ec6ba7c4f5e72e81351a11f360bef6 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_ICurvesOperations_i_HeaderFile
 #define _GEOM_ICurvesOperations_i_HeaderFile
 
@@ -64,6 +65,10 @@ class GEOM_I_EXPORT GEOM_ICurvesOperations_i :
                                        GEOM::GEOM_Object_ptr thePnt2,
                                        GEOM::GEOM_Object_ptr thePnt3,
                                        bool theSense);
+
+  GEOM::GEOM_Object_ptr MakeArcOfEllipse (GEOM::GEOM_Object_ptr thePnt1,
+                                         GEOM::GEOM_Object_ptr thePnt2,
+                                         GEOM::GEOM_Object_ptr thePnt3);
   
   GEOM::GEOM_Object_ptr MakePolyline (const GEOM::ListOfGO& thePoints);
 
@@ -72,6 +77,8 @@ class GEOM_I_EXPORT GEOM_ICurvesOperations_i :
   GEOM::GEOM_Object_ptr MakeSplineInterpolation (const GEOM::ListOfGO& thePoints);
 
   GEOM::GEOM_Object_ptr MakeSketcher (const char* theCommand, const GEOM::ListOfDouble& theWorkingPlane);
+  
+  GEOM::GEOM_Object_ptr Make3DSketcher (const GEOM::ListOfDouble& theCoordinates);
 
   GEOM::GEOM_Object_ptr MakeSketcherOnPlane (const char* theCommand, GEOM::GEOM_Object_ptr theWorkingPlane);
 
index e99524c98cb46379d9672be8085e1a3614824c28..7f87d4ac4887bc089f8870922a18ce5d520ee355 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
index 505f16ee4db3250ea3d2aaba8bef06cd0a4a255a..c4cf01e93fe2df17c24c2092a9b1da91fc3c4b79 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_IGroupOperations_i_HeaderFile
 #define _GEOM_IGroupOperations_i_HeaderFile
 
index cdd3f1efec13f02368601a86dfef46afbaa98045..a529c1cfe23570e43fd370fe7b969a2159f86a9c 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
index 1b3f451188829a97ee1be4d055b8aa08f17d5037..a76e39ac111b12fddea294f2f39247689cd62bf9 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_IHealingOperations_i_HeaderFile
 #define _GEOM_IHealingOperations_i_HeaderFile
 
index 01ffb311d1f5fc55cc63e6fec40f648ea60f0242..a0145517c5dcec84d9466d3542749283a9fa9374 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
 #ifdef WNT
 #pragma warning( disable:4786 )
index bd0941f4f2cdddfb04eb7b59707d9610d60742bc..da29eabf0600ea325980119fabc6fe97864b97d0 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_IInsertOperations_i_HeaderFile
 #define _GEOM_IInsertOperations_i_HeaderFile
 
index a9ec1fc6dae486a1f7e085f30232a641bd152da5..c71a24780310ec41c406a41913376ee4388aa809 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
@@ -219,6 +221,41 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletFacesR1R2
   return GetObject(anObject);
 }
 
+//=============================================================================
+/*!
+ *  MakeFillet2D
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFillet2D
+                      (GEOM::GEOM_Object_ptr theShape, CORBA::Double theR,
+                      const GEOM::ListOfLong& theVertexes)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  if (theShape == NULL) return aGEOMObject._retn();
+
+  //Get the reference shape
+  Handle(GEOM_Object) aShapeRef = GetOperations()->GetEngine()->GetObject
+    (theShape->GetStudyID(), theShape->GetEntry());
+  if (aShapeRef.IsNull()) return aGEOMObject._retn();
+
+  //Get the reference vertex
+  int ind = 0;
+  int aLen = theVertexes.length();
+  list<int> aVertexes;
+  for (; ind < aLen; ind++) {
+    aVertexes.push_back(theVertexes[ind]);
+  }
+
+  //Create the Fillet
+  Handle(GEOM_Object) anObject =
+    GetOperations()->MakeFillet2D(aShapeRef, theR, aVertexes);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}
+
 //=============================================================================
 /*!
  *  MakeChamferAll
index 79a80acfc2f0fc5e46afe60e0ed457aaec4183c4..e13d37f498d3007d88ec2860123eeeed3e34bf58 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_ILocalOperations_i_HeaderFile
 #define _GEOM_ILocalOperations_i_HeaderFile
 
@@ -58,6 +59,9 @@ class GEOM_I_EXPORT GEOM_ILocalOperations_i :
                                              CORBA::Double theR1,
                                              CORBA::Double theR2,
                                             const GEOM::ListOfLong& theFaces);
+                                            
+  GEOM::GEOM_Object_ptr MakeFillet2D (GEOM::GEOM_Object_ptr theShape, CORBA::Double theR,
+                                     const GEOM::ListOfLong& theVertexes);
 
   GEOM::GEOM_Object_ptr MakeChamferAll   (GEOM::GEOM_Object_ptr theShape, CORBA::Double theD);
 
index d4e8c6a8e67fc9bf8d9c74c332c330794d5b48f6..84248c73bcd2f408ab954e8d1de21403287a9a33 100644 (file)
@@ -1,23 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 #include <Standard_Stream.hxx>
 
 #include "GEOM_IMeasureOperations_i.hh"
@@ -473,3 +474,151 @@ CORBA::Double GEOM_IMeasureOperations_i::GetAngle (GEOM::GEOM_Object_ptr theShap
   // Get the angle
   return GetOperations()->GetAngle(aShape1, aShape2);
 }
+
+
+//=============================================================================
+/*!
+ *  CurveCurvatureByParam
+ */
+//=============================================================================
+CORBA::Double GEOM_IMeasureOperations_i::CurveCurvatureByParam
+                       (GEOM::GEOM_Object_ptr theCurve, CORBA::Double theParam)
+{
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if(theCurve==NULL) return -1.0;
+
+  //Get the reference shape
+  Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
+    (theCurve->GetStudyID(), theCurve->GetEntry());
+
+  if(aShape.IsNull()) return -1.0;
+
+  return GetOperations()->CurveCurvatureByParam(aShape,theParam);
+}
+
+
+//=============================================================================
+/*!
+ *  CurveCurvatureByPoint
+ */
+//=============================================================================
+CORBA::Double GEOM_IMeasureOperations_i::CurveCurvatureByPoint
+               (GEOM::GEOM_Object_ptr theCurve, GEOM::GEOM_Object_ptr thePoint)
+{
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if( theCurve==NULL || thePoint==NULL ) return -1.0;
+
+  //Get the reference shape
+  Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
+    (theCurve->GetStudyID(), theCurve->GetEntry());
+  Handle(GEOM_Object) aPoint = GetOperations()->GetEngine()->GetObject
+    (thePoint->GetStudyID(), thePoint->GetEntry());
+
+  if( aShape.IsNull() || aPoint.IsNull() ) return -1.0;
+
+  return GetOperations()->CurveCurvatureByPoint(aShape,aPoint);
+}
+
+
+//=============================================================================
+/*!
+ *  MaxSurfaceCurvatureByParam
+ */
+//=============================================================================
+CORBA::Double GEOM_IMeasureOperations_i::MaxSurfaceCurvatureByParam
+                                                (GEOM::GEOM_Object_ptr theSurf,
+                                                CORBA::Double theUParam,
+                                                CORBA::Double theVParam)
+{
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if(theSurf==NULL) return -1.0;
+
+  //Get the reference shape
+  Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
+    (theSurf->GetStudyID(), theSurf->GetEntry());
+
+  if(aShape.IsNull()) return -1.0;
+
+  return GetOperations()->MaxSurfaceCurvatureByParam(aShape,theUParam,theVParam);
+}
+
+
+//=============================================================================
+/*!
+ *  MaxSurfaceCurvatureByPoint
+ */
+//=============================================================================
+CORBA::Double GEOM_IMeasureOperations_i::MaxSurfaceCurvatureByPoint
+                (GEOM::GEOM_Object_ptr theSurf, GEOM::GEOM_Object_ptr thePoint)
+{
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if( theSurf==NULL || thePoint==NULL ) return -1.0;
+
+  //Get the reference shape
+  Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
+    (theSurf->GetStudyID(), theSurf->GetEntry());
+  Handle(GEOM_Object) aPoint = GetOperations()->GetEngine()->GetObject
+    (thePoint->GetStudyID(), thePoint->GetEntry());
+
+  if( aShape.IsNull() || aPoint.IsNull() ) return -1.0;
+
+  return GetOperations()->MaxSurfaceCurvatureByPoint(aShape,aPoint);
+}
+
+
+//=============================================================================
+/*!
+ *  MinSurfaceCurvatureByParam
+ */
+//=============================================================================
+CORBA::Double GEOM_IMeasureOperations_i::MinSurfaceCurvatureByParam
+                                                (GEOM::GEOM_Object_ptr theSurf,
+                                                CORBA::Double theUParam,
+                                                CORBA::Double theVParam)
+{
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if(theSurf==NULL) return -1.0;
+
+  //Get the reference shape
+  Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
+    (theSurf->GetStudyID(), theSurf->GetEntry());
+
+  if(aShape.IsNull()) return -1.0;
+
+  return GetOperations()->MinSurfaceCurvatureByParam(aShape,theUParam,theVParam);
+}
+
+
+//=============================================================================
+/*!
+ *  MinSurfaceCurvatureByPoint
+ */
+//=============================================================================
+CORBA::Double GEOM_IMeasureOperations_i::MinSurfaceCurvatureByPoint
+                (GEOM::GEOM_Object_ptr theSurf, GEOM::GEOM_Object_ptr thePoint)
+{
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if( theSurf==NULL || thePoint==NULL ) return -1.0;
+
+  //Get the reference shape
+  Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
+    (theSurf->GetStudyID(), theSurf->GetEntry());
+  Handle(GEOM_Object) aPoint = GetOperations()->GetEngine()->GetObject
+    (thePoint->GetStudyID(), thePoint->GetEntry());
+
+  if( aShape.IsNull() || aPoint.IsNull() ) return -1.0;
+
+  return GetOperations()->MinSurfaceCurvatureByPoint(aShape,aPoint);
+}
index 4db8a26d410dac87a029955a3ef29e1482207c14..1aace732a454d0f52dd370a2a5746baa13ad549d 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_IMeasureOperations_i_HeaderFile
 #define _GEOM_IMeasureOperations_i_HeaderFile
 
@@ -94,6 +95,28 @@ class GEOM_I_EXPORT GEOM_IMeasureOperations_i :
   CORBA::Double GetAngle (GEOM::GEOM_Object_ptr theShape1,
                          GEOM::GEOM_Object_ptr theShape2);
 
+  // Methods for recieving radiuses of curvature of curves and surfaces
+  // in the given point
+  CORBA::Double CurveCurvatureByParam (GEOM::GEOM_Object_ptr theCurve,
+                                      CORBA::Double theParam);
+
+  CORBA::Double CurveCurvatureByPoint (GEOM::GEOM_Object_ptr theCurve,
+                                      GEOM::GEOM_Object_ptr thePoint);
+
+  CORBA::Double MaxSurfaceCurvatureByParam (GEOM::GEOM_Object_ptr theSurf,
+                                           CORBA::Double theUParam,
+                                           CORBA::Double theVParam);
+
+  CORBA::Double MaxSurfaceCurvatureByPoint (GEOM::GEOM_Object_ptr theSurf,
+                                           GEOM::GEOM_Object_ptr thePoint);
+
+  CORBA::Double MinSurfaceCurvatureByParam (GEOM::GEOM_Object_ptr theSurf,
+                                           CORBA::Double theUParam,
+                                           CORBA::Double theVParam);
+
+  CORBA::Double MinSurfaceCurvatureByPoint (GEOM::GEOM_Object_ptr theSurf,
+                                           GEOM::GEOM_Object_ptr thePoint);
+
   ::GEOMImpl_IMeasureOperations* GetOperations()
   { return (::GEOMImpl_IMeasureOperations*)GetImpl(); }
 };
index 3d5c87c468be22892a2cdb04f029c1dfb32e00e0..3a6516150124c95a41ce45137192e17044472547 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 "GEOM_IOperations_i.hh"
 
index c425449dc8406c26a60d7679f446398ced3006a4..c816e0bebaebb45e3014d525abb6b3f8c6312ddd 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_IOperations_i_HeaderFile
 #define _GEOM_IOperations_i_HeaderFile
 
index 6d9bf7fcc7a6ef351c2438d21f763e05a17e5d8a..16eb765751e2bfcdc362d7410d3b071454be57a9 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_Stream.hxx>
 
@@ -1290,6 +1292,133 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnBoxIDs
   return aSeq._retn();
 }
 
+
+//=============================================================================
+/*!
+ *  GetShapesOnShape
+ */
+//=============================================================================
+GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnShape
+                                           (GEOM::GEOM_Object_ptr theCheckShape,
+                                           GEOM::GEOM_Object_ptr theShape,
+                                           CORBA::Short          theShapeType,
+                                           GEOM::shape_state     theState)
+{
+  GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if ( theShape == NULL ||  theCheckShape == NULL )
+    return aSeq._retn();
+
+  //Get the reference objects
+  Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
+    (theShape->GetStudyID(), theShape->GetEntry());
+  Handle(GEOM_Object) aCheckShape = GetOperations()->GetEngine()->GetObject
+    (theShape->GetStudyID(), theCheckShape->GetEntry());
+
+  if (aShape.IsNull() || aCheckShape.IsNull() )
+    return aSeq._retn();
+
+  //Get Shapes On Shape
+  Handle(TColStd_HSequenceOfTransient) aHSeq = GetOperations()->GetShapesOnShape
+    (aCheckShape,aShape, theShapeType,ShapeState(theState));
+
+  if (!GetOperations()->IsDone() || aHSeq.IsNull())
+    return aSeq._retn();
+
+  Standard_Integer aLength = aHSeq->Length();
+  aSeq->length(aLength);
+  for (Standard_Integer i = 1; i <= aLength; i++)
+    aSeq[i-1] = GetObject(Handle(GEOM_Object)::DownCast(aHSeq->Value(i)));
+
+  return aSeq._retn();
+}
+
+
+//=============================================================================
+/*!
+ *  GetShapesOnShapeAsCompound
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetShapesOnShapeAsCompound
+                                           (GEOM::GEOM_Object_ptr theCheckShape,
+                                           GEOM::GEOM_Object_ptr theShape,
+                                           CORBA::Short          theShapeType,
+                                           GEOM::shape_state     theState)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if ( theShape == NULL ||  theCheckShape == NULL )
+    return aGEOMObject._retn();
+
+  //Get the reference objects
+  Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
+    (theShape->GetStudyID(), theShape->GetEntry());
+  Handle(GEOM_Object) aCheckShape = GetOperations()->GetEngine()->GetObject
+    (theShape->GetStudyID(), theCheckShape->GetEntry());
+
+  if (aShape.IsNull() || aCheckShape.IsNull() )
+    return aGEOMObject._retn();
+
+  //Get Shapes On Shape
+  Handle(GEOM_Object) anObject = GetOperations()->GetShapesOnShapeAsCompound
+    (aCheckShape,aShape, theShapeType,ShapeState(theState));
+
+  if (anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}
+
+
+//=============================================================================
+/*!
+ *  GetShapesOnShapeIDs
+ */
+//=============================================================================
+GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnShapeIDs
+                                           (GEOM::GEOM_Object_ptr theCheckShape,
+                                           GEOM::GEOM_Object_ptr theShape,
+                                           CORBA::Short          theShapeType,
+                                           GEOM::shape_state     theState)
+{
+  GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if ( theShape == NULL ||  theCheckShape == NULL )
+    return aSeq._retn();
+
+  //Get the reference objects
+  Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
+    (theShape->GetStudyID(), theShape->GetEntry());
+  Handle(GEOM_Object) aCheckShape = GetOperations()->GetEngine()->GetObject
+    (theShape->GetStudyID(), theCheckShape->GetEntry());
+
+  if (aShape.IsNull() || aCheckShape.IsNull() )
+    return aSeq._retn();
+
+  //Get Shapes On Shape
+  Handle(TColStd_HSequenceOfInteger) aHSeq = GetOperations()->GetShapesOnShapeIDs
+    (aCheckShape,aShape, theShapeType,ShapeState(theState));
+  if (!GetOperations()->IsDone() || aHSeq.IsNull())
+    return aSeq._retn();
+
+  Standard_Integer aLength = aHSeq->Length();
+  aSeq->length(aLength);
+  for (Standard_Integer i = 1; i <= aLength; i++)
+    aSeq[i-1] = aHSeq->Value(i);
+
+  return aSeq._retn();
+}
+
+
 //=============================================================================
 /*!
  *  GetInPlace
index de1b24be14b8895552248132c61bb1d9ef43b283..2b15239185a3f2651fb04461708ed25c726fc2c2 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_IShapesOperations_i_HeaderFile
 #define _GEOM_IShapesOperations_i_HeaderFile
 
@@ -175,6 +176,22 @@ class GEOM_I_EXPORT GEOM_IShapesOperations_i :
                                       CORBA::Long           theShapeType,
                                       GEOM::shape_state     theState);
 
+  GEOM::ListOfGO* GetShapesOnShape (GEOM::GEOM_Object_ptr theSheckShape,
+                                   GEOM::GEOM_Object_ptr theShape,
+                                   CORBA::Short          theShapeType,
+                                   GEOM::shape_state     theState);
+
+  GEOM::GEOM_Object_ptr GetShapesOnShapeAsCompound
+                                   (GEOM::GEOM_Object_ptr theSheckShape,
+                                   GEOM::GEOM_Object_ptr theShape,
+                                   CORBA::Short          theShapeType,
+                                   GEOM::shape_state     theState);
+
+  GEOM::ListOfLong* GetShapesOnShapeIDs (GEOM::GEOM_Object_ptr theCheckShape,
+                                        GEOM::GEOM_Object_ptr theShape,
+                                        CORBA::Short          theShapeType,
+                                        GEOM::shape_state     theState);
+
   GEOM::GEOM_Object_ptr GetInPlace (GEOM::GEOM_Object_ptr theShapeWhere,
                                    GEOM::GEOM_Object_ptr theShapeWhat);
 
index e914733f6a59fe7df80e0da32d985b4dc208c5c5..ac359856dd5fc18dc94cd6afc9aeacfdd35e25e0 100644 (file)
@@ -1,21 +1,23 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #include <Standard_Stream.hxx>
 
@@ -84,18 +86,21 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateTwoPoints
   aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) anObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (anObject.IsNull()) return aGEOMObject._retn();
 
   //Get the first point of translation
+  CORBA::String_var aP1Entry = thePoint1->GetEntry();
   Handle(GEOM_Object) aPoint1 =
-    GetOperations()->GetEngine()->GetObject(thePoint1->GetStudyID(), thePoint1->GetEntry());
+    GetOperations()->GetEngine()->GetObject(thePoint1->GetStudyID(), aP1Entry);
   if (aPoint1.IsNull()) return aGEOMObject._retn();
 
   //Get the second point of translation
+  CORBA::String_var aP2Entry = thePoint2->GetEntry();
   Handle(GEOM_Object) aPoint2 =
-    GetOperations()->GetEngine()->GetObject(thePoint2->GetStudyID(), thePoint2->GetEntry());
+    GetOperations()->GetEngine()->GetObject(thePoint2->GetStudyID(), aP2Entry);
   if (aPoint2.IsNull()) return aGEOMObject._retn();
 
   //Perform the translation
@@ -122,18 +127,21 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateTwoPointsCopy
   if (thePoint1 == NULL || thePoint2 == NULL || theObject == NULL) return aGEOMObject._retn();
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) aBasicObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Get the first point of translation
+  CORBA::String_var aP1Entry = thePoint1->GetEntry();
   Handle(GEOM_Object) aPoint1 =
-    GetOperations()->GetEngine()->GetObject(thePoint1->GetStudyID(), thePoint1->GetEntry());
+    GetOperations()->GetEngine()->GetObject(thePoint1->GetStudyID(), aP1Entry);
   if (aPoint1.IsNull()) return aGEOMObject._retn();
 
   //Get the second point of translation
+  CORBA::String_var aP2Entry = thePoint2->GetEntry();
   Handle(GEOM_Object) aPoint2 =
-    GetOperations()->GetEngine()->GetObject(thePoint2->GetStudyID(), thePoint2->GetEntry());
+    GetOperations()->GetEngine()->GetObject(thePoint2->GetStudyID(), aP2Entry);
   if (aPoint2.IsNull()) return aGEOMObject._retn();
 
   //Create the translated shape
@@ -150,8 +158,9 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateTwoPointsCopy
  *  TranslateDXDYDZ
  */
 //=============================================================================
-GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateDXDYDZ (GEOM::GEOM_Object_ptr theObject,
-                                                                   CORBA::Double theDX, CORBA::Double theDY, CORBA::Double theDZ)
+GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateDXDYDZ
+                                                   (GEOM::GEOM_Object_ptr theObject,
+                                                   CORBA::Double theDX, CORBA::Double theDY, CORBA::Double theDZ)
 {
   //Set a not done flag
   GetOperations()->SetNotDone();
@@ -168,8 +177,9 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateDXDYDZ (GEOM::GEOM_O
   aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) anObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (anObject.IsNull()) return aGEOMObject._retn();
 
   //Perform the translation
@@ -185,7 +195,8 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateDXDYDZ (GEOM::GEOM_O
  */
 //=============================================================================
 GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateDXDYDZCopy
-                                             (GEOM::GEOM_Object_ptr theObject, CORBA::Double theDX, CORBA::Double theDY, CORBA::Double theDZ)
+                                             (GEOM::GEOM_Object_ptr theObject,
+                                             CORBA::Double theDX, CORBA::Double theDY, CORBA::Double theDZ)
 {
   GEOM::GEOM_Object_var aGEOMObject;
 
@@ -195,12 +206,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateDXDYDZCopy
   if (theObject == NULL) return aGEOMObject._retn();
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) aBasicObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
-
-
   //Create the translated shape
   Handle(GEOM_Object) anObject =
     GetOperations()->TranslateDXDYDZCopy(aBasicObject, theDX, theDY, theDZ);
@@ -232,16 +242,18 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateVector
     return aGEOMObject._retn();
   }
 
-   aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
+  aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) anObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (anObject.IsNull()) return aGEOMObject._retn();
 
   //Get the vector of translation
+  CORBA::String_var aVEntry = theVector->GetEntry();
   Handle(GEOM_Object) aVector =
-    GetOperations()->GetEngine()->GetObject(theVector->GetStudyID(), theVector->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theVector->GetStudyID(), aVEntry);
   if (aVector.IsNull()) return aGEOMObject._retn();
 
   //Perform the translation
@@ -267,13 +279,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateVectorCopy
   if (theObject == NULL || theVector == NULL) return aGEOMObject._retn();
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) aBasicObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Get the vector of translation
+  CORBA::String_var aVEntry = theVector->GetEntry();
   Handle(GEOM_Object) aVector =
-    GetOperations()->GetEngine()->GetObject(theVector->GetStudyID(), theVector->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theVector->GetStudyID(), aVEntry);
   if (aVector.IsNull()) return aGEOMObject._retn();
 
   //Perform the translation
@@ -284,6 +298,56 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateVectorCopy
   return GetObject(anObject);
 }
 
+//=============================================================================
+/*!
+ *  TranslateVectorDistance
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateVectorDistance
+                                            (GEOM::GEOM_Object_ptr theObject,
+                                            GEOM::GEOM_Object_ptr theVector,
+                                            CORBA::Double theDistance,
+                                            CORBA::Boolean theCopy)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+  GetOperations()->SetNotDone(); //Set a not done flag
+
+  if (theObject == NULL || theVector == NULL) return aGEOMObject._retn();
+
+  //check if the object is a subshape
+  if (!theCopy && !theObject->IsMainShape()) {
+    GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
+    return aGEOMObject._retn();
+  }
+
+  if (!theCopy)
+    aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
+
+  //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
+  Handle(GEOM_Object) aBasicObject =
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+  if (aBasicObject.IsNull()) return aGEOMObject._retn();
+
+  //Get the vector of translation
+  CORBA::String_var aVecEntry = theVector->GetEntry();
+  Handle(GEOM_Object) aVector =
+    GetOperations()->GetEngine()->GetObject(theVector->GetStudyID(), aVecEntry);
+  if (aVector.IsNull()) return aGEOMObject._retn();
+
+  //Perform the translation
+  if (theCopy) {
+    Handle(GEOM_Object) anObject = GetOperations()->
+      TranslateVectorDistance(aBasicObject, aVector, theDistance, theCopy);
+    if (!GetOperations()->IsDone() || anObject.IsNull())
+      return aGEOMObject._retn();
+
+    return GetObject(anObject);
+  }
+
+  GetOperations()->TranslateVectorDistance(aBasicObject, aVector, theDistance, theCopy);
+  return aGEOMObject._retn();
+}
 
 //=============================================================================
 /*!
@@ -309,12 +373,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::Rotate (GEOM::GEOM_Object_ptr
   aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
 
   //Get the object itself
-  Handle(GEOM_Object) anObject = GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+  CORBA::String_var anEntry = theObject->GetEntry();
+  Handle(GEOM_Object) anObject =
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (anObject.IsNull()) return aGEOMObject._retn();
 
   //Get the axis of revolution
+  CORBA::String_var anAEntry = theAxis->GetEntry();
   Handle(GEOM_Object) anAxis =
-    GetOperations()->GetEngine()->GetObject(theAxis->GetStudyID(), theAxis->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theAxis->GetStudyID(), anAEntry);
   if (anAxis.IsNull()) return aGEOMObject._retn();
 
   //Perform the rotation
@@ -340,13 +407,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RotateCopy (GEOM::GEOM_Object
   if (theObject == NULL || theAxis == NULL) return aGEOMObject._retn();
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) aBasicObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Get the axis of rotation
+  CORBA::String_var anAEntry = theAxis->GetEntry();
   Handle(GEOM_Object) anAxis =
-    GetOperations()->GetEngine()->GetObject(theAxis->GetStudyID(), theAxis->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theAxis->GetStudyID(), anAEntry);
   if (anAxis.IsNull()) return aGEOMObject._retn();
 
   //Perform the rotation
@@ -375,19 +444,21 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPlane
   if (theObject == NULL || thePlane == NULL) return aGEOMObject._retn();
 
   //check if the object is a subshape
-  if(!theObject->IsMainShape()) {
+  if (!theObject->IsMainShape()) {
     GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
     return aGEOMObject._retn();
   }
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) anObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (anObject.IsNull()) return aGEOMObject._retn();
 
   //Get the plane
+  CORBA::String_var aPlnEntry = thePlane->GetEntry();
   Handle(GEOM_Object) aPlane =
-    GetOperations()->GetEngine()->GetObject(thePlane->GetStudyID(), thePlane->GetEntry());
+    GetOperations()->GetEngine()->GetObject(thePlane->GetStudyID(), aPlnEntry);
   if (aPlane.IsNull()) return aGEOMObject._retn();
 
   //Perform the mirror
@@ -413,13 +484,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPlaneCopy
   if (theObject == NULL || thePlane == NULL) return aGEOMObject._retn();
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) aBasicObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Get the vector of translation
+  CORBA::String_var aPlnEntry = thePlane->GetEntry();
   Handle(GEOM_Object) aPlane =
-    GetOperations()->GetEngine()->GetObject(thePlane->GetStudyID(), thePlane->GetEntry());
+    GetOperations()->GetEngine()->GetObject(thePlane->GetStudyID(), aPlnEntry);
   if (aPlane.IsNull()) return aGEOMObject._retn();
 
   //Perform the mirror
@@ -453,13 +526,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorAxis
   }
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) anObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (anObject.IsNull()) return aGEOMObject._retn();
 
   //Get the axis
+  CORBA::String_var anAEntry = theAxis->GetEntry();
   Handle(GEOM_Object) aAxis =
-    GetOperations()->GetEngine()->GetObject(theAxis->GetStudyID(), theAxis->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theAxis->GetStudyID(), anAEntry);
   if (aAxis.IsNull()) return aGEOMObject._retn();
 
   //Perform the mirror
@@ -485,13 +560,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorAxisCopy
   if (theObject == NULL || theAxis == NULL) return aGEOMObject._retn();
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) aBasicObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Get the vector of translation
+  CORBA::String_var anAEntry = theAxis->GetEntry();
   Handle(GEOM_Object) aAxis =
-    GetOperations()->GetEngine()->GetObject(theAxis->GetStudyID(), theAxis->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theAxis->GetStudyID(), anAEntry);
   if (aAxis.IsNull()) return aGEOMObject._retn();
 
   //Perform the mirror
@@ -519,19 +596,21 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPoint
   if (theObject == NULL || thePoint == NULL) return aGEOMObject._retn();
 
   //check if the object is a subshape
-  if(!theObject->IsMainShape()) {
+  if (!theObject->IsMainShape()) {
     GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
     return aGEOMObject._retn();
   }
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) anObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (anObject.IsNull()) return aGEOMObject._retn();
 
   //Get the point
+  CORBA::String_var aPntEntry = thePoint->GetEntry();
   Handle(GEOM_Object) aPoint =
-    GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), thePoint->GetEntry());
+    GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), aPntEntry);
   if (aPoint.IsNull()) return aGEOMObject._retn();
 
   //Perform the mirror
@@ -557,13 +636,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPointCopy
   if (theObject == NULL || thePoint == NULL) return aGEOMObject._retn();
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) aBasicObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Get the vector of translation
+  CORBA::String_var aPntEntry = thePoint->GetEntry();
   Handle(GEOM_Object) aPoint =
-    GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), thePoint->GetEntry());
+    GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), aPntEntry);
   if (aPoint.IsNull()) return aGEOMObject._retn();
 
   //Perform the mirror
@@ -592,15 +673,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShape
   if (theObject == NULL) return aGEOMObject._retn();
 
   //check if the object is a subshape
-  if(!theObject->IsMainShape()) {
+  if (!theObject->IsMainShape()) {
     GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
     return aGEOMObject._retn();
   }
 
-
   //Get the basic object
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) aBasicObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Create the offset shape
@@ -626,8 +707,9 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShapeCopy
   if (theObject == NULL) return aGEOMObject._retn();
 
   //Get the basic object
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) aBasicObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Create the offset shape
@@ -647,30 +729,34 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShapeCopy
 GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShape
                                              (GEOM::GEOM_Object_ptr theObject,
                                              GEOM::GEOM_Object_ptr thePoint,
-                                             CORBA::Double theFactor)
+                                             CORBA::Double         theFactor)
 {
   GEOM::GEOM_Object_var aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
 
   //Set a not done flag
   GetOperations()->SetNotDone();
 
-  if (thePoint == NULL || theObject == NULL) return aGEOMObject._retn();
+  if (theObject->_is_nil()) return aGEOMObject._retn();
 
   //check if the object is a subshape
-  if(!theObject->IsMainShape()) {
+  if (!theObject->IsMainShape()) {
     GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
     return aGEOMObject._retn();
   }
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) anObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (anObject.IsNull()) return aGEOMObject._retn();
 
   //Get the point
-  Handle(GEOM_Object) aPoint =
-    GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), thePoint->GetEntry());
-  if (aPoint.IsNull()) return aGEOMObject._retn();
+  Handle(GEOM_Object) aPoint;
+  if (!thePoint->_is_nil()) {
+    CORBA::String_var aPntEntry = thePoint->GetEntry();
+    aPoint = GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), aPntEntry);
+    if (aPoint.IsNull()) return aGEOMObject._retn();
+  }
 
   //Perform the scale
   GetOperations()->ScaleShape(anObject, aPoint, theFactor);
@@ -686,24 +772,28 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShape
 GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShapeCopy
                                              (GEOM::GEOM_Object_ptr theObject,
                                              GEOM::GEOM_Object_ptr thePoint,
-                                             CORBA::Double theFactor)
+                                             CORBA::Double         theFactor)
 {
   GEOM::GEOM_Object_var aGEOMObject;
 
   //Set a not done flag
   GetOperations()->SetNotDone();
 
-  if (thePoint == NULL || theObject == NULL) return aGEOMObject._retn();
+  if (theObject->_is_nil()) return aGEOMObject._retn();
 
   //Get the basic object
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) aBasicObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Get the point
-  Handle(GEOM_Object) aPoint =
-    GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), thePoint->GetEntry());
-  if (aPoint.IsNull()) return aGEOMObject._retn();
+  Handle(GEOM_Object) aPoint;
+  if (!thePoint->_is_nil()) {
+    CORBA::String_var aPntEntry = thePoint->GetEntry();
+    aPoint = GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), aPntEntry);
+    if (aPoint.IsNull()) return aGEOMObject._retn();
+  }
 
   //Perform the scale
   Handle(GEOM_Object) anObject =
@@ -714,6 +804,94 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShapeCopy
   return GetObject(anObject);
 }
 
+//=============================================================================
+/*!
+ *  ScaleShapeAlongAxes
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShapeAlongAxes
+                                             (GEOM::GEOM_Object_ptr theObject,
+                                             GEOM::GEOM_Object_ptr thePoint,
+                                             CORBA::Double         theFactorX,
+                                             CORBA::Double         theFactorY,
+                                             CORBA::Double         theFactorZ)
+{
+  GEOM::GEOM_Object_var aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if (theObject->_is_nil()) return aGEOMObject._retn();
+
+  //check if the object is a subshape
+  if (!theObject->IsMainShape()) {
+    GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
+    return aGEOMObject._retn();
+  }
+
+  //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
+  Handle(GEOM_Object) anObject =
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+  if (anObject.IsNull()) return aGEOMObject._retn();
+
+  //Get the point
+  Handle(GEOM_Object) aPoint;
+  if (!thePoint->_is_nil()) {
+    CORBA::String_var aPntEntry = thePoint->GetEntry();
+    aPoint = GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), aPntEntry);
+    if (aPoint.IsNull()) return aGEOMObject._retn();
+  }
+
+  //Perform the scale
+  GetOperations()->ScaleShapeAlongAxes
+    (anObject, aPoint, theFactorX, theFactorY, theFactorZ, /*doCopy*/false);
+
+  return  aGEOMObject._retn();
+}
+
+//=============================================================================
+/*!
+ *  ScaleShapeAlongAxesCopy
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShapeAlongAxesCopy
+                                             (GEOM::GEOM_Object_ptr theObject,
+                                             GEOM::GEOM_Object_ptr thePoint,
+                                             CORBA::Double         theFactorX,
+                                             CORBA::Double         theFactorY,
+                                             CORBA::Double         theFactorZ)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if (theObject->_is_nil()) return aGEOMObject._retn();
+
+  //Get the basic object
+  CORBA::String_var anEntry = theObject->GetEntry();
+  Handle(GEOM_Object) aBasicObject =
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+  if (aBasicObject.IsNull()) return aGEOMObject._retn();
+
+  //Get the point
+  Handle(GEOM_Object) aPoint;
+  if (!thePoint->_is_nil()) {
+    CORBA::String_var aPntEntry = thePoint->GetEntry();
+    aPoint = GetOperations()->GetEngine()->GetObject(thePoint->GetStudyID(), aPntEntry);
+    if (aPoint.IsNull()) return aGEOMObject._retn();
+  }
+
+  //Perform the scale
+  Handle(GEOM_Object) anObject = GetOperations()->ScaleShapeAlongAxes
+    (aBasicObject, aPoint, theFactorX, theFactorY, theFactorZ, /*doCopy*/true);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}
+
 //=============================================================================
 /*!
  *  PositionShape
@@ -733,26 +911,29 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::PositionShape
     return aGEOMObject._retn();
 
   //check if the object is a subshape
-  if(!theObject->IsMainShape()) {
+  if (!theObject->IsMainShape()) {
     GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
     return aGEOMObject._retn();
   }
 
   //Get the basic object
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) anObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (anObject.IsNull()) return aGEOMObject._retn();
 
   //Get the Start LCS (may be NULL for positioning from global LCS)
   Handle(GEOM_Object) aStartLCS = NULL;
   if (theStartLCS != NULL && !CORBA::is_nil(theStartLCS)) {
-    aStartLCS = GetOperations()->GetEngine()->GetObject(theStartLCS->GetStudyID(), theStartLCS->GetEntry());
+    CORBA::String_var aStartLCSEntry = theStartLCS->GetEntry();
+    aStartLCS = GetOperations()->GetEngine()->GetObject(theStartLCS->GetStudyID(), aStartLCSEntry);
     if (aStartLCS.IsNull()) return aGEOMObject._retn();
   }
 
   //Get the End LCS
+  CORBA::String_var anEndLCSEntry = theEndLCS->GetEntry();
   Handle(GEOM_Object) aEndLCS =
-    GetOperations()->GetEngine()->GetObject(theEndLCS->GetStudyID(), theEndLCS->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theEndLCS->GetStudyID(), anEndLCSEntry);
   if (aEndLCS.IsNull()) return aGEOMObject._retn();
 
   //Perform the Position
@@ -780,20 +961,23 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::PositionShapeCopy
     return aGEOMObject._retn();
 
   //Get the basic object
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) aBasicObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Get the Start LCS (may be NULL for positioning from global LCS)
   Handle(GEOM_Object) aStartLCS = NULL;
   if (theStartLCS != NULL && !CORBA::is_nil(theStartLCS)) {
-    aStartLCS = GetOperations()->GetEngine()->GetObject(theStartLCS->GetStudyID(), theStartLCS->GetEntry());
+    CORBA::String_var aStartLCSEntry = theStartLCS->GetEntry();
+    aStartLCS = GetOperations()->GetEngine()->GetObject(theStartLCS->GetStudyID(), aStartLCSEntry);
     if (aStartLCS.IsNull()) return aGEOMObject._retn();
   }
 
   //Get the End LCS
+  CORBA::String_var anEndLCSEntry = theEndLCS->GetEntry();
   Handle(GEOM_Object) aEndLCS =
-    GetOperations()->GetEngine()->GetObject(theEndLCS->GetStudyID(), theEndLCS->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theEndLCS->GetStudyID(), anEndLCSEntry);
   if (aEndLCS.IsNull()) return aGEOMObject._retn();
 
   //Perform the position
@@ -805,6 +989,47 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::PositionShapeCopy
   return GetObject(anObject);
 }
 
+//=============================================================================
+/*!
+ *  PositionAlongPath
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::PositionAlongPath
+                                             (GEOM::GEOM_Object_ptr theObject,
+                                             GEOM::GEOM_Object_ptr thePath,
+                                             CORBA::Double         theDistance,
+                                             CORBA::Boolean        theCopy,
+                                             CORBA::Boolean        theReverse)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  if (theObject == NULL || thePath == NULL)
+    return aGEOMObject._retn();
+
+  //Get the basic object
+  CORBA::String_var anEntry = theObject->GetEntry();
+  Handle(GEOM_Object) aBasicObject =
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+  if (aBasicObject.IsNull()) return aGEOMObject._retn();
+
+  //Get the path object
+  CORBA::String_var aPathEntry = thePath->GetEntry();
+  Handle(GEOM_Object) aPathObject =
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), aPathEntry);
+  if (aPathObject.IsNull()) return aGEOMObject._retn();
+
+  //Perform the position
+  Handle(GEOM_Object) anObject =
+    GetOperations()->PositionAlongPath(aBasicObject, aPathObject, theDistance, theCopy, theReverse);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}
+
 //=============================================================================
 /*!
  *  MultiTranslate1D
@@ -823,13 +1048,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiTranslate1D
   if (theObject == NULL || theVector == NULL) return aGEOMObject._retn();
 
   //Get the object itself
-  Handle(GEOM_Object) aBasicObject = GetOperations()->GetEngine()->GetObject
-    (theObject->GetStudyID(), theObject->GetEntry());
+  CORBA::String_var anEntry = theObject->GetEntry();
+  Handle(GEOM_Object) aBasicObject =
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Get the vector of translation
-  Handle(GEOM_Object) aVector = GetOperations()->GetEngine()->GetObject
-    (theVector->GetStudyID(), theVector->GetEntry());
+  CORBA::String_var aVecEntry = theVector->GetEntry();
+  Handle(GEOM_Object) aVector =
+    GetOperations()->GetEngine()->GetObject(theVector->GetStudyID(), aVecEntry);
   if (aVector.IsNull()) return aGEOMObject._retn();
 
   //Perform the translation
@@ -861,18 +1088,21 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiTranslate2D (GEOM::GEOM_
   if (theObject == NULL || theVector1 == NULL || theVector2 == NULL) return aGEOMObject._retn();
 
   //Get the object itself
-  Handle(GEOM_Object) aBasicObject = GetOperations()->GetEngine()->GetObject
-    (theObject->GetStudyID(), theObject->GetEntry());
+  CORBA::String_var anEntry = theObject->GetEntry();
+  Handle(GEOM_Object) aBasicObject =
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Get the vector1 of translation
-  Handle(GEOM_Object) aVector1 = GetOperations()->GetEngine()->GetObject
-    (theVector1->GetStudyID(), theVector1->GetEntry());
+  CORBA::String_var aVec1Entry = theVector1->GetEntry();
+  Handle(GEOM_Object) aVector1 =
+    GetOperations()->GetEngine()->GetObject(theVector1->GetStudyID(), aVec1Entry);
   if (aVector1.IsNull()) return aGEOMObject._retn();
 
   //Get the vector2 of translation
-  Handle(GEOM_Object) aVector2 = GetOperations()->GetEngine()->GetObject
-    (theVector2->GetStudyID(), theVector2->GetEntry());
+  CORBA::String_var aVec2Entry = theVector2->GetEntry();
+  Handle(GEOM_Object) aVector2 =
+    GetOperations()->GetEngine()->GetObject(theVector2->GetStudyID(), aVec2Entry);
   if (aVector2.IsNull()) return aGEOMObject._retn();
 
   //Perform the translation
@@ -900,13 +1130,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiRotate1D (GEOM::GEOM_Obj
   if (theObject == NULL || theVector == NULL) return aGEOMObject._retn();
 
   //Get the object itself
-  Handle(GEOM_Object) aBasicObject = GetOperations()->GetEngine()->GetObject
-    (theObject->GetStudyID(), theObject->GetEntry());
+  CORBA::String_var anEntry = theObject->GetEntry();
+  Handle(GEOM_Object) aBasicObject =
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Get the a directon of rotation
-  Handle(GEOM_Object) aVector = GetOperations()->GetEngine()->GetObject
-    (theVector->GetStudyID(), theVector->GetEntry());
+  CORBA::String_var aVecEntry = theVector->GetEntry();
+  Handle(GEOM_Object) aVector =
+    GetOperations()->GetEngine()->GetObject(theVector->GetStudyID(), aVecEntry);
   if (aVector.IsNull()) return aGEOMObject._retn();
 
   //Perform the rotation
@@ -936,13 +1168,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiRotate2D (GEOM::GEOM_Obj
   if (theObject == NULL || theVector == NULL) return aGEOMObject._retn();
 
   //Get the object itself
-  Handle(GEOM_Object) aBasicObject = GetOperations()->GetEngine()->GetObject
-    (theObject->GetStudyID(), theObject->GetEntry());
+  CORBA::String_var anEntry = theObject->GetEntry();
+  Handle(GEOM_Object) aBasicObject =
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Get the a directon of rotation
-  Handle(GEOM_Object) aVector = GetOperations()->GetEngine()->GetObject
-    (theVector->GetStudyID(), theVector->GetEntry());
+  CORBA::String_var aVecEntry = theVector->GetEntry();
+  Handle(GEOM_Object) aVector =
+    GetOperations()->GetEngine()->GetObject(theVector->GetStudyID(), aVecEntry);
   if (aVector.IsNull()) return aGEOMObject._retn();
 
   //Perform the rotation
@@ -968,10 +1202,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RotateThreePoints
   GetOperations()->SetNotDone();
   GEOM::GEOM_Object_var aGEOMObject;
 
-  if (theCentPoint == NULL || thePoint1 == NULL || thePoint2 == NULL || theObject == NULL) return aGEOMObject._retn();
+  if (theCentPoint == NULL || thePoint1 == NULL || thePoint2 == NULL || theObject == NULL)
+    return aGEOMObject._retn();
 
   //check if the object is a subshape
-  if(!theObject->IsMainShape()) {
+  if (!theObject->IsMainShape()) {
     GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
     return aGEOMObject._retn();
   }
@@ -979,23 +1214,27 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RotateThreePoints
   aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) anObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (anObject.IsNull()) return aGEOMObject._retn();
 
   //Get the central point of rotation
+  CORBA::String_var aCPEntry = theCentPoint->GetEntry();
   Handle(GEOM_Object) aCentPoint =
-    GetOperations()->GetEngine()->GetObject(theCentPoint->GetStudyID(), theCentPoint->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theCentPoint->GetStudyID(), aCPEntry);
   if (aCentPoint.IsNull()) return aGEOMObject._retn();
 
   //Get the first point
+  CORBA::String_var aP1Entry = thePoint1->GetEntry();
   Handle(GEOM_Object) aPoint1 =
-    GetOperations()->GetEngine()->GetObject(thePoint1->GetStudyID(), thePoint1->GetEntry());
+    GetOperations()->GetEngine()->GetObject(thePoint1->GetStudyID(), aP1Entry);
   if (aPoint1.IsNull()) return aGEOMObject._retn();
 
   //Get the second point
+  CORBA::String_var aP2Entry = thePoint2->GetEntry();
   Handle(GEOM_Object) aPoint2 =
-    GetOperations()->GetEngine()->GetObject(thePoint2->GetStudyID(), thePoint2->GetEntry());
+    GetOperations()->GetEngine()->GetObject(thePoint2->GetStudyID(), aP2Entry);
   if (aPoint2.IsNull()) return aGEOMObject._retn();
 
   //Perform the translation
@@ -1020,26 +1259,31 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RotateThreePointsCopy
   //Set a not done flag
   GetOperations()->SetNotDone();
 
-  if (theCentPoint == NULL || thePoint1 == NULL || thePoint2 == NULL || theObject == NULL) return aGEOMObject._retn();
+  if (theCentPoint == NULL || thePoint1 == NULL || thePoint2 == NULL || theObject == NULL)
+    return aGEOMObject._retn();
 
   //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
   Handle(GEOM_Object) aBasicObject =
-    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), theObject->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
   if (aBasicObject.IsNull()) return aGEOMObject._retn();
 
   //Get the central point of rotation
+  CORBA::String_var aCPEntry = theCentPoint->GetEntry();
   Handle(GEOM_Object) aCentPoint =
-    GetOperations()->GetEngine()->GetObject(theCentPoint->GetStudyID(), theCentPoint->GetEntry());
+    GetOperations()->GetEngine()->GetObject(theCentPoint->GetStudyID(), aCPEntry);
   if (aCentPoint.IsNull()) return aGEOMObject._retn();
 
   //Get the first point
+  CORBA::String_var aP1Entry = thePoint1->GetEntry();
   Handle(GEOM_Object) aPoint1 =
-    GetOperations()->GetEngine()->GetObject(thePoint1->GetStudyID(), thePoint1->GetEntry());
+    GetOperations()->GetEngine()->GetObject(thePoint1->GetStudyID(), aP1Entry);
   if (aPoint1.IsNull()) return aGEOMObject._retn();
 
   //Get the second point
+  CORBA::String_var aP2Entry = thePoint2->GetEntry();
   Handle(GEOM_Object) aPoint2 =
-    GetOperations()->GetEngine()->GetObject(thePoint2->GetStudyID(), thePoint2->GetEntry());
+    GetOperations()->GetEngine()->GetObject(thePoint2->GetStudyID(), aP2Entry);
   if (aPoint2.IsNull()) return aGEOMObject._retn();
 
   //Perform the rotation
@@ -1051,3 +1295,38 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RotateThreePointsCopy
   return GetObject(anObject);
 }
 
+//=============================================================================
+/*!
+ *  RecomputeObject
+ */
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RecomputeObject
+                                             (GEOM::GEOM_Object_ptr theObject)
+{
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  if (theObject == NULL) return aGEOMObject._retn();
+
+  //check if the object is a subshape
+  //if (!theObject->IsMainShape()) {
+  //  GetOperations()->SetErrorCode(SUBSHAPE_ERROR);
+  //  return aGEOMObject._retn();
+  //}
+
+  aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject);
+
+  //Get the object itself
+  CORBA::String_var anEntry = theObject->GetEntry();
+  Handle(GEOM_Object) anObject =
+    GetOperations()->GetEngine()->GetObject(theObject->GetStudyID(), anEntry);
+  if (anObject.IsNull()) return aGEOMObject._retn();
+
+  //Perform the recomputation
+  Handle(GEOM_Function) aLastFunction = anObject->GetLastFunction();
+  if (aLastFunction.IsNull()) return aGEOMObject._retn();
+  GetOperations()->GetSolver()->ComputeFunction(aLastFunction);
+
+  return aGEOMObject._retn();
+}
index 3f49b17b787a5f060e6d2fb3ca668652c1fa68c6..e46758e01f02cd2a7864cfed9546d5b4215a5b12 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_ITransformOperations_i_HeaderFile
 #define _GEOM_ITransformOperations_i_HeaderFile
 
@@ -60,6 +61,11 @@ class GEOM_I_EXPORT GEOM_ITransformOperations_i :
   GEOM::GEOM_Object_ptr TranslateVectorCopy (GEOM::GEOM_Object_ptr theObject,
                                             GEOM::GEOM_Object_ptr theVector);
 
+  GEOM::GEOM_Object_ptr TranslateVectorDistance (GEOM::GEOM_Object_ptr theObject,
+                                                GEOM::GEOM_Object_ptr theVector,
+                                                CORBA::Double theDistance,
+                                                CORBA::Boolean theCopy);
+
   GEOM::GEOM_Object_ptr MultiTranslate1D (GEOM::GEOM_Object_ptr theObject, GEOM::GEOM_Object_ptr theVector, CORBA::Double theStep, CORBA::Long theNbTimes);
 
   GEOM::GEOM_Object_ptr MultiTranslate2D (GEOM::GEOM_Object_ptr theObject, GEOM::GEOM_Object_ptr theVector1, CORBA::Double theStep1, CORBA::Long theNbTimes1,
@@ -72,7 +78,6 @@ class GEOM_I_EXPORT GEOM_ITransformOperations_i :
   GEOM::GEOM_Object_ptr MultiRotate1D (GEOM::GEOM_Object_ptr theObject,
                                       GEOM::GEOM_Object_ptr theVector,
                                       CORBA::Long theNbTimes);
-
  
   GEOM::GEOM_Object_ptr MultiRotate2D (GEOM::GEOM_Object_ptr theObject,
                                       GEOM::GEOM_Object_ptr theVector, 
@@ -117,6 +122,18 @@ class GEOM_I_EXPORT GEOM_ITransformOperations_i :
                                        GEOM::GEOM_Object_ptr thePoint,
                                        CORBA::Double theFactor);
 
+  GEOM::GEOM_Object_ptr ScaleShapeAlongAxes (GEOM::GEOM_Object_ptr theObject,
+                                            GEOM::GEOM_Object_ptr thePoint,
+                                            CORBA::Double theFactorX,
+                                            CORBA::Double theFactorY,
+                                            CORBA::Double theFactorZ);
+
+  GEOM::GEOM_Object_ptr ScaleShapeAlongAxesCopy (GEOM::GEOM_Object_ptr theObject,
+                                                GEOM::GEOM_Object_ptr thePoint,
+                                                CORBA::Double theFactorX,
+                                                CORBA::Double theFactorY,
+                                                CORBA::Double theFactorZ);
+
   GEOM::GEOM_Object_ptr PositionShape (GEOM::GEOM_Object_ptr theObject,
                                       GEOM::GEOM_Object_ptr theStartLCS,
                                       GEOM::GEOM_Object_ptr theEndLCS);
@@ -125,6 +142,12 @@ class GEOM_I_EXPORT GEOM_ITransformOperations_i :
                                           GEOM::GEOM_Object_ptr theStartLCS,
                                           GEOM::GEOM_Object_ptr theEndLCS);
 
+  GEOM::GEOM_Object_ptr PositionAlongPath (GEOM::GEOM_Object_ptr theObject,
+                                          GEOM::GEOM_Object_ptr thePath,
+                                          CORBA::Double         theDistance,
+                                          CORBA::Boolean        theCopy,
+                                          CORBA::Boolean        theReverse);
+
   GEOM::GEOM_Object_ptr RotateThreePoints (GEOM::GEOM_Object_ptr theObject,
                                           GEOM::GEOM_Object_ptr theCentPoint,
                                           GEOM::GEOM_Object_ptr thePoint1,
@@ -135,6 +158,8 @@ class GEOM_I_EXPORT GEOM_ITransformOperations_i :
                                               GEOM::GEOM_Object_ptr thePoint1,
                                               GEOM::GEOM_Object_ptr thePoint2);
 
+  GEOM::GEOM_Object_ptr RecomputeObject (GEOM::GEOM_Object_ptr theObject);
+
 
   ::GEOMImpl_ITransformOperations* GetOperations() { return (::GEOMImpl_ITransformOperations*)GetImpl(); }
 };
index 4a86443b64649dd578f5123654e9a25b3bff4c23..12ea73a99a2b5b5086206ceb85ae1597cbd72f38 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 <Standard_OStream.hxx>
 
@@ -360,3 +362,14 @@ bool GEOM_Object_i::IsShape()
 {
   return !_impl->GetValue().IsNull() && _impl->GetType() != GEOM_MARKER;
 }
+
+void GEOM_Object_i::SetParameters(const char* theParameters)
+{
+  _impl->SetParameters((char*)theParameters);
+}
+
+char* GEOM_Object_i::GetParameters()
+{
+  return CORBA::string_dup(_impl->GetParameters().ToCString());
+}
+
index 56631b7f0e7e8f1493cb124374b2584722c5358f..13bb0290f7646f176e817c497914055a46a4e4e4 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _GEOM_Object_i_HeaderFile
 #define _GEOM_Object_i_HeaderFile
 
@@ -81,6 +82,10 @@ class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public
 
   virtual bool IsShape();
 
+  virtual void SetParameters(const char* theParameters);
+
+  virtual char* GetParameters();
+
   Handle(GEOM_Object) GetImpl() { return _impl; }
 
  private:
index 7915c62bb359a0a9f0e68960380a76d2e86f36c8..4458042064a96507179041ad225df4ffa7bcb5dc 100644 (file)
-#  GEOM GEOM : implementaion of GEOM_Gen.idl
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 #
-#  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
+#  This library is free software; you can redistribute it and/or
+#  modify it 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
+#
+#  GEOM GEOM : implementaion of GEOM_Gen.idl
 #  File   : Makefile.in
 #  Author : Patrick GOLDBRONN (CEA)
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOMEngine.la
 
 # header files 
-salomeinclude_HEADERS = \
-       GEOM_Object_i.hh \
-        GEOM_IOperations_i.hh \
-        GEOM_IBasicOperations_i.hh \
-       GEOM_IHealingOperations_i.hh \
-        GEOM_I3DPrimOperations_i.hh \
-       GEOM_IShapesOperations_i.hh \
-       GEOM_IBlocksOperations_i.hh \
-       GEOM_IBooleanOperations_i.hh \
-       GEOM_ICurvesOperations_i.hh \
-       GEOM_ILocalOperations_i.hh \
-       GEOM_IInsertOperations_i.hh \
-       GEOM_ITransformOperations_i.hh \
-       GEOM_IMeasureOperations_i.hh \
-       GEOM_IGroupOperations_i.hh \
-       GEOM_Gen_i.hh \
+salomeinclude_HEADERS =                        \
+       GEOM_Object_i.hh                \
+        GEOM_IOperations_i.hh          \
+        GEOM_IBasicOperations_i.hh     \
+       GEOM_IHealingOperations_i.hh    \
+        GEOM_I3DPrimOperations_i.hh    \
+       GEOM_IShapesOperations_i.hh     \
+       GEOM_IBlocksOperations_i.hh     \
+       GEOM_IBooleanOperations_i.hh    \
+       GEOM_ICurvesOperations_i.hh     \
+       GEOM_ILocalOperations_i.hh      \
+       GEOM_IInsertOperations_i.hh     \
+       GEOM_ITransformOperations_i.hh  \
+       GEOM_IMeasureOperations_i.hh    \
+       GEOM_IGroupOperations_i.hh      \
+       GEOM_Gen_i.hh                   \
        GEOM_GEOM_I.hxx
 
-dist_libGEOMEngine_la_SOURCES = \
-       GEOM_Object_i.cc \
-       GEOM_IOperations_i.cc \
-       GEOM_IBasicOperations_i.cc \
-        GEOM_IHealingOperations_i.cc \
-       GEOM_I3DPrimOperations_i.cc \
-       GEOM_IShapesOperations_i.cc \
-       GEOM_IBlocksOperations_i.cc \
-       GEOM_IBooleanOperations_i.cc \
-       GEOM_ICurvesOperations_i.cc \
-       GEOM_ILocalOperations_i.cc \
-       GEOM_IInsertOperations_i.cc \
-       GEOM_ITransformOperations_i.cc \
-       GEOM_IMeasureOperations_i.cc \
-       GEOM_IGroupOperations_i.cc \
-       GEOM_Gen_i.cc \
+dist_libGEOMEngine_la_SOURCES =                \
+       GEOM_Object_i.cc                \
+       GEOM_IOperations_i.cc           \
+       GEOM_IBasicOperations_i.cc      \
+        GEOM_IHealingOperations_i.cc   \
+       GEOM_I3DPrimOperations_i.cc     \
+       GEOM_IShapesOperations_i.cc     \
+       GEOM_IBlocksOperations_i.cc     \
+       GEOM_IBooleanOperations_i.cc    \
+       GEOM_ICurvesOperations_i.cc     \
+       GEOM_ILocalOperations_i.cc      \
+       GEOM_IInsertOperations_i.cc     \
+       GEOM_ITransformOperations_i.cc  \
+       GEOM_IMeasureOperations_i.cc    \
+       GEOM_IGroupOperations_i.cc      \
+       GEOM_Gen_i.cc                   \
        GEOM_DumpPython.cc
 
-# additionnal information to compil and link file
-libGEOMEngine_la_CPPFLAGS = \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       -I$(srcdir)/../SKETCHER \
-       -I$(srcdir)/../ARCHIMEDE \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(srcdir)/../GEOMAlgo \
-       -I$(srcdir)/../GEOM \
-       -I$(top_builddir)/idl \
+# additional information to compile and link file
+
+libGEOMEngine_la_CPPFLAGS =            \
+       $(CORBA_CXXFLAGS)               \
+       $(CORBA_INCLUDES)               \
+       $(CAS_CPPFLAGS)                 \
+       $(BOOST_CPPFLAGS)               \
+       $(KERNEL_CXXFLAGS)              \
+       -I$(srcdir)/../SKETCHER         \
+       -I$(srcdir)/../ARCHIMEDE        \
+       -I$(srcdir)/../GEOMImpl         \
+       -I$(srcdir)/../GEOMAlgo         \
+       -I$(srcdir)/../GEOM             \
+       -I$(top_builddir)/idl           \
        -I$(top_builddir)/salome_adm/unix
 
 
-libGEOMEngine_la_LDFLAGS  = \
-       ../../idl/libSalomeIDLGEOM.la \
-       ../ARCHIMEDE/libGEOMArchimede.la \
-       ../GEOMImpl/libGEOMimpl.la \
-       ../SKETCHER/libGEOMSketcher.la \
-       ../GEOM/libGEOMbasic.la \
-       $(KERNEL_LDFLAGS) -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS \
-       $(CAS_DATAEXCHANGE) \
-       $(CAS_LDPATH) -lTKFillet -lTKOffset \
-       $(STDLIB) \
-       $(CORBA_LIBS)
+libGEOMEngine_la_LDFLAGS  =                    \
+       ../../idl/libSalomeIDLGEOM.la           \
+       ../ARCHIMEDE/libGEOMArchimede.la        \
+       ../GEOMImpl/libGEOMimpl.la              \
+       ../SKETCHER/libGEOMSketcher.la          \
+       ../GEOM/libGEOMbasic.la                 \
+       $(KERNEL_LDFLAGS) -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS     \
+       $(CAS_DATAEXCHANGE)                     \
+       $(CAS_LDPATH) -lTKFillet -lTKOffset
+
+# \
+#      $(STDLIB) \
+#      $(CORBA_LIBS)
index 7b8e56c751d6ae232aaf34d8d8ed1ba8e2563aee..292cb4fb937231294b164742153c7f30f465fc77 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 __GEOM_LIST_I_H__
 #define __GEOM_LIST_I_H__
index 387c3b0d4b867c4058c2fa9a797faa39f91152da..159bb6f4997a021ac5aa51250174cdb690ccab06 100644 (file)
@@ -1,23 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 "GEOM_Superv_i.hh"
 #include "SALOME_LifeCycleCORBA.hxx"
 
@@ -771,6 +772,80 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeBoxTwoPnt (GEOM::GEOM_Object_ptr thePnt
   return anObj;
 }
 
+//=============================================================================
+//  MakeFaceHW:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFaceHW (CORBA::Double theH,
+                                                CORBA::Double theW,
+                                                CORBA::Short  theOrientation)
+{
+  beginService( " GEOM_Superv_i::MakeFaceHW" );
+  MESSAGE("GEOM_Superv_i::MakeFaceHW");
+  get3DPrimOp();
+  GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeFaceHW(theH, theW, theOrientation);
+  endService( " GEOM_Superv_i::MakeFaceHW" );
+  return anObj;
+}
+
+//=============================================================================
+//  MakeFaceObjHW:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFaceObjHW (GEOM::GEOM_Object_ptr theObj, 
+                                                   CORBA::Double theH,
+                                                   CORBA::Double theW)
+{
+  beginService( " GEOM_Superv_i::MakeFaceObjHW" );
+  MESSAGE("GEOM_Superv_i::MakeFaceObjHW");
+  get3DPrimOp();
+  GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeFaceObjHW(theObj, theH, theW);
+  endService( " GEOM_Superv_i::MakeFaceObjHW" );
+  return anObj;
+}
+
+//=============================================================================
+//  MakeDiskPntVecR:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeDiskPntVecR (GEOM::GEOM_Object_ptr theCenter,
+                                                     GEOM::GEOM_Object_ptr theVector,
+                                                     CORBA::Double theR)
+{
+  beginService( " GEOM_Superv_i::MakeDiskPntVecR" );
+  MESSAGE("GEOM_Superv_i::MakeDiskPntVecR");
+  get3DPrimOp();
+  GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeDiskPntVecR(theCenter, theVector, theR);
+  endService( " GEOM_Superv_i::MakeDiskPntVecR" );
+  return anObj;
+}
+
+//=============================================================================
+//  MakeDiskThreePnt:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeDiskThreePnt (GEOM::GEOM_Object_ptr thePnt1,
+                                                      GEOM::GEOM_Object_ptr thePnt2,
+                                                      GEOM::GEOM_Object_ptr thePnt3)
+{
+  beginService( " GEOM_Superv_i::MakeDiskThreePnt" );
+  MESSAGE("GEOM_Superv_i::MakeDiskThreePnt");
+  get3DPrimOp();
+  GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeDiskThreePnt(thePnt1, thePnt2, thePnt3);
+  endService( " GEOM_Superv_i::MakeDiskThreePnt" );
+  return anObj;
+}
+
+//=============================================================================
+//  MakeDiskR:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeDiskR (CORBA::Double theR,
+                                               CORBA::Short  theOrientation)
+{
+  beginService( " GEOM_Superv_i::MakeDiskR" );
+  MESSAGE("GEOM_Superv_i::MakeDiskR");
+  get3DPrimOp();
+  GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeDiskR(theR, theOrientation);
+  endService( " GEOM_Superv_i::MakeDiskR" );
+  return anObj;
+}
+
 //=============================================================================
 //  MakeCylinderPntVecRH:
 //=============================================================================
@@ -813,9 +888,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSphere  (CORBA::Double theX,
   MESSAGE("GEOM_Superv_i::MakeSphepe");
   getBasicOp();
   get3DPrimOp();
-  GEOM::GEOM_Object_var o = myBasicOp->MakePointXYZ(theX, theY, theZ);
-  GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeSpherePntR(o, theRadius);
-  o->Destroy();
+  GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakeSpherePntR(myBasicOp->MakePointXYZ(theX, theY, theZ), theRadius);
   endService( " GEOM_Superv_i::MakeSphepe" );
   return anObj;
 }
@@ -969,6 +1042,34 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePrismTwoPnt2Ways (GEOM::GEOM_Object_ptr
   return anObj;
 }
 
+//=============================================================================
+//  MakePrismDXDYDZ:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePrismDXDYDZ (GEOM::GEOM_Object_ptr theBase,
+                     CORBA::Double theDX, CORBA::Double theDY, CORBA::Double theDZ)
+{
+  beginService( " GEOM_Superv_i::MakePrismDXDYDZ" );
+  MESSAGE("GEOM_Superv_i::MakePrismDXDYDZ");
+  get3DPrimOp();
+  GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakePrismDXDYDZ(theBase, theDX, theDY, theDZ);
+  endService( " GEOM_Superv_i::MakePrismDXDYDZ" );
+  return anObj;
+}
+
+//=============================================================================
+//  MakePrismDXDYDZ:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePrismDXDYDZ2Ways (GEOM::GEOM_Object_ptr theBase,
+                     CORBA::Double theDX, CORBA::Double theDY, CORBA::Double theDZ)
+{
+  beginService( " GEOM_Superv_i::MakePrismDXDYDZ2Ways" );
+  MESSAGE("GEOM_Superv_i::MakePrismDXDYDZ2Ways");
+  get3DPrimOp();
+  GEOM::GEOM_Object_ptr anObj = my3DPrimOp->MakePrismDXDYDZ2Ways(theBase, theDX, theDY, theDZ);
+  endService( " GEOM_Superv_i::MakePrismDXDYDZ2Ways" );
+  return anObj;
+}
+
 //=============================================================================
 //  MakePipe:
 //=============================================================================
@@ -1122,6 +1223,24 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePipeShellsWithoutPath
 }
 
 
+//=============================================================================
+//  MakePipe:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePipeBiNormalAlongVector 
+                                                (GEOM::GEOM_Object_ptr theBase, 
+                                                GEOM::GEOM_Object_ptr thePath, 
+                                                GEOM::GEOM_Object_ptr theVec)
+{
+  beginService( " GEOM_Superv_i::MakePipeBiNormalAlongVector" );
+  MESSAGE("GEOM_Superv_i::MakePipeBiNormalAlongVector");
+  get3DPrimOp();
+  GEOM::GEOM_Object_ptr anObj = 
+    my3DPrimOp->MakePipeBiNormalAlongVector(theBase, thePath, theVec);
+  endService( " GEOM_Superv_i::MakePipeBiNormalAlongVector" );
+  return anObj;
+}
+
+
 //=============================================================================
 //  MakeFuse:
 //=============================================================================
@@ -1347,6 +1466,23 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::TranslateVectorCopy (GEOM::GEOM_Object_ptr
   return anObj;
 }
 
+//=============================================================================
+//  TranslateVectorDistance:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::TranslateVectorDistance (GEOM::GEOM_Object_ptr theObject,
+                                                             GEOM::GEOM_Object_ptr theVector,
+                                                             CORBA::Double theDistance,
+                                                             CORBA::Boolean theCopy)
+{
+  beginService( " GEOM_Superv_i::TranslateVectorDistance" );
+  MESSAGE("GEOM_Superv_i::TranslateVectorDistance");
+  getTransfOp();
+  GEOM::GEOM_Object_ptr anObj = myTransfOp->TranslateVectorDistance(theObject, 
+                                                                   theVector, theDistance, theCopy);
+  endService( " GEOM_Superv_i::TranslateVectorDistance" );
+  return anObj;
+}
+
 //=============================================================================
 //  MultiTranslate1D:
 //=============================================================================
@@ -1619,6 +1755,42 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::ScaleShapeCopy (GEOM::GEOM_Object_ptr theOb
   return anObj;
 }
 
+//=============================================================================
+//  ScaleShapeAlongAxes:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::ScaleShapeAlongAxes (GEOM::GEOM_Object_ptr theObject,
+                                                         GEOM::GEOM_Object_ptr thePoint,
+                                                         CORBA::Double theFactorX,
+                                                         CORBA::Double theFactorY,
+                                                         CORBA::Double theFactorZ)
+{
+  beginService( " GEOM_Superv_i::ScaleShapeAlongAxes" );
+  MESSAGE("GEOM_Superv_i::ScaleShapeAlongAxes");
+  getTransfOp();
+  GEOM::GEOM_Object_ptr anObj = myTransfOp->ScaleShapeAlongAxes
+    (theObject, thePoint, theFactorX, theFactorY, theFactorZ);
+  endService( " GEOM_Superv_i::ScaleShapeAlongAxes" );
+  return anObj;
+}
+
+//=============================================================================
+//  ScaleShapeAlongAxesCopy:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::ScaleShapeAlongAxesCopy (GEOM::GEOM_Object_ptr theObject,
+                                                             GEOM::GEOM_Object_ptr thePoint,
+                                                             CORBA::Double theFactorX,
+                                                             CORBA::Double theFactorY,
+                                                             CORBA::Double theFactorZ)
+{
+  beginService( " GEOM_Superv_i::ScaleShapeAlongAxesCopy" );
+  MESSAGE("GEOM_Superv_i::ScaleShapeAlongAxesCopy");
+  getTransfOp();
+  GEOM::GEOM_Object_ptr anObj = myTransfOp->ScaleShapeAlongAxesCopy
+    (theObject, thePoint, theFactorX, theFactorY, theFactorZ);
+  endService( " GEOM_Superv_i::ScaleShapeAlongAxesCopy" );
+  return anObj;
+}
+
 //=============================================================================
 //  PositionShape:
 //=============================================================================
@@ -1649,6 +1821,23 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::PositionShapeCopy (GEOM::GEOM_Object_ptr th
   return anObj;
 }
 
+//=============================================================================
+//  PositionAlongPath:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::PositionAlongPath (GEOM::GEOM_Object_ptr theObject,
+                                                       GEOM::GEOM_Object_ptr thePath,
+                                                       CORBA::Double         theDistance,
+                                                       CORBA::Boolean        theCopy,
+                                                       CORBA::Boolean        theReverse)
+{
+  beginService( " GEOM_Superv_i::PositionAlongPath" );
+  MESSAGE("GEOM_Superv_i::PositionAlongPath");
+  getTransfOp();
+  GEOM::GEOM_Object_ptr anObj = myTransfOp->PositionAlongPath(theObject, thePath, theDistance, theCopy, theReverse);
+  endService( " GEOM_Superv_i::PositionAlongPath" );
+  return anObj;
+}
+
 //=============================== ShapesOperations ============================
 //=============================================================================
 //  Make:
@@ -1875,6 +2064,7 @@ CORBA::Long GEOM_Superv_i::NumberOfEdges (GEOM::GEOM_Object_ptr theShape)
   return aRes;
 }
 
+
 //=============================================================================
 //  ChangeOrientation:
 //=============================================================================
@@ -1889,6 +2079,46 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::ChangeOrientation (GEOM::GEOM_Object_ptr th
 }
 
 
+//=============================================================================
+//  GetShapesOnShape:
+//=============================================================================
+GEOM::GEOM_List_ptr GEOM_Superv_i::GetShapesOnShape
+                                          (GEOM::GEOM_Object_ptr theCheckShape,
+                                          GEOM::GEOM_Object_ptr theShape,
+                                          CORBA::Short theShapeType,
+                                          GEOM::shape_state theState)
+{
+  beginService( " GEOM_Superv_i::GetShapesOnShape" );
+  MESSAGE("GEOM_Superv_i::GetShapesOnShape");
+  getShapesOp();
+  GEOM::ListOfGO* aList =
+    myShapesOp->GetShapesOnShape(theCheckShape, theShape, theShapeType, theState);
+  GEOM_List_i<GEOM::ListOfGO>* aListPtr = new GEOM_List_i<GEOM::ListOfGO>(*(aList));
+  MESSAGE(" List of "<<aListPtr->GetList().length()<<" element(s)");
+  endService( " GEOM_Superv_i::GetShapesOnShape" );
+  return aListPtr->_this();
+}
+
+
+//=============================================================================
+//  GetShapesOnShapeAsCompound:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::GetShapesOnShapeAsCompound
+                                          (GEOM::GEOM_Object_ptr theCheckShape,
+                                          GEOM::GEOM_Object_ptr theShape,
+                                          CORBA::Short theShapeType,
+                                          GEOM::shape_state theState)
+{
+  beginService( " GEOM_Superv_i::GetShapesOnShapeAsCompound" );
+  MESSAGE("GEOM_Superv_i::GetShapesOnShapeAsCompound");
+  getShapesOp();
+  GEOM::GEOM_Object_ptr anObj = 
+    myShapesOp->GetShapesOnShapeAsCompound(theCheckShape, theShape, theShapeType, theState);
+  endService( " GEOM_Superv_i::GetShapesOnShapeAsCompound" );
+  return anObj;
+}
+
+
 //=============================== BlocksOperations ============================
 //=============================================================================
 //  MakeQuad4Vertices:
@@ -2333,6 +2563,21 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeArcCenter (GEOM::GEOM_Object_ptr theCen
   return anObj;
 }
 
+//=============================================================================
+//  MakeArcOfEllipse:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeArcOfEllipse (GEOM::GEOM_Object_ptr thePnt1,
+                                                      GEOM::GEOM_Object_ptr thePnt2,
+                                                      GEOM::GEOM_Object_ptr thePnt3)
+{
+  beginService( " GEOM_Superv_i::MakeArcOfEllipse" );
+  MESSAGE("GEOM_Superv_i::MakeArcOfEllipse");
+  getCurvesOp();
+  GEOM::GEOM_Object_ptr anObj = myCurvesOp->MakeArcOfEllipse(thePnt1, thePnt2, thePnt3);
+  endService( " GEOM_Superv_i::MakeArcOfEllipse" );
+  return anObj;
+}
+
 //=============================================================================
 //  MakePolyline:
 //=============================================================================
@@ -2406,6 +2651,24 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSketcher (const char* theCommand,
   return NULL;
 }
 
+//=============================================================================
+//  Make3DSketcher:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::Make3DSketcher ( GEOM::GEOM_List_ptr theCoordinates)
+{
+  beginService( " GEOM_Superv_i::Make3DSketcher" );
+  MESSAGE("GEOM_Superv_i::Make3DSketcher");
+  if (GEOM_List_i<GEOM::ListOfDouble>* aListImpl = 
+      dynamic_cast<GEOM_List_i<GEOM::ListOfDouble>*>(GetServant(theCoordinates, myPOA).in())) {
+    getCurvesOp();
+    GEOM::GEOM_Object_ptr anObj = myCurvesOp->Make3DSketcher(aListImpl->GetList());
+    endService( " GEOM_Superv_i::Make3DSketcher" );
+    return anObj;
+  }
+  endService( " GEOM_Superv_i::Make3DSketcher" );
+  return NULL;
+}
+
 //=============================== LocalOperations =============================
 //=============================================================================
 //  MakeFilletAll:
@@ -2505,6 +2768,26 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilletFacesR1R2 (GEOM::GEOM_Object_ptr
   return NULL;
 }
 
+//=============================================================================
+//  MakeFillet2D:
+//=============================================================================
+GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFillet2D (GEOM::GEOM_Object_ptr theShape, 
+                                                  CORBA::Double theR,
+                                                  GEOM::GEOM_List_ptr theVertexes)
+{
+  beginService( " GEOM_Superv_i::MakeFillet2D" );
+  MESSAGE("GEOM_Superv_i::MakeFillet2D");
+  if (GEOM_List_i<GEOM::ListOfLong>* aListImplV = 
+      dynamic_cast<GEOM_List_i<GEOM::ListOfLong>*>(GetServant(theVertexes, myPOA).in())) {
+    getLocalOp();
+    GEOM::GEOM_Object_ptr anObj = myLocalOp->MakeFillet2D(theShape, theR, aListImplV->GetList());
+    endService( " GEOM_Superv_i::MakeFillet2D" );
+    return anObj;
+  }
+  endService( " GEOM_Superv_i::MakeFillet2D" );
+  return NULL;
+}
+
 //=============================================================================
 //  MakeChamferAll:
 //=============================================================================
index 3cb1ffd2520e892aa713092fbc4b7305e84686a8..b34c13214be5b0fc316bedb1fa6ca172d9e334e3 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 __GEOM_SUPERV_I_H__
 #define __GEOM_SUPERV_I_H__
@@ -187,6 +189,20 @@ public:
                                       CORBA::Double theDZ);
   GEOM::GEOM_Object_ptr MakeBoxTwoPnt (GEOM::GEOM_Object_ptr thePnt1, 
                                       GEOM::GEOM_Object_ptr thePnt2);
+  GEOM::GEOM_Object_ptr MakeFaceHW (CORBA::Double theH,
+                                   CORBA::Double theW,
+                                   CORBA::Short  theOrientation);
+  GEOM::GEOM_Object_ptr MakeFaceObjHW (GEOM::GEOM_Object_ptr theObj, 
+                                      CORBA::Double theH,
+                                      CORBA::Double theW);
+  GEOM::GEOM_Object_ptr MakeDiskPntVecR (GEOM::GEOM_Object_ptr theCenter,
+                                        GEOM::GEOM_Object_ptr theVector,
+                                        CORBA::Double theR);
+  GEOM::GEOM_Object_ptr MakeDiskThreePnt (GEOM::GEOM_Object_ptr thePnt1,
+                                         GEOM::GEOM_Object_ptr thePnt2,
+                                         GEOM::GEOM_Object_ptr thePnt3);
+  GEOM::GEOM_Object_ptr MakeDiskR (CORBA::Double theR,
+                                  CORBA::Short  theOrientation);
   GEOM::GEOM_Object_ptr MakeCylinderPntVecRH (GEOM::GEOM_Object_ptr thePnt,
                                              GEOM::GEOM_Object_ptr theAxis,
                                              CORBA::Double theRadius,
@@ -226,6 +242,14 @@ public:
   GEOM::GEOM_Object_ptr MakePrismTwoPnt2Ways (GEOM::GEOM_Object_ptr theBase,
                                              GEOM::GEOM_Object_ptr thePoint1,
                                              GEOM::GEOM_Object_ptr thePoint2);
+  GEOM::GEOM_Object_ptr MakePrismDXDYDZ (GEOM::GEOM_Object_ptr theBase,
+                                        CORBA::Double         theDX,
+                                        CORBA::Double         theDY,
+                                        CORBA::Double         theDZ);
+  GEOM::GEOM_Object_ptr MakePrismDXDYDZ2Ways (GEOM::GEOM_Object_ptr theBase,
+                                             CORBA::Double         theDX,
+                                             CORBA::Double         theDY,
+                                             CORBA::Double         theDZ);
   GEOM::GEOM_Object_ptr MakePipe (GEOM::GEOM_Object_ptr theBase, 
                                  GEOM::GEOM_Object_ptr thePath);
   GEOM::GEOM_Object_ptr MakeRevolutionAxisAngle (GEOM::GEOM_Object_ptr theBase,
@@ -260,6 +284,10 @@ public:
   GEOM::GEOM_Object_ptr MakePipeShellsWithoutPath(const GEOM::ListOfGO& theBases,
                                                  const GEOM::ListOfGO& theLocations);
   
+  GEOM::GEOM_Object_ptr MakePipeBiNormalAlongVector (GEOM::GEOM_Object_ptr theBase,
+                                                    GEOM::GEOM_Object_ptr thePath,
+                                                    GEOM::GEOM_Object_ptr theVec);
+
   //-----------------------------------------------------------//
   // BooleanOperations                                         //
   //-----------------------------------------------------------//
@@ -314,6 +342,10 @@ public:
                                         GEOM::GEOM_Object_ptr theVector);
   GEOM::GEOM_Object_ptr TranslateVectorCopy (GEOM::GEOM_Object_ptr theObject,
                                             GEOM::GEOM_Object_ptr theVector);
+  GEOM::GEOM_Object_ptr TranslateVectorDistance (GEOM::GEOM_Object_ptr theObject,
+                                                GEOM::GEOM_Object_ptr theVector,
+                                                CORBA::Double theDistance,
+                                                CORBA::Boolean theCopy);
   GEOM::GEOM_Object_ptr MultiTranslate1D (GEOM::GEOM_Object_ptr theObject,
                                          GEOM::GEOM_Object_ptr theVector,
                                          CORBA::Double theStep,
@@ -373,12 +405,27 @@ public:
   GEOM::GEOM_Object_ptr ScaleShapeCopy (GEOM::GEOM_Object_ptr theObject, 
                                        GEOM::GEOM_Object_ptr thePoint,
                                        CORBA::Double theFactor);
+  GEOM::GEOM_Object_ptr ScaleShapeAlongAxes (GEOM::GEOM_Object_ptr theObject,
+                                            GEOM::GEOM_Object_ptr thePoint,
+                                            CORBA::Double theFactorX,
+                                            CORBA::Double theFactorY,
+                                            CORBA::Double theFactorZ);
+  GEOM::GEOM_Object_ptr ScaleShapeAlongAxesCopy (GEOM::GEOM_Object_ptr theObject,
+                                                GEOM::GEOM_Object_ptr thePoint,
+                                                CORBA::Double theFactorX,
+                                                CORBA::Double theFactorY,
+                                                CORBA::Double theFactorZ);
   GEOM::GEOM_Object_ptr PositionShape (GEOM::GEOM_Object_ptr theObject,
                                       GEOM::GEOM_Object_ptr theStartLCS,
                                       GEOM::GEOM_Object_ptr theEndLCS);
   GEOM::GEOM_Object_ptr PositionShapeCopy (GEOM::GEOM_Object_ptr theObject,
                                           GEOM::GEOM_Object_ptr theStartLCS,
                                           GEOM::GEOM_Object_ptr theEndLCS);
+  GEOM::GEOM_Object_ptr PositionAlongPath (GEOM::GEOM_Object_ptr theObject,
+                                          GEOM::GEOM_Object_ptr thePath,
+                                          CORBA::Double         theDistance,
+                                          CORBA::Boolean        theCopy,
+                                          CORBA::Boolean        theReverse);
 
   //-----------------------------------------------------------//
   // ShapesOperations                                          //
@@ -410,6 +457,17 @@ public:
   CORBA::Long NumberOfEdges (GEOM::GEOM_Object_ptr theShape);
   GEOM::GEOM_Object_ptr ChangeOrientation (GEOM::GEOM_Object_ptr theShape);
 
+  GEOM::GEOM_List_ptr GetShapesOnShape (GEOM::GEOM_Object_ptr theCheckShape,
+                                       GEOM::GEOM_Object_ptr theShape,
+                                       CORBA::Short theShapeType,
+                                       GEOM::shape_state theState);
+  GEOM::GEOM_Object_ptr GetShapesOnShapeAsCompound
+                                       (GEOM::GEOM_Object_ptr theCheckShape,
+                                       GEOM::GEOM_Object_ptr theShape,
+                                       CORBA::Short theShapeType,
+                                       GEOM::shape_state theState);
+
+
   //-----------------------------------------------------------//
   // BlocksOperations                                          //
   //-----------------------------------------------------------//
@@ -506,11 +564,15 @@ public:
                                        GEOM::GEOM_Object_ptr thePnt1,
                                        GEOM::GEOM_Object_ptr thePnt2,
                                        CORBA::Boolean theSense);
+  GEOM::GEOM_Object_ptr MakeArcOfEllipse (GEOM::GEOM_Object_ptr thePnt1,
+                                         GEOM::GEOM_Object_ptr thePnt2,
+                                         GEOM::GEOM_Object_ptr thePnt3);
   GEOM::GEOM_Object_ptr MakePolyline (GEOM::GEOM_List_ptr thePoints);
   GEOM::GEOM_Object_ptr MakeSplineBezier (GEOM::GEOM_List_ptr thePoints);
   GEOM::GEOM_Object_ptr MakeSplineInterpolation (GEOM::GEOM_List_ptr thePoints);
   GEOM::GEOM_Object_ptr MakeSketcher (const char* theCommand, 
                                                GEOM::GEOM_List_ptr theWorkingPlane);
+  GEOM::GEOM_Object_ptr Make3DSketcher (GEOM::GEOM_List_ptr theCoordinates);
 
   //-----------------------------------------------------------//
   // LocalOperations                                           //
@@ -525,6 +587,8 @@ public:
                                         GEOM::GEOM_List_ptr theFaces);
   GEOM::GEOM_Object_ptr MakeFilletFacesR1R2 (GEOM::GEOM_Object_ptr theShape, CORBA::Double theR1,
                                             CORBA::Double theR2, GEOM::GEOM_List_ptr theFaces);
+  GEOM::GEOM_Object_ptr MakeFillet2D (GEOM::GEOM_Object_ptr theShape, CORBA::Double theR,
+                                     GEOM::GEOM_List_ptr theVertexes);
   GEOM::GEOM_Object_ptr MakeChamferAll (GEOM::GEOM_Object_ptr theShape, CORBA::Double theD);
   GEOM::GEOM_Object_ptr MakeChamferEdge (GEOM::GEOM_Object_ptr theShape,
                                         CORBA::Double theD1, CORBA::Double theD2,
index 4a97945b02886b4a7517c5bd52e75530a5aa092e..69edb9a10a5ad9fe8eed334583b378f1242e4960 100644 (file)
@@ -1,38 +1,38 @@
-#  GEOM GEOM : implementaion of GEOM_Superv.idl
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 #
-#  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
+#  This library is free software; you can redistribute it and/or
+#  modify it 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
+#
+#  GEOM GEOM : implementaion of GEOM_Superv.idl
 #  File   : Makefile.in
 #  Author : Patrick GOLDBRONN (CEA)
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
 # Libraries targets
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS = \
+       GEOM_Superv_i.hh \
+       GEOM_List_i.hh
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOM_SupervEngine.la
@@ -40,29 +40,26 @@ lib_LTLIBRARIES = libGEOM_SupervEngine.la
 dist_libGEOM_SupervEngine_la_SOURCES = \
        GEOM_Superv_i.cc
 
-#LIB_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOME_Exception.idl \
-#                 SALOME_GenericObj.idl SALOME_ModuleCatalog.idl SALOME_Session.idl GEOM_Gen.idl GEOM_Superv.idl
+# additional information to compile and link file
 
-# additionnal information to compil and link file
-libGEOM_SupervEngine_la_CPPFLAGS = \
-       $(CAS_CPPFLAGS) \
-       $(QT_INCLUDES) \
-       $(KERNEL_CXXFLAGS) \
-       $(BOOST_CPPFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(srcdir)/../GEOM \
-       -I$(srcdir)/../GEOM_I \
-       -I$(srcdir)/../GEOMAlgo \
-       -I$(top_builddir)/idl \
+libGEOM_SupervEngine_la_CPPFLAGS =     \
+       $(CAS_CPPFLAGS)                 \
+       $(QT_INCLUDES)                  \
+       $(KERNEL_CXXFLAGS)              \
+       $(BOOST_CPPFLAGS)               \
+       $(CORBA_CXXFLAGS)               \
+       $(CORBA_INCLUDES)               \
+       -I$(srcdir)/../GEOMGUI          \
+       -I$(srcdir)/../GEOMBase         \
+       -I$(srcdir)/../GEOMClient       \
+       -I$(srcdir)/../GEOMImpl         \
+       -I$(srcdir)/../GEOM             \
+       -I$(srcdir)/../GEOM_I           \
+       -I$(srcdir)/../GEOMAlgo         \
+       -I$(top_builddir)/idl           \
        -I$(top_builddir)/salome_adm/unix
 
-libGEOM_SupervEngine_la_LDFLAGS  = \
-       ../GEOM_I/libGEOMEngine.la \
+libGEOM_SupervEngine_la_LDFLAGS  =     \
+       $(CORBA_LIBS)                   \
        $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer -lSalomeDSClient \
-       $(CORBA_LIBS) \
        $(STDLIB)
index 3a1f90adb20260f8e109cdf72f9433f3fb192e60..d5624c17fb1d37c8276c8b9ae054bea75bb1209d 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
+#  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
diff --git a/src/GEOM_SWIG/GEOM_ObjectInfo.py b/src/GEOM_SWIG/GEOM_ObjectInfo.py
new file mode 100644 (file)
index 0000000..a5c57e9
--- /dev/null
@@ -0,0 +1,60 @@
+#  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_ObjectInfo.py
+#  Author : Michael ZORIN
+#  Module : GEOM
+#  $Header: 
+
+import salome
+import geompy
+
+geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
+
+# Create several objects
+obj1 = geompy.MakeVertex(0.,0.,0.)
+obj2 = geompy.MakeCircleR(150.)
+obj3 = geompy.MakeBoxDXDYDZ(300.,400.,500.)
+obj4 = geompy.MakeCylinderRH(100.,200.)
+ShapeListCompound = []
+ShapeListCompound.append(obj3)
+ShapeListCompound.append(obj4)
+obj5 = geompy.MakeCompound(ShapeListCompound)
+
+obj1_entry = geompy.addToStudy(obj1, "Object1")
+obj2_entry = geompy.addToStudy(obj2, "Object2")
+obj3_entry = geompy.addToStudy(obj3, "Object3")
+obj4_entry = geompy.addToStudy(obj4, "Object4")
+obj5_entry = geompy.addToStudy(obj5, "Object5")
+
+# Get information about objects
+hasInfo = geom.hasObjectInfo()
+print "Check if GEOM module provides information about its objects: ", hasInfo
+if hasInfo == True:
+    print "Information about first  object: ", geom.getObjectInfo(salome.myStudyId, obj1_entry) 
+    print "Information about second object: ", geom.getObjectInfo(salome.myStudyId, obj2_entry)
+    print "Information about third  object: ", geom.getObjectInfo(salome.myStudyId, obj3_entry)
+    print "Information about fourth object: ", geom.getObjectInfo(salome.myStudyId, obj4_entry)
+    print "Information about fifth  object: ", geom.getObjectInfo(salome.myStudyId, obj5_entry)
+
+salome.sg.updateObjBrowser(1)
index bc8e4c138fd3dd5bc31d64f98fd6d0636ee5aa56..14b7be011085796b010e1f1ec75b3c3e126785cf 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  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
-
-#%Make geometry (like CEA script (A1)) using Partition algorithm%
 # appel:
 # import alveole_3D_01_GEOM
 # reload(alveole_3D_01_GEOM)
-
 # -- Rayon de la bariere
-
+#
 barier_height = 7.0
 barier_radius = 5.6 / 2 # Rayon de la bariere
 colis_radius = 1.0 / 2  # Rayon du colis
index fd66fa72c1913d7dea88496450d9b7d0564b5724..14375f6c983c68524c608b8e299c681154bbad83 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  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
-
-#%Make geometry (like CEA script (A2)) using Partition algorithm%
 # import callovo_01_GEOM
 # reload(callovo_01_GEOM)
-
-
 # --------------------------------------------
 # Geometrie avec une galerie perpendiculaire
 # --------------------------------------------
-
+#
 import geompy
 geom = geompy.geom
 
index 462c8ac7f22d9eff2865a29762eaa88346988bed..c613a4b20d9b2ca8dd8ccc83e9e759f9e0d85fee 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  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
-
-#%Make geometry (like CEA script (A2)) using Partition algorithm%
 # import callovo_01_GEOM
 # reload(callovo_01_GEOM)
-
-
+#
 import geompy
 geom = geompy.geom
 
index 348d6b45bd92daca83c20ff68727144d8db3ff8f..6c5924711f6195d61ca1028c388568836db867f4 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  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
-
-#%Make geometry (like CEA script (A3)) using Partition algorithm%
 # import couplex2_01_GEOM
 # reload(couplex2_01_GEOM)
-
 # Dimensions de alveolus
 # Parall\89pip\88de rectangle de taille alDx, alDy, alDz
-
+#
 alDx   = 2.5
 alDy   = 20.0
 alDz   = 2.5
index 00ce525d5845cdcc4c75a7ff2dcb1885314584df..69c621a5f50b9e2369ddc9bc1114c5c9c02ee491 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  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
-
-#%Make geometry (like CEA script (A4)) using Partition algorithm%
 # import gallery_01_GEOM
 # reload(gallery_01_GEOM)
-
 # -- Import geompy pour piloter GEOM par script
-
+#
 import geompy
 geom = geompy.geom
 
index dc8bf692d1ae7988523dc73866fb89b7d8f6d61e..7ea56b3cbb6666c41d94f605164d530117f87cb6 100644 (file)
@@ -1,31 +1,30 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY 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_Sketcher.py
 #  Author : Damien COQUERET, Open CASCADE
 #  Module : GEOM
 #  $Header$
-
+#
 import geompy
 
 #SKETCHER INFOS
index 2e410ca9c674aea5e405719bf7b2c84f57595163..f95ab64e39280d4c39e7d10852c3c5a9e3747cf4 100644 (file)
@@ -1,6 +1,7 @@
-#  GEOM GEOM_SWIG : binding of C++ implementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  CEA
+#  Copyright (C) 2003-2007  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 along with this library; if 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
-#
-#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+#  GEOM GEOM_SWIG : binding of C++ implementaion with Python
 #  File   : GEOM_Spanner.py
 #  Author : Julia DOROVSKIKH
 #  Module : GEOM
 #  $Header$
-
+# ! Please, if you edit this example file, update also
+# ! GEOM_SRC/doc/salome/gui/GEOM/input/tui_test_spanner.doc
+# ! as some sequences of symbols from this example are used during
+# ! documentation generation to identify certain places of this file
 ############# MakeSpanner #############
-
+#
 def MakeSpanner (geompy, math, isBlocksTest = 0, isMeshTest = 0, smesh = None):
 
   ### Variables ###
@@ -400,8 +403,8 @@ def MakeSpanner (geompy, math, isBlocksTest = 0, isMeshTest = 0, smesh = None):
     print algoReg.GetName()
     print algoReg.GetId()
     algoReg.SetName("Regular_1D")
-      
-      
+
+
     hypNbSeg3 = algoReg.NumberOfSegments(3)
     print hypNbSeg3.GetName()
     print hypNbSeg3.GetId()
@@ -419,7 +422,7 @@ def MakeSpanner (geompy, math, isBlocksTest = 0, isMeshTest = 0, smesh = None):
     algoQuad.SetName("Quadrangle_2D")
 
     print "-------------------------- add hypothesis to the Middle Block"
-    
+
     print "-------------------------- LocalLength"
     algoRegMb = mesh.Segment(BlockMh)
     hypLen1 = algoRegMb.LocalLength(10)
@@ -436,14 +439,14 @@ def MakeSpanner (geompy, math, isBlocksTest = 0, isMeshTest = 0, smesh = None):
     print hypPropE1.GetId()
     smesh.SetName(hypPropE1, "Propagation hypothesis")
     smesh.SetName(algoRegE1.GetSubMesh(), "SubMesh Edge 1 of Top Face")
-    
+
     algoRegE2 = mesh.Segment(Edge2)
     hypPropE2 = algoRegE2.Propagation()
     print hypPropE2.GetName()
     print hypPropE2.GetId()
     smesh.SetName(hypPropE2, "Propagation hypothesis")
     smesh.SetName(algoRegE2.GetSubMesh(), "SubMesh Edge 2 of Top Face")
-    
+
     print "-------------------------- compute the mesh"
     mesh.Compute()
 
index 4c2d3675aa55891043393d4f62a7f57c5b76746c..317f1dc40abeab3c51208b0e458c9ef5d725309f 100644 (file)
@@ -1,7 +1,7 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  CEA
-
+#  Copyright (C) 2003-2007  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 along with this library; if 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
-#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
 #  File   : GEOM_usinggeom.py
 #  Author : Damien COQUERET, Open CASCADE
 #  Module : GEOM
-#  $Header$
-
-
+#
+# ! Please, if you edit this example file, update also
+# ! GEOM_SRC/doc/salome/gui/GEOM/input/tui_test_all.doc
+# ! as some sequences of symbols from this example are used during
+# ! documentation generation to identify certain places of this file
+#
 def TestAll (geompy, math):
 
   #Create base Variables
@@ -76,18 +79,20 @@ def TestAll (geompy, math):
   vxyz = geompy.MakeVectorDXDYDZ(100., 100., 100.) #(3 Doubles)->GEOM_Object_ptr
 
   #Create local coordinate systems
-  cs1 = geompy.MakeMarker(50,50,50, 1,0,0, 0,1,0)
-  cs2 = geompy.MakeMarker(70,80,10, 1,0,1, 1,1,0)
+  cs1 = geompy.MakeMarker(50,50,50, 1,0,0, 0,1,0) #(9 Doubles)->GEOM_Object_ptr
+  cs2 = geompy.MakeMarker(70,80,10, 1,0,1, 1,1,0) #(9 Doubles)->GEOM_Object_ptr
+  cs3 = geompy.MakeMarkerPntTwoVec(pz, vxy, vz)   #(3 GEOM_Object_ptr)->GEOM_Object_ptr
 
   #Create base geometry 2D
   Line   = geompy.MakeLineTwoPnt(p0, pxyz)                  #(2 GEOM_Object_ptr)->GEOM_Object_ptr
   Line1  = geompy.MakeLine(pz, vxy)                         #(2 GEOM_Object_ptr)->GEOM_Object_ptr
-  Line2  = geompy.MakeLineTwoPnt(pxyz, pz)                   #(2 GEOM_Object_ptr)->GEOM_Object_ptr
+  Line2  = geompy.MakeLineTwoPnt(pxyz, pz)                  #(2 GEOM_Object_ptr)->GEOM_Object_ptr
   Plane  = geompy.MakePlane(pz, vxyz, trimsize)             #(2 GEOM_Object_ptr, Double)->GEOM_Object_ptr
   Plane1 = geompy.MakePlaneThreePnt(px, pz, p200, trimsize) #(4 Doubles)->GEOM_Object_ptr
 
   Arc      = geompy.MakeArc(py, pz, px)                   #(3 GEOM_Object_ptr)->GEOM_Object_ptr
   Arc2     = geompy.MakeArcCenter(py, pz, px,0)           #(3 GEOM_Object_ptr,Boolean)->GEOM_Object_ptr
+  Arc3     = geompy.MakeArcOfEllipse(p0, px, pz)          #(3 GEOM_Object_ptr,Boolean)->GEOM_Object_ptr
   Circle   = geompy.MakeCircle(p0, vz, radius1)           #(2 GEOM_Object_ptr, Double)->GEOM_Object_ptr
   Circle1  = geompy.MakeCircleThreePnt(p0, pxyz, px)      #(3 GEOM_Object_ptr)->GEOM_Object_ptr
   Circle2  = geompy.MakeCircleCenter2Pnt(p0, pxyz, py)    #(3 GEOM_Object_ptr)->GEOM_Object_ptr
@@ -97,12 +102,16 @@ def TestAll (geompy, math):
   Interpol = geompy.MakeInterpol([px, py, p200, pxyz])    #(List of GEOM_Object_ptr)->GEOM_Object_ptr
   Sketcher = geompy.MakeSketcher("Sketcher:F -100 -100:TT 250 -100:R 0:C 100 150:R 0:L 300:WW",
                                  [100,0,0, 1,1,1, -1,1,0]) #(String, List of Doubles)->GEOM_Object_ptr
+  Sketcher3d = geompy.Make3DSketcher([0,0,0, 50,50,50, 0,50,50, 10,0,0])
 
   #Test point on curve creation
   p_on_arc = geompy.MakeVertexOnCurve(Arc, 0.25) #(GEOM_Object_ptr, Double)->GEOM_Object_ptr
 
   #Test point on lines intersection
-  pLine   = geompy.MakeVertexOnLinesIntersection( Line1, Line2 )
+  p_on_l1l2 = geompy.MakeVertexOnLinesIntersection(Line1, Line2) #(2 GEOM_Object_ptr)->GEOM_Object_ptr
+
+  #Test tangent on curve creation
+  tan_on_arc = geompy.MakeTangentOnCurve(Arc, 0.7) #(GEOM_Object_ptr, Double)->GEOM_Object_ptr
 
   #Create base geometry 3D
   Box      = geompy.MakeBoxTwoPnt(p0, p200)                   #(2 GEOM_Object_ptr)->GEOM_Object_ptr
@@ -131,6 +140,11 @@ def TestAll (geompy, math):
   Face1    = geompy.MakeFaceWires([Wire, Sketcher],
                                   WantPlanarFace)    #(List of GEOM_Object_ptr, Boolean)->GEOM_Object_ptr
   Face2    = geompy.MakeFace(Sketcher, WantPlanarFace)
+  Face3    = geompy.MakeFaceHW (100., 200., 1)       #(2 Doubles, 1 Int)->GEOM_Object_ptr
+  Face4    = geompy.MakeFaceObjHW (vz, 200., 100.)   #(1 GEOM_Object_ptr, 2 Doubles)->GEOM_Object_ptr
+  Disk     = geompy.MakeDiskPntVecR (p0, vz, radius) #(2 GEOM_Object_ptr, 1 Double)->GEOM_Object_ptr
+  Disk2    = geompy.MakeDiskThreePnt(p0, p200, pz)   #(3 GEOM_Object_ptr)->GEOM_Object_ptr
+  Disk3    = geompy.MakeDiskR(100., 1)               #(1 Doubles, 1 Int)->GEOM_Object_ptr
   Shell    = geompy.MakeShell([Face, Face1])         #(List of GEOM_Object_ptr)->GEOM_Object_ptr
 
   Prism1   = geompy.MakePrism(Face2, p0, pxyz)       #(3 GEOM_Object_ptr)->GEOM_Object_ptr
@@ -148,19 +162,24 @@ def TestAll (geompy, math):
         i = i + 1
   Compound = geompy.MakeCompound(ShapeListCompound)  #(List of GEOM_Object_ptr)->GEOM_Object_ptr
 
+  #Test point on surface creation
+  p_on_face = geompy.MakeVertexOnSurface(Face, 0.1, 0.8) #(GEOM_Object_ptr, Double, Double)->GEOM_Object_ptr
+
   # Test plane from existing face creation
   Plane2 = geompy.MakePlaneFace(Face, trimsize)      #(GEOM_Object_ptr, Double)->GEOM_Object_ptr
 
   #ShapeList for Sewing
   S = geompy.MakeRotation(Face, vxy, angle1)
-       
+
   #Test Line on Faces Intersection
-  Line3  = geompy.MakeLineTwoFaces( prism1_faces[0], prism1_faces[1]) #(2 GEOM_Object_ptr)->GEOM_Object_ptr
+  Line3 = geompy.MakeLineTwoFaces(prism1_faces[0], prism1_faces[1]) #(2 GEOM_Object_ptr)->GEOM_Object_ptr
 
   #Create advanced objects
   Copy       = geompy.MakeCopy(Box)                      #(GEOM_Object_ptr)->GEOM_Object_ptr
   Prism      = geompy.MakePrismVecH(Face, vz, 100.0)     #(2 GEOM_Object_ptr, Double)->GEOM_Object_ptr
   Prism2Ways = geompy.MakePrismVecH2Ways(Face, vz, 10.0) #(2 GEOM_Object_ptr, Double)->GEOM_Object_ptr
+  PrismDXDYDZ= geompy.MakePrismDXDYDZ(Face2, 10, 20, 100)#(2 GEOM_Object_ptr, Double)->GEOM_Object_ptr
+  PrismDXDYDZ2Ways= geompy.MakePrismDXDYDZ2Ways(Face, 30, -20, 200)#(2 GEOM_Object_ptr, Double)->GEOM_Object_ptr
   Revolution = geompy.MakeRevolution(Face, vz, angle2)   #
   Revolution2Ways = geompy.MakeRevolution(Face, vz, angle1)   #
   Filling    = geompy.MakeFilling(Compound, mindeg, maxdeg,
@@ -171,14 +190,25 @@ def TestAll (geompy, math):
   #Transform objects
   Translation = geompy.MakeTranslationTwoPoints(Box, px, pz)    #(3 GEOM_Object_ptr)->GEOM_Object_ptr
   TranslVect  = geompy.MakeTranslationVector(Box, vxyz)         #(2 GEOM_Object_ptr)->GEOM_Object_ptr
+  TranslVectD = geompy.MakeTranslationVectorDistance(Box, vxyz, 50.0)   #(2 GEOM_Object_ptr)->GEOM_Object_ptr  
   Rotation    = geompy.MakeRotation(Box, vz, angle1)            #(2 GEOM_Object_ptr, Double)->GEOM_Object_ptr
   RotatPnt    = geompy.MakeRotationThreePoints(Box, px, py, pz) #(4 GEOM_Object_ptr)->GEOM_Object_ptr
-  Scale       = geompy.MakeScaleTransform(Box, p0, factor)      #
-  Mirror      = geompy.MakeMirrorByPlane(Box, Plane)            #(2 GEOM_Object_ptr)->GEOM_Object_ptr
-  MirrorAxis  = geompy.MakeMirrorByAxis(Box, Line1)             #
-  MirrorPnt   = geompy.MakeMirrorByPoint(Box, p200)             #
-  Position    = geompy.MakePosition(Box, cs1, cs2)              #(3 GEOM_Object_ptr)->GEOM_Object_ptr
-  Offset      = geompy.MakeOffset(Box, 10.)                     #(GEOM_Object_ptr, Double)->GEOM_Object_ptr
+
+  #Scale by factor relatively given point
+  Scale1 = geompy.MakeScaleTransform(Box, pxyz, factor)      #(2 GEOM_Object_ptr, Double)->GEOM_Object_ptr
+  #Scale by factor relatively the origin of global CS
+  Scale2 = geompy.MakeScaleTransform(Box, None, factor)      #
+  #Scale along axes of global CS by different factors. Scale relatively given point
+  Scale3 = geompy.MakeScaleAlongAxes(Box, pxyz, 1.5, 0.5, 3) #(2 GEOM_Object_ptr, 3 Doubles)->GEOM_Object_ptr
+  #Scale along axes of global CS by different factors. Scale relatively the origin of global CS
+  Scale4 = geompy.MakeScaleAlongAxes(Box, None, 1.5, 0.5, 3) #
+
+  Mirror      = geompy.MakeMirrorByPlane(Box, Plane) #(2 GEOM_Object_ptr)->GEOM_Object_ptr
+  MirrorAxis  = geompy.MakeMirrorByAxis(Box, Line1)  #
+  MirrorPnt   = geompy.MakeMirrorByPoint(Box, p200)  #
+  Position    = geompy.MakePosition(Box, cs1, cs2)   #(3 GEOM_Object_ptr)->GEOM_Object_ptr
+  Position2   = geompy.PositionAlongPath(Box, Arc, 0.5, 1, 0)  #(2 GEOM_Object_ptr, 1 Double, 2 Bool)->GEOM_Object_ptr
+  Offset      = geompy.MakeOffset(Box, 10.)          #(GEOM_Object_ptr, Double)->GEOM_Object_ptr
   Orientation = geompy.ChangeOrientation(Box)
 
   #IDList for Fillet/Chamfer
@@ -205,6 +235,7 @@ def TestAll (geompy, math):
   IDlist_f = [f_ind_1, f_ind_2]
   
   #Local operations
+  Fillet2d = geompy.MakeFillet2D(Face3, radius, [4, 7, 9]) #(GEOM_Object_ptr, Double, ListOfLong)->GEOM_Object_ptr
   Fillet   = geompy.MakeFillet (Prism, radius, ShapeTypeEdge,
                                 IDlist_e) #(GEOM_Object_ptr, Double, Short, ListOfLong)->GEOM_Object_ptr
   Fillet2  = geompy.MakeFilletR1R2 (Prism, 7., 13., ShapeTypeEdge,
@@ -217,6 +248,8 @@ def TestAll (geompy, math):
                                      IDlist_e) #(GEOM_Object_ptr, 2 Doubles, ListOfLong)->GEOM_Object_ptr
   Chamfer4 = geompy.MakeChamferFacesAD(Prism, d1, 20. * math.pi / 180.,
                                        IDlist_f) #(GEOM_Object_ptr, 2 Doubles, ListOfLong)->GEOM_Object_ptr
+  #End of Local operations
+
   #Create Patterns
   MultiTrans1D = geompy.MakeMultiTranslation1D(Fillet, vz, step1, nbtimes1)
   MultiTrans2D = geompy.MakeMultiTranslation2D(Fillet, vz, step1, nbtimes1, vy, step2, nbtimes2)
@@ -228,6 +261,9 @@ def TestAll (geompy, math):
   CDG        = geompy.MakeCDG(Prism)               #(GEOM_Object_ptr)->GEOM_Object_ptr
   Archimede  = geompy.Archimede(Box, weight, waterdensity,
                                 meshingdeflection) #(GEOM_Object_ptr, 3 Doubles)->GEOM_Object_ptr
+  mindist = geompy.MinDistanceComponents(TranslVect, Mirror) #(2 GEOM_Object_ptr)->4 Doubles
+  print "Minumal distance between TranslVect and Mirror is", mindist[0],
+  print "by components:", mindist[1], ",", mindist[2], ",", mindist[3]
   CheckShape = geompy.CheckShape(Prism)            #(GEOM_Object_ptr)->Boolean
   print "CheckShape(Prism) = ", CheckShape
 
@@ -236,14 +272,12 @@ def TestAll (geompy, math):
   Partition1 = geompy.MakeHalfPartition(Box, Plane) #(2 GEOM_Object_ptr)->GEOM_Object_ptr
 
   #Add In Study
-
   id_p0   = geompy.addToStudy(p0,   "Vertex 0")
   id_px   = geompy.addToStudy(px,   "Vertex X")
   id_py   = geompy.addToStudy(py,   "Vertex Y")
   id_pz   = geompy.addToStudy(pz,   "Vertex Z")
   id_pxyz = geompy.addToStudy(pxyz, "Vertex XYZ")
   id_p200 = geompy.addToStudy(p200, "Vertex 200")
-  id_pLine = geompy.addToStudy(pLine, "Vertex on Lines Intersection")  
 
   id_vx   = geompy.addToStudy(vx,   "Vector X")
   id_vy   = geompy.addToStudy(vy,   "Vector Y")
@@ -253,6 +287,7 @@ def TestAll (geompy, math):
 
   id_cs1 = geompy.addToStudy(cs1, "CS 50,50,50, 1,0,0, 0,1,0")
   id_cs2 = geompy.addToStudy(cs2, "CS 70,80,10, 1,0,1, 1,1,0")
+  id_cs3 = geompy.addToStudy(cs3, "CS: pz, vxy, vz")
 
   id_Line   = geompy.addToStudy(Line,   "Line")
   id_Line1  = geompy.addToStudy(Line1,  "Line by point and vector")
@@ -261,6 +296,8 @@ def TestAll (geompy, math):
   id_Plane1 = geompy.addToStudy(Plane1,  "Plane by 3 points")
 
   id_Arc      = geompy.addToStudy(Arc,      "Arc")
+  id_Arc2     = geompy.addToStudy(Arc2,     "Arc2")
+  id_Arc3     = geompy.addToStudy(Arc3,     "Arc3")
   id_Circle   = geompy.addToStudy(Circle,   "Circle")
   id_Circle1  = geompy.addToStudy(Circle1,  "Circle by 3 points")
   id_Circle2  = geompy.addToStudy(Circle2,  "Circle by center and 2 points")
@@ -269,8 +306,12 @@ def TestAll (geompy, math):
   id_Bezier   = geompy.addToStudy(Bezier,   "Bezier")
   id_Interpol = geompy.addToStudy(Interpol, "Interpol")
   id_Sketcher = geompy.addToStudy(Sketcher, "Sketcher")
+  id_Sketcher3d = geompy.addToStudy(Sketcher3d, "Sketcher 3D")
+
+  id_p_on_arc  = geompy.addToStudy(p_on_arc,  "Vertex on Arc (0.25)")
+  id_p_on_l1l2 = geompy.addToStudy(p_on_l1l2, "Vertex on Lines Intersection")
 
-  id_p_on_arc = geompy.addToStudy(p_on_arc, "Vertex on Arc")
+  id_tan_on_arc = geompy.addToStudy(tan_on_arc, "Tangent on Arc (0.7)")
 
   id_Box      = geompy.addToStudy(Box,      "Box")
   id_Box1     = geompy.addToStudy(Box1,     "Box 10x20x30")
@@ -295,8 +336,15 @@ def TestAll (geompy, math):
   id_Face     = geompy.addToStudy(Face,     "Face")
   id_Face1    = geompy.addToStudy(Face1,    "Face from two wires")
   id_Face2    = geompy.addToStudy(Face2,    "Face from Sketcher")
+  id_Face3    = geompy.addToStudy(Face3,    "Face Height Width")
+  id_Face4    = geompy.addToStudy(Face4,    "Face Plane_HW")
+  id_Disk     = geompy.addToStudy(Disk,     "Disk PntVecR")
+  id_Disk2    = geompy.addToStudy(Disk2,    "Disk Three Points")
+  id_Disk3    = geompy.addToStudy(Disk3,    "Disk OXY Radius")
   id_Shell    = geompy.addToStudy(Shell,    "Shell")
 
+  id_p_on_face = geompy.addToStudy(p_on_face, "Vertex on Face (0.1, 0.8)")
+
   id_Prism1   = geompy.addToStudy(Prism1,     "Prism by Two Pnt")
   id_Shell1   = geompy.addToStudy(Shell1,   "Shell from Prism1 faces")
   id_Solid    = geompy.addToStudy(Solid,    "Solid")
@@ -307,6 +355,8 @@ def TestAll (geompy, math):
   id_Copy       = geompy.addToStudy(Copy,       "Copy")
   id_Prism      = geompy.addToStudy(Prism,      "Prism")
   id_Prism2Ways = geompy.addToStudy(Prism2Ways, "Prism2Ways")
+  id_PrismDXDYDZ= geompy.addToStudy(PrismDXDYDZ,"PrismDXDYDZ")
+  id_PrismDXDYDZ2Ways= geompy.addToStudy(PrismDXDYDZ2Ways,"PrismDXDYDZ2Ways")
   id_Revolution = geompy.addToStudy(Revolution, "Revolution")
   id_Revolution2Ways = geompy.addToStudy(Revolution2Ways, "Revolution2Ways")
   id_Filling    = geompy.addToStudy(Filling,    "Filling")
@@ -315,18 +365,24 @@ def TestAll (geompy, math):
 
   id_Translation = geompy.addToStudy(Translation, "Translation")
   id_TranslVect  = geompy.addToStudy(TranslVect , "Translation along vector")
+  id_TranslVectD = geompy.addToStudy(TranslVectD, "Translation along vector with defined distance")
   id_Rotation    = geompy.addToStudy(Rotation,    "Rotation")
   id_RotatPnt    = geompy.addToStudy(RotatPnt,    "Rotation by three points")
-  id_Scale       = geompy.addToStudy(Scale,       "Scale")
+  id_Scale1      = geompy.addToStudy(Scale1,      "Scale1")
+  id_Scale2      = geompy.addToStudy(Scale2,      "Scale2")
+  id_Scale3      = geompy.addToStudy(Scale3,      "Scale3")
+  id_Scale4      = geompy.addToStudy(Scale4,      "Scale4")
   id_Mirror      = geompy.addToStudy(Mirror,      "Mirror by Plane")
   id_MirrorAxis  = geompy.addToStudy(MirrorAxis,  "Mirror by Axis")
   id_MirrorPnt   = geompy.addToStudy(MirrorPnt,   "Mirror by Point")
   id_Position    = geompy.addToStudy(Position,    "Positioned box")
+  id_Position2   = geompy.addToStudy(Position2,   "Positioned box along path")
   id_Offset      = geompy.addToStudy(Offset,      "Offset")
   id_Orientation = geompy.addToStudy(Orientation, "Orientation")
 
   id_Fillet   = geompy.addToStudy(Fillet,   "Fillet")
   id_Fillet2  = geompy.addToStudy(Fillet2,  "Fillet2")
+  id_Fillet2d = geompy.addToStudy(Fillet2d, "Fillet2D")
 
   id_Chamfer  = geompy.addToStudy(Chamfer,  "Chamfer on Edge")
   id_Chamfer2 = geompy.addToStudy(Chamfer2, "Chamfer on Faces")
@@ -345,20 +401,40 @@ def TestAll (geompy, math):
   id_Partition1 = geompy.addToStudy(Partition1, "Half Partition")
 
   #Decompose objects
+
+  # SubShape
   SubFace    = geompy.SubShape(Box, geompy.ShapeType["FACE"], [2])
   name       = geompy.SubShapeName(SubFace, Box)
   id_SubFace = geompy.addToStudyInFather(Box, SubFace, name)
 
+  # SubShapeSorted
   SubFaceS   = geompy.SubShapeSorted(Box, geompy.ShapeType["FACE"], [5])
   nameS      = geompy.SubShapeName(SubFaceS, Box)
   id_SubFace = geompy.addToStudyInFather(Box, SubFaceS, nameS)
 
+  # SubShapeAll
   SubEdgeList = geompy.SubShapeAll(SubFace, geompy.ShapeType["EDGE"])
   i=0
   for SubEdge in SubEdgeList :
     name = geompy.SubShapeName(SubEdge, SubFace)
     id_SubEdge = geompy.addToStudyInFather(SubFace, SubEdge, name)
 
-  #-------------------
+  # SubShapeAllIDs
+  SubEdgeIDsList = geompy.SubShapeAllIDs(SubFace, geompy.ShapeType["EDGE"])
+  print "IDs of edges of SubFace:", SubEdgeIDsList, "(unsorted)"
+  group = geompy.CreateGroup(SubFace, geompy.ShapeType["EDGE"])
+  geompy.UnionIDs(group, SubEdgeIDsList)
+  geompy.addToStudyInFather(SubFace, group, "Group of all edges")
+
+  # SubShapeAllSortedIDs
+  SubEdgeIDsList = geompy.SubShapeAllSortedIDs(SubFace, geompy.ShapeType["EDGE"])
+  print "IDs of edges of SubFace:", SubEdgeIDsList, "(sorted)"
+
+  # GetSubShape and GetSubShapeID
+  for ind in SubEdgeIDsList:
+    edge = geompy.GetSubShape(SubFace, [ind])
+    ind_e = geompy.GetSubShapeID(SubFace, edge)
+    if ind_e != ind:
+      print "Error in GetSubShape or GetSubShapeID"
 
   print "DONE"
index 1ae6078c98eaa97d1db8ae41f05ac325a6c8f60e..b5f4d688abd88e6d161859ff80860cbad21a3261 100644 (file)
@@ -1,6 +1,7 @@
-#  GEOM GEOM_SWIG : binding of C++ implementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  CEA
+#  Copyright (C) 2003-2007  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 along with this library; if 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
-#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+#  GEOM GEOM_SWIG : binding of C++ implementaion with Python
 #  File   : GEOM_TestHealing.py
 #  Author : Julia DOROVSKIKH
 #  Module : GEOM
 #  $Header$
-
+#
 def TestProcessShape (geompy):
 
   ##Load shape from BREP file
index d552abf06bbd65181a39bf9619f0058a2d93a22c..08d341090085406aa348dd18934c54c64d171fff 100644 (file)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
@@ -15,7 +17,7 @@
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 def TestMeasureOperations (geompy, math):
 
@@ -152,6 +154,13 @@ def TestMeasureOperations (geompy, math):
   if math.fabs(Angle - 45.0) > 1e-05:
     print "  Error: returned angle is", Angle, "while must be 45.0"
 
+  Angle = geompy.GetAngleRadians(OX, OXY)
+
+  print "\nAngle between OX and OXY in radians = ", Angle
+  if math.fabs(Angle - math.pi/4) > 1e-05:
+    print "  Error: returned angle is", Angle, "while must be pi/4"
+    pass
+
   # not in one plane
   OXY_shift = geompy.MakeTranslation(OXY,10,-10,20)
   Angle = geompy.GetAngle(OX, OXY_shift)
index 3bf25cf7527c8c30f4ef368ce67c676af98e490e..76d4e2811e3df5bed2a1a60cea39a91f7e6691c2 100644 (file)
@@ -1,6 +1,7 @@
-#  GEOM GEOM_SWIG : binding of C++ implementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  CEA
+#  Copyright (C) 2003-2007  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 along with this library; if 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
-#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+#  GEOM GEOM_SWIG : binding of C++ implementaion with Python
 #  File   : GEOM_TestOthers.py
 #  Author : Julia DOROVSKIKH
 #  Module : GEOM
 #  $Header$
-
+# ! Please, if you edit this example file, update also
+# ! GEOM_SRC/doc/salome/gui/GEOM/input/tui_test_others.doc
+# ! as some sequences of symbols from this example are used during
+# ! documentation generation to identify certain places of this file
+#
 import os
 
 def TestExportImport (geompy, shape):
@@ -94,7 +99,11 @@ def TestExportImport (geompy, shape):
 
 def TestOtherOperations (geompy, math):
 
-  # MakeFaces
+  # prepare data for further operations
+  vx = geompy.MakeVectorDXDYDZ( 1,  0,  0)
+  vy = geompy.MakeVectorDXDYDZ( 0,  1,  0)
+  vz = geompy.MakeVectorDXDYDZ( 0,  0,  1)
+
   p11 = geompy.MakeVertex( 0,  0, 0)
   p12 = geompy.MakeVertex(30,  0, 0)
   p13 = geompy.MakeVertex(30, 30, 0)
@@ -123,6 +132,7 @@ def TestOtherOperations (geompy, math):
   id_w2 = geompy.addToStudy(w2, "Inside Wire")
   id_w3 = geompy.addToStudy(w3, "Inside Wire, translated along OZ")
 
+  # MakeFaces
   f12 = geompy.MakeFaces([w1, w2], 0)
   id_f12 = geompy.addToStudy(f12, "MakeFaces WO + WI")
 
@@ -232,6 +242,10 @@ def TestOtherOperations (geompy, math):
   else:
     print "The Box is VALID"
 
+  # GetSame
+  Cone_ss = geompy.GetSame(Compound1, Cone)
+  id_Cone_ss = geompy.addToStudyInFather(Compound1, Cone_ss, "Cone subshape")
+
   # test geometrical groups
 
   # CreateGroup
@@ -269,6 +283,7 @@ def TestOtherOperations (geompy, math):
   for ObjectID in GetObjectIDs:
     print " ", ObjectID
 
+  # GetMainShape
   BoxCopy = geompy.GetMainShape(CreateGroup)
 
   # DifferenceIDs
@@ -289,7 +304,8 @@ def TestOtherOperations (geompy, math):
   # -----------------------------------------------------------------------------
   # enumeration ShapeTypeString as a dictionary
   # -----------------------------------------------------------------------------
-  ShapeTypeString = {'0':"COMPOUND", '1':"COMPSOLID", '2':"SOLID", '3':"SHELL", '4':"FACE", '5':"WIRE", '6':"EDGE", '7':"VERTEX", '8':"SHAPE"}
+  ShapeTypeString = {'0':"COMPOUND", '1':"COMPSOLID", '2':"SOLID", '3':"SHELL",
+                     '4':"FACE", '5':"WIRE", '6':"EDGE", '7':"VERTEX", '8':"SHAPE"}
 
   GroupType = geompy.GetType(CreateGroup)
   print "Type of elements of the created group is ", ShapeTypeString[`GroupType`]
@@ -303,66 +319,67 @@ def TestOtherOperations (geompy, math):
   id_s0 = geompy.addToStudy(s0, "s0")
 
   v_0pp = geompy.MakeVectorDXDYDZ( 0,  1,  1)
-  v_0np = geompy.MakeVectorDXDYDZ( 0, -1,  1)
-  v_p0p = geompy.MakeVectorDXDYDZ( 1,  0,  1)
-  v_n0p = geompy.MakeVectorDXDYDZ(-1,  0,  1)
-  v_pp0 = geompy.MakeVectorDXDYDZ( 1,  1,  0)
-  v_np0 = geompy.MakeVectorDXDYDZ(-1,  1,  0)
+  #v_0np = geompy.MakeVectorDXDYDZ( 0, -1,  1)
+  #v_p0p = geompy.MakeVectorDXDYDZ( 1,  0,  1)
+  #v_n0p = geompy.MakeVectorDXDYDZ(-1,  0,  1)
+  #v_pp0 = geompy.MakeVectorDXDYDZ( 1,  1,  0)
+  #v_np0 = geompy.MakeVectorDXDYDZ(-1,  1,  0)
   v_0n0 = geompy.MakeVectorDXDYDZ( 0, -1,  0)
 
-  pln_0pp = geompy.MakePlane(p0, v_0pp, 300)
-  pln_0np = geompy.MakePlane(p0, v_0np, 300)
-  pln_p0p = geompy.MakePlane(p0, v_p0p, 300)
-  pln_n0p = geompy.MakePlane(p0, v_n0p, 300)
-  pln_pp0 = geompy.MakePlane(p0, v_pp0, 300)
-  pln_np0 = geompy.MakePlane(p0, v_np0, 300)
-
-  #part_tool_1 = geompy.MakePartition([b0, pln_0pp, pln_0np, pln_p0p, pln_n0p, pln_pp0, pln_np0],
-  #                                   [],
-  #                                   [],
-  #                                   [b0])
-  part_tool_1 = geompy.MakePartition([b0, pln_0pp, pln_0np, pln_p0p, pln_n0p, pln_pp0, pln_np0])
-
-  id_part_tool_1 = geompy.addToStudy(part_tool_1, "part_tool_1")
-
-  pt_pnt_1  = geompy.MakeVertex( 55,   0,  55)
-  pt_pnt_2  = geompy.MakeVertex(  0,  55,  55)
-  pt_pnt_3  = geompy.MakeVertex(-55,   0,  55)
-  pt_pnt_4  = geompy.MakeVertex(  0, -55,  55)
-  pt_pnt_5  = geompy.MakeVertex( 55,  55,   0)
-  pt_pnt_6  = geompy.MakeVertex( 55, -55,   0)
-  pt_pnt_7  = geompy.MakeVertex(-55,  55,   0)
-  pt_pnt_8  = geompy.MakeVertex(-55, -55,   0)
-  pt_pnt_9  = geompy.MakeVertex( 55,   0, -55)
-  pt_pnt_10 = geompy.MakeVertex(  0,  55, -55)
-  pt_pnt_11 = geompy.MakeVertex(-55,   0, -55)
-  pt_pnt_12 = geompy.MakeVertex(  0, -55, -55)
-
-  pt_face_1  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_1)
-  pt_face_2  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_2)
-  pt_face_3  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_3)
-  pt_face_4  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_4)
-  pt_face_5  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_5)
-  pt_face_6  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_6)
-  pt_face_7  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_7)
-  pt_face_8  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_8)
-  pt_face_9  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_9)
-  pt_face_10 = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_10)
-  pt_face_11 = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_11)
-  pt_face_12 = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_12)
-
+  #pln_0pp = geompy.MakePlane(p0, v_0pp, 300)
+  #pln_0np = geompy.MakePlane(p0, v_0np, 300)
+  #pln_p0p = geompy.MakePlane(p0, v_p0p, 300)
+  #pln_n0p = geompy.MakePlane(p0, v_n0p, 300)
+  #pln_pp0 = geompy.MakePlane(p0, v_pp0, 300)
+  #pln_np0 = geompy.MakePlane(p0, v_np0, 300)
+  #
+  #part_objs = [b0, pln_0pp, pln_0np, pln_p0p, pln_n0p, pln_pp0, pln_np0]
+  #part_tool_1 = geompy.MakePartition(part_objs, [], [], [b0])
+  #part_tool_1 = geompy.MakePartition(part_objs)
+  #
+  #id_part_tool_1 = geompy.addToStudy(part_tool_1, "part_tool_1")
+  #
+  #pt_pnt_1  = geompy.MakeVertex( 55,   0,  55)
+  #pt_pnt_2  = geompy.MakeVertex(  0,  55,  55)
+  #pt_pnt_3  = geompy.MakeVertex(-55,   0,  55)
+  #pt_pnt_4  = geompy.MakeVertex(  0, -55,  55)
+  #pt_pnt_5  = geompy.MakeVertex( 55,  55,   0)
+  #pt_pnt_6  = geompy.MakeVertex( 55, -55,   0)
+  #pt_pnt_7  = geompy.MakeVertex(-55,  55,   0)
+  #pt_pnt_8  = geompy.MakeVertex(-55, -55,   0)
+  #pt_pnt_9  = geompy.MakeVertex( 55,   0, -55)
+  #pt_pnt_10 = geompy.MakeVertex(  0,  55, -55)
+  #pt_pnt_11 = geompy.MakeVertex(-55,   0, -55)
+  #pt_pnt_12 = geompy.MakeVertex(  0, -55, -55)
+  #
+  #pt_face_1  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_1)
+  #pt_face_2  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_2)
+  #pt_face_3  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_3)
+  #pt_face_4  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_4)
+  #pt_face_5  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_5)
+  #pt_face_6  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_6)
+  #pt_face_7  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_7)
+  #pt_face_8  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_8)
+  #pt_face_9  = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_9)
+  #pt_face_10 = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_10)
+  #pt_face_11 = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_11)
+  #pt_face_12 = geompy.GetFaceNearPoint(part_tool_1, pt_pnt_12)
+  #
   #pt_box = geompy.GetBlockNearPoint(part_tool_1, p0)
-
-  #part_tool = geompy.MakeCompound([pt_face_1, pt_face_4, pt_face_7, pt_face_10,
-  #                                 pt_face_2, pt_face_5, pt_face_8, pt_face_11,
-  #                                 #pt_face_3, pt_face_6, pt_face_9, pt_face_12, pt_box])
-  #                                 pt_face_3, pt_face_6, pt_face_9, pt_face_12)
+  #
+  #comp_parts = [pt_face_1, pt_face_4, pt_face_7, pt_face_10,
+  #              pt_face_2, pt_face_5, pt_face_8, pt_face_11,
+  #              #pt_face_3, pt_face_6, pt_face_9, pt_face_12, pt_box]
+  #              pt_face_3, pt_face_6, pt_face_9, pt_face_12]
+  #part_tool = geompy.MakeCompound(comp_parts)
   #id_part_tool = geompy.addToStudy(part_tool, "part_tool")
-
+  #
   #part = geompy.MakePartition([s0], [part_tool])
-  #part = geompy.MakePartition([s0], [ pt_face_1, pt_face_4, pt_face_7, pt_face_10,
-  #                                    pt_face_2, pt_face_5, pt_face_8, pt_face_11,
-  #                                    pt_face_3, pt_face_6, pt_face_9, pt_face_12, b0] )
+  #
+  #part_tools = [pt_face_1, pt_face_4, pt_face_7, pt_face_10,
+  #              pt_face_2, pt_face_5, pt_face_8, pt_face_11,
+  #              pt_face_3, pt_face_6, pt_face_9, pt_face_12, b0]
+  #part = geompy.MakePartition([s0], part_tools)
 
   p1 = geompy.MakeVertex(50, 0, 0)
   p2 = geompy.MakeVertex(-50, 0, 0)
@@ -371,10 +388,6 @@ def TestOtherOperations (geompy, math):
   p5 = geompy.MakeVertex(0, 0, 50)
   p6 = geompy.MakeVertex(0, 0, -50)
 
-  vx = geompy.MakeVectorDXDYDZ( 1,  0,  0)
-  vy = geompy.MakeVectorDXDYDZ( 0,  1,  0)
-  vz = geompy.MakeVectorDXDYDZ( 0,  0,  1)
-
   plnX1 = geompy.MakePlane(p1, vx, 300)
   plnX2 = geompy.MakePlane(p2, vx, 300)
   plnY1 = geompy.MakePlane(p3, vy, 300)
@@ -403,7 +416,8 @@ def TestOtherOperations (geompy, math):
   geompy.addToStudy(freeFacesWithoutExtra, "freeFacesWithoutExtra")
 
   # GetSharedShapes
-  sharedFaces = geompy.GetSharedShapes(part, freeFacesWithoutExtra, geompy.ShapeType["FACE"])
+  sharedFaces = geompy.GetSharedShapes(part, freeFacesWithoutExtra,
+                                       geompy.ShapeType["FACE"])
 
   for shFace in sharedFaces:
     geompy.addToStudy(shFace, "sharedFace")
@@ -465,12 +479,13 @@ def TestOtherOperations (geompy, math):
     geompy.addToStudy(edge_i, "Edge on Plane (N = (0, -1, 0) & Location = (0, -50, 0)")
     
   # GetShapesOnPlaneWithLocationIDs
-  edges_on_pln_ids = geompy.GetShapesOnPlaneWithLocationIDs(blocksComp, geompy.ShapeType["EDGE"],
-                                                            v_0n0, Loc, geompy.GEOM.ST_ON)
+  edges_on_pln_ids = geompy.GetShapesOnPlaneWithLocationIDs(
+           blocksComp, geompy.ShapeType["EDGE"], v_0n0, Loc, geompy.GEOM.ST_ON)
   group_edges_on_pln = geompy.CreateGroup(blocksComp, geompy.ShapeType["EDGE"])
   geompy.UnionIDs(group_edges_on_pln, edges_on_pln_ids)
-  geompy.addToStudy(group_edges_on_pln, "Group of edges on Plane (N = (0, -1, 0) & Location = (0, -50, 0))")
-  
+  grname = "Group of edges on Plane (N = (0, -1, 0) & Location = (0, -50, 0))"
+  geompy.addToStudy(group_edges_on_pln, grname)
+
   # GetShapesOnCylinder
   edges_out_cyl = geompy.GetShapesOnCylinder(blocksComp, geompy.ShapeType["EDGE"],
                                              vy, 55, geompy.GEOM.ST_OUT)
@@ -489,7 +504,6 @@ def TestOtherOperations (geompy, math):
                                              p0, 100, geompy.GEOM.ST_ON)
   for vertex_i in vertices_on_sph:
     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"],
@@ -513,13 +527,12 @@ def TestOtherOperations (geompy, math):
   quadrangle = geompy.MakeWire([qe1, qe2, qe3, qe4])
   geompy.addToStudy(quadrangle, "Quadrangle")
 
-  edges_onin_quad = geompy.GetShapesOnQuadrangle( f12, geompy.ShapeType["EDGE"],
-                                                  tl, tr, bl, br, geompy.GEOM.ST_ONIN)
+  edges_onin_quad = geompy.GetShapesOnQuadrangle(f12, geompy.ShapeType["EDGE"],
+                                                 tl, tr, bl, br, geompy.GEOM.ST_ONIN)
   comp = geompy.MakeCompound(edges_onin_quad)
   geompy.addToStudy(comp, "Edges of F12 ONIN Quadrangle")
   if len( edges_onin_quad ) != 4:
     print "Error in GetShapesOnQuadrangle()"
-    pass
 
   # GetShapesOnQuadrangleIDs
   vertices_on_quad_ids = geompy.GetShapesOnQuadrangleIDs(f12, geompy.ShapeType["VERTEX"],
@@ -528,6 +541,55 @@ def TestOtherOperations (geompy, math):
   geompy.UnionIDs(vertices_on_quad, vertices_on_quad_ids)
   geompy.addToStudy(vertices_on_quad, "Group of vertices on Quadrangle F12")
 
+  # GetShapesOnBox
+  edges_on_box = geompy.GetShapesOnBox(b0, part, geompy.ShapeType["EDGE"],
+                                       geompy.GEOM.ST_ON)
+  comp = geompy.MakeCompound(edges_on_box)
+  geompy.addToStudy(comp, "Edges of part ON box b0")
+  if len( edges_on_box ) != 12:
+    print "Error in GetShapesOnBox()"
+
+  # GetShapesOnBoxIDs
+  faces_on_box_ids = geompy.GetShapesOnBoxIDs(b0, part, geompy.ShapeType["FACE"],
+                                              geompy.GEOM.ST_ON)
+  faces_on_box = geompy.CreateGroup(part, geompy.ShapeType["FACE"])
+  geompy.UnionIDs(faces_on_box, faces_on_box_ids)
+  geompy.addToStudyInFather(part, faces_on_box, "Group of faces on box b0")
+
+  # Prepare arguments for GetShapesOnShape
+  sph1 = geompy.MakeSphere(50, 50,  50, 40)
+  sph2 = geompy.MakeSphere(50, 50, -50, 40)
+  pcyl = geompy.MakeVertex(50, 50, -50)
+  cyli = geompy.MakeCylinder(pcyl, vz, 40, 100)
+  fuse = geompy.MakeFuse(sph1, cyli)
+  fuse = geompy.MakeFuse(fuse, sph2)
+  # As after Fuse we have a compound, we need to obtain a solid from it
+  shsh = geompy.SubShapeAll(fuse, geompy.ShapeType["SOLID"])
+  sh_1 = shsh[0]
+  geompy.addToStudy(sh_1, "sh_1")
+
+  # GetShapesOnShape
+  faces_in_sh = geompy.GetShapesOnShape(sh_1, part, geompy.ShapeType["FACE"],
+                                        geompy.GEOM.ST_IN)
+  comp = geompy.MakeCompound(faces_in_sh)
+  geompy.addToStudy(comp, "Faces of part IN shape sh_1")
+  if len(faces_in_sh) != 11:
+    print "Error in GetShapesOnShape()"
+
+  # GetShapesOnShapeAsCompound
+  faces_in_sh_c = geompy.GetShapesOnShapeAsCompound(sh_1, part, geompy.ShapeType["FACE"],
+                                                    geompy.GEOM.ST_IN)
+  geompy.addToStudy(faces_in_sh_c, "Faces of part IN shape sh_1 (as compound)")
+
+  # GetShapesOnShapeIDs
+  edges_in_sh_ids = geompy.GetShapesOnShapeIDs(sh_1, part, geompy.ShapeType["EDGE"],
+                                               geompy.GEOM.ST_IN)
+  edges_in_sh = geompy.CreateGroup(part, geompy.ShapeType["EDGE"])
+  geompy.UnionIDs(edges_in_sh, edges_in_sh_ids)
+  geompy.addToStudyInFather(part, edges_in_sh, "Group of edges in shape sh_1")
+  if len(edges_in_sh_ids) != 15:
+    print "Error in GetShapesOnShapeIDs()"
+
   # Prepare arguments for GetInPlace and GetInPlaceByHistory
   box5 = geompy.MakeBoxDXDYDZ(100, 100, 100)
   box6 = geompy.MakeTranslation(box5, 50, 50, 0)
@@ -541,15 +603,9 @@ def TestOtherOperations (geompy, math):
   box5_faces = geompy.SubShapeAll(box5, geompy.ShapeType["FACE"])
   box6_faces = geompy.SubShapeAll(box6, geompy.ShapeType["FACE"])
 
-  ifa = 1
-  for aface in box5_faces:
-    geompy.addToStudyInFather(box5, aface, "Face" + `ifa`)
-    ifa = ifa + 1
-
-  ifa = 1
-  for aface in box6_faces:
-    geompy.addToStudyInFather(box6, aface, "Face" + `ifa`)
-    ifa = ifa + 1
+  for ifa in range(6):
+    geompy.addToStudyInFather(box5, box5_faces[ifa], "Face" + `ifa + 1`)
+    geompy.addToStudyInFather(box6, box6_faces[ifa], "Face" + `ifa + 1`)
 
   # GetInPlace(theShapeWhere, theShapeWhat)
   ibb = 5
@@ -557,19 +613,17 @@ def TestOtherOperations (geompy, math):
   for afaces in faces_list:
     ifa = 1
     for aface in afaces:
+      refl_box_face = geompy.GetInPlace(part, aface)
       if ibb == 6 and (ifa == 2 or ifa == 4):
-        # use IDL interface directly to avoid error message appearence in Python console
-        refl_box_face = geompy.ShapesOp.GetInPlace(part, aface)
+        # For two faces of the tool box
+        # there is no reflection in the result.
         if refl_box_face is not None:
-          geompy.addToStudyInFather(part, refl_box_face,
-                                    "Reflection of face " + `ifa` + " of box " + `ibb`)
-          error = "Result of GetInPlace must be NULL for face " + `ifa` + " of box " + `ibb`
+          error = "Result of GetInPlace must be NULL for face "
+          error += `ifa` + " of box " + `ibb`
           raise RuntimeError, error
       else:
-        # use geompy interface
-        refl_box_face = geompy.GetInPlace(part, aface)
-        geompy.addToStudyInFather(part, refl_box_face,
-                                  "Reflection of face " + `ifa` + " of box " + `ibb`)
+        ssname = "Reflection of face " + `ifa` + " of box " + `ibb`
+        geompy.addToStudyInFather(part, refl_box_face, ssname)
       ifa = ifa + 1
     ibb = ibb + 1
 
@@ -582,18 +636,20 @@ def TestOtherOperations (geompy, math):
   for afaces in faces_list:
     ifa = 1
     for aface in afaces:
+      ssname = "Reflection of face " + `ifa` + " of box " + `ibb` + " (by history)"
       if ibb == 6 and (ifa == 2 or ifa == 4):
         # use IDL interface directly to avoid error message appearence in Python console
         refl_box_face = geompy.ShapesOp.GetInPlaceByHistory(part, aface)
         if refl_box_face is not None:
-          geompy.addToStudyInFather(part, refl_box_face,
-                                    "Reflection of face " + `ifa` + " of box " + `ibb` + " (by history)")
-          error = "Result of GetInPlaceByHistory must be NULL for face " + `ifa` + " of box " + `ibb`
+          geompy.addToStudyInFather(part, refl_box_face, ssname)
+          error = "Result of GetInPlaceByHistory must be NULL for face "
+          error += `ifa` + " of box " + `ibb`
           raise RuntimeError, error
       else:
         # use geompy interface
         refl_box_face = geompy.GetInPlaceByHistory(part, aface)
-        geompy.addToStudyInFather(part, refl_box_face,
-                                  "Reflection of face " + `ifa` + " of box " + `ibb` + " (by history)")
+        geompy.addToStudyInFather(part, refl_box_face, ssname)
       ifa = ifa + 1
     ibb = ibb + 1
+
+#END
index 6155e297106baea8760f45f0009392f1181dd602..99be53789540e81a200f607b10dcc1693effe9ba 100644 (file)
@@ -1,6 +1,7 @@
-#  GEOM GEOM_SWIG : binding of C++ implementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  CEA
+#  Copyright (C) 2003-2007  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 along with this library; if 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
-#
-#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+#  GEOM GEOM_SWIG : binding of C++ implementaion with Python
 #  File   : GEOM_blocks.py
 #  Author : Julia DOROVSKIKH
 #  Module : GEOM
 #  $Header$
-
+#
 import salome
 import geompy
 import math
index fd979913d6d3e23bed69c5bd5d1bf7094580e135..7a28cfe4b8408e6a699aaae1b7a0070c9a1bcc10 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
@@ -15,7 +17,7 @@
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #==============================================================================
 #  Info.
 #  Author                   : Kovaltchuk Alexey
 #  Project                  : PAL/SALOME
 #==============================================================================
-
 # Import
 # ------
-
+#
 import salome
 import geompy
 geomgui = salome.ImportComponentGUI("GEOM") 
index 1214194962858277a0d2ad4d55920ec01debe76a..d5f2463a2ab808a66fd6740071ed33b66960ee26 100644 (file)
@@ -1,31 +1,30 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY 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_example.py
 #  Author : Paul RASCLE, EDF
 #  Module : GEOM
 #  $Header$
-
+#
 import salome
 import geompy
 
index 5b57a7078e2dcf52ddb0f1a0fb225a685ea6e848..0006232959767604f502779960ccc605d80f0549 100644 (file)
@@ -1,31 +1,30 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY 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_example2.py
 #  Author : Paul RASCLE, EDF
 #  Module : GEOM
 #  $Header$
-
+#
 import salome
 import geompy
 import math
index 4e0dbd1bcbf3c78850c4d46a4e8f288180b5b5f0..3c5bd049861f853eec4a5ec910d439b4a3a572b5 100644 (file)
@@ -1,31 +1,30 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY 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_example3.py
 #  Author : Paul RASCLE, EDF
 #  Module : GEOM
 #  $Header$
-
+#
 import salome
 import geompy
 import math
index cc8d82941b78f8478d77ed4600c3ac7040993ea6..4406bd81d82a1b4902036567cc63320b7d5cea1b 100755 (executable)
@@ -1,31 +1,30 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY 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_example4.py
 #  Module : GEOM
-
 #import SMESH
 #import smeshpy
+#
 import salome
 from salome import sg
 import math
index 035d9a9568650d9e5cc35ce09b5abf1e035c3df5..9edda83e1dd99509f98e71ed36008048627f2987 100644 (file)
@@ -1,31 +1,30 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY 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_example5.py
 #  Author : Damien COQUERET, Open CASCADE
 #  Module : GEOM
 #  $Header$
-
+#
 import salome
 import geompy
 
index 91c3739810525338a1a6ef10fe2e7463b19efd75..904d4b897a15480245219537e1ed9ac43e756298 100755 (executable)
@@ -1,30 +1,30 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
 #  GEOM GEOM_SWIG : binding of C++ omplementaion with Python\r
-#\r
-#  Copyright (C) 2003  CEA\r
-#\r
-#  This library is free software; you can redistribute it and/or\r
-#  modify it under the terms of the GNU Lesser General Public\r
-#  License as published by the Free Software Foundation; either\r
-#  version 2.1 of the License.\r
-#\r
-#  This library is distributed in the hope that it will be useful,\r
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
-#  Lesser General Public License for more details.\r
-#\r
-#  You should have received a copy of the GNU Lesser General Public\r
-#  License along with this library; if not, write to the Free Software\r
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA\r
-#\r
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com\r
-#\r
-#\r
 #  File   : GEOM_example6.py\r
 #  Author : Dmitry MATVEITCHEV\r
 #  Module : GEOM\r
 #  $Header$\r
-\r
-\r
+#
 import salome\r
 import geompy\r
 \r
index 23ad1aeda1b7d2e68c143e94588fffccd56b2cdf..22a6bd88c31cbcd8859877390eec7c948f36b9db 100644 (file)
@@ -1,6 +1,6 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
-#
-#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
 #  File   : GEOM_moteur.py
 #  Author : Damien COQUERET, Open CASCADE
 #  Module : GEOM
 #  $Header$
-
+#
 import salome
 import geompy
 import math
index 1c05517c45e36d85052b760b3b1ff8977204f351..2bd68bcb2a7d0f48ce07b234886af7f28c78a353 100644 (file)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
@@ -15,7 +17,7 @@
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 """
 
index b3c1daffd235356b719839455853ab73b5484fbf..5ea17620654fc9e7503609da2815095180b6978e 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
@@ -15,7 +17,7 @@
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #==============================================================================
 #  Info.
 #  Author                   : Kovaltchuk Alexey
 #  Project                  : PAL/SALOME
 #==============================================================================
-
 # Imports
 # -------
-
+#
 import salome
 import SALOMEDS
 
index c3034ffaf385f31b3a59d70fe3769bd236052f63..1e2d91689262c763a25899ea23fb1410972e5029 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
@@ -15,7 +17,7 @@
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #==============================================================================
 #  Info.
@@ -24,7 +26,6 @@
 #  Author                   : Kovaltchuk Alexey
 #  Project                  : PAL/SALOME
 #==============================================================================
-#
 # Geometrie du cas test
 #
 import salome
index 9c1f2ce019bd9df1716d904cf9909cbfa5f575c1..6cc90f3c0edb13276bce6d05fbb6a2f07d1d363d 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
@@ -15,7 +17,7 @@
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #==============================================================================
 #  Info.
 #  Author                   : Kovaltchuk Alexey
 #  Project                  : PAL/SALOME
 #==============================================================================
-#
 # Geometrie du cas test
 #
-
 from geompy import *
 import salome
 #
index b49d22d11eba89b82dd28cc008c33e1695695711..14d98ed37bd990969aefc8b0a8eac6216eb85396 100644 (file)
@@ -1,6 +1,6 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
-#
-#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
 #  File   : GEOM_usinggeom.py
 #  Author : Damien COQUERET, Open CASCADE
 #  Module : GEOM
 #  $Header$
-
+#
 import geompy
 import math
 
index 040d500ce75578ceb7db88f7163306b944e8920c..3b7c921fbd306688538101c754ca0c9202f6c4ae 100644 (file)
@@ -1,6 +1,6 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2003-2007  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
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-#
-#
+#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
 #  File   : Makefile.in
 #  Author : Nicolas REJNERI, Paul RASCLE
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
-#  $Header$
 
 
 # Libraries targets
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-
-EXPORT_SHAREDPYSCRIPTS=\
-       GEOM_shared_modules.py
-
-#
 # ===============================================================
 # Files to be installed
 # ===============================================================
 #
 
 # Scripts to be installed.
-dist_salomescript_DATA= \
-       geompy.py \
-       geompyDC.py \
-       batchmode_geompy.py \
-       GEOM_Spanner.py \
-       GEOM_blocks.py \
-       GEOM_example.py \
-       GEOM_example2.py \
-       GEOM_example3.py \
-       GEOM_example4.py \
-       GEOM_example5.py \
-       GEOM_example6.py \
-       GEOM_moteur.py \
-       GEOM_TestAll.py  \
-       GEOM_TestOthers.py \
-       GEOM_TestHealing.py \
-       GEOM_TestMeasures.py \
-       GEOM_usinggeom.py  \
-       GEOM_Partition1.py \
-       GEOM_Partition2.py \
-       GEOM_Partition3.py \
-       GEOM_Partition4.py \
-       GEOM_Partition5.py \
-       GEOM_cyl2complementary.py \
-       GEOM_shellSolid.py \
-       GEOM_tube_geom.py \
-       GEOM_tube_geom_gg2.py \
-       GEOM_Nut.py \
-       GEOM_Sketcher.py \
-       PAL_MESH_019_020_geometry.py \
-       PAL_MESH_028_geometry.py \
-       PAL_MESH_030_geometry.py \
-       PAL_MESH_033_geometry.py \
+dist_salomescript_DATA =               \
+       geompy.py                       \
+       geompyDC.py                     \
+       batchmode_geompy.py             \
+       GEOM_Spanner.py                 \
+       GEOM_blocks.py                  \
+       GEOM_example.py                 \
+       GEOM_example2.py                \
+       GEOM_example3.py                \
+       GEOM_example4.py                \
+       GEOM_example5.py                \
+       GEOM_example6.py                \
+       GEOM_moteur.py                  \
+       GEOM_TestAll.py                 \
+       GEOM_TestOthers.py              \
+       GEOM_TestHealing.py             \
+       GEOM_TestMeasures.py            \
+       GEOM_usinggeom.py               \
+       GEOM_Partition1.py              \
+       GEOM_Partition2.py              \
+       GEOM_Partition3.py              \
+       GEOM_Partition4.py              \
+       GEOM_Partition5.py              \
+       GEOM_cyl2complementary.py       \
+       GEOM_shellSolid.py              \
+       GEOM_tube_geom.py               \
+       GEOM_tube_geom_gg2.py           \
+       GEOM_Nut.py                     \
+       GEOM_Sketcher.py                \
+       GEOM_ObjectInfo.py              \
+       PAL_MESH_019_020_geometry.py    \
+       PAL_MESH_028_geometry.py        \
+       PAL_MESH_030_geometry.py        \
+       PAL_MESH_033_geometry.py        \
        PAL_MESH_035_geometry.py
 
-sharedpkgpython_PYTHON = \
+sharedpkgpython_PYTHON =               \
        GEOM_shared_modules.py
index 46b7ecabf2dc8d41fb44e2e3a14c5829fabd8956..e2e5667d4a707f887edc3e790be791bc957ccc7d 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #####################################################################################
 #Created                :17/02/2005
 #Auhtor                 :KOVALTCHUK Alexey 
 #GUI test scenario      :PAL-MESH-019 (geometry part), PAL-MESH-020 (geometry part)
 #####################################################################################
-
+#
 import geompy
 import salome
 
index 6063695c309b2e7ebb299dffde91a0a654cdaaf7..0c52a7e9427cf5310aa520c255f01e0eac2ed6ee 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #####################################################################
 #Created                :17/02/2005
 #Auhtor                 :KOVALTCHUK Alexey 
 #GUI test scenario      :PAL-MESH-028 (geometry part)
 #####################################################################
-
+#
 import geompy
 import salome
 import os
index de0c447fea23e1afb79597f2f14c43aecadd69b8..e8503a4894c91e992424f122cc49fac5755b1b67 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #==============================================================================
 #  Created              : 17/02/2005
 #  Author               : Alexander KOVALEV
 #  GUI test scenario    : PAL-MESH-030_geometry
 #============================================================================== 
-
+#
 import salome
 import geompy
 
index e4c4e35414f3431d75ecad2289593f84024bfc0e..06f3dfeb5a3edadf5fbc3cf60c9c9413f8865a23 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #####################################################################
 #Created                :17/02/2005
 #Auhtor                 :KOVALTCHUK Alexey 
 #GUI test scenario      :PAL-MESH-033 (geometry part)
 #####################################################################
-
+#
 import geompy
 import salome
 
index d79f21c9a59d06f37f1514bc53a65b31cd903d1e..615d41bad4e5c4678145e0891665cf2112294d00 100755 (executable)
@@ -1,4 +1,6 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #####################################################################
 #Created                :15/02/2005
 #Auhtor                 :KOVALTCHUK Alexey 
 #GUI test scenario      :PAL-MESH-035 (geometry part)
 #####################################################################
-
+#
 import geompy
 import salome
 
index 3ca8d022fa5eb4f14465f12013d29fa760044fc5..181f5f34f30df8b882a3f68e9afb78b02533384a 100644 (file)
@@ -1,6 +1,6 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
-#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-#
-#  File   : geompy.py
+#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  File   : batchmode_geompy.py
 #  Author : Paul RASCLE, EDF
 #  Module : GEOM
 #  $Header$
-
-from batchmode_salome import *
-import GEOM
-
-g=None
-step = 0
-sleeping_time = 0.01
-sleeping_time_max = 1.0
-while 1:
-    g = lcc.FindOrLoadComponent("FactoryServer", "GEOM")
-    if g is not None: break
-    step = step + 1
-    if step > 100: break
-    time.sleep(sleeping_time)
-    sleeping_time = max(sleeping_time_max, 2*sleeping_time)
-    pass
-geom = g._narrow( GEOM.GEOM_Gen )
-
-myBuilder = None
-myStudyId = 0
-father    = None
-
-BasicOp  = None
-CurvesOp = None
-PrimOp   = None
-ShapesOp = None
-HealOp   = None
-InsertOp = None
-BoolOp   = None
-TrsfOp   = None
-LocalOp  = None
-MeasuOp  = None
-BlocksOp = None
-GroupOp  = None
-
-def init_geom(theStudy):
-
-    global myStudy, myBuilder, myStudyId, BasicOp, CurvesOp, PrimOp, ShapesOp, HealOp
-    global InsertOp, BoolOp, TrsfOp, LocalOp, MeasuOp, BlocksOp, GroupOp, father
-
-    myStudy = theStudy
-    myStudyId = myStudy._get_StudyId()
-    myBuilder = myStudy.NewBuilder()
-    father = myStudy.FindComponent("GEOM")
-    if father is None:
-        father = myBuilder.NewComponent("GEOM")
-        A1 = myBuilder.FindOrCreateAttribute(father, "AttributeName")
-        FName = A1._narrow(SALOMEDS.AttributeName)
-        FName.SetValue("Geometry")
-       A2 = myBuilder.FindOrCreateAttribute(father, "AttributePixMap")
-       aPixmap = A2._narrow(SALOMEDS.AttributePixMap)
-       aPixmap.SetPixMap("ICON_OBJBROWSER_Geometry")
-       myBuilder.DefineComponentInstance(father,geom)
-        pass
-
-    # -----------------------------------------------------------------------------
-    # Assign Operations Interfaces
-    # -----------------------------------------------------------------------------
-
-    BasicOp  = geom.GetIBasicOperations    (myStudyId)
-    CurvesOp = geom.GetICurvesOperations   (myStudyId)
-    PrimOp   = geom.GetI3DPrimOperations   (myStudyId)
-    ShapesOp = geom.GetIShapesOperations   (myStudyId)
-    HealOp   = geom.GetIHealingOperations  (myStudyId)
-    InsertOp = geom.GetIInsertOperations   (myStudyId)
-    BoolOp   = geom.GetIBooleanOperations  (myStudyId)
-    TrsfOp   = geom.GetITransformOperations(myStudyId)
-    LocalOp  = geom.GetILocalOperations    (myStudyId)
-    MeasuOp  = geom.GetIMeasureOperations  (myStudyId)
-    BlocksOp = geom.GetIBlocksOperations   (myStudyId)
-    GroupOp  = geom.GetIGroupOperations   (myStudyId)
-    pass
-
-init_geom(myStudy)
-
-#     *  Get name for sub-shape aSubObj of shape aMainObj
-#
-def SubShapeName(aSubObj, aMainObj):
-    name = "SubShape"
-    print name
-    return name
-
-#     *  Publish in study aShape with name aName
-#
-def addToStudy(aShape, aName):
-    try:
-        aSObject = geom.AddInStudy(myStudy, aShape, aName, None)
-    except:
-        print "addToStudy() failed"
-        return ""
-    return aShape.GetStudyEntry()
-
-#     *  Publish in study aShape with name aName as sub-object of previously published aFather
-#
-def addToStudyInFather(aFather, aShape, aName):
-    try:
-        aSObject = geom.AddInStudy(myStudy, aShape, aName, aFather)
-    except:
-        print "addToStudyInFather() failed"
-        return ""
-    return aShape.GetStudyEntry()
-
-# -----------------------------------------------------------------------------
-# enumeration ShapeType as a dictionary
-# -----------------------------------------------------------------------------
-
-ShapeType = {"COMPOUND":0, "COMPSOLID":1, "SOLID":2, "SHELL":3, "FACE":4, "WIRE":5, "EDGE":6, "VERTEX":7, "SHAPE":8}
-
-# -----------------------------------------------------------------------------
-# Basic primitives
-# -----------------------------------------------------------------------------
-
-def MakeVertex(theX, theY, theZ):
-    anObj = BasicOp.MakePointXYZ(theX, theY, theZ)
-    if BasicOp.IsDone() == 0:
-      print "MakePointXYZ : ", BasicOp.GetErrorCode()
-    return anObj
-
-def MakeVertexWithRef(vertex,x,y,z):
-    anObj = BasicOp.MakePointWithReference(vertex,x,y,z)
-    if BasicOp.IsDone() == 0:
-      print "MakePointWithReference : ", BasicOp.GetErrorCode()
-    return anObj
-
-def MakeVertexOnCurve(curve,par):
-    anObj = BasicOp.MakePointOnCurve(curve,par)
-    if BasicOp.IsDone() == 0:
-      print "MakePointOnCurve : ", BasicOp.GetErrorCode()
-    return anObj
-
-def MakeVertexOnLinesIntersection(line1,line2):
-    anObj = BasicOp.MakePointOnLinesIntersection(line1,line2)
-    if BasicOp.IsDone() == 0:
-      print "MakePointOnLinesIntersection : ", BasicOp.GetErrorCode()
-    return anObj
-
-def MakeVectorDXDYDZ(dx,dy,dz):
-    anObj = BasicOp.MakeVectorDXDYDZ(dx,dy,dz)
-    if BasicOp.IsDone() == 0:
-      print "MakeVectorDXDYDZ : ", BasicOp.GetErrorCode()
-    return anObj
-
-def MakeVector(p1,p2):
-    anObj = BasicOp.MakeVectorTwoPnt(p1, p2)
-    if BasicOp.IsDone() == 0:
-      print "MakeVectorTwoPnt : ", BasicOp.GetErrorCode()
-    return anObj
-
-def MakeLine(p1, d1):
-    anObj = BasicOp.MakeLine(p1,d1)
-    if BasicOp.IsDone() == 0:
-      print "MakeLine : ", BasicOp.GetErrorCode()
-    return anObj
-
-def MakeLineTwoPnt(p1, p2):
-    anObj = BasicOp.MakeLineTwoPnt(p1,p2)
-    if BasicOp.IsDone() == 0:
-      print "MakeLineTwoPnt : ", BasicOp.GetErrorCode()
-    return anObj
-
-def MakeLineTwoFaces(f1, f2):
-    anObj = BasicOp.MakeLineTwoFaces(f1,f2)
-    if BasicOp.IsDone() == 0:
-      print "MakeLineTwoFaces : ", BasicOp.GetErrorCode()
-    return anObj
-
-def MakePlane(p1,v1,trimsize):
-    anObj = BasicOp.MakePlanePntVec(p1,v1,trimsize)
-    if BasicOp.IsDone() == 0:
-      print "MakePlanePntVec : ", BasicOp.GetErrorCode()
-    return anObj
-
-def MakePlaneThreePnt(p1,p2,p3,trimsize):
-    anObj = BasicOp.MakePlaneThreePnt(p1,p2,p3,trimsize)
-    if BasicOp.IsDone() == 0:
-      print "MakePlaneThreePnt : ", BasicOp.GetErrorCode()
-    return anObj
-
-def MakePlaneFace(face,trimsize):
-    anObj = BasicOp.MakePlaneFace(face,trimsize)
-    if BasicOp.IsDone() == 0:
-      print "MakePlaneFace : ", BasicOp.GetErrorCode()
-    return anObj
-
-def MakeMarker(OX,OY,OZ, XDX,XDY,XDZ, YDX,YDY,YDZ):
-    anObj = BasicOp.MakeMarker(OX,OY,OZ, XDX,XDY,XDZ, YDX,YDY,YDZ)
-    if BasicOp.IsDone() == 0:
-      print "MakeMarker : ", BasicOp.GetErrorCode()
-    return anObj
-
-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 ]:
-        v1, v2 = SubShapeAll( vec, ShapeType["VERTEX"] )
-        p1 = PointCoordinates( v1 )
-        p2 = PointCoordinates( v2 )
-        for i in range( 0, 3 ):
-             OXOY.append( p2[i] - p1[i] )
-    #
-    anObj = BasicOp.MakeMarker( O[0], O[1], O[2],
-                                OXOY[0], OXOY[1], OXOY[2],
-                                OXOY[3], OXOY[4], OXOY[5], )
-    if BasicOp.IsDone() == 0:
-      print "MakeMarker : ", BasicOp.GetErrorCode()
-    return anObj
-
-# -----------------------------------------------------------------------------
-# Curves
-# -----------------------------------------------------------------------------
-
-def MakeArc(p1,p2,p3):
-    anObj = CurvesOp.MakeArc(p1,p2,p3)
-    if CurvesOp.IsDone() == 0:
-      print "MakeArc : ", CurvesOp.GetErrorCode()
-    return anObj
-
-def MakeCircle(p1,v1,radius):
-    anObj = CurvesOp.MakeCirclePntVecR(p1,v1,radius)
-    if CurvesOp.IsDone() == 0:
-      print "MakeCirclePntVecR : ", CurvesOp.GetErrorCode()
-    return anObj
-
-def MakeCircleThreePnt(p1,p2,p3):
-    anObj = CurvesOp.MakeCircleThreePnt(p1,p2,p3)
-    if CurvesOp.IsDone() == 0:
-      print "MakeCircleThreePnt : ", CurvesOp.GetErrorCode()
-    return anObj
-
-def MakeCircleCenter2Pnt(p1,p2,p3):
-    anObj = CurvesOp.MakeCircleCenter2Pnt(p1,p2,p3)
-    if CurvesOp.IsDone() == 0:
-      print "MakeCircleCenter2Pnt : ", CurvesOp.GetErrorCode()
-    return anObj
-
-def MakeEllipse(p1,v1,radiusMaj,radiusMin):
-    anObj = CurvesOp.MakeEllipse(p1,v1,radiusMaj, radiusMin)
-    if CurvesOp.IsDone() == 0:
-      print "MakeEllipse : ", CurvesOp.GetErrorCode()
-    return anObj
-
-def MakePolyline(ListShape):
-    anObj = CurvesOp.MakePolyline(ListShape)
-    if CurvesOp.IsDone() == 0:
-      print "MakePolyline : ", CurvesOp.GetErrorCode()
-    return anObj
-
-def MakeBezier(ListShape):
-    anObj = CurvesOp.MakeSplineBezier(ListShape)
-    if CurvesOp.IsDone() == 0:
-      print "MakeSplineBezier : ", CurvesOp.GetErrorCode()
-    return anObj
-
-def MakeInterpol(ListShape):
-    anObj = CurvesOp.MakeSplineInterpolation(ListShape)
-    if CurvesOp.IsDone() == 0:
-      print "MakeSplineInterpolation : ", CurvesOp.GetErrorCode()
-    return anObj
-
-# <WPL>: Nine double values, defining origin,
-# OZ and OX directions of the working plane.
-def MakeSketcher(Cmd, WPL = [0,0,0, 0,0,1, 1,0,0]):
-    anObj = CurvesOp.MakeSketcher(Cmd, WPL)
-    if CurvesOp.IsDone() == 0:
-      print "MakeSketcher : ", CurvesOp.GetErrorCode()
-    return anObj
-
-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()
-    return anObj
-
-# -----------------------------------------------------------------------------
-# Create 3D Primitives
-# -----------------------------------------------------------------------------
-
-def MakeBox(x1,y1,z1,x2,y2,z2):
-    pnt1 = MakeVertex(x1,y1,z1)
-    pnt2 = MakeVertex(x2,y2,z2)
-    return MakeBoxTwoPnt(pnt1,pnt2)
-
-def MakeBoxDXDYDZ(dx,dy,dz):
-    anObj = PrimOp.MakeBoxDXDYDZ(dx,dy,dz)
-    if PrimOp.IsDone() == 0:
-      print "MakeBoxDXDYDZ : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakeBoxTwoPnt(point1, point2):
-    anObj = PrimOp.MakeBoxTwoPnt(point1, point2)
-    if PrimOp.IsDone() == 0:
-      print "MakeBoxTwoPnt : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakeCylinder(p1,v1,radius,height):
-    anObj = PrimOp.MakeCylinderPntVecRH(p1,v1,radius,height)
-    if PrimOp.IsDone() == 0:
-      print "MakeCylinderPntVecRH : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakeCylinderRH(radius,height):
-    anObj = PrimOp.MakeCylinderRH(radius,height)
-    if PrimOp.IsDone() == 0:
-      print "MakeCylinderRH : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakeSpherePntR(point,radius):
-    anObj = PrimOp.MakeSpherePntR(point,radius)
-    if PrimOp.IsDone() == 0:
-      print "MakeSpherePntR : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakeSphere(x,y,z,radius):
-    point = MakeVertex(x,y,z)
-    anObj = MakeSpherePntR(point,radius)
-    return anObj
-
-def MakeSphereR(radius):
-    anObj = PrimOp.MakeSphereR(radius)
-    if PrimOp.IsDone() == 0:
-      print "MakeSphereR : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakeCone(p1,v1,radius1,radius2,height):
-    anObj = PrimOp.MakeConePntVecR1R2H(p1,v1,radius1,radius2,height)
-    if PrimOp.IsDone() == 0:
-      print "MakeConePntVecR1R2H : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakeConeR1R2H(radius1,radius2,height):
-    anObj = PrimOp.MakeConeR1R2H(radius1,radius2,height)
-    if PrimOp.IsDone() == 0:
-      print "MakeConeR1R2H : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakeTorus(p1,v1,major_radius,minor_radius):
-    anObj = PrimOp.MakeTorusPntVecRR(p1,v1,major_radius,minor_radius)
-    if PrimOp.IsDone() == 0:
-      print "MakeTorusPntVecRR : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakeTorusRR(major_radius,minor_radius):
-    anObj = PrimOp.MakeTorusRR(major_radius,minor_radius)
-    if PrimOp.IsDone() == 0:
-      print "MakeTorusRR : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakePrism(baseShape,point1,point2):
-    anObj = PrimOp.MakePrismTwoPnt(baseShape,point1,point2)
-    if PrimOp.IsDone() == 0:
-      print "MakePrismTwoPnt : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakePrism2Ways(baseShape,point1,point2):
-    anObj = PrimOp.MakePrismTwoPnt2Ways(baseShape,point1,point2)
-    if PrimOp.IsDone() == 0:
-      print "MakePrismTwoPnt2Ways : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakePrismVecH(baseShape,vector,height):
-    anObj = PrimOp.MakePrismVecH(baseShape,vector,height)
-    if PrimOp.IsDone() == 0:
-      print "MakePrismVecH : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakePrismVecH2Ways(baseShape,vector,height):
-    anObj = PrimOp.MakePrismVecH2Ways(baseShape,vector,height)
-    if PrimOp.IsDone() == 0:
-      print "MakePrismVecH2Ways : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakePipe(baseShape,pathShape):
-    anObj = PrimOp.MakePipe(baseShape,pathShape)
-    if PrimOp.IsDone() == 0:
-      print "MakePipe : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakeRevolution(aShape,axis,angle):
-    anObj = PrimOp.MakeRevolutionAxisAngle(aShape,axis,angle)
-    if PrimOp.IsDone() == 0:
-      print "MakeRevolutionAxisAngle : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakeRevolution2Ways(aShape,axis,angle):
-    anObj = PrimOp.MakeRevolutionAxisAngle2Ways(aShape,axis,angle)
-    if PrimOp.IsDone() == 0:
-      print "MakeRevolutionAxisAngle2Ways : ", PrimOp.GetErrorCode()
-    return anObj
-
-# -----------------------------------------------------------------------------
-# Create base shapes
-# -----------------------------------------------------------------------------
-
-def MakeEdge(p1,p2):
-    anObj = ShapesOp.MakeEdge(p1,p2)
-    if ShapesOp.IsDone() == 0:
-      print "MakeEdge : ", ShapesOp.GetErrorCode()
-    return anObj
-
-def MakeWire(ListShape):
-    anObj = ShapesOp.MakeWire(ListShape)
-    if ShapesOp.IsDone() == 0:
-      print "MakeWire : ", ShapesOp.GetErrorCode()
-    return anObj
-
-def MakeFace(aShapeWire,WantPlanarFace):
-    anObj = ShapesOp.MakeFace(aShapeWire,WantPlanarFace)
-    if ShapesOp.IsDone() == 0:
-      print "MakeFace : ", ShapesOp.GetErrorCode()
-    return anObj
-
-def MakeFaceWires(ListWires,WantPlanarFace):
-    anObj = ShapesOp.MakeFaceWires(ListWires,WantPlanarFace)
-    if ShapesOp.IsDone() == 0:
-      print "MakeFaceWires : ", ShapesOp.GetErrorCode()
-    return anObj
-
-def MakeFaces(ListWires,WantPlanarFace):
-    anObj = MakeFaceWires(ListWires,WantPlanarFace)
-    return anObj
-
-def MakeShell(ListOfShapes):
-    anObj = ShapesOp.MakeShell(ListOfShapes)
-    if ShapesOp.IsDone() == 0:
-       print "MakeShell : ", ShapesOp.GetErrorCode()
-    return anObj
-
-def MakeSolid(ListOfShells):
-    anObj = ShapesOp.MakeSolidShells(ListOfShells)
-    if ShapesOp.IsDone() == 0:
-       print "MakeSolid : ", ShapesOp.GetErrorCode()
-    return anObj
-
-def MakeCompound(ListShape):
-    anObj = ShapesOp.MakeCompound(ListShape)
-    if ShapesOp.IsDone() == 0:
-      print "MakeCompound : ", ShapesOp.GetErrorCode()
-    return anObj
-
-def NumberOfFaces(theShape):
-    nb_faces = ShapesOp.NumberOfFaces(theShape)
-    if ShapesOp.IsDone() == 0:
-      print "NumberOfFaces : ", ShapesOp.GetErrorCode()
-    return nb_faces
-
-def NumberOfEdges(theShape):
-    nb_edges = ShapesOp.NumberOfEdges(theShape)
-    if ShapesOp.IsDone() == 0:
-      print "NumberOfEdges : ", ShapesOp.GetErrorCode()
-    return nb_edges
-
-def ChangeOrientation(Shape):
-    anObj = ShapesOp.ChangeOrientation(Shape)
-    if ShapesOp.IsDone() == 0:
-      print "ChangeOrientation : ", ShapesOp.GetErrorCode()
-    return anObj
-
-def OrientationChange(Shape):
-    anObj = ChangeOrientation(Shape)
-    return anObj
-
-def GetFreeFacesIDs(theShape):
-    anIDs = ShapesOp.GetFreeFacesIDs(theShape)
-    if ShapesOp.IsDone() == 0:
-      print "GetFreeFacesIDs : ", ShapesOp.GetErrorCode()
-    return anIDs
-
-def GetSharedShapes(theShape1, theShape2, theShapeType):
-    aList = ShapesOp.GetSharedShapes(theShape1, theShape2, theShapeType)
-    if ShapesOp.IsDone() == 0:
-      print "GetSharedShapes : ", ShapesOp.GetErrorCode()
-    return aList
-
-def GetShapesOnPlane(theShape, theShapeType, theAx1, theState):
-    aList = ShapesOp.GetShapesOnPlane(theShape, theShapeType, theAx1, theState)
-    if ShapesOp.IsDone() == 0:
-      print "GetShapesOnPlane : ", ShapesOp.GetErrorCode()
-    return aList
-
-def GetShapesOnPlaneIDs(theShape, theShapeType, theAx1, theState):
-    aList = ShapesOp.GetShapesOnPlaneIDs(theShape, theShapeType, theAx1, theState)
-    if ShapesOp.IsDone() == 0:
-        print "GetShapesOnPlaneIDs : ", ShapesOp.GetErrorCode()
-    return aList
-
-def GetShapesOnCylinder(theShape, theShapeType, theAxis, theRadius, theState):
-    aList = ShapesOp.GetShapesOnCylinder(theShape, theShapeType, theAxis, theRadius, theState)
-    if ShapesOp.IsDone() == 0:
-      print "GetShapesOnCylinder : ", ShapesOp.GetErrorCode()
-    return aList
-
-def GetShapesOnCylinderIDs(theShape, theShapeType, theAxis, theRadius, theState):
-    aList = ShapesOp.GetShapesOnCylinderIDs(theShape, theShapeType, theAxis, theRadius, theState)
-    if ShapesOp.IsDone() == 0:
-        print "GetShapesOnCylinderIDs : ", ShapesOp.GetErrorCode()
-    return aList
-
-def GetShapesOnSphere(theShape, theShapeType, theCenter, theRadius, theState):
-    aList = ShapesOp.GetShapesOnSphere(theShape, theShapeType, theCenter, theRadius, theState)
-    if ShapesOp.IsDone() == 0:
-      print "GetShapesOnSphere : ", ShapesOp.GetErrorCode()
-    return aList
-
-def GetShapesOnSphereIDs(theShape, theShapeType, theCenter, theRadius, theState):
-    aList = ShapesOp.GetShapesOnSphereIDs(theShape, theShapeType, theCenter, theRadius, theState)
-    if ShapesOp.IsDone() == 0:
-        print "GetShapesOnSphereIDs : ", ShapesOp.GetErrorCode()
-    return aList
-
-def GetShapesOnQuadrangle(theShape, theShapeType, theTopLeftPoint, theTopRigthPoint, theBottomLeftPoint, theBottomRigthPoint, theState):
-    aList = ShapesOp.GetShapesOnQuadrangle(theShape, theShapeType, theTopLeftPoint, theTopRigthPoint, theBottomLeftPoint, theBottomRigthPoint, theState)
-    if ShapesOp.IsDone() == 0:
-      print "GetShapesOnQuadrangle : ", ShapesOp.GetErrorCode()
-    return aList
-
-def GetShapesOnQuadrangleIDs(theShape, theShapeType, theTopLeftPoint, theTopRigthPoint, theBottomLeftPoint, theBottomRigthPoint, theState):
-    aList = ShapesOp.GetShapesOnQuadrangleIDs(theShape, theShapeType, theTopLeftPoint, theTopRigthPoint, theBottomLeftPoint, theBottomRigthPoint, theState)
-    if ShapesOp.IsDone() == 0:
-        print "GetShapesOnQuadrangleIDs : ", ShapesOp.GetErrorCode()
-    return aList
-
-def GetInPlace(theShapeWhere, theShapeWhat):
-    anObj = ShapesOp.GetInPlace(theShapeWhere, theShapeWhat)
-    if ShapesOp.IsDone() == 0:
-      print "GetInPlace : ", ShapesOp.GetErrorCode()
-    return anObj
-
-# -----------------------------------------------------------------------------
-# Access to sub-shapes by their unique IDs inside the main shape.
-# -----------------------------------------------------------------------------
-
-# Obtain a composite sub-shape of <aShape>, composed from sub-shapes
-# of <aShape>, selected by their unique IDs inside <aShape>
-def GetSubShape(aShape, ListOfID):
-    anObj = geom.AddSubShape(aShape,ListOfID)
-    return anObj
-
-# Obtain unique ID of sub-shape <aSubShape> inside <aShape>
-def GetSubShapeID(aShape, aSubShape):
-    anID = LocalOp.GetSubShapeIndex(aShape, aSubShape)
-    if LocalOp.IsDone() == 0:
-      print "GetSubShapeIndex : ", LocalOp.GetErrorCode()
-    return anID
-
-# -----------------------------------------------------------------------------
-# Decompose objects
-# -----------------------------------------------------------------------------
-
-def SubShapeAll(aShape, aType):
-    ListObj = ShapesOp.MakeExplode(aShape,aType,0)
-    if ShapesOp.IsDone() == 0:
-      print "MakeExplode : ", ShapesOp.GetErrorCode()
-    return ListObj
-
-def SubShapeAllIDs(aShape, aType):
-    ListObj = ShapesOp.SubShapeAllIDs(aShape,aType,0)
-    if ShapesOp.IsDone() == 0:
-      print "SubShapeAllIDs : ", ShapesOp.GetErrorCode()
-    return ListObj
-
-def SubShapeAllSorted(aShape, aType):
-    ListObj = ShapesOp.MakeExplode(aShape,aType,1)
-    if ShapesOp.IsDone() == 0:
-      print "MakeExplode : ", ShapesOp.GetErrorCode()
-    return ListObj
-
-def SubShapeAllSortedIDs(aShape, aType):
-    ListIDs = ShapesOp.SubShapeAllIDs(aShape,aType,1)
-    if ShapesOp.IsDone() == 0:
-      print "SubShapeAllSortedIDs : ", ShapesOp.GetErrorCode()
-    return ListObj
-
-# Obtain a compound of sub-shapes of <aShape>,
-# selected by they indices in list of all sub-shapes of type <aType>
-def SubShape(aShape, aType, ListOfInd):
-    ListOfIDs = []
-    AllShapeList = SubShapeAll(aShape, aType)
-    for ind in ListOfInd:
-        ListOfIDs.append(GetSubShapeID(aShape, AllShapeList[ind - 1]))
-    anObj = GetSubShape(aShape, ListOfIDs)
-    return anObj
-
-# Obtain a compound of sub-shapes of <aShape>,
-# selected by they indices in sorted list of all sub-shapes of type <aType>
-def SubShapeSorted(aShape, aType, ListOfInd):
-    ListOfIDs = []
-    AllShapeList = SubShapeAllSorted(aShape, aType)
-    for ind in ListOfInd:
-        ListOfIDs.append(GetSubShapeID(aShape, AllShapeList[ind - 1]))
-    anObj = GetSubShape(aShape, ListOfIDs)
-    return anObj
-
-# -----------------------------------------------------------------------------
-# Healing operations
-# -----------------------------------------------------------------------------
-
-def ProcessShape(Shape, Operators, Parameters, Values):
-    anObj = HealOp.ProcessShape(Shape, Operators, Parameters, Values)
-    if HealOp.IsDone() == 0:
-       print "ProcessShape : ", HealOp.GetErrorCode()
-    return anObj
-
-def SuppressFaces(aShape,ListOfId):
-    anObj = HealOp.SuppressFaces(aShape,ListOfId)
-    if HealOp.IsDone() == 0:
-      print "SuppressFaces : ", HealOp.GetErrorCode()
-    return anObj
-
-def MakeSewing(ListShape,precision):
-    comp = MakeCompound(ListShape)
-    anObj = Sew(comp,precision)
-    return anObj
-
-def Sew(aShape,precision):
-    anObj = HealOp.Sew(aShape,precision)
-    if HealOp.IsDone() == 0:
-      print "Sew : ", HealOp.GetErrorCode()
-    return anObj
-
-def SuppressInternalWires(aShape, Wires):
-    anObj = HealOp.RemoveIntWires(aShape, Wires)
-    if HealOp.IsDone() == 0:
-      print "SuppressInternalWires : ", HealOp.GetErrorCode()
-    return anObj
-
-def SuppressHoles(aShape, ListOfId):
-    anObj = HealOp.FillHoles(aShape,ListOfId)
-    if HealOp.IsDone() == 0:
-      print "SuppressHoles : ", HealOp.GetErrorCode()
-    return anObj
-
-def CloseContour(aShape, Wires, IsCommonVertex):
-    anObj = HealOp.CloseContour(aShape, Wires, IsCommonVertex)
-    if HealOp.IsDone() == 0:
-      print "CloseContour : ", HealOp.GetErrorCode()
-    return anObj
-
-def DivideEdge(aShape, EdgeID, Value, IsByParameter):
-    anObj = HealOp.DivideEdge(aShape, EdgeID, Value, IsByParameter)
-    if HealOp.IsDone() == 0:
-      print "DivideEdge : ", HealOp.GetErrorCode()
-    return anObj
-
-def GetFreeBoundary(Shape):
-    anObj = HealOp.GetFreeBoundary(Shape)
-    if HealOp.IsDone() == 0:
-      print "GetFreeBoundaries : ", HealOp.GetErrorCode()
-    return anObj
-
-# -----------------------------------------------------------------------------
-# Create advanced objects
-# -----------------------------------------------------------------------------
-
-def MakeCopy(aShape):
-    anObj = InsertOp.MakeCopy(aShape)
-    if InsertOp.IsDone() == 0:
-      print "MakeCopy : ", InsertOp.GetErrorCode()
-    return anObj
-
-def MakeFilling(aShape,mindeg,maxdeg,tol2d,tol3d,nbiter,isApprox=0):
-    anObj = PrimOp.MakeFilling(aShape,mindeg,maxdeg,tol2d,tol3d,nbiter,isApprox)
-    if PrimOp.IsDone() == 0:
-      print "MakeFilling : ", PrimOp.GetErrorCode()
-    return anObj
-
-def MakeGlueFaces(aShape,aTolerance):
-    anObj = ShapesOp.MakeGlueFaces(aShape,aTolerance)
-    if ShapesOp.IsDone() == 0:
-      print "MakeGlueFaces : ", ShapesOp.GetErrorCode()
-    return anObj
-
-# -----------------------------------------------------------------------------
-# Boolean (Common, Cut, Fuse, Section)
-# -----------------------------------------------------------------------------
-
-def MakeBoolean(shape1,shape2,operation):
-    anObj = BoolOp.MakeBoolean(shape1,shape2,operation)
-    if BoolOp.IsDone() == 0:
-      print "MakeBoolean : ", BoolOp.GetErrorCode()
-    return anObj
-
-def MakeCommon(s1, s2):
-    return MakeBoolean(s1, s2, 1)
-
-def MakeCut(s1, s2):
-    return MakeBoolean(s1, s2, 2)
-
-def MakeFuse(s1, s2):
-    return MakeBoolean(s1, s2, 3)
-
-def MakeSection(s1, s2):
-    return MakeBoolean(s1, s2, 4)
-
-def MakePartition(ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside=[],
-                  Limit=ShapeType["SHAPE"], RemoveWebs=0, ListMaterials=[],
-                  KeepNonlimitShapes=0):
-    anObj = BoolOp.MakePartition(ListShapes, ListTools,
-                                 ListKeepInside, ListRemoveInside,
-                                 Limit, RemoveWebs, ListMaterials,
-                                 KeepNonlimitShapes);
-    if BoolOp.IsDone() == 0:
-      print "MakePartition : ", BoolOp.GetErrorCode()
-    return anObj
-
-def Partition(ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside=[],
-              Limit=ShapeType["SHAPE"], RemoveWebs=0, ListMaterials=[],
-              KeepNonlimitShapes=0):
-    anObj = MakePartition(ListShapes, ListTools,
-                          ListKeepInside, ListRemoveInside,
-                          Limit, RemoveWebs, ListMaterials,
-                          KeepNonlimitShapes);
-    return anObj
-
-def MakeHalfPartition(theShape, thePlane):
-    anObj = BoolOp.MakeHalfPartition(theShape, thePlane)
-    if BoolOp.IsDone() == 0:
-      print "MakeHalfPartition : ", BoolOp.GetErrorCode()
-    return anObj
-
-# -----------------------------------------------------------------------------
-# Transform objects
-# -----------------------------------------------------------------------------
-
-def MakeTranslationTwoPoints(aShape,point1,point2):
-    anObj = TrsfOp.TranslateTwoPointsCopy(aShape,point1,point2)
-    if TrsfOp.IsDone() == 0:
-      print "TranslateTwoPointsCopy : ", TrsfOp.GetErrorCode()
-    return anObj
-
-def MakeTranslation(aShape,dx,dy,dz):
-    anObj = TrsfOp.TranslateDXDYDZCopy(aShape,dx,dy,dz)
-    if TrsfOp.IsDone() == 0:
-      print "TranslateDXDYDZCopy : ", TrsfOp.GetErrorCode()
-    return anObj
-
-def MakeTranslationVector(theObject, theVector):
-    anObj = TrsfOp.TranslateVectorCopy(theObject, theVector)
-    if TrsfOp.IsDone() == 0:
-      print "TranslateVectorCopy : ", TrsfOp.GetErrorCode()
-    return anObj
-
-def MakeRotation(aShape,axis,angle):
-    anObj = TrsfOp.RotateCopy(aShape,axis,angle)
-    if TrsfOp.IsDone() == 0:
-      print "RotateCopy : ", TrsfOp.GetErrorCode()
-    return anObj
-
-def MakeRotationThreePoints(aShape, centpoint, point1, point2):
-    anObj = TrsfOp.RotateThreePointsCopy(aShape, centpoint, point1, point2)
-    if TrsfOp.IsDone() == 0:
-      print "RotateThreePointsCopy : ", TrsfOp.GetErrorCode()
-    return anObj
-
-def MakeScaleTransform(aShape,theCenterofScale,factor):
-    anObj = TrsfOp.ScaleShapeCopy(aShape,theCenterofScale,factor)
-    if TrsfOp.IsDone() == 0:
-      print "ScaleShapeCopy : ", TrsfOp.GetErrorCode()
-    return anObj
-
-def MakeMirrorByPlane(aShape,aPlane):
-    anObj = TrsfOp.MirrorPlaneCopy(aShape,aPlane)
-    if TrsfOp.IsDone() == 0:
-      print "MirrorPlaneCopy : ", TrsfOp.GetErrorCode()
-    return anObj
-
-def MakeMirrorByAxis(theObject, theAxis):
-    anObj = TrsfOp.MirrorAxisCopy(theObject, theAxis)
-    if TrsfOp.IsDone() == 0:
-      print "MirrorAxisCopy : ", TrsfOp.GetErrorCode()
-    return anObj
-
-def MakeMirrorByPoint(theObject, thePoint):
-    anObj = TrsfOp.MirrorPointCopy(theObject, thePoint)
-    if TrsfOp.IsDone() == 0:
-      print "MirrorPointCopy : ", TrsfOp.GetErrorCode()
-    return anObj
-
-def MakePosition(aShape,theStartLCS,theEndLCS):
-    anObj = TrsfOp.PositionShapeCopy(aShape,theStartLCS,theEndLCS)
-    if TrsfOp.IsDone() == 0:
-      print "PositionShapeCopy : ", TrsfOp.GetErrorCode()
-    return anObj
-
-def MakeOffset(aShape, anOffset):
-    anObj = TrsfOp.OffsetShapeCopy(aShape, anOffset)
-    if TrsfOp.IsDone() == 0:
-      print "OffsetShapeCopy : ", TrsfOp.GetErrorCode()
-    return anObj
-
-# -----------------------------------------------------------------------------
-# Patterns
-# -----------------------------------------------------------------------------
-
-def MakeMultiTranslation1D(aShape,aDir,aStep,aNbTimes):
-    anObj = TrsfOp.MultiTranslate1D(aShape,aDir,aStep,aNbTimes)
-    if TrsfOp.IsDone() == 0:
-      print "MultiTranslate1D : ", TrsfOp.GetErrorCode()
-    return anObj
-
-def MakeMultiTranslation2D(aShape,d1,step1,nbtimes1,d2,step2,nbtimes2):
-    anObj = TrsfOp.MultiTranslate2D(aShape,d1,step1,nbtimes1,d2,step2,nbtimes2)
-    if TrsfOp.IsDone() == 0:
-      print "MultiTranslate2D : ", TrsfOp.GetErrorCode()
-    return anObj
-
-def MultiRotate1D(aShape,aVec,aNbTimes):
-    anObj = TrsfOp.MultiRotate1D(aShape,aVec,aNbTimes)
-    if TrsfOp.IsDone() == 0:
-      print "MultiRotate1D : ", TrsfOp.GetErrorCode()
-    return anObj
-
-def MultiRotate2D(aShape,aVec,anAngle,nbtimes1,aStep,nbtimes2):
-    anObj = TrsfOp.MultiRotate2D(aShape,aVec,anAngle,nbtimes1,aStep,nbtimes2)
-    if TrsfOp.IsDone() == 0:
-      print "MultiRotate2D : ", TrsfOp.GetErrorCode()
-    return anObj
-
-def MakeMultiRotation1D(aShape,aDir,aPoint,aNbTimes):
-    aVec = MakeLine(aPoint,aDir)
-    anObj = MultiRotate1D(aShape,aVec,aNbTimes)
-    return anObj
-
-def MakeMultiRotation2D(aShape,aDir,aPoint,anAngle,nbtimes1,aStep,nbtimes2):
-    aVec = MakeLine(aPoint,aDir)
-    anObj = MultiRotate2D(aShape,aVec,anAngle,nbtimes1,aStep,nbtimes2)
-    return anObj
-
-# -----------------------------------------------------------------------------
-# Local operations
-# -----------------------------------------------------------------------------
-
-def MakeFilletAll(aShape,radius):
-    anObj = LocalOp.MakeFilletAll(aShape,radius)
-    if LocalOp.IsDone() == 0:
-      print "MakeFilletAll : ", LocalOp.GetErrorCode()
-    return anObj
-
-def MakeFillet(aShape,radius,aShapeType,ListShape):
-    anObj = None
-    if aShapeType == ShapeType["EDGE"]:
-        anObj = LocalOp.MakeFilletEdges(aShape,radius,ListShape)
-    else:
-        anObj = LocalOp.MakeFilletFaces(aShape,radius,ListShape)
-    if LocalOp.IsDone() == 0:
-      print "MakeFillet : ", LocalOp.GetErrorCode()
-    return anObj
-
-def MakeFilletR1R2(aShape,radius1,radius2,aShapeType,ListShape):
-    anObj = None
-    if aShapeType == ShapeType["EDGE"]:
-        anObj = LocalOp.MakeFilletEdgesR1R2(aShape,radius1,radius2,ListShape)
-    else:
-        anObj = LocalOp.MakeFilletFacesR1R2(aShape,radius1,radius2,ListShape)
-    if LocalOp.IsDone() == 0:
-      print "MakeFilletR1R2 : ", LocalOp.GetErrorCode()
-    return anObj
-
-def MakeChamferAll(aShape,d):
-    anObj = LocalOp.MakeChamferAll(aShape,d)
-    if LocalOp.IsDone() == 0:
-      print "MakeChamferAll : ", LocalOp.GetErrorCode()
-    return anObj
-
-def MakeChamferEdge(aShape,d1,d2,face1,face2):
-    anObj = LocalOp.MakeChamferEdge(aShape,d1,d2,face1,face2)
-    if LocalOp.IsDone() == 0:
-      print "MakeChamferEdge : ", LocalOp.GetErrorCode()
-    return anObj
-
-def MakeChamferEdgeAD(aShape,d,angle,face1,face2):
-    anObj = LocalOp.MakeChamferEdgeAD(aShape,d,angle,face1,face2)
-    if LocalOp.IsDone() == 0:
-      print "MakeChamferEdgeAD : ", LocalOp.GetErrorCode()
-    return anObj
-
-def MakeChamferFaces(aShape,d1,d2,ListShape):
-    anObj = LocalOp.MakeChamferFaces(aShape,d1,d2,ListShape)
-    if LocalOp.IsDone() == 0:
-      print "MakeChamferFaces : ", LocalOp.GetErrorCode()
-    return anObj
-
-def MakeChamferFacesAD(aShape,d,angle,ListShape):
-    anObj = LocalOp.MakeChamferFacesAD(aShape,d,angle,ListShape)
-    if LocalOp.IsDone() == 0:
-      print "MakeChamferFacesAD : ", LocalOp.GetErrorCode()
-    return anObj
-
-def MakeChamferEdges(aShape,d1,d2,ListShape):
-    anObj = LocalOp.MakeChamferEdges(aShape,d1,d2,ListShape)
-    if LocalOp.IsDone() == 0:
-      print "MakeChamferEdges : ", LocalOp.GetErrorCode()
-    return anObj
-
-def MakeChamferEdgesAD(aShape,d,angle,ListShape):
-    anObj = LocalOp.MakeChamferEdgesAD(aShape,d,angle,ListShape)
-    if LocalOp.IsDone() == 0:
-      print "MakeChamferEdgesAD : ", LocalOp.GetErrorCode()
-    return anObj
-
-def MakeChamfer(aShape,d1,d2,aShapeType,ListShape):
-    anObj = None
-    if aShapeType == ShapeType["EDGE"]:
-        anObj = MakeChamferEdge(aShape,d1,d2,ListShape[0],ListShape[1])
-    else:
-        anObj = MakeChamferFaces(aShape,d1,d2,ListShape)
-    return anObj
-
-def Archimede(aShape,weight,WaterDensity,MeshingDeflection):
-    anObj = LocalOp.MakeArchimede(aShape,weight,WaterDensity,MeshingDeflection)
-    if LocalOp.IsDone() == 0:
-      print "MakeArchimede : ", LocalOp.GetErrorCode()
-    return anObj
-
-# -----------------------------------------------------------------------------
-# Information objects
-# -----------------------------------------------------------------------------
-
-def PointCoordinates(Point):
-    aTuple = MeasuOp.PointCoordinates(Point)
-    if MeasuOp.IsDone() == 0:
-      print "PointCoordinates : ", MeasuOp.GetErrorCode()
-    return aTuple
-
-def BasicProperties(Shape):
-    aTuple = MeasuOp.GetBasicProperties(Shape)
-    if MeasuOp.IsDone() == 0:
-      print "BasicProperties : ", MeasuOp.GetErrorCode()
-    return aTuple
-
-def BoundingBox(Shape):
-    aTuple = MeasuOp.GetBoundingBox(Shape)
-    if MeasuOp.IsDone() == 0:
-      print "BoundingBox : ", MeasuOp.GetErrorCode()
-    return aTuple
-
-def Inertia(Shape):
-    aTuple = MeasuOp.GetInertia(Shape)
-    if MeasuOp.IsDone() == 0:
-      print "Inertia : ", MeasuOp.GetErrorCode()
-    return aTuple
-
-def MinDistance(Shape1, Shape2):
-    aTuple = MeasuOp.GetMinDistance(Shape1, Shape2)
-    if MeasuOp.IsDone() == 0:
-      print "MinDistance : ", MeasuOp.GetErrorCode()
-    return aTuple[0]
-
-def Tolerance(Shape):
-    aTuple = MeasuOp.GetTolerance(Shape)
-    if MeasuOp.IsDone() == 0:
-      print "Tolerance : ", MeasuOp.GetErrorCode()
-    return aTuple
-
-def WhatIs(Shape):
-    aDescr = MeasuOp.WhatIs(Shape)
-    if MeasuOp.IsDone() == 0:
-      print "WhatIs : ", MeasuOp.GetErrorCode()
-    return aDescr
-
-def MakeCDG(aShape):
-    anObj = MeasuOp.GetCentreOfMass(aShape)
-    if MeasuOp.IsDone() == 0:
-      print "GetCentreOfMass : ", MeasuOp.GetErrorCode()
-    return anObj
-
-def CheckShape(theShape, theIsCheckGeom = 0):
-    if theIsCheckGeom:
-        (IsValid, Status) = MeasuOp.CheckShapeWithGeometry(theShape)
-    else:
-        (IsValid, Status) = MeasuOp.CheckShape(theShape)
-
-    if MeasuOp.IsDone() == 0:
-      print "CheckShape : ", MeasuOp.GetErrorCode()
-    else:
-      if IsValid == 0:
-        print Status
-    return IsValid
-
-# -----------------------------------------------------------------------------
-# Import/Export objects
-# -----------------------------------------------------------------------------
-
-def Import(filename, formatname):
-    anObj = InsertOp.Import(filename, formatname)
-    if InsertOp.IsDone() == 0:
-      print "Import : ", InsertOp.GetErrorCode()
-    return anObj
-
-def ImportBREP(theFileName):
-    return Import(theFileName, "BREP")
-
-def ImportIGES(theFileName):
-    return Import(theFileName, "IGES")
-
-def ImportSTEP(theFileName):
-    return Import(theFileName, "STEP")
-
-def Export(aShape, filename, formatname):
-    InsertOp.Export(aShape, filename, formatname)
-    if InsertOp.IsDone() == 0:
-      print "Export : ", InsertOp.GetErrorCode()
-
-def ExportBREP(theObject, theFileName):
-    return Export(theObject, theFileName, "BREP")
-
-def ExportIGES(theObject, theFileName):
-    return Export(theObject, theFileName, "IGES")
-
-def ExportSTEP(theObject, theFileName):
-    return Export(theObject, theFileName, "STEP")
-
-# -----------------------------------------------------------------------------
-# Block operations
-# -----------------------------------------------------------------------------
-
-def MakeQuad(E1, E2, E3, E4):
-    anObj = BlocksOp.MakeQuad(E1, E2, E3, E4)
-    if BlocksOp.IsDone() == 0:
-      print "MakeQuad : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def MakeQuad2Edges(E1, E2):
-    anObj = BlocksOp.MakeQuad2Edges(E1, E2)
-    if BlocksOp.IsDone() == 0:
-      print "MakeQuad2Edges : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def MakeQuad4Vertices(V1, V2, V3, V4):
-    anObj = BlocksOp.MakeQuad4Vertices(V1, V2, V3, V4)
-    if BlocksOp.IsDone() == 0:
-      print "MakeQuad4Vertices : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def MakeHexa(F1, F2, F3, F4, F5, F6):
-    anObj = BlocksOp.MakeHexa(F1, F2, F3, F4, F5, F6)
-    if BlocksOp.IsDone() == 0:
-      print "MakeHexa : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def MakeHexa2Faces(F1, F2):
-    anObj = BlocksOp.MakeHexa2Faces(F1, F2)
-    if BlocksOp.IsDone() == 0:
-      print "MakeHexa2Faces : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def GetPoint(theShape, theX, theY, theZ, theEpsilon):
-    anObj = BlocksOp.GetPoint(theShape, theX, theY, theZ, theEpsilon)
-    if BlocksOp.IsDone() == 0:
-      print "GetPoint : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def GetEdge(theShape, thePoint1, thePoint2):
-    anObj = BlocksOp.GetEdge(theShape, thePoint1, thePoint2)
-    if BlocksOp.IsDone() == 0:
-      print "GetEdge : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def GetEdgeNearPoint(theShape, thePoint):
-    anObj = BlocksOp.GetEdgeNearPoint(theShape, thePoint)
-    if BlocksOp.IsDone() == 0:
-      print "GetEdgeNearPoint : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def GetFaceByPoints(theShape, thePoint1, thePoint2, thePoint3, thePoint4):
-    anObj = BlocksOp.GetFaceByPoints(theShape, thePoint1, thePoint2, thePoint3, thePoint4)
-    if BlocksOp.IsDone() == 0:
-      print "GetFaceByPoints : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def GetFaceByEdges(theShape, theEdge1, theEdge2):
-    anObj = BlocksOp.GetFaceByEdges(theShape, theEdge1, theEdge2)
-    if BlocksOp.IsDone() == 0:
-      print "GetFaceByEdges : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def GetOppositeFace(theBlock, theFace):
-    anObj = BlocksOp.GetOppositeFace(theBlock, theFace)
-    if BlocksOp.IsDone() == 0:
-      print "GetOppositeFace : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def GetFaceNearPoint(theShape, thePoint):
-    anObj = BlocksOp.GetFaceNearPoint(theShape, thePoint)
-    if BlocksOp.IsDone() == 0:
-      print "GetFaceNearPoint : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def GetFaceByNormale(theBlock, theVector):
-    anObj = BlocksOp.GetFaceByNormale(theBlock, theVector)
-    if BlocksOp.IsDone() == 0:
-      print "GetFaceByNormale : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def CheckCompoundOfBlocks(theCompound):
-    (IsValid, BCErrors) = BlocksOp.CheckCompoundOfBlocks(theCompound)
-    if BlocksOp.IsDone() == 0:
-      print "CheckCompoundOfBlocks : ", BlocksOp.GetErrorCode()
-    else:
-      if IsValid == 0:
-        Descr = BlocksOp.PrintBCErrors(theCompound, BCErrors)
-        print Descr
-    return IsValid
-
-def RemoveExtraEdges(theShape):
-    anObj = BlocksOp.RemoveExtraEdges(theShape)
-    if BlocksOp.IsDone() == 0:
-      print "RemoveExtraEdges : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def CheckAndImprove(theShape):
-    anObj = BlocksOp.CheckAndImprove(theShape)
-    if BlocksOp.IsDone() == 0:
-      print "CheckAndImprove : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def MakeBlockExplode(theCompound, theMinNbFaces, theMaxNbFaces):
-    aList = BlocksOp.ExplodeCompoundOfBlocks(theCompound, theMinNbFaces, theMaxNbFaces)
-    if BlocksOp.IsDone() == 0:
-      print "MakeBlockExplode : ", BlocksOp.GetErrorCode()
-    return aList
-
-def GetBlockNearPoint(theCompound, thePoint):
-    anObj = BlocksOp.GetBlockNearPoint(theCompound, thePoint)
-    if BlocksOp.IsDone() == 0:
-      print "GetBlockNearPoint : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def GetBlockByParts(theCompound, theParts):
-    anObj = BlocksOp.GetBlockByParts(theCompound, theParts)
-    if BlocksOp.IsDone() == 0:
-      print "GetBlockByParts : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def GetBlocksByParts(theCompound, theParts):
-    aList = BlocksOp.GetBlocksByParts(theCompound, theParts)
-    if BlocksOp.IsDone() == 0:
-      print "GetBlocksByParts : ", BlocksOp.GetErrorCode()
-    return aList
-
-def MakeMultiTransformation1D(Block, DirFaceID1, DirFaceID2, NbTimes):
-    anObj = BlocksOp.MakeMultiTransformation1D(Block, DirFaceID1, DirFaceID2, NbTimes)
-    if BlocksOp.IsDone() == 0:
-      print "MakeMultiTransformation1D : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def MakeMultiTransformation2D(Block, DirFaceID1U, DirFaceID2U, NbTimesU,
-                                    DirFaceID1V, DirFaceID2V, NbTimesV):
-    anObj = BlocksOp.MakeMultiTransformation2D(Block, DirFaceID1U, DirFaceID2U, NbTimesU,
-                                                     DirFaceID1V, DirFaceID2V, NbTimesV)
-    if BlocksOp.IsDone() == 0:
-      print "MakeMultiTransformation2D : ", BlocksOp.GetErrorCode()
-    return anObj
-
-def Propagate(theShape):
-    listChains = BlocksOp.Propagate(theShape)
-    if BlocksOp.IsDone() == 0:
-      print "Propagate : ", BlocksOp.GetErrorCode()
-    return listChains
-
-# -----------------------------------------------------------------------------
-# Group operations
-# -----------------------------------------------------------------------------
-
-def CreateGroup(MainShape, ShapeType):
-    anObj = GroupOp.CreateGroup(MainShape, ShapeType)
-    if GroupOp.IsDone() == 0:
-       print "CreateGroup : ", GroupOp.GetErrorCode()
-    return anObj
-
-def AddObject(Group, SubShapeID):
-    GroupOp.AddObject(Group, SubShapeID)
-    if GroupOp.IsDone() == 0:
-      print "AddObject : ", GroupOp.GetErrorCode()
-
-def RemoveObject(Group, SubShapeID):
-    GroupOp.RemoveObject(Group, SubShapeID)
-    if GroupOp.IsDone() == 0:
-      print "RemoveObject : ", GroupOp.GetErrorCode()
-
-def UnionList (theGroup, theSubShapes):
-    GroupOp.UnionList(theGroup, theSubShapes)
-    if GroupOp.IsDone() == 0:
-      print "UnionList : ", GroupOp.GetErrorCode()
-
-def UnionIDs(theGroup, theSubShapes):
-    GroupOp.UnionIDs(theGroup, theSubShapes)
-    if GroupOp.IsDone() == 0:
-        print "UnionIDs : ", GroupOp.GetErrorCode()
-
-def DifferenceList (theGroup, theSubShapes):
-    GroupOp.DifferenceList(theGroup, theSubShapes)
-    if GroupOp.IsDone() == 0:
-      print "DifferenceList : ", GroupOp.GetErrorCode()
-
-def DifferenceIDs(theGroup, theSubShapes):
-    GroupOp.DifferenceIDs(theGroup, theSubShapes)
-    if GroupOp.IsDone() == 0:
-        print "DifferenceIDs : ", GroupOp.GetErrorCode()
-
-def GetObjectIDs(Group):
-    ListIDs = GroupOp.GetObjects(Group)
-    if GroupOp.IsDone() == 0:
-      print "GetObjectIDs : ", GroupOp.GetErrorCode()
-    return ListIDs
-
-def GetType(theGroup):
-    aType = GroupOp.GetType(theGroup)
-    if GroupOp.IsDone() == 0:
-      print "GetType : ", GroupOp.GetErrorCode()
-    return aType
-
-def GetMainShape(theGroup):
-    anObj = GroupOp.GetMainShape(theGroup)
-    if GroupOp.IsDone() == 0:
-      print "GetMainShape : ", GroupOp.GetErrorCode()
-    return anObj
-
-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:
-        Props = BasicProperties(edge)
-       if min_length <= Props[0] and Props[0] <= max_length:
-           if (not include_min) and (min_length == Props[0]):
-               skip = 1
-            else:
-               if (not include_max) and (Props[0] == max_length):
-                   skip = 1
-                else:
-                   edges_in_range.append(edge)
-
-    if len(edges_in_range) <= 0:
-        print "No edges found by given criteria"
-       return 0
-
-    group_edges = CreateGroup(theShape, ShapeType["EDGE"])
-    UnionList(group_edges, edges_in_range)
-
-    return group_edges
-
-# Add Path to the system path
+# From Salome version 3.2.0 geompy package suits for work in batch mode
 #
-def addPath(Path):
-    if (sys.path.count(Path) < 1):
-       sys.path.append(Path)
+from geompy import *
index 7a997f56465f392603f4fd23c5050c1a79ccb319..83b9fa7ddd2bda55eebcaec2adbaf0031c719db3 100644 (file)
@@ -1,6 +1,6 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
-#
-#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
 #  File   : geompy.py
 #  Author : Paul RASCLE, EDF
 #  Module : GEOM
 #  $Header$
-
+#
 import salome
 import geompyDC
 from salome import *
index 5853af96666764107117bf8f5701a78a189606c0..849095d4e31f5e9a91225f305f13a108d50a7ce9 100644 (file)
@@ -1,6 +1,6 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
-#
-#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
 #  File   : geompy.py
 #  Author : Paul RASCLE, EDF
 #  Module : GEOM
-#  $Header$
+
 """
     \namespace geompy
     \brief Module geompy
 """
 
+## @defgroup l1_geompy_auxiliary Auxiliary data structures and methods
+
+## @defgroup l1_geompy_purpose   All package methods, grouped by their purpose
+## @{
+##   @defgroup l2_import_export Importing/exporting geometrical objects
+##   @defgroup l2_creating      Creating geometrical objects
+##   @{
+##     @defgroup l3_basic_go      Creating Basic Geometric Objects
+##     @{
+##       @defgroup l4_curves        Creating Curves
+
+##     @}
+##     @defgroup l3_3d_primitives Creating 3D Primitives
+##     @defgroup l3_complex       Creating Complex Objects
+##     @defgroup l3_groups        Working with groups
+##     @defgroup l3_blocks        Building by blocks
+##     @{
+##       @defgroup l4_blocks_measure Check and Improve
+
+##     @}
+##     @defgroup l3_sketcher      Sketcher
+##     @defgroup l3_advanced      Creating Advanced Geometrical Objects
+##     @{
+##       @defgroup l4_decompose     Decompose objects
+##       @defgroup l4_access        Access to sub-shapes by their unique IDs inside the main shape
+##       @defgroup l4_obtain        Access to subshapes by a criteria
+
+##     @}
+
+##   @}
+##   @defgroup l2_transforming  Transforming geometrical objects
+##   @{
+##     @defgroup l3_basic_op      Basic Operations
+##     @defgroup l3_boolean       Boolean Operations
+##     @defgroup l3_transform     Transformation Operations
+##     @defgroup l3_local         Local Operations (Fillet and Chamfer)
+##     @defgroup l3_blocks_op     Blocks Operations
+##     @defgroup l3_healing       Repairing Operations
+##     @defgroup l3_restore_ss    Restore presentation parameters and a tree of subshapes
+
+##   @}
+##   @defgroup l2_measure       Using measurement tools
+
+## @}
+
 import salome
 salome.salome_init()
 from salome import *
 
-import GEOM
+from salome_notebook import *
 
-# -----------------------------------------------------------------------------
-# enumeration ShapeType as a dictionary
-# -----------------------------------------------------------------------------
+import GEOM
+import math
 
+## Enumeration ShapeType as a dictionary
+#  @ingroup l1_geompy_auxiliary
 ShapeType = {"COMPOUND":0, "COMPSOLID":1, "SOLID":2, "SHELL":3, "FACE":4, "WIRE":5, "EDGE":6, "VERTEX":7, "SHAPE":8}
 
-# -----------------------------------------------------------------------------
-# Raise an Error Function if Operation is Failed
-# -----------------------------------------------------------------------------
+## Raise an Error, containing the Method_name, if Operation is Failed
+## @ingroup l1_geompy_auxiliary
 def RaiseIfFailed (Method_name, Operation):
-    #NPAL18017#if Operation.IsDone() == 0:
     if Operation.IsDone() == 0 and Operation.GetErrorCode() != "NOT_FOUND_ANY":
         raise RuntimeError, Method_name + " : " + Operation.GetErrorCode()
+    
+## Return list of variables value from salome notebook
+## @ingroup l1_geompy_auxiliary    
+def ParseParameters(*parameters):
+    Result = []
+    StringResult = ""
+    for parameter in parameters:
+        if isinstance(parameter,str):
+            if notebook.isVariable(parameter):
+                Result.append(notebook.get(parameter))
+            else:
+                raise RuntimeError, "Variable with name '" + parameter + "' doesn't exist!!!"
+        else:
+            Result.append(parameter)
+            pass
+        
+        StringResult = StringResult + str(parameter)
+        StringResult = StringResult + ":"
+        pass
+    StringResult = StringResult[:len(StringResult)-1]
+    Result.append(StringResult)
+    return Result
+    
+## Return list of variables value from salome notebook
+## @ingroup l1_geompy_auxiliary    
+def ParseList(list):
+    Result = []
+    StringResult = ""
+    for parameter in list:
+        if isinstance(parameter,str) and notebook.isVariable(parameter):
+            Result.append(str(notebook.get(parameter)))
+            pass
+        else:
+            Result.append(str(parameter))
+            pass
+        
+        StringResult = StringResult + str(parameter)
+        StringResult = StringResult + ":"
+        pass
+    StringResult = StringResult[:len(StringResult)-1]
+    return Result, StringResult
+    
+## Return list of variables value from salome notebook
+## @ingroup l1_geompy_auxiliary    
+def ParseSketcherCommand(command):
+    Result = ""
+    StringResult = ""
+    sections = command.split(":")
+    for section in sections:
+        parameters = section.split(" ")
+        paramIndex = 1
+        for parameter in parameters:
+            if paramIndex > 1 and parameter.find("'") != -1:
+                parameter = parameter.replace("'","")
+                if notebook.isVariable(parameter):
+                    Result = Result + str(notebook.get(parameter)) + " "
+                    pass
+                else:
+                    raise RuntimeError, "Variable with name '" + parameter + "' doesn't exist!!!"
+                    pass
+                pass
+            else:
+                Result = Result + str(parameter) + " "
+                pass
+            if paramIndex > 1:
+                StringResult = StringResult + parameter
+                StringResult = StringResult + ":"
+                pass
+            paramIndex = paramIndex + 1
+            pass
+        Result = Result[:len(Result)-1] + ":"
+        pass
+    Result = Result[:len(Result)-1]
+    return Result, StringResult
 
-# -----------------------------------------------------------------------------
-# enumeration shape_kind
-# -----------------------------------------------------------------------------
-
+## Kinds of shape enumeration
+#  @ingroup l1_geompy_auxiliary
 kind = GEOM.GEOM_IKindOfShape
 
+## Information about closed/unclosed state of shell or wire
+#  @ingroup l1_geompy_auxiliary
 class info:
     UNKNOWN  = 0
     CLOSED   = 1
@@ -63,12 +180,13 @@ class info:
 
 
 class geompyDC(GEOM._objref_GEOM_Gen):
+
         def __init__(self):
             GEOM._objref_GEOM_Gen.__init__(self)
             self.myBuilder = None
             self.myStudyId = 0
             self.father    = None
-            
+
             self.BasicOp  = None
             self.CurvesOp = None
             self.PrimOp   = None
@@ -83,6 +201,8 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             self.GroupOp  = None
             pass
 
+        ## @addtogroup l1_geompy_auxiliary
+        ## @{
         def init_geom(self,theStudy):
             self.myStudy = theStudy
             self.myStudyId = self.myStudy._get_StudyId()
@@ -111,11 +231,13 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             self.BlocksOp = self.GetIBlocksOperations   (self.myStudyId)
             self.GroupOp  = self.GetIGroupOperations    (self.myStudyId)
             pass
-    
+
         ## Get name for sub-shape aSubObj of shape aMainObj
         #
-        #  Example: see GEOM_TestAll.py
+        # @ref swig_SubShapeAllSorted "Example"
         def SubShapeName(self,aSubObj, aMainObj):
+            # Example: see GEOM_TestAll.py
+
             #aSubId  = orb.object_to_string(aSubObj)
             #aMainId = orb.object_to_string(aMainObj)
             #index = gg.getIndexTopology(aSubId, aMainId)
@@ -123,45 +245,96 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             index = self.ShapesOp.GetTopologyIndex(aMainObj, aSubObj)
             name = self.ShapesOp.GetShapeTypeString(aSubObj) + "_%d"%(index)
             return name
-    
+
         ## Publish in study aShape with name aName
         #
-        #  Example: see GEOM_TestAll.py
-        def addToStudy(self,aShape, aName):
+        #  \param aShape the shape to be published
+        #  \param aName  the name for the shape
+        #  \param doRestoreSubShapes if True, finds and publishes also
+        #         sub-shapes of <VAR>aShape</VAR>, corresponding to its arguments
+        #         and published sub-shapes of arguments
+        #  \param theArgs,theFindMethod,theInheritFirstArg see geompy.RestoreSubShapes for
+        #                                                  these arguments description
+        #  \return study entry of the published shape in form of string
+        #
+        #  @ref swig_MakeQuad4Vertices "Example"
+        def addToStudy(self, aShape, aName, doRestoreSubShapes=False,
+                       theArgs=[], theFindMethod=GEOM.FSM_GetInPlace, theInheritFirstArg=False):
+            # Example: see GEOM_TestAll.py
             try:
                 aSObject = self.AddInStudy(self.myStudy, aShape, aName, None)
+                if doRestoreSubShapes:
+                    self.RestoreSubShapesSO(self.myStudy, aSObject, theArgs,
+                                            theFindMethod, theInheritFirstArg)
             except:
                 print "addToStudy() failed"
                 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(self,aFather, aShape, aName):
+        #  @ref swig_SubShapeAllSorted "Example"
+        def addToStudyInFather(self, aFather, aShape, aName):
+            # Example: see GEOM_TestAll.py
             try:
                 aSObject = self.AddInStudy(myStudy, aShape, aName, aFather)
             except:
                 print "addToStudyInFather() failed"
                 return ""
             return aShape.GetStudyEntry()
-        
-        # -----------------------------------------------------------------------------
-        # Basic primitives
-        # -----------------------------------------------------------------------------
-        
+
+        # end of l1_geompy_auxiliary
+        ## @}
+
+        ## @addtogroup l3_restore_ss
+        ## @{
+
+        ## Publish sub-shapes, standing for arguments and sub-shapes of arguments
+        #  To be used from python scripts out of geompy.addToStudy (non-default usage)
+        #  \param theObject published GEOM object, arguments of which will be published
+        #  \param theArgs   list of GEOM_Object, operation arguments to be published.
+        #                   If this list is empty, all operation arguments will be published
+        #  \param theFindMethod method to search subshapes, corresponding to arguments and
+        #                       their subshapes. Value from enumeration GEOM::find_shape_method.
+        #  \param theInheritFirstArg set properties of the first argument for <VAR>theObject</VAR>.
+        #                            Do not publish subshapes in place of arguments, but only
+        #                            in place of subshapes of the first argument,
+        #                            because the whole shape corresponds to the first argument.
+        #                            Mainly to be used after transformations, but it also can be
+        #                            usefull after partition with one object shape, and some other
+        #                            operations, where only the first argument has to be considered.
+        #                            If theObject has only one argument shape, this flag is automatically
+        #                            considered as True, not regarding really passed value.
+        #  \return True in case of success, False otherwise.
+        #
+        #  @ref tui_restore_prs_params "Example"
+        def RestoreSubShapes (self, theObject, theArgs=[],
+                              theFindMethod=GEOM.FSM_GetInPlace, theInheritFirstArg=False):
+            # Example: see GEOM_TestAll.py
+            return self.RestoreSubShapesO(self.myStudy, theObject, theArgs,
+                                          theFindMethod, theInheritFirstArg)
+
+        # end of l3_restore_ss
+        ## @}
+
+        ## @addtogroup l3_basic_go
+        ## @{
+
         ## 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
+        #  @ref tui_creation_point "Example"
         def MakeVertex(self,theX, theY, theZ):
+            # Example: see GEOM_TestAll.py
+            theX,theY,theZ,Parameters = ParseParameters(theX, theY, theZ)
             anObj = self.BasicOp.MakePointXYZ(theX, theY, theZ)
             RaiseIfFailed("MakePointXYZ", self.BasicOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
         ## Create a point, distant from the referenced point
         #  on the given distances along the coordinate axes.
         #  @param theReference The referenced point.
@@ -170,99 +343,131 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theZ Displacement from the referenced point along OZ axis.
         #  @return New GEOM_Object, containing the created point.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_creation_point "Example"
         def MakeVertexWithRef(self,theReference, theX, theY, theZ):
+            # Example: see GEOM_TestAll.py
+            theX,theY,theZ,Parameters = ParseParameters(theX, theY, theZ)
             anObj = self.BasicOp.MakePointWithReference(theReference, theX, theY, theZ)
             RaiseIfFailed("MakePointWithReference", self.BasicOp)
+            anObj.SetParameters(Parameters)
             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
+        #  @ref tui_creation_point "Example"
         def MakeVertexOnCurve(self,theRefCurve, theParameter):
+            # Example: see GEOM_TestAll.py
+            theParameter, Parameters = ParseParameters(theParameter)
             anObj = self.BasicOp.MakePointOnCurve(theRefCurve, theParameter)
             RaiseIfFailed("MakePointOnCurve", self.BasicOp)
+            anObj.SetParameters(Parameters)
+            return anObj
+
+        ## Create a point, corresponding to the given parameters on the
+        #    given surface.
+        #  @param theRefSurf The referenced surface.
+        #  @param theUParameter Value of U-parameter on the referenced surface.
+        #  @param theVParameter Value of V-parameter on the referenced surface.
+        #  @return New GEOM_Object, containing the created point.
+        #
+        #  @ref swig_MakeVertexOnSurface "Example"
+        def MakeVertexOnSurface(self, theRefSurf, theUParameter, theVParameter):
+            theUParameter, theVParameter, Parameters = ParseParameters(theUParameter, theVParameter)
+            # Example: see GEOM_TestAll.py
+            anObj = self.BasicOp.MakePointOnSurface(theRefSurf, theUParameter, theVParameter)
+            RaiseIfFailed("MakePointOnSurface", self.BasicOp)
+            anObj.SetParameters(Parameters);
             return anObj
 
         ## Create a point on intersection of two lines.
         #  @param theRefLine1, theRefLine2 The referenced lines.
         #  @return New GEOM_Object, containing the created point.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref swig_MakeVertexOnLinesIntersection "Example"
         def MakeVertexOnLinesIntersection(self, theRefLine1, theRefLine2):
+            # Example: see GEOM_TestAll.py
             anObj = self.BasicOp.MakePointOnLinesIntersection(theRefLine1, theRefLine2)
             RaiseIfFailed("MakePointOnLinesIntersection", self.BasicOp)
             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(self,theRefCurve, theParameter):
+        #
+        #  @ref swig_MakeTangentOnCurve "Example"
+        def MakeTangentOnCurve(self, theRefCurve, theParameter):
             anObj = self.BasicOp.MakeTangentOnCurve(theRefCurve, theParameter)
             RaiseIfFailed("MakeTangentOnCurve", self.BasicOp)
             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
+        #  @ref tui_creation_vector "Example"
         def MakeVectorDXDYDZ(self,theDX, theDY, theDZ):
+            # Example: see GEOM_TestAll.py
+            theDX,theDY,theDZ,Parameters = ParseParameters(theDX, theDY, theDZ)
             anObj = self.BasicOp.MakeVectorDXDYDZ(theDX, theDY, theDZ)
             RaiseIfFailed("MakeVectorDXDYDZ", self.BasicOp)
+            anObj.SetParameters(Parameters)
             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
+        #
+        #  @ref tui_creation_vector "Example"
         def MakeVector(self,thePnt1, thePnt2):
+            # Example: see GEOM_TestAll.py
             anObj = self.BasicOp.MakeVectorTwoPnt(thePnt1, thePnt2)
             RaiseIfFailed("MakeVectorTwoPnt", self.BasicOp)
             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
+        #  @ref tui_creation_line "Example"
         def MakeLine(self,thePnt, theDir):
+            # Example: see GEOM_TestAll.py
             anObj = self.BasicOp.MakeLine(thePnt, theDir)
             RaiseIfFailed("MakeLine", self.BasicOp)
             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
+        #  @ref tui_creation_line "Example"
         def MakeLineTwoPnt(self,thePnt1, thePnt2):
+            # Example: see GEOM_TestAll.py
             anObj = self.BasicOp.MakeLineTwoPnt(thePnt1, thePnt2)
             RaiseIfFailed("MakeLineTwoPnt", self.BasicOp)
             return anObj
 
-        ## Create a line on two faces intersection. 
+        ## Create a line on two faces intersection.
         #  @param theFace1 First of two faces, defining the line.
         #  @param theFace2 Second of two faces, defining the line.
         #  @return New GEOM_Object, containing the created line.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref swig_MakeLineTwoFaces "Example"
         def MakeLineTwoFaces(self, theFace1, theFace2):
+            # Example: see GEOM_TestAll.py
             anObj = self.BasicOp.MakeLineTwoFaces(theFace1, theFace2)
             RaiseIfFailed("MakeLineTwoFaces", self.BasicOp)
             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.
@@ -270,12 +475,15 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @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
+        #  @ref tui_creation_plane "Example"
         def MakePlane(self,thePnt, theVec, theTrimSize):
+            # Example: see GEOM_TestAll.py
+            theTrimSize, Parameters = ParseParameters(theTrimSize);
             anObj = self.BasicOp.MakePlanePntVec(thePnt, theVec, theTrimSize)
             RaiseIfFailed("MakePlanePntVec", self.BasicOp)
+            anObj.SetParameters(Parameters)
             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.
@@ -283,41 +491,52 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @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
+        #  @ref tui_creation_plane "Example"
         def MakePlaneThreePnt(self,thePnt1, thePnt2, thePnt3, theTrimSize):
+            # Example: see GEOM_TestAll.py
+            theTrimSize, Parameters = ParseParameters(theTrimSize);
             anObj = self.BasicOp.MakePlaneThreePnt(thePnt1, thePnt2, thePnt3, theTrimSize)
             RaiseIfFailed("MakePlaneThreePnt", self.BasicOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
         ## Create a plane, similar to the existing one, but with another size of representing face.
         #  @param theFace Referenced plane or LCS(Marker).
         #  @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
+        #  @ref tui_creation_plane "Example"
         def MakePlaneFace(self,theFace, theTrimSize):
+            # Example: see GEOM_TestAll.py
+            theTrimSize, Parameters = ParseParameters(theTrimSize);
             anObj = self.BasicOp.MakePlaneFace(theFace, theTrimSize)
             RaiseIfFailed("MakePlaneFace", self.BasicOp)
+            anObj.SetParameters(Parameters)
             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(self,OX,OY,OZ, XDX,XDY,XDZ, YDX,YDY,YDZ):
+        #  @ref swig_MakeMarker "Example"
+        def MakeMarker(self, OX,OY,OZ, XDX,XDY,XDZ, YDX,YDY,YDZ):
+            # Example: see GEOM_TestAll.py
+            OX,OY,OZ, XDX,XDY,XDZ, YDX,YDY,YDZ, Parameters = ParseParameters(OX,OY,OZ, XDX,XDY,XDZ, YDX,YDY,YDZ);  
             anObj = self.BasicOp.MakeMarker(OX,OY,OZ, XDX,XDY,XDZ, YDX,YDY,YDZ)
             RaiseIfFailed("MakeMarker", self.BasicOp)
+            anObj.SetParameters(Parameters)
             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(self,theOrigin, theXVec, theYVec):
+        #
+        #  @ref swig_MakeMarker "Example"
+        def MakeMarkerPntTwoVec(self, theOrigin, theXVec, theYVec):
             O = self.PointCoordinates( theOrigin )
             OXOY = []
             for vec in [ theXVec, theYVec ]:
@@ -332,53 +551,85 @@ class geompyDC(GEOM._objref_GEOM_Gen):
                                              OXOY[3], OXOY[4], OXOY[5], )
             RaiseIfFailed("MakeMarker", self.BasicOp)
             return anObj
-        
-        # -----------------------------------------------------------------------------
-        # Curves
-        # -----------------------------------------------------------------------------
-        
+
+        # end of l3_basic_go
+        ## @}
+
+        ## @addtogroup l4_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
+        #  @ref swig_MakeArc "Example"
         def MakeArc(self,thePnt1, thePnt2, thePnt3):
+            # Example: see GEOM_TestAll.py
             anObj = self.CurvesOp.MakeArc(thePnt1, thePnt2, thePnt3)
             RaiseIfFailed("MakeArc", self.CurvesOp)
             return anObj
-        
+
         ##  Create an arc of circle from a center and 2 points.
         #  @param thePnt1 Center of the arc
         #  @param thePnt2 Start point of the arc. (Gives also the radius of the arc)
         #  @param thePnt3 End point of the arc (Gives also a direction)
+        #  @param theSense Orientation of the arc
         #  @return New GEOM_Object, containing the created arc.
         #
-        #  Example: see GEOM_TestAll.py
-        def MakeArcCenter(self,thePnt1, thePnt2, thePnt3,theSense):
-            anObj = self.CurvesOp.MakeArcCenter(thePnt1, thePnt2, thePnt3,theSense)
+        #  @ref swig_MakeArc "Example"
+        def MakeArcCenter(self, thePnt1, thePnt2, thePnt3, theSense=False):
+            # Example: see GEOM_TestAll.py
+            anObj = self.CurvesOp.MakeArcCenter(thePnt1, thePnt2, thePnt3, theSense)
             RaiseIfFailed("MakeArcCenter", self.CurvesOp)
             return anObj
-        
+       
+        ##  Create an arc of ellipse, of center and two points.
+        #  @param theCenter Center of the arc.
+        #  @param thePnt1 defines major radius of the arc by distance from Pnt1 to Pnt2.
+        #  @param thePnt2 defines plane of ellipse and minor radius as distance from Pnt3 to line from Pnt1 to Pnt2.
+        #  @return New GEOM_Object, containing the created arc.
+        #
+        #  @ref swig_MakeArc "Example"
+        def MakeArcOfEllipse(self,theCenter, thePnt1, thePnt2):
+            # Example: see GEOM_TestAll.py
+            anObj = self.CurvesOp.MakeArcOfEllipse(theCenter, thePnt1, thePnt2)
+            RaiseIfFailed("MakeArcOfEllipse", self.CurvesOp)
+            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(self,thePnt, theVec, theR):
+        #  @ref tui_creation_circle "Example"
+        def MakeCircle(self, thePnt, theVec, theR):
+            # Example: see GEOM_TestAll.py
+            theR, Parameters = ParseParameters(theR)
             anObj = self.CurvesOp.MakeCirclePntVecR(thePnt, theVec, theR)
             RaiseIfFailed("MakeCirclePntVecR", self.CurvesOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
+        ## Create a circle with given radius.
+        #  Center of the circle will be in the origin of global
+        #  coordinate system and normal vector will be codirected with Z axis
+        #  @param theR Circle radius.
+        #  @return New GEOM_Object, containing the created circle.
+        def MakeCircleR(self, theR):
+            anObj = self.CurvesOp.MakeCirclePntVecR(None, None, theR)
+            RaiseIfFailed("MakeCirclePntVecR", self.CurvesOp)
+            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
+        #  @ref tui_creation_circle "Example"
         def MakeCircleThreePnt(self,thePnt1, thePnt2, thePnt3):
+            # Example: see GEOM_TestAll.py
             anObj = self.CurvesOp.MakeCircleThreePnt(thePnt1, thePnt2, thePnt3)
             RaiseIfFailed("MakeCircleThreePnt", self.CurvesOp)
             return anObj
@@ -389,12 +640,13 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param thePnt1,thePnt2,thePnt3 Points, defining the circle.
         #  @return New GEOM_Object, containing the created circle.
         #
-        #  Example: see GEOM_example6.py
+        #  @ref swig_MakeCircle "Example"
         def MakeCircleCenter2Pnt(self,thePnt1, thePnt2, thePnt3):
+            # Example: see GEOM_example6.py
             anObj = self.CurvesOp.MakeCircleCenter2Pnt(thePnt1, thePnt2, thePnt3)
             RaiseIfFailed("MakeCircleCenter2Pnt", self.CurvesOp)
             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.
@@ -402,44 +654,67 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theRMinor Minor ellipse radius.
         #  @return New GEOM_Object, containing the created ellipse.
         #
-        #  Example: see GEOM_TestAll.py
-        def MakeEllipse(self,thePnt, theVec, theRMajor, theRMinor):
+        #  @ref tui_creation_ellipse "Example"
+        def MakeEllipse(self, thePnt, theVec, theRMajor, theRMinor):
+            # Example: see GEOM_TestAll.py
+            theRMajor, theRMinor, Parameters = ParseParameters(theRMajor, theRMinor)
             anObj = self.CurvesOp.MakeEllipse(thePnt, theVec, theRMajor, theRMinor)
             RaiseIfFailed("MakeEllipse", self.CurvesOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
+        ## Create an ellipse with given radiuses.
+        #  Center of the ellipse will be in the origin of global
+        #  coordinate system and normal vector will be codirected with Z axis
+        #  @param theRMajor Major ellipse radius.
+        #  @param theRMinor Minor ellipse radius.
+        #  @return New GEOM_Object, containing the created ellipse.
+        def MakeEllipseRR(self, theRMajor, theRMinor):
+            anObj = self.CurvesOp.MakeEllipse(None, None, theRMajor, theRMinor)
+            RaiseIfFailed("MakeEllipse", self.CurvesOp)
+            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
+        #  @ref tui_creation_curve "Example"
         def MakePolyline(self,thePoints):
+            # Example: see GEOM_TestAll.py
             anObj = self.CurvesOp.MakePolyline(thePoints)
             RaiseIfFailed("MakePolyline", self.CurvesOp)
             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
+        #  @ref tui_creation_curve "Example"
         def MakeBezier(self,thePoints):
+            # Example: see GEOM_TestAll.py
             anObj = self.CurvesOp.MakeSplineBezier(thePoints)
             RaiseIfFailed("MakeSplineBezier", self.CurvesOp)
             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
+        #  @ref tui_creation_curve "Example"
         def MakeInterpol(self,thePoints):
+            # Example: see GEOM_TestAll.py
             anObj = self.CurvesOp.MakeSplineInterpolation(thePoints)
             RaiseIfFailed("MakeSplineInterpolation", self.CurvesOp)
             return anObj
-        
+
+        # end of l4_curves
+        ## @}
+
+        ## @addtogroup l3_sketcher
+        ## @{
+
         ## Create a sketcher (wire or face), following the textual description,
-        #  passed through \a theCommand argument. \n
+        #  passed through <VAR>theCommand</VAR> 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:
         #
@@ -471,36 +746,56 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #                         OZ and OX directions of the working plane.
         #  @return New GEOM_Object, containing the created wire.
         #
-        #  Example: see GEOM_TestAll.py
-        def MakeSketcher(self,theCommand, theWorkingPlane = [0,0,0, 0,0,1, 1,0,0]):
+        #  @ref tui_sketcher_page "Example"
+        def MakeSketcher(self, theCommand, theWorkingPlane = [0,0,0, 0,0,1, 1,0,0]):
+            # Example: see GEOM_TestAll.py
+            theCommand,Parameters = ParseSketcherCommand(theCommand)
             anObj = self.CurvesOp.MakeSketcher(theCommand, theWorkingPlane)
             RaiseIfFailed("MakeSketcher", self.CurvesOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
         ## Create a sketcher (wire or face), following the textual description,
-        #  passed through \a theCommand argument. \n
+        #  passed through <VAR>theCommand</VAR> 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 or LCS(Marker) of the working plane.
         #  @return New GEOM_Object, containing the created wire.
-        def MakeSketcherOnPlane(self,theCommand, theWorkingPlane):
+        #
+        #  @ref tui_sketcher_page "Example"
+        def MakeSketcherOnPlane(self, theCommand, theWorkingPlane):
             anObj = self.CurvesOp.MakeSketcherOnPlane(theCommand, theWorkingPlane)
             RaiseIfFailed("MakeSketcherOnPlane", self.CurvesOp)
             return anObj
-        
-        # -----------------------------------------------------------------------------
-        # Create 3D Primitives
-        # -----------------------------------------------------------------------------
-        
+           
+       ## Create a sketcher wire, following the numerical description,
+        #  passed through <VAR>theCoordinates</VAR> argument. \n
+       #  @param theCoordinates double values, defining points to create a wire,
+        #                                                      passing from it.
+        #  @return New GEOM_Object, containing the created wire.
+        #
+        #  @ref tui_sketcher_page "Example"
+        def Make3DSketcher(self, theCoordinates):
+            anObj = self.CurvesOp.Make3DSketcher(theCoordinates)
+            RaiseIfFailed("Make3DSketcher", self.CurvesOp)
+            return anObj
+
+        # end of l3_sketcher
+        ## @}
+
+        ## @addtogroup l3_3d_primitives
+        ## @{
+
         ## Create a box by coordinates of two opposite vertices.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_creation_box "Example"
         def MakeBox(self,x1,y1,z1,x2,y2,z2):
+            # Example: see GEOM_TestAll.py
             pnt1 = self.MakeVertex(x1,y1,z1)
             pnt2 = self.MakeVertex(x2,y2,z2)
             return self.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).
@@ -509,24 +804,101 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theDZ Length of Box edges, parallel to OZ axis.
         #  @return New GEOM_Object, containing the created box.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_creation_box "Example"
         def MakeBoxDXDYDZ(self,theDX, theDY, theDZ):
+            # Example: see GEOM_TestAll.py
+            theDX,theDY,theDZ,Parameters = ParseParameters(theDX, theDY, theDZ)
             anObj = self.PrimOp.MakeBoxDXDYDZ(theDX, theDY, theDZ)
             RaiseIfFailed("MakeBoxDXDYDZ", self.PrimOp)
+            anObj.SetParameters(Parameters)
             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
+        #  @ref tui_creation_box "Example"
         def MakeBoxTwoPnt(self,thePnt1, thePnt2):
+            # Example: see GEOM_TestAll.py
             anObj = self.PrimOp.MakeBoxTwoPnt(thePnt1, thePnt2)
             RaiseIfFailed("MakeBoxTwoPnt", self.PrimOp)
             return anObj
-        
+           
+        ## Create a face with specified dimensions along OX-OY coordinate axes,
+        #  with edges, parallel to this coordinate axes.
+        #  @param theH height of Face.
+        #  @param theW width of Face.
+       #  @param theOrientation orientation belong axis OXY OYZ OZX 
+        #  @return New GEOM_Object, containing the created face.
+        #
+        #  @ref tui_creation_face "Example"
+        def MakeFaceHW(self,theH, theW, theOrientation):
+            # Example: see GEOM_TestAll.py
+            theH,theW,Parameters = ParseParameters(theH, theW)
+            anObj = self.PrimOp.MakeFaceHW(theH, theW, theOrientation)
+            RaiseIfFailed("MakeFaceHW", self.PrimOp)
+            anObj.SetParameters(Parameters)
+            return anObj
+
+        ## Create a face from another plane and two sizes,
+        #  vertical size and horisontal size.
+        #  @param theObj   Normale vector to the creating face or
+       #  the face object.
+        #  @param theH     Height (vertical size).
+        #  @param theW     Width (horisontal size).
+        #  @return New GEOM_Object, containing the created face.
+        #
+        #  @ref tui_creation_face "Example"
+        def MakeFaceObjHW(self, theObj, theH, theW):
+            # Example: see GEOM_TestAll.py
+            theH,theW,Parameters = ParseParameters(theH, theW)
+            anObj = self.PrimOp.MakeFaceObjHW(theObj, theH, theW)
+            RaiseIfFailed("MakeFaceObjHW", self.PrimOp)
+            anObj.SetParameters(Parameters)
+            return anObj
+
+        ## Create a disk with given center, normal vector and radius.
+        #  @param thePnt Disk center.
+        #  @param theVec Vector, normal to the plane of the disk.
+        #  @param theR Disk radius.
+        #  @return New GEOM_Object, containing the created disk.
+        #
+        #  @ref tui_creation_disk "Example"
+        def MakeDiskPntVecR(self,thePnt, theVec, theR):
+            # Example: see GEOM_TestAll.py
+            theR,Parameters = ParseParameters(theR)
+            anObj = self.PrimOp.MakeDiskPntVecR(thePnt, theVec, theR)
+            RaiseIfFailed("MakeDiskPntVecR", self.PrimOp)
+            anObj.SetParameters(Parameters)
+            return anObj
+
+        ## Create a disk, passing through three given points
+        #  @param thePnt1,thePnt2,thePnt3 Points, defining the disk.
+        #  @return New GEOM_Object, containing the created disk.
+        #
+        #  @ref tui_creation_disk "Example"
+        def MakeDiskThreePnt(self,thePnt1, thePnt2, thePnt3):
+            # Example: see GEOM_TestAll.py
+            anObj = self.PrimOp.MakeDiskThreePnt(thePnt1, thePnt2, thePnt3)
+            RaiseIfFailed("MakeDiskThreePnt", self.PrimOp)
+            return anObj
+
+        ## Create a disk with specified dimensions along OX-OY coordinate axes.
+        #  @param theR Radius of Face.
+       #  @param theOrientation set the orientation belong axis OXY or OYZ or OZX 
+        #  @return New GEOM_Object, containing the created disk.
+        #
+        #  @ref tui_creation_face "Example"
+        def MakeDiskR(self,theR, theOrientation):
+            # Example: see GEOM_TestAll.py
+            theR,Parameters = ParseParameters(theR)
+            anObj = self.PrimOp.MakeDiskR(theR, theOrientation)
+            RaiseIfFailed("MakeDiskR", self.PrimOp)
+            anObj.SetParameters(Parameters)
+            return anObj
+
         ## Create a cylinder with given base point, axis, radius and height.
         #  @param thePnt Central point of cylinder base.
         #  @param theAxis Cylinder axis.
@@ -534,12 +906,15 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theH Cylinder height.
         #  @return New GEOM_Object, containing the created cylinder.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_creation_cylinder "Example"
         def MakeCylinder(self,thePnt, theAxis, theR, theH):
+            # Example: see GEOM_TestAll.py
+            theR,theH,Parameters = ParseParameters(theR, theH)
             anObj = self.PrimOp.MakeCylinderPntVecRH(thePnt, theAxis, theR, theH)
             RaiseIfFailed("MakeCylinderPntVecRH", self.PrimOp)
+            anObj.SetParameters(Parameters)
             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.
@@ -547,30 +922,37 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theH Cylinder height.
         #  @return New GEOM_Object, containing the created cylinder.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_creation_cylinder "Example"
         def MakeCylinderRH(self,theR, theH):
+            # Example: see GEOM_TestAll.py
+            theR,theH,Parameters = ParseParameters(theR, theH)
             anObj = self.PrimOp.MakeCylinderRH(theR, theH)
             RaiseIfFailed("MakeCylinderRH", self.PrimOp)
+            anObj.SetParameters(Parameters)
             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(self,thePnt, theR):
+        #  @ref tui_creation_sphere "Example"
+        def MakeSpherePntR(self, thePnt, theR):
+            # Example: see GEOM_TestAll.py
+            theR,Parameters = ParseParameters(theR)
             anObj = self.PrimOp.MakeSpherePntR(thePnt, theR)
             RaiseIfFailed("MakeSpherePntR", self.PrimOp)
+            anObj.SetParameters(Parameters)
             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(self,x, y, z, theR):
+        #  @ref tui_creation_sphere "Example"
+        def MakeSphere(self, x, y, z, theR):
+            # Example: see GEOM_TestAll.py
             point = self.MakeVertex(x, y, z)
             anObj = self.MakeSpherePntR(point, theR)
             return anObj
@@ -579,12 +961,15 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theR Sphere radius.
         #  @return New GEOM_Object, containing the created sphere.
         #
-        #  Example: see GEOM_TestAll.py
-        def MakeSphereR(self,theR):
+        #  @ref tui_creation_sphere "Example"
+        def MakeSphereR(self, theR):
+            # Example: see GEOM_TestAll.py
+            theR,Parameters = ParseParameters(theR)
             anObj = self.PrimOp.MakeSphereR(theR)
             RaiseIfFailed("MakeSphereR", self.PrimOp)
+            anObj.SetParameters(Parameters)
             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.
@@ -595,12 +980,15 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theH Cone height.
         #  @return New GEOM_Object, containing the created cone.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_creation_cone "Example"
         def MakeCone(self,thePnt, theAxis, theR1, theR2, theH):
+            # Example: see GEOM_TestAll.py
+            theR1,theR2,theH,Parameters = ParseParameters(theR1,theR2,theH)
             anObj = self.PrimOp.MakeConePntVecR1R2H(thePnt, theAxis, theR1, theR2, theH)
             RaiseIfFailed("MakeConePntVecR1R2H", self.PrimOp)
+            anObj.SetParameters(Parameters)
             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.
@@ -611,12 +999,15 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theH Cone height.
         #  @return New GEOM_Object, containing the created cone.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_creation_cone "Example"
         def MakeConeR1R2H(self,theR1, theR2, theH):
+            # Example: see GEOM_TestAll.py
+            theR1,theR2,theH,Parameters = ParseParameters(theR1,theR2,theH)
             anObj = self.PrimOp.MakeConeR1R2H(theR1, theR2, theH)
             RaiseIfFailed("MakeConeR1R2H", self.PrimOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
         ## Create a torus with given center, normal vector and radiuses.
         #  @param thePnt Torus central point.
         #  @param theVec Torus axis of symmetry.
@@ -624,35 +1015,48 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theRMinor Torus minor radius.
         #  @return New GEOM_Object, containing the created torus.
         #
-        #  Example: see GEOM_TestAll.py
-        def MakeTorus(self,thePnt, theVec, theRMajor, theRMinor):
+        #  @ref tui_creation_torus "Example"
+        def MakeTorus(self, thePnt, theVec, theRMajor, theRMinor):
+            # Example: see GEOM_TestAll.py
+            theRMajor,theRMinor,Parameters = ParseParameters(theRMajor,theRMinor)
             anObj = self.PrimOp.MakeTorusPntVecRR(thePnt, theVec, theRMajor, theRMinor)
             RaiseIfFailed("MakeTorusPntVecRR", self.PrimOp)
+            anObj.SetParameters(Parameters)
             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(self,theRMajor, theRMinor):
+        #  @ref tui_creation_torus "Example"
+        def MakeTorusRR(self, theRMajor, theRMinor):
+            # Example: see GEOM_TestAll.py
+            theRMajor,theRMinor,Parameters = ParseParameters(theRMajor,theRMinor)
             anObj = self.PrimOp.MakeTorusRR(theRMajor, theRMinor)
             RaiseIfFailed("MakeTorusRR", self.PrimOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
+        # end of l3_3d_primitives
+        ## @}
+
+        ## @addtogroup l3_complex
+        ## @{
+
         ## 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(self,theBase, thePoint1, thePoint2):
+        #  @ref tui_creation_prism "Example"
+        def MakePrism(self, theBase, thePoint1, thePoint2):
+            # Example: see GEOM_TestAll.py
             anObj = self.PrimOp.MakePrismTwoPnt(theBase, thePoint1, thePoint2)
             RaiseIfFailed("MakePrismTwoPnt", self.PrimOp)
             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.
@@ -661,10 +1065,13 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theH Prism dimension along theVec.
         #  @return New GEOM_Object, containing the created prism.
         #
-        #  Example: see GEOM_TestAll.py
-        def MakePrismVecH(self,theBase, theVec, theH):
+        #  @ref tui_creation_prism "Example"
+        def MakePrismVecH(self, theBase, theVec, theH):
+            # Example: see GEOM_TestAll.py
+            theH,Parameters = ParseParameters(theH)
             anObj = self.PrimOp.MakePrismVecH(theBase, theVec, theH)
             RaiseIfFailed("MakePrismVecH", self.PrimOp)
+            anObj.SetParameters(Parameters)
             return anObj
 
         ## Create a shape by extrusion of the base shape along the vector,
@@ -675,24 +1082,45 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theH Prism dimension along theVec in forward direction.
         #  @return New GEOM_Object, containing the created prism.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_creation_prism "Example"
         def MakePrismVecH2Ways(self, theBase, theVec, theH):
+            # Example: see GEOM_TestAll.py
+            theH,Parameters = ParseParameters(theH)
             anObj = self.PrimOp.MakePrismVecH2Ways(theBase, theVec, theH)
             RaiseIfFailed("MakePrismVecH2Ways", self.PrimOp)
+            anObj.SetParameters(Parameters)
             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.
+           
+       ## Create a shape by extrusion of the base shape along the dx, dy, dz direction
         #  @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.
+        #  @param theDX, theDY, theDZ Directions of extrusion.
+        #  @return New GEOM_Object, containing the created prism.
         #
-        #  Example: see GEOM_TestAll.py
-        def MakePipe(self,theBase, thePath):
-            anObj = self.PrimOp.MakePipe(theBase, thePath)
-            RaiseIfFailed("MakePipe", self.PrimOp)
+        #  @ref tui_creation_prism "Example"
+        def MakePrismDXDYDZ(self, theBase, theDX, theDY, theDZ):
+            # Example: see GEOM_TestAll.py
+            theDX,theDY,theDZ,Parameters = ParseParameters(theDX, theDY, theDZ)
+            anObj = self.PrimOp.MakePrismDXDYDZ(theBase, theDX, theDY, theDZ)
+            RaiseIfFailed("MakePrismDXDYDZ", self.PrimOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+           
+       ## Create a shape by extrusion of the base shape along the dx, dy, dz direction
+        #  i.e. all the space, transfixed by the base shape during its translation
+        #  along the vector on the given distance in 2 Ways (forward/backward) .
+        #  @param theBase Base shape to be extruded.
+        #  @param theDX, theDY, theDZ Directions of extrusion.
+        #  @return New GEOM_Object, containing the created prism.
+        #
+        #  @ref tui_creation_prism "Example"
+        def MakePrismDXDYDZ2Ways(self, theBase, theDX, theDY, theDZ):
+            # Example: see GEOM_TestAll.py
+            theDX,theDY,theDZ,Parameters = ParseParameters(theDX, theDY, theDZ)
+            anObj = self.PrimOp.MakePrismDXDYDZ2Ways(theBase, theDX, theDY, theDZ)
+            RaiseIfFailed("MakePrismDXDYDZ2Ways", self.PrimOp)
+            anObj.SetParameters(Parameters)
+            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.
@@ -701,17 +1129,48 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theAngle Rotation angle in radians.
         #  @return New GEOM_Object, containing the created revolution.
         #
-        #  Example: see GEOM_TestAll.py
-        def MakeRevolution(self,theBase, theAxis, theAngle):
+        #  @ref tui_creation_revolution "Example"
+        def MakeRevolution(self, theBase, theAxis, theAngle):
+            # Example: see GEOM_TestAll.py
+            theAngle,Parameters = ParseParameters(theAngle)
             anObj = self.PrimOp.MakeRevolutionAxisAngle(theBase, theAxis, theAngle)
             RaiseIfFailed("MakeRevolutionAxisAngle", self.PrimOp)
+            anObj.SetParameters(Parameters)
             return anObj
+
         ## The Same Revolution but in both ways forward&backward.
         def MakeRevolution2Ways(self, theBase, theAxis, theAngle):
+            theAngle,Parameters = ParseParameters(theAngle)
             anObj = self.PrimOp.MakeRevolutionAxisAngle2Ways(theBase, theAxis, theAngle)
             RaiseIfFailed("MakeRevolutionAxisAngle2Ways", self.PrimOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
+        ## Create a filling from the given compound of contours.
+        #  @param theShape the compound of contours
+        #  @param theMinDeg a minimal degree of BSpline surface to create
+        #  @param theMaxDeg a maximal degree of BSpline surface to create
+        #  @param theTol2D a 2d tolerance to be reached
+        #  @param theTol3D a 3d tolerance to be reached
+        #  @param theNbIter a number of iteration of approximation algorithm
+        #  @param isApprox if True, BSpline curves are generated in the process
+        #                  of surface construction. By default it is False, that means
+        #                  the surface is created using Besier curves. The usage of
+        #                  Approximation makes the algorithm work slower, but allows
+        #                  building the surface for rather complex cases
+        #  @return New GEOM_Object, containing the created filling surface.
+        #
+        #  @ref tui_creation_filling "Example"
+        def MakeFilling(self, theShape, theMinDeg, theMaxDeg, theTol2D, theTol3D, theNbIter, isApprox=0):
+            # Example: see GEOM_TestAll.py
+            theMinDeg,theMaxDeg,theTol2D,theTol3D,theNbIter,Parameters = ParseParameters(theMinDeg, theMaxDeg,
+                                                                                         theTol2D, theTol3D, theNbIter)
+            anObj = self.PrimOp.MakeFilling(theShape, theMinDeg, theMaxDeg,
+                                            theTol2D, theTol3D, theNbIter, isApprox)
+            RaiseIfFailed("MakeFilling", self.PrimOp)
+            anObj.SetParameters(Parameters)
+            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
@@ -719,12 +1178,26 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @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
+        #  @ref swig_todo "Example"
         def MakeThruSections(self,theSeqSections,theModeSolid,thePreci,theRuled):
+            # Example: see GEOM_TestAll.py
             anObj = self.PrimOp.MakeThruSections(theSeqSections,theModeSolid,thePreci,theRuled)
             RaiseIfFailed("MakeThruSections", self.PrimOp)
             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.
+        #
+        #  @ref tui_creation_pipe "Example"
+        def MakePipe(self,theBase, thePath):
+            # Example: see GEOM_TestAll.py
+            anObj = self.PrimOp.MakePipe(theBase, thePath)
+            RaiseIfFailed("MakePipe", self.PrimOp)
+            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.     
@@ -735,10 +1208,11 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @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
+        #  @param theWithCorrection - 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.
         #
+        #  @ref tui_creation_pipe_with_diff_sec "Example"
         def MakePipeWithDifferentSections(self, theSeqBases,
                                           theLocations, thePath,
                                           theWithContact, theWithCorrection):
@@ -747,12 +1221,18 @@ class geompyDC(GEOM._objref_GEOM_Gen):
                                                               theWithContact, theWithCorrection)
             RaiseIfFailed("MakePipeWithDifferentSections", self.PrimOp)
             return anObj
-        
+
         ## Create a shape by extrusion of the profile shape along
-        #  the path shape. The path shape can be a shell or a face.
+        #  the path shape. The path shape can be a wire or a edge.
         #  the several profiles can be specified in the several locations of path.     
-        #  @param theSeqBases - list of  Bases shape to be extruded.
+        #  @param theSeqBases - list of  Bases shape to be extruded. Base shape must be
+        #                       shell or face. If number of faces in neighbour sections
+        #                       aren't coincided result solid between such sections will
+        #                       be created using external boundaries of this shells.
         #  @param theSeqSubBases - list of corresponding subshapes of section shapes.
+        #                          This list is used for searching correspondences between
+        #                          faces in the sections. Size of this list must be equal
+        #                          to size of list of base shapes.
         #  @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. First and last
@@ -761,10 +1241,11 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @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
+        #  @param theWithCorrection - defining that the section is rotated to be
+        #                             orthogonal to the spine tangent in the correspondent point
         #  @return New GEOM_Object, containing the created solids.
         #
+        #  @ref tui_creation_pipe_with_shell_sec "Example"
         def MakePipeWithShellSections(self,theSeqBases, theSeqSubBases,
                                       theLocations, thePath,
                                       theWithContact, theWithCorrection):
@@ -774,6 +1255,12 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             RaiseIfFailed("MakePipeWithShellSections", self.PrimOp)
             return anObj
 
+        ## Create a shape by extrusion of the profile shape along
+        #  the path shape. This function is used only for debug pipe
+        #  functionality - it is a version of previous function
+        #  (MakePipeWithShellSections(...)) which give a possibility to
+        #  recieve information about creating pipe between each pair of
+        #  sections step by step.
         def MakePipeWithShellSectionsBySteps(self, theSeqBases, theSeqSubBases,
                                              theLocations, thePath,
                                              theWithContact, theWithCorrection):
@@ -799,115 +1286,150 @@ class geompyDC(GEOM._objref_GEOM_Gen):
                     res.append(anObj)
                     pass
                 pass
-            
+
             resc = self.MakeCompound(res)
             #resc = self.MakeSewing(res, 0.001)
             #print "resc: ",resc
             return resc
-        
+
         ## Create solids between given sections
         #  @param theSeqBases - list of sections (shell or face).
         #  @param theLocations - list of corresponding vertexes
         #  @return New GEOM_Object, containing the created solids.
         #
+        #  @ref tui_creation_pipe_without_path "Example"
         def MakePipeShellsWithoutPath(self, theSeqBases, theLocations):
             anObj = self.PrimOp.MakePipeShellsWithoutPath(theSeqBases, theLocations)
             RaiseIfFailed("MakePipeShellsWithoutPath", self.PrimOp)
             return anObj
-        
-        
-        # -----------------------------------------------------------------------------
-        # Create base shapes
-        # -----------------------------------------------------------------------------
-        
+
+        ## Create a shape by extrusion of the base shape along
+        #  the path shape with constant bi-normal direction along the given vector.
+        #  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.
+        #  @param theVec Vector defines a constant binormal direction to keep the
+        #                same angle beetween the direction and the sections
+        #                along the sweep surface.
+        #  @return New GEOM_Object, containing the created pipe.
+        #
+        #  @ref tui_creation_pipe "Example"
+        def MakePipeBiNormalAlongVector(self,theBase, thePath, theVec):
+            # Example: see GEOM_TestAll.py
+            anObj = self.PrimOp.MakePipeBiNormalAlongVector(theBase, thePath, theVec)
+            RaiseIfFailed("MakePipeBiNormalAlongVector", self.PrimOp)
+            return anObj
+
+        # end of l3_complex
+        ## @}
+
+        ## @addtogroup l3_advanced
+        ## @{
+
         ## 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
+        #  @ref tui_creation_edge "Example"
         def MakeEdge(self,thePnt1, thePnt2):
+            # Example: see GEOM_TestAll.py
             anObj = self.ShapesOp.MakeEdge(thePnt1, thePnt2)
             RaiseIfFailed("MakeEdge", self.ShapesOp)
             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
+        #  @ref tui_creation_wire "Example"
         def MakeWire(self,theEdgesAndWires):
+            # Example: see GEOM_TestAll.py
             anObj = self.ShapesOp.MakeWire(theEdgesAndWires)
             RaiseIfFailed("MakeWire", self.ShapesOp)
             return anObj
-        
+
         ## Create a face on the given wire.
         #  @param theWire closed Wire or Edge 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
+        #  @ref tui_creation_face "Example"
         def MakeFace(self,theWire, isPlanarWanted):
+            # Example: see GEOM_TestAll.py
             anObj = self.ShapesOp.MakeFace(theWire, isPlanarWanted)
             RaiseIfFailed("MakeFace", self.ShapesOp)
             return anObj
-        
+
         ## Create a face on the given wires set.
         #  @param theWires List of closed wires or edges 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
+        #  @ref tui_creation_face "Example"
         def MakeFaceWires(self,theWires, isPlanarWanted):
+            # Example: see GEOM_TestAll.py
             anObj = self.ShapesOp.MakeFaceWires(theWires, isPlanarWanted)
             RaiseIfFailed("MakeFaceWires", self.ShapesOp)
             return anObj
-        
+
         ## Shortcut to MakeFaceWires()
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref tui_creation_face "Example 1"
+        #  \n @ref swig_MakeFaces  "Example 2"
         def MakeFaces(self,theWires, isPlanarWanted):
+            # Example: see GEOM_TestOthers.py
             anObj = self.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
+        #  @ref tui_creation_shell "Example"
         def MakeShell(self,theFacesAndShells):
+            # Example: see GEOM_TestAll.py
             anObj = self.ShapesOp.MakeShell(theFacesAndShells)
             RaiseIfFailed("MakeShell", self.ShapesOp)
             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
+        #  @ref tui_creation_solid "Example"
         def MakeSolid(self,theShells):
+            # Example: see GEOM_TestAll.py
             anObj = self.ShapesOp.MakeSolidShells(theShells)
             RaiseIfFailed("MakeSolidShells", self.ShapesOp)
             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
+        #  @ref tui_creation_compound "Example"
         def MakeCompound(self,theShapes):
+            # Example: see GEOM_TestAll.py
             anObj = self.ShapesOp.MakeCompound(theShapes)
             RaiseIfFailed("MakeCompound", self.ShapesOp)
             return anObj
-        
+
+        # end of l3_advanced
+        ## @}
+
+        ## @addtogroup l2_measure
+        ## @{
+
         ## Gives quantity of faces in the given shape.
         #  @param theShape Shape to count faces of.
         #  @return Quantity of faces.
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_NumberOfFaces "Example"
         def NumberOfFaces(self,theShape):
+            # Example: see GEOM_TestOthers.py
             nb_faces = self.ShapesOp.NumberOfFaces(theShape)
             RaiseIfFailed("NumberOfFaces", self.ShapesOp)
             return nb_faces
@@ -916,54 +1438,72 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theShape Shape to count edges of.
         #  @return Quantity of edges.
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_NumberOfEdges "Example"
         def NumberOfEdges(self,theShape):
+            # Example: see GEOM_TestOthers.py
             nb_edges = self.ShapesOp.NumberOfEdges(theShape)
             RaiseIfFailed("NumberOfEdges", self.ShapesOp)
             return nb_edges
-        
+
+        # end of l2_measure
+        ## @}
+
+        ## @addtogroup l3_healing
+        ## @{
+
         ## Reverses an orientation the given shape.
         #  @param theShape Shape to be reversed.
         #  @return The reversed copy of theShape.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref swig_ChangeOrientation "Example"
         def ChangeOrientation(self,theShape):
+            # Example: see GEOM_TestAll.py
             anObj = self.ShapesOp.ChangeOrientation(theShape)
             RaiseIfFailed("ChangeOrientation", self.ShapesOp)
             return anObj
-        
+
         ## Shortcut to ChangeOrientation()
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_OrientationChange "Example"
         def OrientationChange(self,theShape):
+            # Example: see GEOM_TestOthers.py
             anObj = self.ChangeOrientation(theShape)
             return anObj
-        
+
+        # end of l3_healing
+        ## @}
+
+        ## @addtogroup l4_obtain
+        ## @{
+
         ## 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
+        #  @ref tui_measurement_tools_page "Example"
         def GetFreeFacesIDs(self,theShape):
+            # Example: see GEOM_TestOthers.py
             anIDs = self.ShapesOp.GetFreeFacesIDs(theShape)
             RaiseIfFailed("GetFreeFacesIDs", self.ShapesOp)
             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
+        #  @ref swig_GetSharedShapes "Example"
         def GetSharedShapes(self,theShape1, theShape2, theShapeType):
+            # Example: see GEOM_TestOthers.py
             aList = self.ShapesOp.GetSharedShapes(theShape1, theShape2, theShapeType)
             RaiseIfFailed("GetSharedShapes", self.ShapesOp)
             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.
+
+        ## Find in <VAR>theShape</VAR> all sub-shapes of type <VAR>theShapeType</VAR>,
+        #  situated relatively the specified plane by the certain way,
+        #  defined through <VAR>theState</VAR> 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
@@ -972,45 +1512,52 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #   ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
         #  @return List of all found sub-shapes.
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_GetShapesOnPlane "Example"
         def GetShapesOnPlane(self,theShape, theShapeType, theAx1, theState):
+            # Example: see GEOM_TestOthers.py
             aList = self.ShapesOp.GetShapesOnPlane(theShape, theShapeType, theAx1, theState)
             RaiseIfFailed("GetShapesOnPlane", self.ShapesOp)
             return aList
-        
+
         ## Works like the above method, but returns list of sub-shapes indices
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_GetShapesOnPlaneIDs "Example"
         def GetShapesOnPlaneIDs(self,theShape, theShapeType, theAx1, theState):
+            # Example: see GEOM_TestOthers.py
             aList = self.ShapesOp.GetShapesOnPlaneIDs(theShape, theShapeType, theAx1, theState)
             RaiseIfFailed("GetShapesOnPlaneIDs", self.ShapesOp)
             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.
+
+        ## Find in <VAR>theShape</VAR> all sub-shapes of type <VAR>theShapeType</VAR>,
+        #  situated relatively the specified plane by the certain way,
+        #  defined through <VAR>theState</VAR> 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 of the plane to find shapes on.
         #  @param thePnt Point specifying 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.
+        #                  ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
         #  @return List of all found sub-shapes.
         #
-        #  Example: see GEOM_TestOthers.py
-        def GetShapesOnPlaneWithLocation(self,theShape, theShapeType, theAx1, thePnt, theState):
-            aList = self.ShapesOp.GetShapesOnPlaneWithLocation(theShape, theShapeType, theAx1, thePnt, theState)
+        #  @ref swig_GetShapesOnPlaneWithLocation "Example"
+        def GetShapesOnPlaneWithLocation(self, theShape, theShapeType, theAx1, thePnt, theState):
+            # Example: see GEOM_TestOthers.py
+            aList = self.ShapesOp.GetShapesOnPlaneWithLocation(theShape, theShapeType,
+                                                               theAx1, thePnt, theState)
             RaiseIfFailed("GetShapesOnPlaneWithLocation", self.ShapesOp)
             return aList
-        
+
         ## Works like the above method, but returns list of sub-shapes indices
         #
-        #  Example: see GEOM_TestOthers.py
-        def GetShapesOnPlaneWithLocationIDs(self,theShape, theShapeType, theAx1, thePnt, theState):
-            aList = self.ShapesOp.GetShapesOnPlaneWithLocationIDs(theShape, theShapeType, theAx1, thePnt, theState)
+        #  @ref swig_GetShapesOnPlaneWithLocationIDs "Example"
+        def GetShapesOnPlaneWithLocationIDs(self, theShape, theShapeType, theAx1, thePnt, theState):
+            # Example: see GEOM_TestOthers.py
+            aList = self.ShapesOp.GetShapesOnPlaneWithLocationIDs(theShape, theShapeType,
+                                                                  theAx1, thePnt, theState)
             RaiseIfFailed("GetShapesOnPlaneWithLocationIDs", self.ShapesOp)
             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.
@@ -1022,20 +1569,22 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #   ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
         #  @return List of all found sub-shapes.
         #
-        #  Example: see GEOM_TestOthers.py
-        def GetShapesOnCylinder(self,theShape, theShapeType, theAxis, theRadius, theState):
+        #  @ref swig_GetShapesOnCylinder "Example"
+        def GetShapesOnCylinder(self, theShape, theShapeType, theAxis, theRadius, theState):
+            # Example: see GEOM_TestOthers.py
             aList = self.ShapesOp.GetShapesOnCylinder(theShape, theShapeType, theAxis, theRadius, theState)
             RaiseIfFailed("GetShapesOnCylinder", self.ShapesOp)
             return aList
-        
+
         ## Works like the above method, but returns list of sub-shapes indices
         #
-        #  Example: see GEOM_TestOthers.py
-        def GetShapesOnCylinderIDs(self,theShape, theShapeType, theAxis, theRadius, theState):
+        #  @ref swig_GetShapesOnCylinderIDs "Example"
+        def GetShapesOnCylinderIDs(self, theShape, theShapeType, theAxis, theRadius, theState):
+            # Example: see GEOM_TestOthers.py
             aList = self.ShapesOp.GetShapesOnCylinderIDs(theShape, theShapeType, theAxis, theRadius, theState)
             RaiseIfFailed("GetShapesOnCylinderIDs", self.ShapesOp)
             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.
@@ -1046,20 +1595,22 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #   ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
         #  @return List of all found sub-shapes.
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_GetShapesOnSphere "Example"
         def GetShapesOnSphere(self,theShape, theShapeType, theCenter, theRadius, theState):
+            # Example: see GEOM_TestOthers.py
             aList = self.ShapesOp.GetShapesOnSphere(theShape, theShapeType, theCenter, theRadius, theState)
             RaiseIfFailed("GetShapesOnSphere", self.ShapesOp)
             return aList
-        
+
         ## Works like the above method, but returns list of sub-shapes indices
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_GetShapesOnSphereIDs "Example"
         def GetShapesOnSphereIDs(self,theShape, theShapeType, theCenter, theRadius, theState):
+            # Example: see GEOM_TestOthers.py
             aList = self.ShapesOp.GetShapesOnSphereIDs(theShape, theShapeType, theCenter, theRadius, theState)
             RaiseIfFailed("GetShapesOnSphereIDs", self.ShapesOp)
             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.
@@ -1069,56 +1620,109 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theBottomLeftPoint Point, specifying bottom left corner of a quadrangle
         #  @param theBottomRigthPoint Point, specifying bottom right corner of a quadrangle
         #  @param theState The state of the subshapes to find. It can be one of
-        #   ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
+        #                  ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
         #  @return List of all found sub-shapes.
         #
-        #  Example: see GEOM_TestOthers.py
-        def GetShapesOnQuadrangle(self,theShape, theShapeType, theTopLeftPoint, theTopRigthPoint, theBottomLeftPoint, theBottomRigthPoint, theState):
-            aList = self.ShapesOp.GetShapesOnQuadrangle(theShape, theShapeType, theTopLeftPoint, theTopRigthPoint, theBottomLeftPoint, theBottomRigthPoint, theState)
+        #  @ref swig_GetShapesOnQuadrangle "Example"
+        def GetShapesOnQuadrangle(self, theShape, theShapeType,
+                                  theTopLeftPoint, theTopRigthPoint,
+                                  theBottomLeftPoint, theBottomRigthPoint, theState):
+            # Example: see GEOM_TestOthers.py
+            aList = self.ShapesOp.GetShapesOnQuadrangle(theShape, theShapeType,
+                                                        theTopLeftPoint, theTopRigthPoint,
+                                                        theBottomLeftPoint, theBottomRigthPoint, theState)
             RaiseIfFailed("GetShapesOnQuadrangle", self.ShapesOp)
             return aList
-        
+
         ## Works like the above method, but returns list of sub-shapes indices
         #
-        #  Example: see GEOM_TestOthers.py
-        def GetShapesOnQuadrangleIDs(self,theShape, theShapeType, theTopLeftPoint, theTopRigthPoint, theBottomLeftPoint, theBottomRigthPoint, theState):
-            aList = self.ShapesOp.GetShapesOnQuadrangleIDs(theShape, theShapeType, theTopLeftPoint, theTopRigthPoint, theBottomLeftPoint, theBottomRigthPoint, theState)
+        #  @ref swig_GetShapesOnQuadrangleIDs "Example"
+        def GetShapesOnQuadrangleIDs(self, theShape, theShapeType,
+                                     theTopLeftPoint, theTopRigthPoint,
+                                     theBottomLeftPoint, theBottomRigthPoint, theState):
+            # Example: see GEOM_TestOthers.py
+            aList = self.ShapesOp.GetShapesOnQuadrangleIDs(theShape, theShapeType,
+                                                           theTopLeftPoint, theTopRigthPoint,
+                                                           theBottomLeftPoint, theBottomRigthPoint, theState)
             RaiseIfFailed("GetShapesOnQuadrangleIDs", self.ShapesOp)
             return aList
-        
+
         ## Find in \a theShape all sub-shapes of type \a theShapeType, situated relatively
         #  the specified \a theBox by the certain way, defined through \a theState parameter.
         #  @param theBox Shape for relative comparing.
         #  @param theShape Shape to find sub-shapes of.
         #  @param theShapeType Type of sub-shapes to be retrieved.
         #  @param theState The state of the subshapes to find. It can be one of
-        #   ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
+        #                  ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
         #  @return List of all found sub-shapes.
         #
-        def GetShapesOnBox(self,theBox, theShape, theShapeType, theState):
+        #  @ref swig_GetShapesOnBox "Example"
+        def GetShapesOnBox(self, theBox, theShape, theShapeType, theState):
+            # Example: see GEOM_TestOthers.py
             aList = self.ShapesOp.GetShapesOnBox(theBox, theShape, theShapeType, theState)
             RaiseIfFailed("GetShapesOnBox", self.ShapesOp)
             return aList
-        
+
         ## Works like the above method, but returns list of sub-shapes indices
         #
-        def GetShapesOnBoxIDs(self,theBox, theShape, theShapeType, theState):
+        #  @ref swig_GetShapesOnBoxIDs "Example"
+        def GetShapesOnBoxIDs(self, theBox, theShape, theShapeType, theState):
+            # Example: see GEOM_TestOthers.py
             aList = self.ShapesOp.GetShapesOnBoxIDs(theBox, theShape, theShapeType, theState)
             RaiseIfFailed("GetShapesOnBoxIDs", self.ShapesOp)
             return aList
-        
+
+        ## Find in \a theShape all sub-shapes of type \a theShapeType,
+        #  situated relatively the specified \a theCheckShape by the
+        #  certain way, defined through \a theState parameter.
+        #  @param theCheckShape Shape for relative comparing.
+        #  @param theShape Shape to find sub-shapes of.
+        #  @param theShapeType Type of sub-shapes to be retrieved.
+        #  @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.
+        #
+        #  @ref swig_GetShapesOnShape "Example"
+        def GetShapesOnShape(self, theCheckShape, theShape, theShapeType, theState):
+            # Example: see GEOM_TestOthers.py
+            aList = self.ShapesOp.GetShapesOnShape(theCheckShape, theShape,
+                                                   theShapeType, theState)
+            RaiseIfFailed("GetShapesOnShape", self.ShapesOp)
+            return aList
+
+        ## Works like the above method, but returns result as compound
+        #
+        #  @ref swig_GetShapesOnShapeAsCompound "Example"
+        def GetShapesOnShapeAsCompound(self, theCheckShape, theShape, theShapeType, theState):
+            # Example: see GEOM_TestOthers.py
+            anObj = self.ShapesOp.GetShapesOnShapeAsCompound(theCheckShape, theShape,
+                                                             theShapeType, theState)
+            RaiseIfFailed("GetShapesOnShapeAsCompound", self.ShapesOp)
+            return anObj
+
+        ## Works like the above method, but returns list of sub-shapes indices
+        #
+        #  @ref swig_GetShapesOnShapeIDs "Example"
+        def GetShapesOnShapeIDs(self, theCheckShape, theShape, theShapeType, theState):
+            # Example: see GEOM_TestOthers.py
+            aList = self.ShapesOp.GetShapesOnShapeIDs(theCheckShape, theShape,
+                                                      theShapeType, theState)
+            RaiseIfFailed("GetShapesOnShapeIDs", self.ShapesOp)
+            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
+        #  @ref swig_GetInPlace "Example"
         def GetInPlace(self,theShapeWhere, theShapeWhat):
+            # Example: see GEOM_TestOthers.py
             anObj = self.ShapesOp.GetInPlace(theShapeWhere, theShapeWhat)
             RaiseIfFailed("GetInPlace", self.ShapesOp)
             return anObj
-        
+
         ## Get sub-shape(s) of \a theShapeWhere, which are
         #  coincident with \a theShapeWhat or could be a part of it.
         #
@@ -1133,8 +1737,9 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #                      building history of the ShapeWhere).
         #  @return Group of all found sub-shapes or a single found sub-shape.
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_GetInPlace "Example"
         def GetInPlaceByHistory(self, theShapeWhere, theShapeWhat):
+            # Example: see GEOM_TestOthers.py
             anObj = self.ShapesOp.GetInPlaceByHistory(theShapeWhere, theShapeWhat)
             RaiseIfFailed("GetInPlaceByHistory", self.ShapesOp)
             return anObj
@@ -1145,83 +1750,97 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theShapeWhat Shape, specifying what to find.
         #  @return New GEOM_Object for found sub-shape.
         #
+        #  @ref swig_GetSame "Example"
         def GetSame(self,theShapeWhere, theShapeWhat):
             anObj = self.ShapesOp.GetSame(theShapeWhere, theShapeWhat)
             RaiseIfFailed("GetSame", self.ShapesOp)
             return anObj
-        
-        # -----------------------------------------------------------------------------
-        # Access to sub-shapes by their unique IDs inside the main shape.
-        # -----------------------------------------------------------------------------
-        
-        ## Obtain a composite sub-shape of <aShape>, composed from sub-shapes
-        #  of <aShape>, selected by their unique IDs inside <aShape>
+
+        # end of l4_obtain
+        ## @}
+
+        ## @addtogroup l4_access
+        ## @{
+
+        ## Obtain a composite sub-shape of <VAR>aShape</VAR>, composed from sub-shapes
+        #  of aShape, selected by their unique IDs inside <VAR>aShape</VAR>
         #
-        #  Example: see GEOM_TestAll.py
-        def GetSubShape(self,aShape, ListOfID):
+        #  @ref swig_all_decompose "Example"
+        def GetSubShape(self, aShape, ListOfID):
+            # Example: see GEOM_TestAll.py
             anObj = self.AddSubShape(aShape,ListOfID)
             return anObj
-        
-        ## Obtain unique ID of sub-shape <aSubShape> inside <aShape>
+
+        ## Obtain unique ID of sub-shape <VAR>aSubShape</VAR> inside <VAR>aShape</VAR>
         #
-        #  Example: see GEOM_TestAll.py
-        def GetSubShapeID(self,aShape, aSubShape):
+        #  @ref swig_all_decompose "Example"
+        def GetSubShapeID(self, aShape, aSubShape):
+            # Example: see GEOM_TestAll.py
             anID = self.LocalOp.GetSubShapeIndex(aShape, aSubShape)
             RaiseIfFailed("GetSubShapeIndex", self.LocalOp)
             return anID
-        
-        # -----------------------------------------------------------------------------
-        # Decompose objects
-        # -----------------------------------------------------------------------------
-        
+
+        # end of l4_access
+        ## @}
+
+        ## @addtogroup l4_decompose
+        ## @{
+
         ## Explode a shape on subshapes of a given type.
-        #  @param theShape Shape to be exploded.
-        #  @param theShapeType Type of sub-shapes to be retrieved.
+        #  @param aShape Shape to be exploded.
+        #  @param aType 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(self,aShape, aType):
+        #  @ref swig_all_decompose "Example"
+        def SubShapeAll(self, aShape, aType):
+            # Example: see GEOM_TestAll.py
             ListObj = self.ShapesOp.MakeExplode(aShape,aType,0)
             RaiseIfFailed("MakeExplode", self.ShapesOp)
             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.
+        #  @param aShape Shape to be exploded.
+        #  @param aType Type of sub-shapes to be retrieved.
         #  @return List of IDs of sub-shapes.
-        def SubShapeAllIDs(self,aShape, aType):
+        #
+        #  @ref swig_all_decompose "Example"
+        def SubShapeAllIDs(self, aShape, aType):
             ListObj = self.ShapesOp.SubShapeAllIDs(aShape,aType,0)
             RaiseIfFailed("SubShapeAllIDs", self.ShapesOp)
             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.
+        #  @param aShape Shape to be exploded.
+        #  @param aType 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(self,aShape, aType):
+        #  @ref swig_SubShapeAllSorted "Example"
+        def SubShapeAllSorted(self, aShape, aType):
+            # Example: see GEOM_TestAll.py
             ListObj = self.ShapesOp.MakeExplode(aShape,aType,1)
             RaiseIfFailed("MakeExplode", self.ShapesOp)
             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.
+        #  @param aShape Shape to be exploded.
+        #  @param aType Type of sub-shapes to be retrieved.
         #  @return List of IDs of sub-shapes.
-        def SubShapeAllSortedIDs(self,aShape, aType):
+        #
+        #  @ref swig_all_decompose "Example"
+        def SubShapeAllSortedIDs(self, aShape, aType):
             ListIDs = self.ShapesOp.SubShapeAllIDs(aShape,aType,1)
             RaiseIfFailed("SubShapeAllIDs", self.ShapesOp)
             return ListIDs
-        
-        ## Obtain a compound of sub-shapes of <aShape>,
-        #  selected by they indices in list of all sub-shapes of type <aType>.
+
+        ## Obtain a compound of sub-shapes of <VAR>aShape</VAR>,
+        #  selected by they indices in list of all sub-shapes of type <VAR>aType</VAR>.
         #  Each index is in range [1, Nb_Sub-Shapes_Of_Given_Type]
         #
-        #  Example: see GEOM_TestAll.py
-        def SubShape(self,aShape, aType, ListOfInd):
+        #  @ref swig_all_decompose "Example"
+        def SubShape(self, aShape, aType, ListOfInd):
+            # Example: see GEOM_TestAll.py
             ListOfIDs = []
             AllShapeList = self.SubShapeAll(aShape, aType)
             for ind in ListOfInd:
@@ -1229,54 +1848,65 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             anObj = self.GetSubShape(aShape, ListOfIDs)
             return anObj
 
-        ## Obtain a compound of sub-shapes of <aShape>,
-        #  selected by they indices in sorted list of all sub-shapes of type <aType>.
+        ## Obtain a compound of sub-shapes of <VAR>aShape</VAR>,
+        #  selected by they indices in sorted list of all sub-shapes of type <VAR>aType</VAR>.
         #  Each index is in range [1, Nb_Sub-Shapes_Of_Given_Type]
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref swig_all_decompose "Example"
         def SubShapeSorted(self,aShape, aType, ListOfInd):
+            # Example: see GEOM_TestAll.py
             ListOfIDs = []
             AllShapeList = self.SubShapeAllSorted(aShape, aType)
             for ind in ListOfInd:
                 ListOfIDs.append(self.GetSubShapeID(aShape, AllShapeList[ind - 1]))
             anObj = self.GetSubShape(aShape, ListOfIDs)
             return anObj
-        
-        # -----------------------------------------------------------------------------
-        # Healing operations
-        # -----------------------------------------------------------------------------
-        
+
+        # end of l4_decompose
+        ## @}
+
+        ## @addtogroup l3_healing
+        ## @{
+
         ## 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.
+        #                    as parameters are listed in <VAR>theParameters</VAR> list.
         #  @return New GEOM_Object, containing processed shape.
         #
-        #  Example: see GEOM_TestHealing.py
+        #  @ref tui_shape_processing "Example"
         def ProcessShape(self,theShape, theOperators, theParameters, theValues):
+            # Example: see GEOM_TestHealing.py
+            theValues,Parameters = ParseList(theValues)
             anObj = self.HealOp.ProcessShape(theShape, theOperators, theParameters, theValues)
             RaiseIfFailed("ProcessShape", self.HealOp)
+            for string in (theOperators + theParameters):
+                Parameters = ":" + Parameters
+                pass
+            anObj.SetParameters(Parameters)
             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
+        #  @ref tui_suppress_faces "Example"
         def SuppressFaces(self,theObject, theFaces):
+            # Example: see GEOM_TestHealing.py
             anObj = self.HealOp.SuppressFaces(theObject, theFaces)
             RaiseIfFailed("SuppressFaces", self.HealOp)
             return anObj
 
         ## Sewing of some shapes into single shape.
         #
-        #  Example: see GEOM_TestHealing.py
-        def MakeSewing(self,ListShape, theTolerance):
+        #  @ref tui_sewing "Example"
+        def MakeSewing(self, ListShape, theTolerance):
+            # Example: see GEOM_TestHealing.py
             comp = self.MakeCompound(ListShape)
             anObj = self.Sew(comp, theTolerance)
             return anObj
@@ -1285,51 +1915,55 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theObject Shape to be processed.
         #  @param theTolerance Required tolerance value.
         #  @return New GEOM_Object, containing processed shape.
-        #
-         Example: see MakeSewing() above
-        def Sew(self,theObject, theTolerance):
+        def Sew(self, theObject, theTolerance):
+            # Example: see MakeSewing() above
+            theTolerance,Parameters = ParseParameters(theTolerance)
             anObj = self.HealOp.Sew(theObject, theTolerance)
             RaiseIfFailed("Sew", self.HealOp)
+            anObj.SetParameters(Parameters)
             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
+        #  @ref tui_suppress_internal_wires "Example"
         def SuppressInternalWires(self,theObject, theWires):
+            # Example: see GEOM_TestHealing.py
             anObj = self.HealOp.RemoveIntWires(theObject, theWires)
             RaiseIfFailed("RemoveIntWires", self.HealOp)
             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
+        #  @ref tui_suppress_holes "Example"
         def SuppressHoles(self,theObject, theWires):
+            # Example: see GEOM_TestHealing.py
             anObj = self.HealOp.FillHoles(theObject, theWires)
             RaiseIfFailed("FillHoles", self.HealOp)
             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 <VAR>theObject</VAR>'s shape,
-        #                  if -1, then theObject itself is a wire.
+        #                  if -1, then <VAR>theObject</VAR> 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
+        #  @ref tui_close_contour "Example"
         def CloseContour(self,theObject, theWires, isCommonVertex):
+            # Example: see GEOM_TestHealing.py
             anObj = self.HealOp.CloseContour(theObject, theWires, isCommonVertex)
             RaiseIfFailed("CloseContour", self.HealOp)
             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,
@@ -1340,28 +1974,34 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #                       if FALSE : \a theValue is treated as a length parameter [0..1]
         #  @return New GEOM_Object, containing processed shape.
         #
-        #  Example: see GEOM_TestHealing.py
+        #  @ref tui_add_point_on_edge "Example"
         def DivideEdge(self,theObject, theEdgeIndex, theValue, isByParameter):
+            # Example: see GEOM_TestHealing.py
+            theEdgeIndex,theValue,isByParameter,Parameters = ParseParameters(theEdgeIndex,theValue,isByParameter)
             anObj = self.HealOp.DivideEdge(theObject, theEdgeIndex, theValue, isByParameter)
             RaiseIfFailed("DivideEdge", self.HealOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
-        ## Change orientation of the given object.
+
+        ## Change orientation of the given object. Updates given shape.
         #  @param theObject Shape to be processed.
-        #  @update given shape
+        #
+        #  @ref swig_todo "Example"
         def ChangeOrientationShell(self,theObject):
             theObject = self.HealOp.ChangeOrientation(theObject)
             RaiseIfFailed("ChangeOrientation", self.HealOp)
             pass
-        
+
         ## Change orientation of the given object.
         #  @param theObject Shape to be processed.
         #  @return New GEOM_Object, containing processed shape.
+        #
+        #  @ref swig_todo "Example"
         def ChangeOrientationShellCopy(self,theObject):
             anObj = self.HealOp.ChangeOrientationCopy(theObject)
             RaiseIfFailed("ChangeOrientationCopy", self.HealOp)
             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.
@@ -1370,39 +2010,13 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  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
+        #  @ref tui_measurement_tools_page "Example"
         def GetFreeBoundary(self,theObject):
+            # Example: see GEOM_TestHealing.py
             anObj = self.HealOp.GetFreeBoundary(theObject)
             RaiseIfFailed("GetFreeBoundary", self.HealOp)
             return anObj
-        
-        # -----------------------------------------------------------------------------
-        # Create advanced objects
-        # -----------------------------------------------------------------------------
-        
-        ## Create a copy of the given object
-        #
-        #  Example: see GEOM_TestAll.py
-        def MakeCopy(self,theOriginal):
-            anObj = self.InsertOp.MakeCopy(theOriginal)
-            RaiseIfFailed("MakeCopy", self.InsertOp)
-            return anObj
-        
-        ## Create a filling from the given compound of contours.
-        #  @param theShape the compound of contours
-        #  @param theMinDeg a minimal degree of BSpline surface to create
-        #  @param theMaxDeg a maximal degree of BSpline surface to create
-        #  @param theTol2D a 2d tolerance to be reached
-        #  @param theTol3D a 3d tolerance to be reached
-        #  @param theNbIter a number of iteration of approximation algorithm
-        #  @return New GEOM_Object, containing the created filling surface.
-        #
-        #  Example: see GEOM_TestAll.py
-        def MakeFilling(self,theShape, theMinDeg, theMaxDeg, theTol2D, theTol3D, theNbIter, isApprox=0):
-            anObj = self.PrimOp.MakeFilling(theShape, theMinDeg, theMaxDeg, theTol2D, theTol3D, theNbIter, isApprox)
-            RaiseIfFailed("MakeFilling", self.PrimOp)
-            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.
@@ -1410,27 +2024,29 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #                         otherwise all initial shapes.
         #  @return New GEOM_Object, containing a copy of theShape without coincident faces.
         #
-        #  Example: see GEOM_Spanner.py
+        #  @ref tui_glue_faces "Example"
         def MakeGlueFaces(self, theShape, theTolerance, doKeepNonSolids=True):
+            # Example: see GEOM_Spanner.py
+            theTolerance,Parameters = ParseParameters(theTolerance)
             anObj = self.ShapesOp.MakeGlueFaces(theShape, theTolerance, doKeepNonSolids)
             if anObj is None:
                 raise RuntimeError, "MakeGlueFaces : " + self.ShapesOp.GetErrorCode()
+            anObj.SetParameters(Parameters)
             return anObj
-        
-        
+
         ## Find coincident faces in theShape for possible gluing.
         #  @param theShape Initial shape.
         #  @param theTolerance Maximum distance between faces,
         #                      which can be considered as coincident.
         #  @return ListOfGO.
         #
-        #  Example: see GEOM_Spanner.py
+        #  @ref swig_todo "Example"
         def GetGlueFaces(self, theShape, theTolerance):
+            # Example: see GEOM_Spanner.py
             anObj = self.ShapesOp.GetGlueFaces(theShape, theTolerance)
             RaiseIfFailed("GetGlueFaces", self.ShapesOp)
             return anObj
-        
-        
+
         ## Replace coincident faces in theShape by one face
         #  in compliance with given list of faces
         #  @param theShape Initial shape.
@@ -1442,18 +2058,24 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @return New GEOM_Object, containing a copy of theShape
         #          without some faces.
         #
-        #  Example: see GEOM_Spanner.py
+        #  @ref swig_todo "Example"
         def MakeGlueFacesByList(self, theShape, theTolerance, theFaces, doKeepNonSolids=True):
+            # Example: see GEOM_Spanner.py
             anObj = self.ShapesOp.MakeGlueFacesByList(theShape, theTolerance, theFaces, doKeepNonSolids)
             if anObj is None:
                 raise RuntimeError, "MakeGlueFacesByList : " + self.ShapesOp.GetErrorCode()
             return anObj
-        
-        
+
+        # end of l3_healing
+        ## @}
+
+        ## @addtogroup l3_boolean Boolean Operations
+        ## @{
+
         # -----------------------------------------------------------------------------
         # 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.
@@ -1461,36 +2083,51 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #                      1 - Common, 2 - Cut, 3 - Fuse, 4 - Section.
         #  @return New GEOM_Object, containing the result shape.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_fuse "Example"
         def MakeBoolean(self,theShape1, theShape2, theOperation):
+            # Example: see GEOM_TestAll.py
             anObj = self.BoolOp.MakeBoolean(theShape1, theShape2, theOperation)
             RaiseIfFailed("MakeBoolean", self.BoolOp)
             return anObj
-        
+
         ## Shortcut to MakeBoolean(s1, s2, 1)
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref tui_common "Example 1"
+        #  \n @ref swig_MakeCommon "Example 2"
         def MakeCommon(self, s1, s2):
+            # Example: see GEOM_TestOthers.py
             return self.MakeBoolean(s1, s2, 1)
 
         ## Shortcut to MakeBoolean(s1, s2, 2)
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref tui_cut "Example 1"
+        #  \n @ref swig_MakeCommon "Example 2"
         def MakeCut(self, s1, s2):
+            # Example: see GEOM_TestOthers.py
             return self.MakeBoolean(s1, s2, 2)
-        
+
         ## Shortcut to MakeBoolean(s1, s2, 3)
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref tui_fuse "Example 1"
+        #  \n @ref swig_MakeCommon "Example 2"
         def MakeFuse(self, s1, s2):
+            # Example: see GEOM_TestOthers.py
             return self.MakeBoolean(s1, s2, 3)
-        
+
         ## Shortcut to MakeBoolean(s1, s2, 4)
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref tui_section "Example 1"
+        #  \n @ref swig_MakeCommon "Example 2"
         def MakeSection(self, s1, s2):
+            # Example: see GEOM_TestOthers.py
             return self.MakeBoolean(s1, s2, 4)
-        
+
+        # end of l3_boolean
+        ## @}
+
+        ## @addtogroup l3_basic_op
+        ## @{
+
         ## Perform partition operation.
         #  @param ListShapes Shapes to be intersected.
         #  @param ListTools Shapes to intersect theShapes.
@@ -1517,17 +2154,18 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #
         #  @return New GEOM_Object, containing the result shapes.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_partition "Example"
         def MakePartition(self, ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside=[],
                           Limit=ShapeType["SHAPE"], RemoveWebs=0, ListMaterials=[],
                           KeepNonlimitShapes=0):
+            # Example: see GEOM_TestAll.py
             anObj = self.BoolOp.MakePartition(ListShapes, ListTools,
                                               ListKeepInside, ListRemoveInside,
                                               Limit, RemoveWebs, ListMaterials,
                                               KeepNonlimitShapes);
             RaiseIfFailed("MakePartition", self.BoolOp)
             return anObj
-        
+
         ## Perform partition operation.
         #  This method may be useful if it is needed to make a partition for
         #  compound contains nonintersected shapes. Performance will be better
@@ -1540,6 +2178,7 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #
         #  @return New GEOM_Object, containing the result shapes.
         #
+        #  @ref swig_todo "Example"
         def MakePartitionNonSelfIntersectedShape(self, ListShapes, ListTools=[],
                                                  ListKeepInside=[], ListRemoveInside=[],
                                                  Limit=ShapeType["SHAPE"], RemoveWebs=0,
@@ -1550,34 +2189,39 @@ class geompyDC(GEOM._objref_GEOM_Gen):
                                                                      KeepNonlimitShapes);
             RaiseIfFailed("MakePartitionNonSelfIntersectedShape", self.BoolOp)
             return anObj
-        
+
         ## Shortcut to MakePartition()
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref tui_partition "Example 1"
+        #  \n @ref swig_Partition "Example 2"
         def Partition(self, ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside=[],
                       Limit=ShapeType["SHAPE"], RemoveWebs=0, ListMaterials=[],
                       KeepNonlimitShapes=0):
+            # Example: see GEOM_TestOthers.py
             anObj = self.MakePartition(ListShapes, ListTools,
                                        ListKeepInside, ListRemoveInside,
                                        Limit, RemoveWebs, ListMaterials,
                                        KeepNonlimitShapes);
             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
+        #  @ref tui_partition "Example"
         def MakeHalfPartition(self,theShape, thePlane):
+            # Example: see GEOM_TestAll.py
             anObj = self.BoolOp.MakeHalfPartition(theShape, thePlane)
             RaiseIfFailed("MakeHalfPartition", self.BoolOp)
             return anObj
-        
-        # -----------------------------------------------------------------------------
-        # Transform objects
-        # -----------------------------------------------------------------------------
-        
+
+        # end of l3_basic_op
+        ## @}
+
+        ## @addtogroup l3_transform
+        ## @{
+
         ## 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.
@@ -1585,34 +2229,106 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param thePoint2 End point of translation vector.
         #  @return New GEOM_Object, containing the translated object.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_translation "Example 1"
+        #  \n @ref swig_MakeTranslationTwoPoints "Example 2"
         def MakeTranslationTwoPoints(self,theObject, thePoint1, thePoint2):
+            # Example: see GEOM_TestAll.py
             anObj = self.TrsfOp.TranslateTwoPointsCopy(theObject, thePoint1, thePoint2)
             RaiseIfFailed("TranslateTwoPointsCopy", self.TrsfOp)
             return anObj
-        
+
+        ## Translate the given object along the vector, specified by its components.
+        #  @param theObject The object to be translated.
+        #  @param theDX,theDY,theDZ Components of translation vector.
+        #  @return Translated GEOM_Object.
+        #
+        #  @ref tui_translation "Example"
+        def TranslateDXDYDZ(self,theObject, theDX, theDY, theDZ):
+            # Example: see GEOM_TestAll.py
+            theDX, theDY, theDZ, Parameters = ParseParameters(theDX, theDY, theDZ)
+            anObj = self.TrsfOp.TranslateDXDYDZ(theObject, theDX, theDY, theDZ)
+            anObj.SetParameters(Parameters)
+            RaiseIfFailed("TranslateDXDYDZ", self.TrsfOp)
+            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
+        #  @ref tui_translation "Example"
         def MakeTranslation(self,theObject, theDX, theDY, theDZ):
+            # Example: see GEOM_TestAll.py
+            theDX, theDY, theDZ, Parameters = ParseParameters(theDX, theDY, theDZ)
             anObj = self.TrsfOp.TranslateDXDYDZCopy(theObject, theDX, theDY, theDZ)
+            anObj.SetParameters(Parameters)
             RaiseIfFailed("TranslateDXDYDZ", self.TrsfOp)
             return anObj
-        
-        ## Translate the given object along the given vector,
+
+        ## 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.
+        #
+        #  @ref tui_translation "Example"
+        def MakeTranslationVector(self,theObject, theVector):
+            # Example: see GEOM_TestAll.py
+            anObj = self.TrsfOp.TranslateVectorCopy(theObject, theVector)
+            RaiseIfFailed("TranslateVectorCopy", self.TrsfOp)
+            return anObj
+
+        ## Translate the given object along the given vector on given distance.
+        #  @param theObject The object to be translated.
+        #  @param theVector The translation vector.
+        #  @param theDistance The translation distance.
+        #  @param theCopy Flag used to translate object itself or create a copy.
+        #  @return Translated GEOM_Object.
+        #
+        #  @ref tui_translation "Example"
+        def TranslateVectorDistance(self, theObject, theVector, theDistance, theCopy):
+            # Example: see GEOM_TestAll.py
+            theDistance,Parameters = ParseParameters(theDistance)
+            anObj = self.TrsfOp.TranslateVectorDistance(theObject, theVector, theDistance, theCopy)
+            RaiseIfFailed("TranslateVectorDistance", self.TrsfOp)
+            anObj.SetParameters(Parameters)
+            return anObj
+
+        ## Translate the given object along the given vector on given distance,
         #  creating its copy before the translation.
         #  @param theObject The object to be translated.
         #  @param theVector The translation vector.
+        #  @param theDistance The translation distance.
         #  @return New GEOM_Object, containing the translated object.
         #
-        #  Example: see GEOM_TestAll.py
-        def MakeTranslationVector(self,theObject, theVector):
-            anObj = self.TrsfOp.TranslateVectorCopy(theObject, theVector)
-            RaiseIfFailed("TranslateVectorCopy", self.TrsfOp)
+        #  @ref tui_translation "Example"
+        def MakeTranslationVectorDistance(self, theObject, theVector, theDistance):
+            # Example: see GEOM_TestAll.py
+            theDistance,Parameters = ParseParameters(theDistance)
+            anObj = self.TrsfOp.TranslateVectorDistance(theObject, theVector, theDistance, 1)
+            RaiseIfFailed("TranslateVectorDistance", self.TrsfOp)
+            anObj.SetParameters(Parameters)
+            return anObj
+
+        ## Rotate the given object around the given axis on the given angle.
+        #  @param theObject The object to be rotated.
+        #  @param theAxis Rotation axis.
+        #  @param theAngle Rotation angle in radians.
+        #  @return Rotated GEOM_Object.
+        #
+        #  @ref tui_rotation "Example"
+        def Rotate(self,theObject, theAxis, theAngle):
+            # Example: see GEOM_TestAll.py
+            flag = False
+            if isinstance(theAngle,str):
+                flag = True
+            theAngle, Parameters = ParseParameters(theAngle)
+            if flag:
+                theAngle = theAngle*math.pi/180.0
+            anObj = self.TrsfOp.Rotate(theObject, theAxis, theAngle)
+            RaiseIfFailed("RotateCopy", self.TrsfOp)
+            anObj.SetParameters(Parameters)
             return anObj
 
         ## Rotate the given object around the given axis
@@ -1622,74 +2338,108 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theAngle Rotation angle in radians.
         #  @return New GEOM_Object, containing the rotated object.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_rotation "Example"
         def MakeRotation(self,theObject, theAxis, theAngle):
+            # Example: see GEOM_TestAll.py
+            flag = False
+            if isinstance(theAngle,str):
+                flag = True
+            theAngle, Parameters = ParseParameters(theAngle)
+            if flag:
+                theAngle = theAngle*math.pi/180.0
             anObj = self.TrsfOp.RotateCopy(theObject, theAxis, theAngle)
             RaiseIfFailed("RotateCopy", self.TrsfOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
         ## Rotate given object around vector perpendicular to plane
         #  containing three points, creating its copy before the rotatation.
         #  @param theObject The object to be rotated.
         #  @param theCentPoint central point - the axis is the vector perpendicular to the plane
         #  containing the three points.
-        #  @param thePoint1 and thePoint2 - in a perpendicular plan of the axis.
+        #  @param thePoint1,thePoint2 - in a perpendicular plane of the axis.
         #  @return New GEOM_Object, containing the rotated object.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_rotation "Example"
         def MakeRotationThreePoints(self,theObject, theCentPoint, thePoint1, thePoint2):
+            # Example: see GEOM_TestAll.py
             anObj = self.TrsfOp.RotateThreePointsCopy(theObject, theCentPoint, thePoint1, thePoint2)
             RaiseIfFailed("RotateThreePointsCopy", self.TrsfOp)
             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.
+        #                  Passing None for it means scaling relatively the origin of global CS.
         #  @param theFactor Scaling factor value.
         #  @return New GEOM_Object, containing the scaled shape.
         #
-        #  Example: see GEOM_TestAll.py
-        def MakeScaleTransform(self,theObject, thePoint, theFactor):
+        #  @ref tui_scale "Example"
+        def MakeScaleTransform(self, theObject, thePoint, theFactor):
+            # Example: see GEOM_TestAll.py
+            theFactor, Parameters = ParseParameters(theFactor)
             anObj = self.TrsfOp.ScaleShapeCopy(theObject, thePoint, theFactor)
             RaiseIfFailed("ScaleShapeCopy", self.TrsfOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
+        ## Scale the given object by different factors along coordinate axes,
+        #  creating its copy before the scaling.
+        #  @param theObject The object to be scaled.
+        #  @param thePoint Center point for scaling.
+        #                  Passing None for it means scaling relatively the origin of global CS.
+        #  @param theFactorX,theFactorY,theFactorZ Scaling factors along each axis.
+        #  @return New GEOM_Object, containing the scaled shape.
+        #
+        #  @ref swig_scale "Example"
+        def MakeScaleAlongAxes(self, theObject, thePoint, theFactorX, theFactorY, theFactorZ):
+            # Example: see GEOM_TestAll.py
+            theFactorX, theFactorY, theFactorZ, Parameters = ParseParameters(theFactorX, theFactorY, theFactorZ)
+            anObj = self.TrsfOp.ScaleShapeAlongAxesCopy(theObject, thePoint,
+                                                        theFactorX, theFactorY, theFactorZ)
+            RaiseIfFailed("MakeScaleAlongAxes", self.TrsfOp)
+            anObj.SetParameters(Parameters)
+            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
+        #  @ref tui_mirror "Example"
         def MakeMirrorByPlane(self,theObject, thePlane):
+            # Example: see GEOM_TestAll.py
             anObj = self.TrsfOp.MirrorPlaneCopy(theObject, thePlane)
             RaiseIfFailed("MirrorPlaneCopy", self.TrsfOp)
             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
+        #  @ref tui_mirror "Example"
         def MakeMirrorByAxis(self,theObject, theAxis):
+            # Example: see GEOM_TestAll.py
             anObj = self.TrsfOp.MirrorAxisCopy(theObject, theAxis)
             RaiseIfFailed("MirrorAxisCopy", self.TrsfOp)
             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
+        #  @ref tui_mirror "Example"
         def MakeMirrorByPoint(self,theObject, thePoint):
+            # Example: see GEOM_TestAll.py
             anObj = self.TrsfOp.MirrorPointCopy(theObject, thePoint)
             RaiseIfFailed("MirrorPointCopy", self.TrsfOp)
             return anObj
-        
+
         ## Modify the Location of the given object by LCS,
         #  creating its copy before the setting.
         #  @param theObject The object to be displaced.
@@ -1701,27 +2451,46 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theEndLCS Coordinate system to perform displacement to it.
         #  @return New GEOM_Object, containing the displaced shape.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_modify_location "Example"
         def MakePosition(self,theObject, theStartLCS, theEndLCS):
+            # Example: see GEOM_TestAll.py
             anObj = self.TrsfOp.PositionShapeCopy(theObject, theStartLCS, theEndLCS)
             RaiseIfFailed("PositionShapeCopy", self.TrsfOp)
             return anObj
-        
+
+        ## Modify the Location of the given object by Path,
+        #  @param  theObject The object to be displaced.
+        #  @param  thePath Wire or Edge along that the object will be translated.
+       #  @param  theDistance progress of Path (0 = start location, 1 = end of path location).
+       #  @param  theCopy is to create a copy objects if true.
+       #  @param  theReverse - 0 for usual direction, 1 to reverse path direction.
+        #  @return New GEOM_Object, containing the displaced shape.
+        #
+        #  @ref tui_modify_location "Example"
+        def PositionAlongPath(self,theObject, thePath, theDistance, theCopy, theReverse):
+            # Example: see GEOM_TestAll.py
+            anObj = self.TrsfOp.PositionAlongPath(theObject, thePath, theDistance, theCopy, theReverse)
+            RaiseIfFailed("PositionAlongPath", self.TrsfOp)
+            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
+        #  @ref tui_offset "Example"
         def MakeOffset(self,theObject, theOffset):
+            # Example: see GEOM_TestAll.py
+            theOffset, Parameters = ParseParameters(theOffset)
             anObj = self.TrsfOp.OffsetShapeCopy(theObject, theOffset)
             RaiseIfFailed("OffsetShapeCopy", self.TrsfOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
         # -----------------------------------------------------------------------------
         # 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.
@@ -1730,12 +2499,15 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @return New GEOM_Object, containing compound of all
         #          the shapes, obtained after each translation.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_multi_translation "Example"
         def MakeMultiTranslation1D(self,theObject, theVector, theStep, theNbTimes):
+            # Example: see GEOM_TestAll.py
+            theStep, theNbTimes, Parameters = ParseParameters(theStep, theNbTimes)
             anObj = self.TrsfOp.MultiTranslate1D(theObject, theVector, theStep, theNbTimes)
             RaiseIfFailed("MultiTranslate1D", self.TrsfOp)
+            anObj.SetParameters(Parameters)
             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.
@@ -1747,14 +2519,17 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @return New GEOM_Object, containing compound of all
         #          the shapes, obtained after each translation.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_multi_translation "Example"
         def MakeMultiTranslation2D(self,theObject, theVector1, theStep1, theNbTimes1,
                                    theVector2, theStep2, theNbTimes2):
+            # Example: see GEOM_TestAll.py
+            theStep1,theNbTimes1,theStep2,theNbTimes2, Parameters = ParseParameters(theStep1,theNbTimes1,theStep2,theNbTimes2)
             anObj = self.TrsfOp.MultiTranslate2D(theObject, theVector1, theStep1, theNbTimes1,
                                                  theVector2, theStep2, theNbTimes2)
             RaiseIfFailed("MultiTranslate2D", self.TrsfOp)
+            anObj.SetParameters(Parameters)
             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.
@@ -1763,12 +2538,15 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @return New GEOM_Object, containing compound of all the
         #          shapes, obtained after each rotation.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_multi_rotation "Example"
         def MultiRotate1D(self,theObject, theAxis, theNbTimes):
+            # Example: see GEOM_TestAll.py
+            theAxis, theNbTimes, Parameters = ParseParameters(theAxis, theNbTimes)
             anObj = self.TrsfOp.MultiRotate1D(theObject, theAxis, theNbTimes)
             RaiseIfFailed("MultiRotate1D", self.TrsfOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
         ## Rotate the given object around the
         #  given axis on the given angle a given number
         #  times and multi-translate each rotation result.
@@ -1783,53 +2561,64 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @return New GEOM_Object, containing compound of all the
         #          shapes, obtained after each transformation.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_multi_rotation "Example"
         def MultiRotate2D(self,theObject, theAxis, theAngle, theNbTimes1, theStep, theNbTimes2):
+            # Example: see GEOM_TestAll.py
+            theAngle, theNbTimes1, theStep, theNbTimes2, Parameters = ParseParameters(theAngle, theNbTimes1, theStep, theNbTimes2)
             anObj = self.TrsfOp.MultiRotate2D(theObject, theAxis, theAngle, theNbTimes1, theStep, theNbTimes2)
             RaiseIfFailed("MultiRotate2D", self.TrsfOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
         ## The same, as MultiRotate1D(), but axis is given by direction and point
-        #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_MakeMultiRotation "Example"
         def MakeMultiRotation1D(self,aShape,aDir,aPoint,aNbTimes):
+            # Example: see GEOM_TestOthers.py
             aVec = self.MakeLine(aPoint,aDir)
             anObj = self.MultiRotate1D(aShape,aVec,aNbTimes)
             return anObj
-        
+
         ## The same, as MultiRotate2D(), but axis is given by direction and point
-        #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_MakeMultiRotation "Example"
         def MakeMultiRotation2D(self,aShape,aDir,aPoint,anAngle,nbtimes1,aStep,nbtimes2):
+            # Example: see GEOM_TestOthers.py
             aVec = self.MakeLine(aPoint,aDir)
             anObj = self.MultiRotate2D(aShape,aVec,anAngle,nbtimes1,aStep,nbtimes2)
             return anObj
-        
-        # -----------------------------------------------------------------------------
-        # Local operations
-        # -----------------------------------------------------------------------------
-        
+
+        # end of l3_transform
+        ## @}
+
+        ## @addtogroup l3_local
+        ## @{
+
         ## 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
+        #  @ref tui_fillet "Example 1"
+        #  \n @ref swig_MakeFilletAll "Example 2"
         def MakeFilletAll(self,theShape, theR):
+            # Example: see GEOM_TestOthers.py
+            theR,Parameters = ParseParameters(theR)
             anObj = self.LocalOp.MakeFilletAll(theShape, theR)
             RaiseIfFailed("MakeFilletAll", self.LocalOp)
+            anObj.SetParameters(Parameters)
             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 <theListShapes>.
+        #  @param theShapeType Type of shapes in <VAR>theListShapes</VAR>.
         #  @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
+        #  @ref tui_fillet "Example"
         def MakeFillet(self,theShape, theR, theShapeType, theListShapes):
+            # Example: see GEOM_TestAll.py
+            theR,Parameters = ParseParameters(theR)
             anObj = None
             if theShapeType == ShapeType["EDGE"]:
                 anObj = self.LocalOp.MakeFilletEdges(theShape, theR, theListShapes)
@@ -1837,10 +2626,12 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             else:
                 anObj = self.LocalOp.MakeFilletFaces(theShape, theR, theListShapes)
                 RaiseIfFailed("MakeFilletFaces", self.LocalOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
         ## The same that MakeFillet but with two Fillet Radius R1 and R2
         def MakeFilletR1R2(self, theShape, theR1, theR2, theShapeType, theListShapes):
+            theR1,theR2,Parameters = ParseParameters(theR1,theR2)
             anObj = None
             if theShapeType == ShapeType["EDGE"]:
                 anObj = self.LocalOp.MakeFilletEdgesR1R2(theShape, theR1, theR2, theListShapes)
@@ -1848,19 +2639,38 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             else:
                 anObj = self.LocalOp.MakeFilletFacesR1R2(theShape, theR1, theR2, theListShapes)
                 RaiseIfFailed("MakeFilletFacesR1R2", self.LocalOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+           
+        ## Perform a fillet on the specified edges/faces of the given shape
+        #  @param theShape - Face Shape to perform fillet on.
+        #  @param theR - Fillet radius.
+        #  @param theListOfVertexes Global indices of vertexes 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.
+        #
+        #  @ref tui_fillet2d "Example"
+        def MakeFillet2D(self,theShape, theR, theListOfVertexes):
+            # Example: see GEOM_TestAll.py
+            anObj = self.LocalOp.MakeFillet2D(theShape, theR, theListOfVertexes)
+            RaiseIfFailed("MakeFillet2D", self.LocalOp)
+            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
+        #  @ref tui_chamfer "Example 1"
+        #  \n @ref swig_MakeChamferAll "Example 2"
         def MakeChamferAll(self,theShape, theD):
+            # Example: see GEOM_TestOthers.py
+            theD,Parameters = ParseParameters(theD)
             anObj = self.LocalOp.MakeChamferAll(theShape, theD)
             RaiseIfFailed("MakeChamferAll", self.LocalOp)
+            anObj.SetParameters(Parameters)
             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.
@@ -1870,19 +2680,29 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #    \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
+        #  @ref tui_chamfer "Example"
         def MakeChamferEdge(self,theShape, theD1, theD2, theFace1, theFace2):
+            # Example: see GEOM_TestAll.py
+            theD1,theD2,Parameters = ParseParameters(theD1,theD2)
             anObj = self.LocalOp.MakeChamferEdge(theShape, theD1, theD2, theFace1, theFace2)
             RaiseIfFailed("MakeChamferEdge", self.LocalOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
-        ## The Same that MakeChamferEdge but with params theD is chamfer lenght and
-        #  theAngle is Angle of chamfer (angle in radians)
+
+        ## The Same that MakeChamferEdge but with params theD is chamfer length and
+        #  theAngle is Angle of chamfer (angle in radians or a name of variable which defines angle in degrees)
         def MakeChamferEdgeAD(self, theShape, theD, theAngle, theFace1, theFace2):
+            flag = False
+            if isinstance(theAngle,str):
+                flag = True
+            theD,theAngle,Parameters = ParseParameters(theD,theAngle)
+            if flag:
+                theAngle = theAngle*math.pi/180.0
             anObj = self.LocalOp.MakeChamferEdgeAD(theShape, theD, theAngle, theFace1, theFace2)
             RaiseIfFailed("MakeChamferEdgeAD", self.LocalOp)
+            anObj.SetParameters(Parameters)
             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.
@@ -1894,50 +2714,78 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #    \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
+        #  @ref tui_chamfer "Example"
         def MakeChamferFaces(self,theShape, theD1, theD2, theFaces):
+            # Example: see GEOM_TestAll.py
+            theD1,theD2,Parameters = ParseParameters(theD1,theD2)
             anObj = self.LocalOp.MakeChamferFaces(theShape, theD1, theD2, theFaces)
             RaiseIfFailed("MakeChamferFaces", self.LocalOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
         ## The Same that MakeChamferFaces but with params theD is chamfer lenght and
-        #  theAngle is Angle of chamfer (angle in radians)
+        #  theAngle is Angle of chamfer (angle in radians or a name of variable which defines angle in degrees)
+        #
+        #  @ref swig_FilletChamfer "Example"
         def MakeChamferFacesAD(self, theShape, theD, theAngle, theFaces):
+            flag = False
+            if isinstance(theAngle,str):
+                flag = True
+            theD,theAngle,Parameters = ParseParameters(theD,theAngle)
+            if flag:
+                theAngle = theAngle*math.pi/180.0
             anObj = self.LocalOp.MakeChamferFacesAD(theShape, theD, theAngle, theFaces)
             RaiseIfFailed("MakeChamferFacesAD", self.LocalOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
         ## Perform a chamfer on edges,
         #  with distance D1 on the first specified face (if several for one edge)
         #  @param theShape Shape, to perform chamfer on.
-        #  @param theD1 and theD2 Chamfer size 
+        #  @param theD1,theD2 Chamfer size
         #  @param theEdges Sequence of edges of \a theShape.
         #  @return New GEOM_Object, containing the result shape.
         #
-        #  Example:
+        #  @ref swig_FilletChamfer "Example"
         def MakeChamferEdges(self, theShape, theD1, theD2, theEdges):
+            theD1,theD2,Parameters = ParseParameters(theD1,theD2)
             anObj = self.LocalOp.MakeChamferEdges(theShape, theD1, theD2, theEdges)
             RaiseIfFailed("MakeChamferEdges", self.LocalOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
         ## The Same that MakeChamferEdges but with params theD is chamfer lenght and
-        #  theAngle is Angle of chamfer (angle in radians)
+        #  theAngle is Angle of chamfer (angle in radians or a name of variable which defines angle in degrees)
         def MakeChamferEdgesAD(self, theShape, theD, theAngle, theEdges):
+            flag = False
+            if isinstance(theAngle,str):
+                flag = True
+            theD,theAngle,Parameters = ParseParameters(theD,theAngle)
+            if flag:
+                theAngle = theAngle*math.pi/180.0
             anObj = self.LocalOp.MakeChamferEdgesAD(theShape, theD, theAngle, theEdges)
             RaiseIfFailed("MakeChamferEdgesAD", self.LocalOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
+
         ## Shortcut to MakeChamferEdge() and MakeChamferFaces()
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_MakeChamfer "Example"
         def MakeChamfer(self,aShape,d1,d2,aShapeType,ListShape):
+            # Example: see GEOM_TestOthers.py
             anObj = None
             if aShapeType == ShapeType["EDGE"]:
                 anObj = self.MakeChamferEdge(aShape,d1,d2,ListShape[0],ListShape[1])
             else:
                 anObj = self.MakeChamferFaces(aShape,d1,d2,ListShape)
             return anObj
-        
+
+        # end of l3_local
+        ## @}
+
+        ## @addtogroup l3_basic_op
+        ## @{
+
         ## 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.
@@ -1947,25 +2795,32 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @return New GEOM_Object, containing a section of \a theShape
         #          by a plane, corresponding to water level.
         #
-        #  Example: see GEOM_TestAll.py
+        #  @ref tui_archimede "Example"
         def Archimede(self,theShape, theWeight, theWaterDensity, theMeshDeflection):
+            # Example: see GEOM_TestAll.py
+            theWeight,theWaterDensity,theMeshDeflection,Parameters = ParseParameters(
+              theWeight,theWaterDensity,theMeshDeflection)
             anObj = self.LocalOp.MakeArchimede(theShape, theWeight, theWaterDensity, theMeshDeflection)
             RaiseIfFailed("MakeArchimede", self.LocalOp)
+            anObj.SetParameters(Parameters)
             return anObj
-        
-        # -----------------------------------------------------------------------------
-        # Information objects
-        # -----------------------------------------------------------------------------
-        
+
+        # end of l3_basic_op
+        ## @}
+
+        ## @addtogroup l2_measure
+        ## @{
+
         ## Get point coordinates
         #  @return [x, y, z]
         #
-        #  Example: see GEOM_TestMeasures.py
+        #  @ref tui_measurement_tools_page "Example"
         def PointCoordinates(self,Point):
+            # Example: see GEOM_TestMeasures.py
             aTuple = self.MeasuOp.PointCoordinates(Point)
             RaiseIfFailed("PointCoordinates", self.MeasuOp)
             return aTuple
-        
+
         ## Get summarized length of all wires,
         #  area of surface and volume of the given shape.
         #  @param theShape Shape to define properties of.
@@ -1974,12 +2829,13 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  theSurfArea: Area of surface of the given shape.
         #  theVolume:   Volume of the given shape.
         #
-        #  Example: see GEOM_TestMeasures.py
+        #  @ref tui_measurement_tools_page "Example"
         def BasicProperties(self,theShape):
+            # Example: see GEOM_TestMeasures.py
             aTuple = self.MeasuOp.GetBasicProperties(theShape)
             RaiseIfFailed("GetBasicProperties", self.MeasuOp)
             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]
@@ -1987,30 +2843,33 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  Ymin,Ymax: Limits of shape along OY axis.
         #  Zmin,Zmax: Limits of shape along OZ axis.
         #
-        #  Example: see GEOM_TestMeasures.py
+        #  @ref tui_measurement_tools_page "Example"
         def BoundingBox(self,theShape):
+            # Example: see GEOM_TestMeasures.py
             aTuple = self.MeasuOp.GetBoundingBox(theShape)
             RaiseIfFailed("GetBoundingBox", self.MeasuOp)
             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
+        #  @ref tui_measurement_tools_page "Example"
         def Inertia(self,theShape):
+            # Example: see GEOM_TestMeasures.py
             aTuple = self.MeasuOp.GetInertia(theShape)
             RaiseIfFailed("GetInertia", self.MeasuOp)
             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
+        #  @ref tui_measurement_tools_page "Example"
         def MinDistance(self, theShape1, theShape2):
+            # Example: see GEOM_TestMeasures.py
             aTuple = self.MeasuOp.GetMinDistance(theShape1, theShape2)
             RaiseIfFailed("GetMinDistance", self.MeasuOp)
             return aTuple[0]
@@ -2019,22 +2878,90 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theShape1,theShape2 Shapes to find minimal distance between.
         #  @return Value of the minimal distance between the given shapes.
         #
-        #  Example: see GEOM_TestMeasures.py
+        #  @ref swig_all_measure "Example"
         def MinDistanceComponents(self, theShape1, theShape2):
+            # Example: see GEOM_TestMeasures.py
             aTuple = self.MeasuOp.GetMinDistance(theShape1, theShape2)
             RaiseIfFailed("GetMinDistance", self.MeasuOp)
             aRes = [aTuple[0], aTuple[4] - aTuple[1], aTuple[5] - aTuple[2], aTuple[6] - aTuple[3]]
             return aRes
 
-        ## Get angle between the given shapes.
+        ## Get angle between the given shapes in degrees.
         #  @param theShape1,theShape2 Lines or linear edges to find angle between.
-        #  @return Value of the angle between the given shapes.
+        #  @return Value of the angle between the given shapes in degrees.
         #
-        #  Example: see GEOM_TestMeasures.py
+        #  @ref tui_measurement_tools_page "Example"
         def GetAngle(self, theShape1, theShape2):
+            # Example: see GEOM_TestMeasures.py
             anAngle = self.MeasuOp.GetAngle(theShape1, theShape2)
             RaiseIfFailed("GetAngle", self.MeasuOp)
             return anAngle
+        ## Get angle between the given shapes in radians.
+        #  @param theShape1,theShape2 Lines or linear edges to find angle between.
+        #  @return Value of the angle between the given shapes in radians.
+        #
+        #  @ref tui_measurement_tools_page "Example"
+        def GetAngleRadians(self, theShape1, theShape2):
+            # Example: see GEOM_TestMeasures.py
+            anAngle = self.MeasuOp.GetAngle(theShape1, theShape2)*math.pi/180.
+            RaiseIfFailed("GetAngle", self.MeasuOp)
+            return anAngle
+
+        ## @name Curve Curvature Measurement
+        #  Methods for receiving radius of curvature of curves
+        #  in the given point
+        ## @{
+
+        ## Measure curvature of a curve at a point, set by parameter.
+        #  @ref swig_todo "Example"
+        def CurveCurvatureByParam(self, theCurve, theParam):
+            # Example: see GEOM_TestMeasures.py
+            aCurv = self.MeasuOp.CurveCurvatureByParam(theCurve,theParam)
+            RaiseIfFailed("CurveCurvatureByParam", self.MeasuOp)
+            return aCurv
+
+        ## @details
+        #  @ref swig_todo "Example"
+        def CurveCurvatureByPoint(self, theCurve, thePoint):
+            aCurv = self.MeasuOp.CurveCurvatureByPoint(theCurve,thePoint)
+            RaiseIfFailed("CurveCurvatureByPoint", self.MeasuOp)
+            return aCurv
+        ## @}
+
+        ## @name Surface Curvature Measurement
+        #  Methods for receiving max and min radius of curvature of surfaces
+        #  in the given point
+        ## @{
+
+        ## @details
+        ## @ref swig_todo "Example"
+        def MaxSurfaceCurvatureByParam(self, theSurf, theUParam, theVParam):
+            # Example: see GEOM_TestMeasures.py
+            aSurf = self.MeasuOp.MaxSurfaceCurvatureByParam(theSurf,theUParam,theVParam)
+            RaiseIfFailed("MaxSurfaceCurvatureByParam", self.MeasuOp)
+            return aSurf
+
+        ## @details
+        ## @ref swig_todo "Example"
+        def MaxSurfaceCurvatureByPoint(self, theSurf, thePoint):
+            aSurf = self.MeasuOp.MaxSurfaceCurvatureByPoint(theSurf,thePoint)
+            RaiseIfFailed("MaxSurfaceCurvatureByPoint", self.MeasuOp)
+            return aSurf
+
+        ## @details
+        ## @ref swig_todo "Example"
+        def MinSurfaceCurvatureByParam(self, theSurf, theUParam, theVParam):
+            aSurf = self.MeasuOp.MinSurfaceCurvatureByParam(theSurf,theUParam,theVParam)
+            RaiseIfFailed("MinSurfaceCurvatureByParam", self.MeasuOp)
+            return aSurf
+
+        ## @details
+        ## @ref swig_todo "Example"
+        def MinSurfaceCurvatureByPoint(self, theSurf, thePoint):
+            aSurf = self.MeasuOp.MinSurfaceCurvatureByPoint(theSurf,thePoint)
+            RaiseIfFailed("MinSurfaceCurvatureByPoint", self.MeasuOp)
+            return aSurf
+        ## @}
 
         ## Get min and max tolerances of sub-shapes of theShape
         #  @param theShape Shape, to get tolerances of.
@@ -2043,8 +2970,9 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  EdgeMin,EdgeMax: Min and max tolerances of the edges.
         #  VertMin,VertMax: Min and max tolerances of the vertices.
         #
-        #  Example: see GEOM_TestMeasures.py
+        #  @ref tui_measurement_tools_page "Example"
         def Tolerance(self,theShape):
+            # Example: see GEOM_TestMeasures.py
             aTuple = self.MeasuOp.GetTolerance(theShape)
             RaiseIfFailed("GetTolerance", self.MeasuOp)
             return aTuple
@@ -2053,34 +2981,37 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theShape Shape to be described.
         #  @return Description of the given shape.
         #
-        #  Example: see GEOM_TestMeasures.py
+        #  @ref tui_measurement_tools_page "Example"
         def WhatIs(self,theShape):
+            # Example: see GEOM_TestMeasures.py
             aDescr = self.MeasuOp.WhatIs(theShape)
             RaiseIfFailed("WhatIs", self.MeasuOp)
             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
+        #  @ref tui_measurement_tools_page "Example"
         def MakeCDG(self,theShape):
+            # Example: see GEOM_TestMeasures.py
             anObj = self.MeasuOp.GetCentreOfMass(theShape)
             RaiseIfFailed("GetCentreOfMass", self.MeasuOp)
             return anObj
-        
+
         ## Get a normale to the given face. If the point is not given,
         #  the normale is calculated at the center of mass.
         #  @param theFace Face to define normale of.
         #  @param theOptionalPoint Point to compute the normale at.
         #  @return New GEOM_Object, containing the created vector.
         #
-        #  Example: see GEOM_TestMeasures.py
+        #  @ref swig_todo "Example"
         def GetNormal(self, theFace, theOptionalPoint = None):
+            # Example: see GEOM_TestMeasures.py
             anObj = self.MeasuOp.GetNormal(theFace, theOptionalPoint)
             RaiseIfFailed("GetNormal", self.MeasuOp)
             return anObj
-        
+
         ## Check a topology of the given shape.
         #  @param theShape Shape to check validity of.
         #  @param theIsCheckGeom If FALSE, only the shape's topology will be checked,
@@ -2088,8 +3019,9 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @return TRUE, if the shape "seems to be valid".
         #  If theShape is invalid, prints a description of problem.
         #
-        #  Example: see GEOM_TestMeasures.py
+        #  @ref tui_measurement_tools_page "Example"
         def CheckShape(self,theShape, theIsCheckGeom = 0):
+            # Example: see GEOM_TestMeasures.py
             if theIsCheckGeom:
                 (IsValid, Status) = self.MeasuOp.CheckShapeWithGeometry(theShape)
                 RaiseIfFailed("CheckShapeWithGeometry", self.MeasuOp)
@@ -2099,7 +3031,7 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             if IsValid == 0:
                 print Status
             return IsValid
-        
+
         ## Get position (LCS) of theShape.
         #
         #  Origin of the LCS is situated at the shape's center of mass.
@@ -2112,12 +3044,13 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #          Zx,Zy,Zz: Coordinates of shape's LCS normal(main) direction.
         #          Xx,Xy,Xz: Coordinates of shape's LCS X direction.
         #
-        #  Example: see GEOM_TestMeasures.py
+        #  @ref swig_todo "Example"
         def GetPosition(self,theShape):
+            # Example: see GEOM_TestMeasures.py
             aTuple = self.MeasuOp.GetPosition(theShape)
             RaiseIfFailed("GetPosition", self.MeasuOp)
             return aTuple
-        
+
         ## Get kind of theShape.
         #
         #  @param theShape Shape to get a kind of.
@@ -2127,69 +3060,72 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #         or \a theDoubles list depends on the kind of the shape.
         #         The full list of possible outputs is:
         #
-        #  geompy.kind.COMPOUND              nb_solids  nb_faces  nb_edges  nb_vertices
-        #  geompy.kind.COMPSOLID             nb_solids  nb_faces  nb_edges  nb_vertices
-        #
-        #  geompy.kind.SHELL       geompy.info.CLOSED   nb_faces  nb_edges  nb_vertices
-        #  geompy.kind.SHELL       geompy.info.UNCLOSED nb_faces  nb_edges  nb_vertices
-        #
-        #  geompy.kind.WIRE        geompy.info.CLOSED             nb_edges  nb_vertices
-        #  geompy.kind.WIRE        geompy.info.UNCLOSED           nb_edges  nb_vertices
-        #
-        #  geompy.kind.SPHERE       xc yc zc            R
-        #  geompy.kind.CYLINDER     xb yb zb  dx dy dz  R         H
-        #  geompy.kind.BOX          xc yc zc                      ax ay az
-        #  geompy.kind.ROTATED_BOX  xc yc zc  zx zy zz  xx xy xz  ax ay az
-        #  geompy.kind.TORUS        xc yc zc  dx dy dz  R_1  R_2
-        #  geompy.kind.CONE         xb yb zb  dx dy dz  R_1  R_2  H
-        #  geompy.kind.POLYHEDRON                       nb_faces  nb_edges  nb_vertices
-        #  geompy.kind.SOLID                            nb_faces  nb_edges  nb_vertices
-        #
-        #  geompy.kind.SPHERE2D     xc yc zc            R
-        #  geompy.kind.CYLINDER2D   xb yb zb  dx dy dz  R         H
-        #  geompy.kind.TORUS2D      xc yc zc  dx dy dz  R_1  R_2
-        #  geompy.kind.CONE2D       xc yc zc  dx dy dz  R_1  R_2  H
-        #  geompy.kind.DISK_CIRCLE  xc yc zc  dx dy dz  R
-        #  geompy.kind.DISK_ELLIPSE xc yc zc  dx dy dz  R_1  R_2
-        #  geompy.kind.POLYGON      xo yo zo  dx dy dz            nb_edges  nb_vertices
-        #  geompy.kind.PLANE        xo yo zo  dx dy dz
-        #  geompy.kind.PLANAR       xo yo zo  dx dy dz            nb_edges  nb_vertices
-        #  geompy.kind.FACE                                       nb_edges  nb_vertices
-        #
-        #  geompy.kind.CIRCLE       xc yc zc  dx dy dz  R
-        #  geompy.kind.ARC_CIRCLE   xc yc zc  dx dy dz  R         x1 y1 z1  x2 y2 z2
-        #  geompy.kind.ELLIPSE      xc yc zc  dx dy dz  R_1  R_2
-        #  geompy.kind.ARC_ELLIPSE  xc yc zc  dx dy dz  R_1  R_2  x1 y1 z1  x2 y2 z2
-        #  geompy.kind.LINE         xo yo zo  dx dy dz
-        #  geompy.kind.SEGMENT      x1 y1 z1  x2 y2 z2
-        #  geompy.kind.EDGE                                                 nb_vertices
-        #
-        #  geompy.kind.VERTEX       x  y  z
-        #
-        #  Example: see GEOM_TestMeasures.py
+        #  geompy.kind.COMPOUND              nb_solids  nb_faces  nb_edges  nb_vertices
+        #  geompy.kind.COMPSOLID             nb_solids  nb_faces  nb_edges  nb_vertices
+        #
+        #  geompy.kind.SHELL       geompy.info.CLOSED   nb_faces  nb_edges  nb_vertices
+        #  geompy.kind.SHELL       geompy.info.UNCLOSED nb_faces  nb_edges  nb_vertices
+        #
+        #  geompy.kind.WIRE        geompy.info.CLOSED             nb_edges  nb_vertices
+        #  geompy.kind.WIRE        geompy.info.UNCLOSED           nb_edges  nb_vertices
+        #
+        #  geompy.kind.SPHERE       xc yc zc            R
+        #  geompy.kind.CYLINDER     xb yb zb  dx dy dz  R         H
+        #  geompy.kind.BOX          xc yc zc                      ax ay az
+        #  geompy.kind.ROTATED_BOX  xc yc zc  zx zy zz  xx xy xz  ax ay az
+        #  geompy.kind.TORUS        xc yc zc  dx dy dz  R_1  R_2
+        #  geompy.kind.CONE         xb yb zb  dx dy dz  R_1  R_2  H
+        #  geompy.kind.POLYHEDRON                       nb_faces  nb_edges  nb_vertices
+        #  geompy.kind.SOLID                            nb_faces  nb_edges  nb_vertices
+        #
+        #  geompy.kind.SPHERE2D     xc yc zc            R
+        #  geompy.kind.CYLINDER2D   xb yb zb  dx dy dz  R         H
+        #  geompy.kind.TORUS2D      xc yc zc  dx dy dz  R_1  R_2
+        #  geompy.kind.CONE2D       xc yc zc  dx dy dz  R_1  R_2  H
+        #  geompy.kind.DISK_CIRCLE  xc yc zc  dx dy dz  R
+        #  geompy.kind.DISK_ELLIPSE xc yc zc  dx dy dz  R_1  R_2
+        #  geompy.kind.POLYGON      xo yo zo  dx dy dz            nb_edges  nb_vertices
+        #  geompy.kind.PLANE        xo yo zo  dx dy dz
+        #  geompy.kind.PLANAR       xo yo zo  dx dy dz            nb_edges  nb_vertices
+        #  geompy.kind.FACE                                       nb_edges  nb_vertices
+        #
+        #  geompy.kind.CIRCLE       xc yc zc  dx dy dz  R
+        #  geompy.kind.ARC_CIRCLE   xc yc zc  dx dy dz  R         x1 y1 z1  x2 y2 z2
+        #  geompy.kind.ELLIPSE      xc yc zc  dx dy dz  R_1  R_2
+        #  geompy.kind.ARC_ELLIPSE  xc yc zc  dx dy dz  R_1  R_2  x1 y1 z1  x2 y2 z2
+        #  geompy.kind.LINE         xo yo zo  dx dy dz
+        #  geompy.kind.SEGMENT      x1 y1 z1  x2 y2 z2
+        #  geompy.kind.EDGE                                                 nb_vertices
+        #
+        #  geompy.kind.VERTEX       x  y  z
+        #
+        #  @ref swig_todo "Example"
         def KindOfShape(self,theShape):
+            # Example: see GEOM_TestMeasures.py
             aRoughTuple = self.MeasuOp.KindOfShape(theShape)
             RaiseIfFailed("KindOfShape", self.MeasuOp)
-             
+
             aKind  = aRoughTuple[0]
             anInts = aRoughTuple[1]
             aDbls  = aRoughTuple[2]
-            
+
             # Now there is no exception from this rule:
             aKindTuple = [aKind] + aDbls + anInts
-            
+
             # If they are we will regroup parameters for such kind of shape.
             # For example:
             #if aKind == kind.SOME_KIND:
             #    #  SOME_KIND     int int double int double double
             #    aKindTuple = [aKind, anInts[0], anInts[1], aDbls[0], anInts[2], aDbls[1], aDbls[2]]
-            
+
             return aKindTuple
-    
-        # -----------------------------------------------------------------------------
-        # Import/Export objects
-        # -----------------------------------------------------------------------------
-        
+
+        # end of l2_measure
+        ## @}
+
+        ## @addtogroup l2_import_export
+        ## @{
+
         ## 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.
@@ -2197,121 +3133,145 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #         Available formats can be obtained with InsertOp.ImportTranslators() method.
         #  @return New GEOM_Object, containing the imported shape.
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_Import_Export "Example"
         def Import(self,theFileName, theFormatName):
+            # Example: see GEOM_TestOthers.py
             anObj = self.InsertOp.Import(theFileName, theFormatName)
             RaiseIfFailed("Import", self.InsertOp)
             return anObj
-        
+
         ## Shortcut to Import() for BREP format
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_Import_Export "Example"
         def ImportBREP(self,theFileName):
+            # Example: see GEOM_TestOthers.py
             return self.Import(theFileName, "BREP")
-        
+
         ## Shortcut to Import() for IGES format
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_Import_Export "Example"
         def ImportIGES(self,theFileName):
+            # Example: see GEOM_TestOthers.py
             return self.Import(theFileName, "IGES")
-        
+
         ## Shortcut to Import() for STEP format
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_Import_Export "Example"
         def ImportSTEP(self,theFileName):
+            # Example: see GEOM_TestOthers.py
             return self.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
+        #  @ref swig_Import_Export "Example"
         def Export(self,theObject, theFileName, theFormatName):
+            # Example: see GEOM_TestOthers.py
             self.InsertOp.Export(theObject, theFileName, theFormatName)
             if self.InsertOp.IsDone() == 0:
                 raise RuntimeError,  "Export : " + self.InsertOp.GetErrorCode()
                 pass
             pass
-        
+
         ## Shortcut to Export() for BREP format
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_Import_Export "Example"
         def ExportBREP(self,theObject, theFileName):
+            # Example: see GEOM_TestOthers.py
             return self.Export(theObject, theFileName, "BREP")
-        
+
         ## Shortcut to Export() for IGES format
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_Import_Export "Example"
         def ExportIGES(self,theObject, theFileName):
+            # Example: see GEOM_TestOthers.py
             return self.Export(theObject, theFileName, "IGES")
-        
+
         ## Shortcut to Export() for STEP format
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_Import_Export "Example"
         def ExportSTEP(self,theObject, theFileName):
+            # Example: see GEOM_TestOthers.py
             return self.Export(theObject, theFileName, "STEP")
-        
-        # -----------------------------------------------------------------------------
-        # Block operations
-        # -----------------------------------------------------------------------------
-        
+
+        # end of l2_import_export
+        ## @}
+
+        ## @addtogroup l3_blocks
+        ## @{
+
         ## 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
+        #  @ref tui_building_by_blocks_page "Example"
         def MakeQuad(self,E1, E2, E3, E4):
+            # Example: see GEOM_Spanner.py
             anObj = self.BlocksOp.MakeQuad(E1, E2, E3, E4)
             RaiseIfFailed("MakeQuad", self.BlocksOp)
             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
+        #  @ref tui_building_by_blocks_page "Example"
         def MakeQuad2Edges(self,E1, E2):
+            # Example: see GEOM_Spanner.py
             anObj = self.BlocksOp.MakeQuad2Edges(E1, E2)
             RaiseIfFailed("MakeQuad2Edges", self.BlocksOp)
             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
+        #  @ref tui_building_by_blocks_page "Example 1"
+        #  \n @ref swig_MakeQuad4Vertices "Example 2"
         def MakeQuad4Vertices(self,V1, V2, V3, V4):
+            # Example: see GEOM_Spanner.py
             anObj = self.BlocksOp.MakeQuad4Vertices(V1, V2, V3, V4)
             RaiseIfFailed("MakeQuad4Vertices", self.BlocksOp)
             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
+        #  @ref tui_building_by_blocks_page "Example 1"
+        #  \n @ref swig_MakeHexa "Example 2"
         def MakeHexa(self,F1, F2, F3, F4, F5, F6):
+            # Example: see GEOM_Spanner.py
             anObj = self.BlocksOp.MakeHexa(F1, F2, F3, F4, F5, F6)
             RaiseIfFailed("MakeHexa", self.BlocksOp)
             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
+        #  @ref tui_building_by_blocks_page "Example 1"
+        #  \n @ref swig_MakeHexa2Faces "Example 2"
         def MakeHexa2Faces(self,F1, F2):
+            # Example: see GEOM_Spanner.py
             anObj = self.BlocksOp.MakeHexa2Faces(F1, F2)
             RaiseIfFailed("MakeHexa2Faces", self.BlocksOp)
             return anObj
-        
+
+        # end of l3_blocks
+        ## @}
+
+        ## @addtogroup l3_blocks_op
+        ## @{
+
         ## 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.
@@ -2319,89 +3279,103 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #                    vertex and point with the given coordinates.
         #  @return New GEOM_Object, containing the found vertex.
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_GetPoint "Example"
         def GetPoint(self,theShape, theX, theY, theZ, theEpsilon):
+            # Example: see GEOM_TestOthers.py
             anObj = self.BlocksOp.GetPoint(theShape, theX, theY, theZ, theEpsilon)
             RaiseIfFailed("GetPoint", self.BlocksOp)
             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
+        #  @ref swig_todo "Example"
         def GetEdge(self,theShape, thePoint1, thePoint2):
+            # Example: see GEOM_Spanner.py
             anObj = self.BlocksOp.GetEdge(theShape, thePoint1, thePoint2)
             RaiseIfFailed("GetEdge", self.BlocksOp)
             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
+        #  @ref swig_GetEdgeNearPoint "Example"
         def GetEdgeNearPoint(self,theShape, thePoint):
+            # Example: see GEOM_TestOthers.py
             anObj = self.BlocksOp.GetEdgeNearPoint(theShape, thePoint)
             RaiseIfFailed("GetEdgeNearPoint", self.BlocksOp)
             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.
+        #  @param thePoint1,thePoint2,thePoint3,thePoint4 Points, close to the corners of the desired face.
         #  @return New GEOM_Object, containing the found face.
         #
-        #  Example: see GEOM_Spanner.py
+        #  @ref swig_todo "Example"
         def GetFaceByPoints(self,theShape, thePoint1, thePoint2, thePoint3, thePoint4):
+            # Example: see GEOM_Spanner.py
             anObj = self.BlocksOp.GetFaceByPoints(theShape, thePoint1, thePoint2, thePoint3, thePoint4)
             RaiseIfFailed("GetFaceByPoints", self.BlocksOp)
             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
+        #  @ref swig_todo "Example"
         def GetFaceByEdges(self,theShape, theEdge1, theEdge2):
+            # Example: see GEOM_Spanner.py
             anObj = self.BlocksOp.GetFaceByEdges(theShape, theEdge1, theEdge2)
             RaiseIfFailed("GetFaceByEdges", self.BlocksOp)
             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
+        #  @ref swig_GetOppositeFace "Example"
         def GetOppositeFace(self,theBlock, theFace):
+            # Example: see GEOM_Spanner.py
             anObj = self.BlocksOp.GetOppositeFace(theBlock, theFace)
             RaiseIfFailed("GetOppositeFace", self.BlocksOp)
             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
+        #  @ref swig_GetFaceNearPoint "Example"
         def GetFaceNearPoint(self,theShape, thePoint):
+            # Example: see GEOM_Spanner.py
             anObj = self.BlocksOp.GetFaceNearPoint(theShape, thePoint)
             RaiseIfFailed("GetFaceNearPoint", self.BlocksOp)
             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 theBlock 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(self,theBlock, theVector):
+        #  @ref swig_todo "Example"
+        def GetFaceByNormale(self, theBlock, theVector):
+            # Example: see GEOM_Spanner.py
             anObj = self.BlocksOp.GetFaceByNormale(theBlock, theVector)
             RaiseIfFailed("GetFaceByNormale", self.BlocksOp)
             return anObj
-        
+
+        # end of l3_blocks_op
+        ## @}
+
+        ## @addtogroup l4_blocks_measure
+        ## @{
+
         ## Check, if the compound of blocks is given.
         #  To be considered as a compound of blocks, the
         #  given shape must satisfy the following conditions:
@@ -2413,39 +3387,49 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @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
+        #  @ref tui_measurement_tools_page "Example 1"
+        #  \n @ref swig_CheckCompoundOfBlocks "Example 2"
         def CheckCompoundOfBlocks(self,theCompound):
+            # Example: see GEOM_Spanner.py
             (IsValid, BCErrors) = self.BlocksOp.CheckCompoundOfBlocks(theCompound)
             RaiseIfFailed("CheckCompoundOfBlocks", self.BlocksOp)
             if IsValid == 0:
                 Descr = self.BlocksOp.PrintBCErrors(theCompound, BCErrors)
                 print Descr
             return IsValid
-        
+
         ## Remove all seam and degenerated edges from \a theShape.
         #  Unite faces and edges, sharing one surface. It means that
         #  this faces must have references to one C++ surface object (handle).
         #  @param theShape The compound or single solid to remove irregular edges from.
         #  @return Improved shape.
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_RemoveExtraEdges "Example"
         def RemoveExtraEdges(self,theShape):
+            # Example: see GEOM_TestOthers.py
             anObj = self.BlocksOp.RemoveExtraEdges(theShape)
             RaiseIfFailed("RemoveExtraEdges", self.BlocksOp)
             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.
+        #  @param theShape The compound to check and improve.
         #  @return Improved compound.
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_CheckAndImprove "Example"
         def CheckAndImprove(self,theShape):
+            # Example: see GEOM_TestOthers.py
             anObj = self.BlocksOp.CheckAndImprove(theShape)
             RaiseIfFailed("CheckAndImprove", self.BlocksOp)
             return anObj
-        
+
+        # end of l4_blocks_measure
+        ## @}
+
+        ## @addtogroup l3_blocks_op
+        ## @{
+
         ## 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.
@@ -2453,42 +3437,51 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #    \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
+        #  @ref tui_explode_on_blocks "Example 1"
+        #  \n @ref swig_MakeBlockExplode "Example 2"
         def MakeBlockExplode(self,theCompound, theMinNbFaces, theMaxNbFaces):
+            # Example: see GEOM_TestOthers.py
+            theMinNbFaces,theMaxNbFaces,Parameters = ParseParameters(theMinNbFaces,theMaxNbFaces)
             aList = self.BlocksOp.ExplodeCompoundOfBlocks(theCompound, theMinNbFaces, theMaxNbFaces)
             RaiseIfFailed("ExplodeCompoundOfBlocks", self.BlocksOp)
+            for anObj in aList:
+                anObj.SetParameters(Parameters)
+                pass
             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
+        #  @ref swig_todo "Example"
         def GetBlockNearPoint(self,theCompound, thePoint):
+            # Example: see GEOM_Spanner.py
             anObj = self.BlocksOp.GetBlockNearPoint(theCompound, thePoint)
             RaiseIfFailed("GetBlockNearPoint", self.BlocksOp)
             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
+        #  @ref swig_GetBlockByParts "Example"
         def GetBlockByParts(self,theCompound, theParts):
+            # Example: see GEOM_TestOthers.py
             anObj = self.BlocksOp.GetBlockByParts(theCompound, theParts)
             RaiseIfFailed("GetBlockByParts", self.BlocksOp)
             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
+        #  @ref swig_todo "Example"
         def GetBlocksByParts(self,theCompound, theParts):
+            # Example: see GEOM_Spanner.py
             aList = self.BlocksOp.GetBlocksByParts(theCompound, theParts)
             RaiseIfFailed("GetBlocksByParts", self.BlocksOp)
             return aList
@@ -2502,12 +3495,15 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #    \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
+        #  @ref tui_multi_transformation "Example"
         def MakeMultiTransformation1D(self,Block, DirFace1, DirFace2, NbTimes):
+            # Example: see GEOM_Spanner.py
+            DirFace1,DirFace2,NbTimes,Parameters = ParseParameters(DirFace1,DirFace2,NbTimes)
             anObj = self.BlocksOp.MakeMultiTransformation1D(Block, DirFace1, DirFace2, NbTimes)
             RaiseIfFailed("MakeMultiTransformation1D", self.BlocksOp)
+            anObj.SetParameters(Parameters)
             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.
@@ -2515,14 +3511,18 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param NbTimesU,NbTimesV Quantity of transformations to be done.
         #  @return New GEOM_Object, containing the result shape.
         #
-        #  Example: see GEOM_Spanner.py
+        #  @ref tui_multi_transformation "Example"
         def MakeMultiTransformation2D(self,Block, DirFace1U, DirFace2U, NbTimesU,
                                       DirFace1V, DirFace2V, NbTimesV):
+            # Example: see GEOM_Spanner.py
+            DirFace1U,DirFace2U,NbTimesU,DirFace1V,DirFace2V,NbTimesV,Parameters = ParseParameters(
+              DirFace1U,DirFace2U,NbTimesU,DirFace1V,DirFace2V,NbTimesV)
             anObj = self.BlocksOp.MakeMultiTransformation2D(Block, DirFace1U, DirFace2U, NbTimesU,
                                                             DirFace1V, DirFace2V, NbTimesV)
             RaiseIfFailed("MakeMultiTransformation2D", self.BlocksOp)
+            anObj.SetParameters(Parameters)
             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.
@@ -2530,74 +3530,84 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @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
+        #  @ref swig_Propagate "Example"
         def Propagate(self,theShape):
+            # Example: see GEOM_TestOthers.py
             listChains = self.BlocksOp.Propagate(theShape)
             RaiseIfFailed("Propagate", self.BlocksOp)
             return listChains
-        
-        # -----------------------------------------------------------------------------
-        # Group operations
-        # -----------------------------------------------------------------------------
-        
+
+        # end of l3_blocks_op
+        ## @}
+
+        ## @addtogroup l3_groups
+        ## @{
+
         ## 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
+        #  @ref tui_working_with_groups_page "Example 1"
+        #  \n @ref swig_CreateGroup "Example 2"
         def CreateGroup(self,theMainShape, theShapeType):
+            # Example: see GEOM_TestOthers.py
             anObj = self.GroupOp.CreateGroup(theMainShape, theShapeType)
             RaiseIfFailed("CreateGroup", self.GroupOp)
             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
+        #  @ref tui_working_with_groups_page "Example"
         def AddObject(self,theGroup, theSubShapeID):
+            # Example: see GEOM_TestOthers.py
             self.GroupOp.AddObject(theGroup, theSubShapeID)
             RaiseIfFailed("AddObject", self.GroupOp)
             pass
-        
+
         ## 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
+        #  @ref tui_working_with_groups_page "Example"
         def RemoveObject(self,theGroup, theSubShapeID):
+            # Example: see GEOM_TestOthers.py
             self.GroupOp.RemoveObject(theGroup, theSubShapeID)
             RaiseIfFailed("RemoveObject", self.GroupOp)
             pass
-        
+
         ## 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
+        #  @ref tui_working_with_groups_page "Example"
         def UnionList (self,theGroup, theSubShapes):
+            # Example: see GEOM_TestOthers.py
             self.GroupOp.UnionList(theGroup, theSubShapes)
             RaiseIfFailed("UnionList", self.GroupOp)
             pass
-        
+
         ## Works like the above method, but argument
         #  theSubShapes here is a list of sub-shapes indices
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_UnionIDs "Example"
         def UnionIDs(self,theGroup, theSubShapes):
+            # Example: see GEOM_TestOthers.py
             self.GroupOp.UnionIDs(theGroup, theSubShapes)
             RaiseIfFailed("UnionIDs", self.GroupOp)
             pass
-        
+
         ## 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
+        #  @ref tui_working_with_groups_page "Example"
         def DifferenceList (self,theGroup, theSubShapes):
+            # Example: see GEOM_TestOthers.py
             self.GroupOp.DifferenceList(theGroup, theSubShapes)
             RaiseIfFailed("DifferenceList", self.GroupOp)
             pass
@@ -2605,43 +3615,49 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         ## Works like the above method, but argument
         #  theSubShapes here is a list of sub-shapes indices
         #
-        #  Example: see GEOM_TestOthers.py
+        #  @ref swig_DifferenceIDs "Example"
         def DifferenceIDs(self,theGroup, theSubShapes):
+            # Example: see GEOM_TestOthers.py
             self.GroupOp.DifferenceIDs(theGroup, theSubShapes)
             RaiseIfFailed("DifferenceIDs", self.GroupOp)
             pass
-        
+
         ## 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
+        #  @ref swig_GetObjectIDs "Example"
         def GetObjectIDs(self,theGroup):
+            # Example: see GEOM_TestOthers.py
             ListIDs = self.GroupOp.GetObjects(theGroup)
             RaiseIfFailed("GetObjects", self.GroupOp)
             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
+        #  @ref swig_GetType "Example"
         def GetType(self,theGroup):
+            # Example: see GEOM_TestOthers.py
             aType = self.GroupOp.GetType(theGroup)
             RaiseIfFailed("GetType", self.GroupOp)
             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
+        #  @ref swig_GetMainShape "Example"
         def GetMainShape(self,theGroup):
+            # Example: see GEOM_TestOthers.py
             anObj = self.GroupOp.GetMainShape(theGroup)
             RaiseIfFailed("GetMainShape", self.GroupOp)
             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 (self,theShape, min_length, max_length, include_min = 1, include_max = 1):
+        #
+        #  @ref swig_todo "Example"
+        def GetEdgesByLength (self, theShape, min_length, max_length, include_min = 1, include_max = 1):
             edges = self.SubShapeAll(theShape, ShapeType["EDGE"])
             edges_in_range = []
             for edge in edges:
@@ -2654,19 +3670,21 @@ class geompyDC(GEOM._objref_GEOM_Gen):
                             skip = 1
                         else:
                             edges_in_range.append(edge)
-                            
+
             if len(edges_in_range) <= 0:
                 print "No edges found by given criteria"
                 return 0
-            
+
             group_edges = self.CreateGroup(theShape, ShapeType["EDGE"])
             self.UnionList(group_edges, edges_in_range)
-            
+
             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 (self,min_length, max_length, include_min = 1, include_max = 1):
+        #
+        #  @ref swig_todo "Example"
+        def SelectEdges (self, min_length, max_length, include_min = 1, include_max = 1):
             nb_selected = sg.SelectedCount()
             if nb_selected < 1:
                 print "Select a shape before calling this function, please."
@@ -2674,25 +3692,39 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             if nb_selected > 1:
                 print "Only one shape must be selected"
                 return 0
-            
+
             id_shape = sg.getSelected(0)
             shape = IDToObject( id_shape )
-            
+
             group_edges = self.GetEdgesByLength(shape, min_length, max_length, include_min, include_max)
-            
+
             left_str  = " < "
             right_str = " < "
             if include_min: left_str  = " <= "
             if include_max: right_str  = " <= "
-            
+
             self.addToStudyInFather(shape, group_edges, "Group of edges with " + `min_length`
                                     + left_str + "length" + right_str + `max_length`)
-            
+
             sg.updateObjBrowser(1)
-            
+
             return group_edges
-        
+
+        # end of l3_groups
+        ## @}
+
+        ## Create a copy of the given object
+        #  @ingroup l1_geompy_auxiliary
+        #
+        #  @ref swig_all_advanced "Example"
+        def MakeCopy(self,theOriginal):
+            # Example: see GEOM_TestAll.py
+            anObj = self.InsertOp.MakeCopy(theOriginal)
+            RaiseIfFailed("MakeCopy", self.InsertOp)
+            return anObj
+
         ## Add Path to load python scripts from
+        #  @ingroup l1_geompy_auxiliary
         def addPath(self,Path):
             if (sys.path.count(Path) < 1):
                 sys.path.append(Path)
index e71593115ba73d2bc4f693892b1d585948227e18..1fcd94b42bba03501c7c9acdd0b14e11538518b9 100644 (file)
@@ -1,6 +1,6 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  Copyright (C) 2003-2007  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
 #  License along with this library; if 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
-#
-#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
 #  File   : Makefile.in
 #  Author : Nicolas REJNERI, Paul RASCLE
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
-
 # Libraries targets
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # ===============================================================
@@ -49,66 +46,46 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 #                          +              |
 #                          dependant libs |
 #
-# The file libSALOME_Swigcmodule.py will be installed in
-# <prefix>/lib/python<version>/site-package/salome.
-# The library will be installed in the same place.
+# The file libGEOM_Swig.py will be installed to the
+# <prefix>/bin/salome directory.
+# The library _libGEOM_Swig.so will be installed to the 
+# <prefix>/lib/python<version>/site-package/salome directory.
 #
 
-# this option puts it to dist
-#BUILT_SOURCES = swig_wrap.cpp
-
-SWIG_FLAGS    = \
-       @SWIG_FLAGS@ \
-       -I$(srcdir) \
-       -I$(srcdir)/../GEOMGUI
-
+SWIG_FLAGS    = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../GEOMGUI
 SWIG_SOURCES  = libGEOM_Swig.i
 
-# Libraries targets
-lib_LTLIBRARIES = libGEOM_Swigcmodule.la
-
-nodist_pkgpython_DATA = libGEOM_Swig.py
 libGEOM_Swig.py: swig_wrap.cpp
 
-libGEOM_Swigcmodule_la_SOURCES = \
-       $(BUILT_SOURCES) \
-       $(SWIG_SOURCES)
-
-nodist_libGEOM_Swigcmodule_la_SOURCES = swig_wrap.cpp
-
-#LIB_CLIENT_IDL = SALOMEDS.idl \
-#                 SALOMEDS_Attributes.idl \
-#               SALOME_Exception.idl \
-#               GEOM_Gen.idl \
-#               SALOME_Component.idl \
-#               SALOME_GenericObj.idl
-
-libGEOM_Swigcmodule_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(PYTHON_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(VTK_INCLUDES) \
-       $(OGL_INCLUDES) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(top_builddir)/idl \
+# Libraries targets
+lib_LTLIBRARIES                 = _libGEOM_Swig.la
+_libGEOM_Swig_la_SOURCES        = $(SWIG_SOURCES)
+nodist__libGEOM_Swig_la_SOURCES = swig_wrap.cpp
+salomeinclude_HEADERS           = $(SWIG_SOURCES)
+
+_libGEOM_Swig_la_CPPFLAGS =            \
+       $(QT_INCLUDES)                  \
+       $(PYTHON_INCLUDES)              \
+       $(CAS_CPPFLAGS)                 \
+       $(VTK_INCLUDES)                 \
+       $(OGL_INCLUDES)                 \
+       $(KERNEL_CXXFLAGS)              \
+       $(GUI_CXXFLAGS)                 \
+       $(CORBA_CXXFLAGS)               \
+       $(CORBA_INCLUDES)               \
+       -I$(srcdir)/../GEOMGUI          \
+       -I$(top_builddir)/idl           \
        -I$(top_builddir)/salome_adm/unix
 
-libGEOM_Swigcmodule_la_LDFLAGS = \
-       ../GEOMGUI/libGEOM.la
-
-
-libGEOM_Swigcmodule_la_LIBADD  = \
+_libGEOM_Swig_la_LDFLAGS = -module
+_libGEOM_Swig_la_LIBADD  =             \
+       ../GEOMGUI/libGEOM.la           \
        $(PYTHON_LIBS)
 
 swig_wrap.cpp : $(SWIG_SOURCES)
        $(SWIG) $(SWIG_FLAGS) -o $@ $<
 
-CLEANFILES = \
-       swig_wrap.cpp
+CLEANFILES = swig_wrap.cpp libGEOM_Swig.py
 
 #
 # ===============================================================
@@ -116,12 +93,8 @@ CLEANFILES = \
 # ===============================================================
 #
 
-# Scripts to be installed.
-dist_salomescript_DATA= \
-       libGEOM_Swig.py
-
-install-exec-hook:\
-       $(libdir)/_libGEOM_Swig.so
+# Scripts to be installed (distributed)
+dist_salomescript_DATA =
 
-$(libdir)/_libGEOM_Swig.so:
-       ( cd $(libdir); ln -sf libGEOM_Swigcmodule.so _libGEOM_Swig.so; )
+# Scripts to be installed (non-distributed)
+nodist_salomescript_DATA = libGEOM_Swig.py
index b1c76a904b6d6ef3b18d429f337e6c7479efe814..2ca52598a3655b8bdaa8b3990589761c836bdbc6 100644 (file)
@@ -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 
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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      : libGeometry_Swig.i
 //  Created   : Tue Mar 26 15:04:48 2002
 //  Author    : Nicolas REJNERI, Paul RASCLE
 //  Project   : SALOME
 //  Module    : GEOM
-//  Copyright : Open CASCADE, EDF 2002
 //  $Header$
-
+//
 %module libGEOM_Swig
 
 %include "GeometryGUI_Swig.i"
index 85832ed847ebfef0340beab530f101c56b51e7e2..0b16254ac2489b3ae8d9dd1eeefb77c947af23ab 100644 (file)
@@ -1,50 +1,46 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GenerationGUI.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : GenerationGUI.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "GenerationGUI.h"
 
-#include "SUIT_Session.h"
-#include "SUIT_Desktop.h"
+#include <GeometryGUI.h>
 
-#include "SalomeApp_Application.h"
+#include <SUIT_Desktop.h>
+#include <SalomeApp_Application.h>
 
 #include "GenerationGUI_PrismDlg.h"     // Method PRISM
 #include "GenerationGUI_RevolDlg.h"     // Method REVOL
 #include "GenerationGUI_FillingDlg.h"   // Method FILLING
 #include "GenerationGUI_PipeDlg.h"      // Method PIPE
 
-using namespace std;
-
 //=======================================================================
 // function : GenerationGUI()
 // purpose  : Constructor
 //=======================================================================
-GenerationGUI::GenerationGUI(GeometryGUI* parent) : GEOMGUI(parent)
+GenerationGUI::GenerationGUI( GeometryGUI* parent )
+  : GEOMGUI( parent )
 {
 }
 
@@ -70,17 +66,16 @@ bool GenerationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 
   QDialog* aDlg = NULL;
 
-  switch (theCommandID)
-    {
-    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    ( getGeometryGUI(), parent, ""); break;
+  switch ( theCommandID ) {
+  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    ( getGeometryGUI(), parent ); break;
     
-    default: app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); break;
+  default: app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); break;
   }
 
-  if (aDlg != NULL)
+  if (aDlg != NULL )
     aDlg->show();
 
   return true;
@@ -92,9 +87,11 @@ bool GenerationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 //=====================================================================================
 extern "C"
 {
-GENERATIONGUI_EXPORT
-  GEOMGUI* GetLibGUI(GeometryGUI* parent)
+#ifdef WIN32
+  __declspec( dllexport )
+#endif
+  GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
-    return new GenerationGUI(parent);
+    return new GenerationGUI( parent );
   }
 }
index a809bdcf73e24d2f612ebd4136a7a409049b20f4..17a28b81586a401706738eeb8f6f13a3cf9b5f2a 100644 (file)
@@ -1,56 +1,44 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GenerationGUI.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : GenerationGUI.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
 #ifndef GENERATIONGUI_H
 #define GENERATIONGUI_H
 
-#ifdef WNT
-# if defined GENERATIONGUI_EXPORTS
-#  define GENERATIONGUI_EXPORT __declspec( dllexport )
-# else
-#  define GENERATIONGUI_EXPORT __declspec( dllimport )
-# endif
-#else
-# define GENERATIONGUI_EXPORT
-#endif
-
-#include "GEOMGUI.h"
+#include <GEOMGUI.h>
 
 //=================================================================================
 // class    : GenerationGUI
 // purpose  :
 //=================================================================================
-class GENERATIONGUI_EXPORT GenerationGUI : public GEOMGUI
+class GenerationGUI : public GEOMGUI
 {
 public:
-  GenerationGUI(GeometryGUI* parent);
+  GenerationGUI( GeometryGUI* );
   ~GenerationGUI();
 
-  bool OnGUIEvent( int theCommandID, SUIT_Desktop* parent );
+  bool OnGUIEvent( int, SUIT_Desktop* );
 };
 
 #endif
diff --git a/src/GenerationGUI/GenerationGUI.pro b/src/GenerationGUI/GenerationGUI.pro
new file mode 100644 (file)
index 0000000..124ba14
--- /dev/null
@@ -0,0 +1,66 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = GenerationGUI
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+CAS_LDPATH = -L$${CASROOT}/Linux/lib
+
+INCLUDEPATH += $${QT_INCLUDES} $${VTK_INCLUDES} $${CAS_CPPFLAGS} $${PYTHON_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} $${CORBA_INCLUDES} ../GEOMGUI ../DlgRef ../GEOMBase ../OBJECT ../GEOMClient ../GEOMImpl ../GEOMFiltersSelection $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lGEOMFiltersSelection -lGEOMBase $${CAS_LDPATH} -lTKOffset
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += GENERATIONGUI_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+SOURCES  = GenerationGUI.cxx
+SOURCES += GenerationGUI_PrismDlg.cxx
+SOURCES += GenerationGUI_RevolDlg.cxx
+SOURCES += GenerationGUI_FillingDlg.cxx
+SOURCES += GenerationGUI_PipeDlg.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index 9f6bc2c60865139fd146f6d8a00b83f82ef4d92a..4f46e1962f51a7749f7c22d20d1945d8fdd0bc80 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GenerationGUI_FillingDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//
-//  File   : GenerationGUI_FillingDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "GenerationGUI_FillingDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-
-#include <GeomFill_SectionGenerator.hxx>
-#include <GeomFill_Line.hxx>
-#include <GeomFill_AppSurf.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <Geom_TrimmedCurve.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <BRep_Tool.hxx>
-#include <Precision.hxx>
-#include "GEOMImpl_Types.hxx"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include <qlabel.h>
-#include <qcheckbox.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
-#include "utilities.h"
+#include <TopoDS_Iterator.hxx>
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : GenerationGUI_FillingDlg()
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-GenerationGUI_FillingDlg::GenerationGUI_FillingDlg(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)
+GenerationGUI_FillingDlg::GenerationGUI_FillingDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                   bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
 {
-  QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_FILLING")));
-  QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_FILLING" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_FILLING_TITLE"));
+  setWindowTitle( tr( "GEOM_FILLING_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_FILLING"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel5Spin1Check(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_FILLING_COMPOUND"));
-  GroupPoints->TextLabel2->setText(tr("GEOM_FILLING_MIN_DEG"));
-  GroupPoints->TextLabel3->setText(tr("GEOM_FILLING_TOL_2D"));
-  GroupPoints->TextLabel4->setText(tr("GEOM_FILLING_NB_ITER"));
-  GroupPoints->TextLabel5->setText(tr("GEOM_FILLING_MAX_DEG"));
-  GroupPoints->TextLabel6->setText(tr("GEOM_FILLING_TOL_3D"));
-  GroupPoints->CheckBox1->setText(tr("GEOM_FILLING_APPROX"));
-  GroupPoints->PushButton1->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle( tr ( "GEOM_FILLING" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_1Sel5Spin1Check( centralWidget() );
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_FILLING_COMPOUND" ) );
+  GroupPoints->TextLabel2->setText( tr( "GEOM_FILLING_MIN_DEG" ) );
+  GroupPoints->TextLabel3->setText( tr( "GEOM_FILLING_TOL_2D" ) );
+  GroupPoints->TextLabel4->setText( tr( "GEOM_FILLING_NB_ITER" ) );
+  GroupPoints->TextLabel5->setText( tr( "GEOM_FILLING_MAX_DEG" ) );
+  GroupPoints->TextLabel6->setText( tr( "GEOM_FILLING_TOL_3D" ) );
+  GroupPoints->CheckBox1->setText( tr( "GEOM_FILLING_APPROX" ) );
+  GroupPoints->PushButton1->setIcon( image1 );
   GroupPoints->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget(GroupPoints, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints  );
   /***************************************************************/
 
-  setHelpFileName("create_filling_page.html");
+  setHelpFileName( "create_filling_page.html" );
 
   /* Initialisations */
   Init();
@@ -117,7 +107,7 @@ void GenerationGUI_FillingDlg::Init()
   myMaxDeg = 5;
   myTol3D = 0.0001;
   myTol2D = 0.0001;
-  myNbIter = 5;
+  myNbIter = 0;
   myIsApprox = false;
   myOkCompound = false;
 
@@ -126,42 +116,52 @@ void GenerationGUI_FillingDlg::Init()
   double SpecificStep1 = 1;
   double SpecificStep2 = 0.0001;
   /* min, max, step and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox_1->RangeStepAndValidator(2.0, MAX_NUMBER, SpecificStep1, 3);
-  GroupPoints->SpinBox_2->RangeStepAndValidator(0.00001, 10000.0, SpecificStep2, 5);
-  GroupPoints->SpinBox_3->RangeStepAndValidator(1.0, MAX_NUMBER, SpecificStep1, 3);
-  GroupPoints->SpinBox_4->RangeStepAndValidator(1.0, MAX_NUMBER, SpecificStep1, 3);
-  GroupPoints->SpinBox_5->RangeStepAndValidator(0.00001, 10000.0, SpecificStep2, 5);
-
-  GroupPoints->SpinBox_1->SetValue(myMinDeg);
-  GroupPoints->SpinBox_2->SetValue(myTol2D);
-  GroupPoints->SpinBox_3->SetValue(myNbIter);
-  GroupPoints->SpinBox_4->SetValue(myMaxDeg);
-  GroupPoints->SpinBox_5->SetValue(myTol3D);
+  initSpinBox( GroupPoints->SpinBox1, 2.0, MAX_NUMBER,  SpecificStep1, 3 );
+  initSpinBox( GroupPoints->SpinBox2, 0.00001, 10000.0, SpecificStep2, 5 );
+  initSpinBox( GroupPoints->SpinBox3, 0.0, MAX_NUMBER,  SpecificStep1, 3 );
+  initSpinBox( GroupPoints->SpinBox4, 1.0, MAX_NUMBER,  SpecificStep1, 3 );
+  initSpinBox( GroupPoints->SpinBox5, 0.00001, 10000.0, SpecificStep2, 5 );
+
+  GroupPoints->SpinBox1->setValue( myMinDeg );
+  GroupPoints->SpinBox2->setValue( myTol2D );
+  GroupPoints->SpinBox3->setValue( myNbIter );
+  GroupPoints->SpinBox4->setValue( myMaxDeg );
+  GroupPoints->SpinBox5->setValue( myTol3D );
 
   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+
+  connect( GroupPoints->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPoints->SpinBox1, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupPoints->SpinBox2, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupPoints->SpinBox3, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupPoints->SpinBox4, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupPoints->SpinBox5, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
 
-  connect(GroupPoints->SpinBox_1, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupPoints->SpinBox_2, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupPoints->SpinBox_3, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupPoints->SpinBox_4, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupPoints->SpinBox_5, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupPoints->CheckBox1, SIGNAL(stateChanged(int)), this, SLOT(ApproxChanged()));
+  connect( GroupPoints->CheckBox1, SIGNAL( stateChanged( int ) ), this, SLOT( ApproxChanged() ) );
 
-  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( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
-  initName(tr("GEOM_FILLING"));
+  initName( tr( "GEOM_FILLING" ) );
+}
+
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void GenerationGUI_FillingDlg::SetDoubleSpinBoxStep( double step )
+{
+  GroupPoints->SpinBox1->setSingleStep(step);
+  GroupPoints->SpinBox2->setSingleStep(step);
+  GroupPoints->SpinBox3->setSingleStep(step);
+  GroupPoints->SpinBox4->setSingleStep(step);
+  GroupPoints->SpinBox5->setSingleStep(step);
 }
 
 
@@ -199,40 +199,41 @@ void GenerationGUI_FillingDlg::SelectionIntoArgument()
   erasePreview();
   myEditCurrentArgument->setText("");
 
-  if(IObjectCount() != 1) {
-    if(myEditCurrentArgument == GroupPoints->LineEdit1)
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
+    if (myEditCurrentArgument == GroupPoints->LineEdit1)
       myOkCompound = 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(aSelList.First(), testResult);
 
   if (!testResult)
     return;
 
-  if(myEditCurrentArgument == GroupPoints->LineEdit1) {
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
     TopoDS_Shape S;
     myOkCompound = false;
 
-    if ( GEOMBase::GetShape(aSelectedObject, S) &&
-        S.ShapeType() == TopAbs_COMPOUND)
-      {
-       // myCompound should be a compound of edges
-       for ( TopoDS_Iterator it( S ); it.More(); it.Next() )
-         if ( it.Value().ShapeType() != TopAbs_EDGE )
-           return;
-       myCompound = aSelectedObject;
-       myOkCompound = true;
-      }
+    if (GEOMBase::GetShape(aSelectedObject, S) && S.ShapeType() == TopAbs_COMPOUND) {
+      // myCompound should be a compound of edges
+      for (TopoDS_Iterator it (S); it.More(); it.Next())
+        if (it.Value().ShapeType() != TopAbs_EDGE)
+          return;
+      myCompound = aSelectedObject;
+      myOkCompound = true;
+    }
   }
 
-  myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
+  myEditCurrentArgument->setText(GEOMBase::GetName(aSelectedObject));
   displayPreview();
 }
 
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -242,7 +243,7 @@ void GenerationGUI_FillingDlg::SetEditCurrentArgument()
   QPushButton* send = (QPushButton*)sender();
   globalSelection( GEOM_ALLSHAPES );
 
-  if(send == GroupPoints->PushButton1) {
+  if ( send == GroupPoints->PushButton1 ) {
     GroupPoints->LineEdit1->setFocus();
     myEditCurrentArgument = GroupPoints->LineEdit1;
     globalSelection( GEOM_COMPOUND );
@@ -258,11 +259,10 @@ void GenerationGUI_FillingDlg::SetEditCurrentArgument()
 void GenerationGUI_FillingDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1)
-    {
-      myEditCurrentArgument = send;
-      GEOMBase_Skeleton::LineEditReturnPressed();
-    }
+  if ( send == GroupPoints->LineEdit1 ) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
 }
 
 
@@ -273,8 +273,8 @@ void GenerationGUI_FillingDlg::LineEditReturnPressed()
 void GenerationGUI_FillingDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
-          SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
   globalSelection( GEOM_COMPOUND );
   displayPreview();
 }
@@ -284,9 +284,9 @@ void GenerationGUI_FillingDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void GenerationGUI_FillingDlg::enterEvent(QEvent* e)
+void GenerationGUI_FillingDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
@@ -295,19 +295,19 @@ void GenerationGUI_FillingDlg::enterEvent(QEvent* e)
 // function : ValueChangedInSpinBox()
 // purpose  :
 //=================================================================================
-void GenerationGUI_FillingDlg::ValueChangedInSpinBox(double newValue)
+void GenerationGUI_FillingDlg::ValueChangedInSpinBox( double newValue )
 {
   QObject* send = (QObject*)sender();
 
-  if(send == GroupPoints->SpinBox_1)
-    myMinDeg = int(newValue);
-  else if(send == GroupPoints->SpinBox_2)
+  if ( send == GroupPoints->SpinBox1 )
+    myMinDeg = int( newValue );
+  else if ( send == GroupPoints->SpinBox2 )
     myTol2D = newValue;
-  else if(send == GroupPoints->SpinBox_3)
+  else if ( send == GroupPoints->SpinBox3 )
     myNbIter = int(newValue);
-  else if(send == GroupPoints->SpinBox_4)
+  else if ( send == GroupPoints->SpinBox4 )
     myMaxDeg = int(newValue);
-  else if(send == GroupPoints->SpinBox_5)
+  else if ( send == GroupPoints->SpinBox5 )
     myTol3D = newValue;
 
   displayPreview();
@@ -336,9 +336,16 @@ GEOM::GEOM_IOperations_ptr GenerationGUI_FillingDlg::createOperation()
 // function : isValid
 // purpose  :
 //=================================================================================
-bool GenerationGUI_FillingDlg::isValid( QString& )
+bool GenerationGUI_FillingDlg::isValid( QString& msg )
 {
-  return myOkCompound > 0;
+  bool ok = true;
+  ok = GroupPoints->SpinBox1->isValid( msg, !IsPreview() ) && ok;
+  ok = GroupPoints->SpinBox2->isValid( msg, !IsPreview() ) && ok;
+  ok = GroupPoints->SpinBox3->isValid( msg, !IsPreview() ) && ok;
+  ok = GroupPoints->SpinBox4->isValid( msg, !IsPreview() ) && ok;
+  ok = GroupPoints->SpinBox5->isValid( msg, !IsPreview() ) && ok;
+
+  return myOkCompound > 0 && ok;
 }
 
 //=================================================================================
@@ -350,10 +357,21 @@ bool GenerationGUI_FillingDlg::execute( ObjectList& objects )
   GEOM::GEOM_Object_var anObj;
 
   anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation() )->MakeFilling(
-         myCompound, myMinDeg, myMaxDeg, myTol2D, myTol3D, myNbIter, myIsApprox );
-
+    myCompound, myMinDeg, myMaxDeg, myTol2D, myTol3D, myNbIter, myIsApprox );
   if ( !anObj->_is_nil() )
+  {
+    if ( !IsPreview() )
+    {
+      QStringList aParameters;
+      aParameters << GroupPoints->SpinBox1->text();
+      aParameters << GroupPoints->SpinBox2->text();
+      aParameters << GroupPoints->SpinBox3->text();
+      aParameters << GroupPoints->SpinBox4->text();
+      aParameters << GroupPoints->SpinBox5->text();
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    }
     objects.push_back( anObj._retn() );
+  }
 
   return true;
 }
index 67d70b83716325a4363089db7f867081778209d7..ed4de1d3d0e83f3f7376a8dca158e2533feab2b6 100644 (file)
@@ -1,81 +1,79 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : GenerationGUI_FillingDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_FILLING_H
-#define DIALOGBOX_FILLING_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : GenerationGUI_FillingDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef GENERATIONGUI_FILLINGDLG_H
+#define GENERATIONGUI_FILLINGDLG_H
 
-#include "GenerationGUI.h"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel5Spin1Check.h"
+class DlgRef_1Sel5Spin1Check;
 
 //=================================================================================
 // class    : GenerationGUI_FillingDlg
 // purpose  :
 //=================================================================================
-class GENERATIONGUI_EXPORT GenerationGUI_FillingDlg : public GEOMBase_Skeleton
+class GenerationGUI_FillingDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    GenerationGUI_FillingDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                            const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~GenerationGUI_FillingDlg();
+  GenerationGUI_FillingDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~GenerationGUI_FillingDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& msg );
-    virtual bool execute( ObjectList& objects );    
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );    
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-
-    GEOM::GEOM_Object_var myCompound; /* compound of curves */
-    Standard_Integer myMinDeg;
-    Standard_Integer myMaxDeg;
-    Standard_Real myTol3D;
-    Standard_Real myTol2D;
-    Standard_Integer myNbIter;
-    bool myIsApprox;
-    bool myOkCompound;         /* to check when curv. compound is defined */
+  void                               Init();
+  void                               enterEvent( QEvent* );
 
-    DlgRef_1Sel5Spin1Check* GroupPoints;
+private:
+  GEOM::GEOM_Object_var              myCompound; /* compound of curves */
+  Standard_Integer                   myMinDeg;
+  Standard_Integer                   myMaxDeg;
+  Standard_Real                      myTol3D;
+  Standard_Real                      myTol2D;
+  Standard_Integer                   myNbIter;
+  bool                               myIsApprox;
+  bool                               myOkCompound; /* to check when curv. compound is defined */
 
+  DlgRef_1Sel5Spin1Check*            GroupPoints;
+    
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ValueChangedInSpinBox(double newValue);
-    void ApproxChanged();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ValueChangedInSpinBox( double );
+  void                               ApproxChanged();
+  void                               SetDoubleSpinBoxStep( double );
 };
 
-#endif // DIALOGBOX_FILLING_H
+#endif // GENERATIONGUI_FILLINGDLG_H
index 2d124940d10ce112347e44ac54c6d732016c19a1..e560176dc627c1b0a3387fa3ab47027fa2e5ca2c 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GenerationGUI_PipeDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : GenerationGUI_PipeDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "GenerationGUI_PipeDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include <qlabel.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
 #include <TopExp.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepOffsetAPI_MakePipe.hxx>
-#if OCC_VERSION_MAJOR >= 5
-#include <BRepAlgo.hxx>
-#else
-#include <BRepAlgoAPI.hxx>
-#endif
-
-#include "GEOMImpl_Types.hxx"
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <TColStd_MapOfInteger.hxx>
 
-#include "utilities.h"
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : GenerationGUI_PipeDlg()
-// purpose  : Constructs a GenerationGUI_PipeDlg which is a child of 'parent', with the 
+// purpose  : Constructs a GenerationGUI_PipeDlg which is 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.
 //=================================================================================
-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)
+GenerationGUI_PipeDlg::GenerationGUI_PipeDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                              bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl)
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PIPE")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_PIPE")));
+  QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
+  QPixmap image2 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_PIPE_BINORMAL")));
 
-  setCaption(tr("GEOM_PIPE_TITLE"));
+  setWindowTitle(tr("GEOM_PIPE_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_PIPE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_PIPE"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image2);
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_3Sel1Check(centralWidget());
 
-  GroupPoints = new DlgRef_2Sel_QTD(this, "GroupPoints");
   GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   GroupPoints->TextLabel1->setText(tr("GEOM_BASE_OBJECT"));
   GroupPoints->TextLabel2->setText(tr("GEOM_PATH_OBJECT"));
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->PushButton2->setPixmap(image1);
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
-
-  Layout1->addWidget(GroupPoints, 2, 0);
+  GroupPoints->TextLabel3->setText(tr("GEOM_BINORMAL"));
+  GroupPoints->PushButton1->setIcon(image1);
+  GroupPoints->PushButton2->setIcon(image1);
+  GroupPoints->PushButton3->setIcon(image1);
+  GroupPoints->CheckButton1->setText(tr("GEOM_SELECT_UNPUBLISHED_EDGES"));
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
   /***************************************************************/
 
   setHelpFileName("create_extrusion_alongpath_page.html");
 
-  /* Initialisations */
+  // Initialisation
   Init();
 }
 
-
 //=================================================================================
 // function : ~GenerationGUI_PipeDlg()
 // purpose  : Destroys the object and frees any allocated resources
 //=================================================================================
 GenerationGUI_PipeDlg::~GenerationGUI_PipeDlg()
 {
-  /* no need to delete child widgets, Qt does it all for us */
+  // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void GenerationGUI_PipeDlg::Init()
 {
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
+  // init variables
+  GroupPoints->LineEdit1->setReadOnly(true);
+  GroupPoints->LineEdit2->setReadOnly(true);
+  GroupPoints->LineEdit3->setReadOnly(true);
 
-  myOkBase = myOkPath = false;
+  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit2->setText("");
+  GroupPoints->LineEdit3->setText("");
+  myBase = myPath = myVec = GEOM::GEOM_Object::_nil();
+  myOkBase = myOkPath = myOkVec = false;
 
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  GroupPoints->CheckButton1->setEnabled(false);
+
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(this,          SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
 
   connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+
+  connect(GroupPoints->LineEdit1,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit2,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit3,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
 
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect(GroupPoints->CheckButton1,   SIGNAL(toggled(bool)), this, SLOT(SelectionTypeButtonClicked()));
 
   initName(tr("GEOM_PIPE"));
 
-  //  globalSelection( GEOM_ALLSHAPES );
+  GroupPoints->TextLabel3->hide();
+  GroupPoints->PushButton3->hide();
+  GroupPoints->LineEdit3->hide();
+  ConstructorsClicked(0);
+
+  GroupPoints->PushButton1->click();
+  SelectionIntoArgument();
+}
+
+//=================================================================================
+// function : ConstructorsClicked()
+// purpose  : Radio button management
+//=================================================================================
+void GenerationGUI_PipeDlg::ConstructorsClicked( int constructorId )
+{
+  erasePreview();
+
+  switch (constructorId)
+  {
+    case 0:
+    {
+      GroupPoints->TextLabel3->hide();
+      GroupPoints->PushButton3->hide();
+      GroupPoints->LineEdit3->hide();
+      break;
+    }
+    case 1:
+    {
+      GroupPoints->TextLabel3->show();
+      GroupPoints->PushButton3->show();
+      GroupPoints->LineEdit3->show();
+      break;
+    }
+  }
+
+  displayPreview();
 }
 
+//=================================================================================
+// function : SelectionBittonClicked()
+// purpose  : Selection type Radio button management
+//=================================================================================
+void GenerationGUI_PipeDlg::SelectionTypeButtonClicked()
+{
+  globalSelection();
+  if ( GroupPoints->CheckButton1->isChecked() ) {
+    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+  } else {
+    TColStd_MapOfInteger aMap;
+    aMap.Add(GEOM_WIRE);
+    aMap.Add(GEOM_LINE);
+    globalSelection(aMap);
+  }
+  if(myEditCurrentArgument == GroupPoints->LineEdit2) {
+    myEditCurrentArgument->setText("");
+    myOkPath = false;
+  }
+  displayPreview();
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -143,115 +202,153 @@ void GenerationGUI_PipeDlg::Init()
 //=================================================================================
 void GenerationGUI_PipeDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
-// function : ClickOnAply()
+// function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool GenerationGUI_PipeDlg::ClickOnApply()
 {
-  if ( !onAccept() )
+  if (!onAccept())
     return false;
 
   initName();
+  if ( getConstructorId() != 1 )
+       ConstructorsClicked( getConstructorId() );
+  // activate selection and connect selection manager
+  GroupPoints->PushButton1->click();
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection has changed
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void GenerationGUI_PipeDlg::SelectionIntoArgument()
 {
   erasePreview();
   myEditCurrentArgument->setText("");
-  
-  if(IObjectCount() != 1) {
-    if(myEditCurrentArgument == GroupPoints->LineEdit1)
-      myOkBase = false;
-    else if(myEditCurrentArgument == GroupPoints->LineEdit2)
-      myOkPath = false;
+  if      (myEditCurrentArgument == GroupPoints->LineEdit1) myOkBase = false;
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) myOkPath = false;
+  else if (myEditCurrentArgument == GroupPoints->LineEdit3) myOkVec  = false;
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1)
     return;
-  }
-  
+
   // nbSel == 1
   Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
-    
-  if (!testResult)
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+
+  if (!testResult || aSelectedObject->_is_nil())
     return;
-  
+
   TopoDS_Shape S;
-  
-  if(myEditCurrentArgument == GroupPoints->LineEdit1) {
-    myOkBase = false;
-    
-    if(!GEOMBase::GetShape(aSelectedObject, S) ||
-       S.ShapeType() == TopAbs_COMPSOLID || 
-       S.ShapeType() == TopAbs_COMPOUND || 
-       S.ShapeType() == TopAbs_SOLID || 
-       S.ShapeType() == TopAbs_SHAPE) 
+  if (!GEOMBase::GetShape(aSelectedObject, S))
+    return;
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
+    if (S.ShapeType() == TopAbs_COMPSOLID ||
+        S.ShapeType() == TopAbs_COMPOUND ||
+        S.ShapeType() == TopAbs_SOLID ||
+        S.ShapeType() == TopAbs_SHAPE)
+      return;
+    if ( getConstructorId() == 1 && 
+        (S.ShapeType() == TopAbs_SHELL || 
+         S.ShapeType() == TopAbs_VERTEX))
       return;
-    
+
     myBase = aSelectedObject;
-    myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
+    myEditCurrentArgument->setText(GEOMBase::GetName(aSelectedObject));
     myOkBase = true;
+    if (!myOkPath)
+      GroupPoints->PushButton2->click();
+    else if (!myOkVec)
+      GroupPoints->PushButton3->click();
   }
-  else if(myEditCurrentArgument == GroupPoints->LineEdit2) {
-    myOkPath = false;
-    
-    if( !GEOMBase::GetShape(aSelectedObject, S) ) 
-      return;
-
-    QString aName = GEOMBase::GetName( aSelectedObject );
-    
-    if ( testResult && !aSelectedObject->_is_nil() && aSelectedObject != myBase)
-      {
-       LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-       TColStd_IndexedMapOfInteger aMap;
-
-       aSelMgr->GetIndexes( firstIObject(), aMap );
-       if ( aMap.Extent() == 1 )
-         {
-           int anIndex = aMap( 1 );
-           aName.append( ":edge_" + QString::number( anIndex ) );
-
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2 || 
+          myEditCurrentArgument == GroupPoints->LineEdit3) {
+    myEditCurrentArgument == GroupPoints->LineEdit2 ? myOkPath = false : myOkVec = false;
+    bool myOk = false;
+    QString aName = GEOMBase::GetName(aSelectedObject);
+
+    if (myEditCurrentArgument == GroupPoints->LineEdit2 && !GroupPoints->CheckButton1->isChecked() ){
+      myPath = aSelectedObject;
+      myOkPath = true;
+      myEditCurrentArgument->setText(aName);
+    }
+    else 
+      { 
+       if (aSelectedObject != myBase) {
+         TColStd_IndexedMapOfInteger aMap;
+         aSelMgr->GetIndexes(aSelList.First(), aMap);
+         if (aMap.Extent() == 1) {
+           int anIndex = aMap(1);
+           aName.append(":edge_" + QString::number(anIndex));
+           
            //Find SubShape Object in Father
            GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
            
-           if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
+           if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
              GEOM::GEOM_IShapesOperations_var aShapesOp =
-               getGeomEngine()->GetIShapesOperations( getStudyId() );
-             myPath = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-             myOkPath = true;
+               getGeomEngine()->GetIShapesOperations(getStudyId());
+             aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+             myOk = true;
            }
-           else {  // get Object from study
-             myPath = aFindedObject;
-             myOkPath = true;
+           else { // get Object from study
+             aSelectedObject = aFindedObject;
+             myOk = true;
            }
          }
-       else {
-         myOkPath = true;
-         if (S.ShapeType() != TopAbs_EDGE) {
-           aSelectedObject = GEOM::GEOM_Object::_nil();
-           aName = "";
-           myOkPath = false;
+         else {
+           myOk = true;
+           if (S.ShapeType() != TopAbs_EDGE) {
+             aSelectedObject = GEOM::GEOM_Object::_nil();
+             aName = "";
+             myOk = false;
+           }
+         }
+         if (myEditCurrentArgument == GroupPoints->LineEdit2) {
+           myPath = aSelectedObject;
+           myOkPath = myOk;
+         }
+         else if (myEditCurrentArgument == GroupPoints->LineEdit3) {
+           myVec = aSelectedObject;
+           myOkVec = myOk;
          }
-         myPath = aSelectedObject;
+       }
+       myEditCurrentArgument->setText(aName);
+
+       if (myOkPath) {
+         if (!myOkBase)
+           GroupPoints->PushButton1->click();
+         else if (!myOkVec)
+           GroupPoints->PushButton3->click();
+       }
+       else if (myOkVec) {
+         if (!myOkBase)
+           GroupPoints->PushButton1->click();
+         else if (!myOkPath)
+           GroupPoints->PushButton2->click();
        }
       }
-    myEditCurrentArgument->setText( aName );
   }
-  
+
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
   displayPreview();
 }
 
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -259,22 +356,49 @@ void GenerationGUI_PipeDlg::SelectionIntoArgument()
 void GenerationGUI_PipeDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  globalSelection();
 
-  if(send == GroupPoints->PushButton1) {
-    GroupPoints->LineEdit1->setFocus();
-    globalSelection( GEOM_ALLSHAPES );
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  globalSelection(GEOM_ALLSHAPES);
+  GroupPoints->PushButton1->setDown(false);
+  GroupPoints->PushButton2->setDown(false);
+  GroupPoints->PushButton3->setDown(false);
+  GroupPoints->LineEdit1->setEnabled(false);
+  GroupPoints->LineEdit2->setEnabled(false);
+  GroupPoints->LineEdit3->setEnabled(false);
+  if (send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
+    GroupPoints->CheckButton1->setEnabled(false);
   }
-  else if(send == GroupPoints->PushButton2) {
-    GroupPoints->LineEdit2->setFocus();
+  else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
-    globalSelection();
+
+    if ( GroupPoints->CheckButton1->isChecked() ) {
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+    } else {
+      TColStd_MapOfInteger aMap;
+      aMap.Add(GEOM_WIRE);
+      aMap.Add(GEOM_LINE);
+      globalSelection(aMap);
+    }
+    GroupPoints->CheckButton1->setEnabled(true);
+  }
+  else if(send == GroupPoints->PushButton3) {
+    myEditCurrentArgument = GroupPoints->LineEdit3;
+    GroupPoints->CheckButton1->setEnabled(false);
     localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
   }
-  SelectionIntoArgument();
-}
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
+  myEditCurrentArgument->setFocus();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
+}
 
 //=================================================================================
 // function : LineEditReturnPressed()
@@ -283,26 +407,19 @@ void GenerationGUI_PipeDlg::SetEditCurrentArgument()
 void GenerationGUI_PipeDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1 ||
-     send == GroupPoints->LineEdit2)
-    {
-      myEditCurrentArgument = send;
-      GEOMBase_Skeleton::LineEditReturnPressed();
-    }
-}
-
+  if (send == GroupPoints->LineEdit1 ||
+      send == GroupPoints->LineEdit2 ||
+      send == GroupPoints->LineEdit3) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
 
-//=================================================================================
-// function : enterEvent()
-// purpose  : when mouse enter onto the QWidget
-//=================================================================================
-void GenerationGUI_PipeDlg::enterEvent(QEvent* e)
-{
-  if ( !GroupConstructors->isEnabled() )
-    ActivateThisDialog();
+  if (send == GroupPoints->LineEdit2)
+    GroupPoints->CheckButton1->setEnabled(true);
+  else
+    GroupPoints->CheckButton1->setEnabled(false);
 }
 
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -310,12 +427,21 @@ void GenerationGUI_PipeDlg::enterEvent(QEvent* e)
 void GenerationGUI_PipeDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  globalSelection( GEOM_ALLSHAPES );
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-  displayPreview();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
+  ConstructorsClicked(getConstructorId());
 }
 
+//=================================================================================
+// function : enterEvent()
+// purpose  : when mouse enter onto the QWidget
+//=================================================================================
+void GenerationGUI_PipeDlg::enterEvent (QEvent*)
+{
+  if (!mainFrame()->GroupConstructors->isEnabled())
+    ActivateThisDialog();
+}
 
 //=================================================================================
 // function : createOperation
@@ -323,31 +449,43 @@ void GenerationGUI_PipeDlg::ActivateThisDialog()
 //=================================================================================
 GEOM::GEOM_IOperations_ptr GenerationGUI_PipeDlg::createOperation()
 {
-  return getGeomEngine()->GetI3DPrimOperations( getStudyId() );
+  return getGeomEngine()->GetI3DPrimOperations(getStudyId());
 }
 
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool GenerationGUI_PipeDlg::isValid( QString& )
+bool GenerationGUI_PipeDlg::isValid (QString&)
 {
-  return myOkBase && myOkPath;
+  switch ( getConstructorId() ) {
+  case 0 :
+    return myOkBase && myOkPath;
+  case 1 :
+    return myOkBase && myOkPath && myOkVec;
+  }
 }
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool GenerationGUI_PipeDlg::execute( ObjectList& objects )
+bool GenerationGUI_PipeDlg::execute (ObjectList& objects)
 {
   GEOM::GEOM_Object_var anObj;
 
-  anObj = GEOM::GEOM_I3DPrimOperations::_narrow(
-    getOperation() )->MakePipe( myBase, myPath );
+  switch ( getConstructorId() ) {
+  case 0 :
+    anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->MakePipe(myBase, myPath);
+    break;
+  case 1 :
+    anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+      MakePipeBiNormalAlongVector(myBase, myPath, myVec);
+    break;
+  }
 
-  if ( !anObj->_is_nil() )
-    objects.push_back( anObj._retn() );
+  if (!anObj->_is_nil())
+    objects.push_back(anObj._retn());
 
   return true;
 }
@@ -362,6 +500,5 @@ void GenerationGUI_PipeDlg::addSubshapesToStudy()
 
   objMap[GroupPoints->LineEdit2->text()] = myPath;
 
-  addSubshapesToFather( objMap );
+  addSubshapesToFather(objMap);
 }
-
index b926d6de7b99eee822f7d0ccfcc92b2a9dfd6b82..ed0b926257a60a76ee8b9a8099aedb552347e475 100644 (file)
@@ -1,76 +1,77 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : GenerationGUI_PipeDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_PIPE_H
-#define DIALOGBOX_PIPE_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : GenerationGUI_PipeDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef GENERATIONGUI_PIPEDLG_H
+#define GENERATIONGUI_PIPEDLG_H
 
-#include "GenerationGUI.h"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel_QTD.h"
+class DlgRef_3Sel1Check;
 
 //=================================================================================
 // class    : GenerationGUI_PipeDlg
 // purpose  :
 //=================================================================================
-class GENERATIONGUI_EXPORT GenerationGUI_PipeDlg : public GEOMBase_Skeleton
+class GenerationGUI_PipeDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    GenerationGUI_PipeDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                         const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~GenerationGUI_PipeDlg();
-
+  GenerationGUI_PipeDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~GenerationGUI_PipeDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& msg );
-    virtual bool execute( ObjectList& objects );    
-    virtual void addSubshapesToStudy();
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );    
+  virtual void                       addSubshapesToStudy();
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-
-    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 */
-
-    DlgRef_2Sel_QTD* GroupPoints;
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  
+private:
+  GEOM::GEOM_Object_var              myBase; /* Base shape */
+  GEOM::GEOM_Object_var              myPath; /* Shape, defining the path */
+  GEOM::GEOM_Object_var              myVec;  /* Vector, defining the constant binormal direction */
+  bool                               myOkBase;
+  bool                               myOkPath;
+  bool                               myOkVec; /* to check when arguments are defined */
+  
+  DlgRef_3Sel1Check*                       GroupPoints;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               SelectionTypeButtonClicked();
 };
 
-#endif // DIALOGBOX_PIPE_H
+#endif // GENERATIONGUI_PIPEDLG_H
index 92fd0fb38729bb0df8cb1b442aaf06c6f2bb6ea2..e4ff74ff39ab4fb2475cf2a51a912da5ee61de0c 100644 (file)
@@ -1,38 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GenerationGUI_PrismDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : GenerationGUI_PrismDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "GenerationGUI_PrismDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
+// OCCT Includes
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qlabel.h>
-#include <qcheckbox.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : GenerationGUI_PrismDlg()
 //            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(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                      WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+GenerationGUI_PrismDlg::GenerationGUI_PrismDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myInitial(true)
 {
   SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
-  QPixmap image0(aResMgr->loadPixmap("GEOM", tr("ICON_DLG_PRISM")));
-  QPixmap image1(aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
-  QPixmap image2(aResMgr->loadPixmap("GEOM", tr("ICON_DLG_PRISM_2P")));
+  QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_PRISM")));
+  QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
+  QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_PRISM_2P")));
+  QPixmap image3 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_PRISM_DXDYDZ")));
 
-  setCaption(tr("GEOM_EXTRUSION_TITLE"));
+  setWindowTitle(tr("GEOM_EXTRUSION_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_EXTRUSION"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image2);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_EXTRUSION"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image2);
+  mainFrame()->RadioButton3->setIcon(image3);
 
-  RadioButton1->setChecked(true);
-  myBothway = myBothway2 = false;
+  mainFrame()->RadioButton1->setChecked(true);
+  myBothway = myBothway2 = myBothway3 = false;
 
-  GroupPoints = new DlgRef_2Sel1Spin2Check(this, "GroupPoints");
+  GroupPoints = new DlgRef_2Sel1Spin2Check(centralWidget());
   GroupPoints->GroupBox1->setTitle(tr("GEOM_EXTRUSION_BSV"));
   GroupPoints->TextLabel1->setText(tr("GEOM_BASE"));
   GroupPoints->TextLabel2->setText(tr("GEOM_VECTOR"));
   GroupPoints->TextLabel3->setText(tr("GEOM_HEIGHT"));
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->PushButton2->setPixmap(image1);
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
+  GroupPoints->PushButton1->setIcon(image1);
+  GroupPoints->PushButton2->setIcon(image1);
+  GroupPoints->LineEdit1->setReadOnly(true);
+  GroupPoints->LineEdit2->setReadOnly(true);
   GroupPoints->CheckButton1->setText(tr("GEOM_BOTHWAY"));
   GroupPoints->CheckButton1->setChecked(myBothway);
   GroupPoints->CheckButton2->setText(tr("GEOM_REVERSE"));
 
-  GroupPoints2 = new DlgRef_3Sel1Check_QTD(this, "GroupPoints2");
+  GroupPoints2 = new DlgRef_3Sel1Check(centralWidget());
   GroupPoints2->GroupBox1->setTitle(tr("GEOM_EXTRUSION_BSV_2P"));
   GroupPoints2->TextLabel1->setText(tr("GEOM_BASE"));
-  GroupPoints2->TextLabel2->setText(tr("GEOM_POINT_I").arg("1"));
-  GroupPoints2->TextLabel3->setText(tr("GEOM_POINT_I").arg("2"));
-  GroupPoints2->PushButton1->setPixmap(image1);
-  GroupPoints2->PushButton2->setPixmap(image1);
-  GroupPoints2->PushButton3->setPixmap(image1);
+  GroupPoints2->TextLabel2->setText(tr("GEOM_POINT_I").arg(1));
+  GroupPoints2->TextLabel3->setText(tr("GEOM_POINT_I").arg(2));
+  GroupPoints2->PushButton1->setIcon(image1);
+  GroupPoints2->PushButton2->setIcon(image1);
+  GroupPoints2->PushButton3->setIcon(image1);
   GroupPoints2->CheckButton1->setText(tr("GEOM_BOTHWAY"));
   GroupPoints2->CheckButton1->setChecked(myBothway2);
 
-  Layout1->addWidget(GroupPoints, 2, 0);
-  Layout1->addWidget(GroupPoints2, 2, 0);
+  GroupPoints3 = new DlgRef_1Sel3Spin1Check(centralWidget());
+  GroupPoints3->GroupBox1->setTitle(tr("GEOM_EXTRUSION_DXDYDZ"));
+  GroupPoints3->TextLabel1->setText(tr("GEOM_BASE"));
+  GroupPoints3->PushButton1->setIcon(image1);
+  GroupPoints3->TextLabel2->setText(tr("GEOM_DX"));
+  GroupPoints3->TextLabel3->setText(tr("GEOM_DY"));
+  GroupPoints3->TextLabel4->setText(tr("GEOM_DZ"));
+  GroupPoints3->CheckButton1->setText(tr("GEOM_BOTHWAY"));
+  GroupPoints3->CheckButton1->setChecked(myBothway3);
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
+  layout->addWidget(GroupPoints2);
+  layout->addWidget(GroupPoints3);
   /***************************************************************/
 
   setHelpFileName("create_extrusion_page.html");
@@ -108,7 +119,6 @@ GenerationGUI_PrismDlg::GenerationGUI_PrismDlg(GeometryGUI* theGeometryGUI, QWid
   Init();
 }
 
-
 //=================================================================================
 // function : ~GenerationGUI_PrismDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -118,38 +128,55 @@ GenerationGUI_PrismDlg::~GenerationGUI_PrismDlg()
   // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void GenerationGUI_PrismDlg::Init()
 {
-  /* init variables */
+  // Get setting of step value from file configuration
+  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+  double step = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100);
+
+  // min, max, step and decimals for spin boxes & initial values
+  initSpinBox(GroupPoints3->SpinBox_DX, COORD_MIN, COORD_MAX, step, 6); // VSR:TODO : DBL_DIGITS_DISPLAY
+  initSpinBox(GroupPoints3->SpinBox_DY, COORD_MIN, COORD_MAX, step, 6); // VSR:TODO : DBL_DIGITS_DISPLAY
+  initSpinBox(GroupPoints3->SpinBox_DZ, COORD_MIN, COORD_MAX, step, 6); // VSR:TODO : DBL_DIGITS_DISPLAY
+  GroupPoints3->SpinBox_DX->setValue(0.0);
+  GroupPoints3->SpinBox_DY->setValue(0.0);
+  GroupPoints3->SpinBox_DZ->setValue(0.0);
+
+  initSpinBox(GroupPoints->SpinBox_DX, 0.000001, COORD_MAX, step, 6); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupPoints->SpinBox_DX->setValue(100.0);
+
+  // init variables
   myEditCurrentArgument = GroupPoints->LineEdit1;
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
+  GroupPoints->LineEdit1->setReadOnly(true);
+  GroupPoints->LineEdit2->setReadOnly(true);
 
-  GroupPoints2->LineEdit1->setReadOnly( true );
-  GroupPoints2->LineEdit2->setReadOnly( true );
-  GroupPoints2->LineEdit3->setReadOnly( true );
+  GroupPoints2->LineEdit1->setReadOnly(true);
+  GroupPoints2->LineEdit2->setReadOnly(true);
+  GroupPoints2->LineEdit3->setReadOnly(true);
 
-  myPoint1 = myPoint2 = myBase = myVec = GEOM::GEOM_Object::_nil();
-  myOkBase = myOkVec = myOkPnt1 = myOkPnt2 = false;
+  GroupPoints3->LineEdit1->setReadOnly(true);
 
-  /* Get setting of step value from file configuration */
-  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
+  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit2->setText("");
+
+  GroupPoints2->LineEdit1->setText("");
+  GroupPoints2->LineEdit2->setText("");
+  GroupPoints2->LineEdit3->setText("");
 
-  /* min, max, step and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox_DX->SetValue(100.0);
+  GroupPoints3->LineEdit1->setText("");
 
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  myPoint1 = myPoint2 = myBase = myVec = GEOM::GEOM_Object::_nil();
+  myOkBase = myOkVec = myOkPnt1 = myOkPnt2 = false;
+
+  // 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(this,          SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
 
   connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
@@ -158,122 +185,149 @@ void GenerationGUI_PrismDlg::Init()
   connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
 
   connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
-  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)),
-          GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double)));
 
-  connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(onBothway()));
-  connect(GroupPoints->CheckButton2, SIGNAL(toggled(bool)), this, SLOT(onReverse()));
+  connect(GroupPoints->CheckButton1,  SIGNAL(toggled(bool)), this, SLOT(onBothway()));
+  connect(GroupPoints->CheckButton2,  SIGNAL(toggled(bool)), this, SLOT(onReverse()));
 
-  connect(GroupPoints2->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints2->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints2->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints2->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(onBothway2()));
+  connect(GroupPoints2->PushButton1,  SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints2->PushButton2,  SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints2->PushButton3,  SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints2->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(onBothway()));
 
-  connect(GroupPoints2->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints2->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints2->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints2->LineEdit1,    SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints2->LineEdit2,    SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints2->LineEdit3,    SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
 
-
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect(GroupPoints3->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints3->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints3->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupPoints3->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupPoints3->SpinBox_DZ, SIGNAL(valueChanged (double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupPoints3->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(onBothway()));
 
   initName(tr("GEOM_EXTRUSION"));
+
   ConstructorsClicked(0);
 }
 
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void GenerationGUI_PrismDlg::SetDoubleSpinBoxStep (double step)
+{
+  GroupPoints->SpinBox_DX->setSingleStep(step);
+  GroupPoints3->SpinBox_DX->setSingleStep(step);
+  GroupPoints3->SpinBox_DY->setSingleStep(step);
+  GroupPoints3->SpinBox_DZ->setSingleStep(step);
+}
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void GenerationGUI_PrismDlg::ConstructorsClicked(int constructorId)
+void GenerationGUI_PrismDlg::ConstructorsClicked (int constructorId)
 {
-  erasePreview();
   disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
 
-  switch (constructorId)
-  {
+  switch (constructorId) {
   case 0:
     {
-      globalSelection( GEOM_ALLSHAPES );
-
       GroupPoints2->hide();
-      resize(0, 0);
+      GroupPoints3->hide();
       GroupPoints->show();
 
-      myEditCurrentArgument = GroupPoints->LineEdit1;
       GroupPoints->LineEdit1->setText(GroupPoints2->LineEdit1->text()); // keep base
       GroupPoints->LineEdit2->setText("");
       myVec = GEOM::GEOM_Object::_nil();
       myOkVec = false;
 
+      GroupPoints->PushButton1->click();
       break;
     }
   case 1:
     {
-      globalSelection( GEOM_ALLSHAPES );
-
       GroupPoints->hide();
-      resize(0, 0);
       GroupPoints2->show();
+      GroupPoints3->hide();
 
-      myEditCurrentArgument = GroupPoints2->LineEdit1;
       GroupPoints2->LineEdit1->setText(GroupPoints->LineEdit1->text()); // keep base
       GroupPoints2->LineEdit2->setText("");
       GroupPoints2->LineEdit3->setText("");
       myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
       myOkPnt1 = myOkPnt2 = false;
 
+      GroupPoints2->PushButton1->click();
+      break;
+    }
+  case 2:
+    {
+      GroupPoints->hide();
+      GroupPoints2->hide();
+      GroupPoints3->show();
+
+      GroupPoints3->LineEdit1->setText(GroupPoints->LineEdit1->text()); // keep base
+
+      GroupPoints3->PushButton1->click();
       break;
     }
   }
 
-  myEditCurrentArgument->setFocus();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
 
-  if (!myOkBase)
+  if (myInitial) {
+    myInitial = false;
     SelectionIntoArgument();
+  }
+  else {
+    displayPreview();
+  }
 }
 
-
 //=================================================================================
 // function : ClickOnOk()
 // purpose  :
 //=================================================================================
 void GenerationGUI_PrismDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool GenerationGUI_PrismDlg::ClickOnApply()
 {
-  if ( !onAccept() )
+  if (!onAccept())
     return false;
 
   initName();
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection has changed
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void GenerationGUI_PrismDlg::SelectionIntoArgument()
 {
   erasePreview();
   myEditCurrentArgument->setText("");
 
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
   if (getConstructorId() == 0)
   {
-    if (IObjectCount() != 1) {
+    if (aSelList.Extent() != 1) {
       if (myEditCurrentArgument == GroupPoints->LineEdit1)
         myOkBase = false;
       else if (myEditCurrentArgument == GroupPoints->LineEdit2)
@@ -284,65 +338,69 @@ void GenerationGUI_PrismDlg::SelectionIntoArgument()
     // nbSel == 1
     Standard_Boolean testResult = Standard_False;
     GEOM::GEOM_Object_var aSelectedObject =
-      GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
-
-    if (!testResult)
+      GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    if (!testResult || CORBA::is_nil(aSelectedObject))
       return;
 
+    QString aName = GEOMBase::GetName(aSelectedObject);
+
+    // Get Selected object if selected subshape
     bool myOk = true;
     TopoDS_Shape aShape;
-    QString aName = GEOMBase::GetName( aSelectedObject );    
-    if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
-      {
-       LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-       TColStd_IndexedMapOfInteger aMap;
-       aSelMgr->GetIndexes( firstIObject(), aMap );
-       if ( aMap.Extent() == 1 )
-         {
-           int anIndex = aMap( 1 );
-           aName.append( ":edge_" + QString::number( anIndex ) );
-
-           //Find SubShape Object in Father
-           GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
-
-           if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-             GEOM::GEOM_IShapesOperations_var aShapesOp =
-               getGeomEngine()->GetIShapesOperations( getStudyId() );
-             aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-           }
-           else
-             aSelectedObject = aFindedObject; // get Object from study       
-         }
-       else {
-         if (aShape.ShapeType() != TopAbs_EDGE && myEditCurrentArgument == GroupPoints->LineEdit2) {
-           aSelectedObject = GEOM::GEOM_Object::_nil();
-           aName = "";
-           myOk = false;
-         }
-       }
+    if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
+    {
+      TColStd_IndexedMapOfInteger aMap;
+      aSelMgr->GetIndexes(aSelList.First(), aMap);
+      if (aMap.Extent() == 1) {
+        int anIndex = aMap(1);
+        aName.append(":edge_" + QString::number(anIndex));
+
+        //Find SubShape Object in Father
+        GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
+
+        if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+          GEOM::GEOM_IShapesOperations_var aShapesOp =
+            getGeomEngine()->GetIShapesOperations(getStudyId());
+          aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+        }
+        else {
+          aSelectedObject = aFindedObject; // get Object from study
+        }
+      }
+      else { // Global Selection
+        if (aShape.ShapeType() != TopAbs_EDGE && myEditCurrentArgument == GroupPoints->LineEdit2) {
+          aSelectedObject = GEOM::GEOM_Object::_nil();
+          aName = "";
+          myOk = false;
+        }
       }
+    }
+
+    myEditCurrentArgument->setText(aName);
+
     if (myEditCurrentArgument == GroupPoints->LineEdit1) {
       myBase = aSelectedObject;
       myOkBase = true;
+      if (!myOkVec)
+        GroupPoints->PushButton2->click();
     }
     else if (myEditCurrentArgument == GroupPoints->LineEdit2 && myOk) {
-      myOkVec = true;      
+      myOkVec = true;
       myVec = aSelectedObject;
+      if (!myOkBase)
+        GroupPoints->PushButton1->click();
     }
-    myEditCurrentArgument->setText( aName );
   }
-  else // getConstructorId()==1 - extrusion using 2 points
-  {
-    if (IObjectCount() != 1) {
+  else if (getConstructorId() == 1) { // getConstructorId()==1 - extrusion using 2 points
+    if (aSelList.Extent() != 1) {
       if (myEditCurrentArgument == GroupPoints2->LineEdit1)
         myOkBase = false;
       else if (myEditCurrentArgument == GroupPoints2->LineEdit2) {
-       myPoint1 = GEOM::GEOM_Object::_nil();
+        myPoint1 = GEOM::GEOM_Object::_nil();
         myOkPnt1 = false;
       }
       else if (myEditCurrentArgument == GroupPoints2->LineEdit3) {
-       myPoint2 = GEOM::GEOM_Object::_nil();
+        myPoint2 = GEOM::GEOM_Object::_nil();
         myOkPnt2 = false;
       }
       return;
@@ -351,83 +409,85 @@ void GenerationGUI_PrismDlg::SelectionIntoArgument()
     // nbSel == 1
     Standard_Boolean testResult = Standard_False;
     GEOM::GEOM_Object_var aSelectedObject =
-      GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
+      GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
-    if (!testResult || CORBA::is_nil( aSelectedObject ))
+    if (!testResult || CORBA::is_nil(aSelectedObject))
       return;
 
-    QString aName = GEOMBase::GetName( aSelectedObject );
+    QString aName = GEOMBase::GetName(aSelectedObject);
     TopoDS_Shape aShape;
     bool myOk = true;
-    if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
-    {
-       LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-       TColStd_IndexedMapOfInteger aMap;
-       aSelMgr->GetIndexes( firstIObject(), aMap );
-       if (aMap.Extent() == 1)
-        {
-          int anIndex = aMap(1);
-          aName.append(":vertex_" + QString::number(anIndex));
-
-         //Find SubShape Object in Father
-         GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
-           
-         if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-           GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
-           aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-         }
-         else
-           aSelectedObject = aFindedObject;
+    if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull()) {
+      TColStd_IndexedMapOfInteger aMap;
+      aSelMgr->GetIndexes(aSelList.First(), aMap);
+      if (aMap.Extent() == 1) {
+        int anIndex = aMap(1);
+        aName.append(":vertex_" + QString::number(anIndex));
+
+        //Find SubShape Object in Father
+        GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
+
+        if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+          GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
+          aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+        }
+        else {
+          aSelectedObject = aFindedObject;
+        }
+      }
+      else {
+        if ((aShape.ShapeType() != TopAbs_VERTEX && myEditCurrentArgument == GroupPoints2->LineEdit2) ||
+             (aShape.ShapeType() != TopAbs_VERTEX && myEditCurrentArgument == GroupPoints2->LineEdit3)) {
+          aSelectedObject = GEOM::GEOM_Object::_nil();
+          aName = "";
+          myOk = false;
         }
-       else
-        {
-         if ((aShape.ShapeType() != TopAbs_VERTEX && myEditCurrentArgument == GroupPoints2->LineEdit2) ||
-              (aShape.ShapeType() != TopAbs_VERTEX && myEditCurrentArgument == GroupPoints2->LineEdit3))
-          {
-           aSelectedObject = GEOM::GEOM_Object::_nil();
-           aName = "";
-           myOk = false;
-         }
-       }
+      }
     }
 
     myEditCurrentArgument->setText(aName);
 
     if (myEditCurrentArgument == GroupPoints2->LineEdit1) {
-      myBase = aSelectedObject;
       myOkBase = true;
+      myBase = aSelectedObject;
+      if (!myOkPnt1)
+        GroupPoints2->PushButton2->click();
     }
     else if (myEditCurrentArgument == GroupPoints2->LineEdit2 && myOk) {
       myOkPnt1 = true;
       myPoint1 = aSelectedObject;
+      if (!myOkPnt2)
+        GroupPoints2->PushButton3->click();
     }
     else if (myEditCurrentArgument == GroupPoints2->LineEdit3 && myOk) {
       myOkPnt2 = true;
       myPoint2 = aSelectedObject;
+      if (!myOkBase)
+        GroupPoints2->PushButton1->click();
     }
   }
+  else if (getConstructorId() == 2) { // extrusion using dx dy dz
+    Standard_Boolean testResult = Standard_False;
+    GEOM::GEOM_Object_var aSelectedObject =
+      GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
-  displayPreview();
-}
+    if (!testResult || CORBA::is_nil(aSelectedObject))
+      return;
 
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose  :
-//=================================================================================
-void GenerationGUI_PrismDlg::LineEditReturnPressed()
-{
-  QLineEdit* send = (QLineEdit*)sender();
-  if (send == GroupPoints->LineEdit1 ||
-      send == GroupPoints->LineEdit2 ||
-      send == GroupPoints2->LineEdit1 ||
-      send == GroupPoints2->LineEdit2 ||
-      send == GroupPoints2->LineEdit3 )
-  {
-    myEditCurrentArgument = send;
-    GEOMBase_Skeleton::LineEditReturnPressed();
+    QString aName = GEOMBase::GetName(aSelectedObject);
+    myBase = aSelectedObject;
+    myOkBase = true;
+    myEditCurrentArgument->setText(aName);
   }
-}
 
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  displayPreview();
+}
 
 //=================================================================================
 // function : SetEditCurrentArgument()
@@ -436,36 +496,76 @@ void GenerationGUI_PrismDlg::LineEditReturnPressed()
 void GenerationGUI_PrismDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  globalSelection( GEOM_ALLSHAPES );
 
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  globalSelection(GEOM_ALLSHAPES);
   if (send == GroupPoints->PushButton1) {
-    GroupPoints->LineEdit1->setFocus();
     myEditCurrentArgument = GroupPoints->LineEdit1;
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
   }
   else if (send == GroupPoints->PushButton2) {
-    GroupPoints->LineEdit2->setFocus();
     myEditCurrentArgument = GroupPoints->LineEdit2;
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
   }
   else if (send == GroupPoints2->PushButton1) {
-    GroupPoints2->LineEdit1->setFocus();
     myEditCurrentArgument = GroupPoints2->LineEdit1;
+    GroupPoints2->PushButton2->setDown(false);
+    GroupPoints2->PushButton3->setDown(false);
+    GroupPoints2->LineEdit2->setEnabled(false);
+    GroupPoints2->LineEdit3->setEnabled(false);
   }
   else if (send == GroupPoints2->PushButton2) {
-    GroupPoints2->LineEdit2->setFocus();
     myEditCurrentArgument = GroupPoints2->LineEdit2;
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+    GroupPoints2->PushButton1->setDown(false);
+    GroupPoints2->PushButton3->setDown(false);
+    GroupPoints2->LineEdit1->setEnabled(false);
+    GroupPoints2->LineEdit3->setEnabled(false);
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
   }
   else if (send == GroupPoints2->PushButton3) {
-    GroupPoints2->LineEdit3->setFocus();
     myEditCurrentArgument = GroupPoints2->LineEdit3;
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+    GroupPoints2->PushButton1->setDown(false);
+    GroupPoints2->PushButton2->setDown(false);
+    GroupPoints2->LineEdit1->setEnabled(false);
+    GroupPoints2->LineEdit2->setEnabled(false);
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+  }
+  else   if (send == GroupPoints3->PushButton1) {
+    myEditCurrentArgument = GroupPoints3->LineEdit1;
   }
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
 }
 
+//=================================================================================
+// function : LineEditReturnPressed()
+// purpose  :
+//=================================================================================
+void GenerationGUI_PrismDlg::LineEditReturnPressed()
+{
+  QLineEdit* send = (QLineEdit*)sender();
+  if (send == GroupPoints->LineEdit1 ||
+      send == GroupPoints->LineEdit2 ||
+      send == GroupPoints2->LineEdit1 ||
+      send == GroupPoints2->LineEdit2 ||
+      send == GroupPoints2->LineEdit3 ||
+      send == GroupPoints3->LineEdit1) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
+}
 
 //=================================================================================
 // function : ActivateThisDialog()
@@ -475,24 +575,22 @@ void GenerationGUI_PrismDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
 
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
   ConstructorsClicked( getConstructorId() );
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  : when mouse enter onto the QWidget
 //=================================================================================
-void GenerationGUI_PrismDlg::enterEvent(QEvent * e)
+void GenerationGUI_PrismDlg::enterEvent (QEvent*)
 {
-  if (!GroupConstructors->isEnabled())
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-
 //=================================================================================
 // function : ValueChangedInSpinBox()
 // purpose  :
@@ -502,14 +600,13 @@ void GenerationGUI_PrismDlg::ValueChangedInSpinBox()
   displayPreview();
 }
 
-
 //=================================================================================
 // function : getHeight()
 // purpose  :
 //=================================================================================
 double GenerationGUI_PrismDlg::getHeight() const
 {
-    return GroupPoints->SpinBox_DX->GetValue();
+  return GroupPoints->SpinBox_DX->value();
 }
 
 //=================================================================================
@@ -518,86 +615,138 @@ double GenerationGUI_PrismDlg::getHeight() const
 //=================================================================================
 GEOM::GEOM_IOperations_ptr GenerationGUI_PrismDlg::createOperation()
 {
-  return getGeomEngine()->GetI3DPrimOperations( getStudyId() );
+  return getGeomEngine()->GetI3DPrimOperations(getStudyId());
 }
 
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool GenerationGUI_PrismDlg::isValid( QString& )
+bool GenerationGUI_PrismDlg::isValid (QString& msg)
 {
+  bool ok = true;
+  if( getConstructorId() == 0 )
+    ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+  else if( getConstructorId() == 2 )
+  {
+    ok = GroupPoints3->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupPoints3->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupPoints3->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok;
+  }
+
   if (getConstructorId() == 0)
-    return (myOkBase && myOkVec);     // by vector and height
-  else
+    return (myOkBase && myOkVec) && ok;     // by vector and height
+  else if (getConstructorId() == 1)
     return (myOkBase && myOkPnt1 && myOkPnt2);   // by two points
+  else if (getConstructorId() == 2)
+    return myOkBase && ok;
+
+  return false;
 }
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool GenerationGUI_PrismDlg::execute( ObjectList& objects )
+bool GenerationGUI_PrismDlg::execute (ObjectList& objects)
 {
+  QStringList aParameters;
   GEOM::GEOM_Object_var anObj;
 
-  switch ( getConstructorId() )
-  {
+  switch (getConstructorId()) {
   case 0:
+    if (!myBothway) {
+      anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+        MakePrismVecH(myBase, myVec, getHeight());
+    }
+    else {
+      anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+        MakePrismVecH2Ways(myBase, myVec, getHeight());
+    }
+
+    if (!anObj->_is_nil() && !IsPreview())
     {
-      if (!myBothway)
-       anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
-         MakePrismVecH(myBase, myVec, getHeight());
-      else
-       anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
-       MakePrismVecH2Ways(myBase, myVec, getHeight() );
-      break;
+      aParameters << GroupPoints->SpinBox_DX->text();
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
     }
+
+    break;
   case 1:
-    {
-      if (!myBothway2)
-       anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+    if (!myBothway2) {
+      anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
         MakePrismTwoPnt(myBase, myPoint1, myPoint2);
-      else
-       anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+    }
+    else {
+      anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
         MakePrismTwoPnt2Ways(myBase, myPoint1, myPoint2);
-      break;
     }
+    break;
+  case 2:
+    double dx = GroupPoints3->SpinBox_DX->value();
+    double dy = GroupPoints3->SpinBox_DY->value();
+    double dz = GroupPoints3->SpinBox_DZ->value();
+
+    if (!myBothway3) {
+      anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+        MakePrismDXDYDZ(myBase, dx, dy, dz);
+    }
+    else {
+      anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+        MakePrismDXDYDZ2Ways(myBase, dx, dy, dz);
+    }
+
+    if (!anObj->_is_nil() && !IsPreview())
+    {
+      aParameters << GroupPoints3->SpinBox_DX->text();
+      aParameters << GroupPoints3->SpinBox_DY->text();
+      aParameters << GroupPoints3->SpinBox_DZ->text();
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    }
+
+    break;
   }
-  if ( !anObj->_is_nil() )
-    objects.push_back( anObj._retn() );
+
+  if (!anObj->_is_nil())
+    objects.push_back(anObj._retn());
 
   return true;
 }
 
-
 //=================================================================================
-// function :  onReverse()
+// function : onReverse()
 // purpose  :
 //=================================================================================
 void GenerationGUI_PrismDlg::onReverse()
 {
-  double anOldValue = GroupPoints->SpinBox_DX->GetValue();
-  GroupPoints->SpinBox_DX->SetValue( -anOldValue );
+  double anOldValue = GroupPoints->SpinBox_DX->value();
+  GroupPoints->SpinBox_DX->setValue(-anOldValue);
 }
 
 //=================================================================================
-// function :  onBothway()
-// purpose  :  
+// function : onBothway()
+// purpose  :
 //=================================================================================
 void GenerationGUI_PrismDlg::onBothway()
 {
-  bool anOldValue = myBothway;
-  myBothway = !anOldValue;
-  GroupPoints->CheckButton2->setEnabled(!myBothway);
-  displayPreview();
-}
-
-void GenerationGUI_PrismDlg::onBothway2()
-{
-  bool anOldValue = myBothway2;
-  myBothway2 = !anOldValue;
-  displayPreview();
+  bool anOldValue;
+  switch (getConstructorId()) {
+  case 0:
+    anOldValue = myBothway;
+    myBothway = !anOldValue;
+    GroupPoints->CheckButton2->setEnabled(!myBothway);
+    displayPreview();
+    break;
+  case 1:
+    anOldValue = myBothway2;
+    myBothway2 = !anOldValue;
+    displayPreview();
+    break;
+  case 2:
+    anOldValue = myBothway3;
+    myBothway3 = !anOldValue;
+    displayPreview();
+    break;
+  }
 }
 
 //=================================================================================
@@ -608,15 +757,14 @@ void GenerationGUI_PrismDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
 
-  switch (getConstructorId())
-    {
-    case 0:
-      objMap[GroupPoints->LineEdit2->text()] = myVec;
-      break;
-    case 1:
-      objMap[GroupPoints2->LineEdit2->text()] = myPoint1;
-      objMap[GroupPoints2->LineEdit3->text()] = myPoint2;
-      break;
-    }
-  addSubshapesToFather( objMap );
+  switch (getConstructorId()) {
+  case 0:
+    objMap[GroupPoints->LineEdit2->text()] = myVec;
+    break;
+  case 1:
+    objMap[GroupPoints2->LineEdit2->text()] = myPoint1;
+    objMap[GroupPoints2->LineEdit3->text()] = myPoint2;
+    break;
+  }
+  addSubshapesToFather(objMap);
 }
index 5f90c0fe1d36e6c056d1b22be42a8bd8e4779da1..1ccc7461b2fba1342a235a826b07884d50a82d60 100644 (file)
@@ -1,91 +1,93 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : GenerationGUI_PrismDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_PRISM_H
-#define DIALOGBOX_PRISM_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : GenerationGUI_PrismDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef GENERATIONGUI_PRISMDLG_H
+#define GENERATIONGUI_PRISMDLG_H
 
-#include "GenerationGUI.h"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel1Spin2Check.h"
-#include "DlgRef_3Sel1Check_QTD.h"
+class DlgRef_2Sel1Spin2Check;
+class DlgRef_3Sel1Check;
+class DlgRef_1Sel3Spin1Check;
 
 //=================================================================================
 // class    : GenerationGUI_PrismDlg
 // purpose  :
 //=================================================================================
-class GENERATIONGUI_EXPORT GenerationGUI_PrismDlg : public GEOMBase_Skeleton
+class GenerationGUI_PrismDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    GenerationGUI_PrismDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                          const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~GenerationGUI_PrismDlg();
-
+  GenerationGUI_PrismDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~GenerationGUI_PrismDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& msg );
-    virtual bool execute( ObjectList& objects );    
-    virtual void addSubshapesToStudy();
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );    
+  virtual void                       addSubshapesToStudy();
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    double getHeight() const;
-
-    GEOM::GEOM_Object_var myBase; /* Base shape */
-    GEOM::GEOM_Object_var myVec;  /* Vector, defining the direction */
-    GEOM::GEOM_Object_var myPoint1, myPoint2; /* Points for extrusion */ 
-
-    bool myOkBase;
-    bool myOkVec;
-    bool myOkPnt1;
-    bool myOkPnt2;
-    bool myBothway;
-    bool myBothway2;
-
-    DlgRef_2Sel1Spin2Check* GroupPoints;
-    DlgRef_3Sel1Check_QTD* GroupPoints2; // for second layout for extrusion using 2 points
-
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  double                             getHeight() const;
+private:
+  GEOM::GEOM_Object_var              myBase; /* Base shape */
+  GEOM::GEOM_Object_var              myVec;  /* Vector, defining the direction */
+  GEOM::GEOM_Object_var              myPoint1, myPoint2;   /* Points for extrusion */ 
+  
+  bool                               myOkBase;
+  bool                               myOkVec;
+  bool                               myOkPnt1;
+  bool                               myOkPnt2;
+  bool                               myBothway;
+  bool                               myBothway2;
+  bool                               myBothway3;
+  
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
+  
+  DlgRef_2Sel1Spin2Check*            GroupPoints;
+  DlgRef_3Sel1Check*                 GroupPoints2; // for second layout for extrusion using 2 points
+  DlgRef_1Sel3Spin1Check*            GroupPoints3;
+  
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-
-    void ActivateThisDialog();
-    void ConstructorsClicked(int);
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ValueChangedInSpinBox();
-    void onReverse();
-    void onBothway();
-    void onBothway2();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               ValueChangedInSpinBox();
+  void                               SetDoubleSpinBoxStep( double );
+  void                               onReverse();
+  void                               onBothway();
 };
 
-#endif // DIALOGBOX_PRISM_H
+#endif // GENERATIONGUI_PRISMDLG_H
index 928fd15f6fe644ced7d7726ef6a53c7ed753617c..2a5d00b43dddffff259cd1558d33d11544a9fc58 100644 (file)
@@ -1,37 +1,38 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GenerationGUI_RevolDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : GenerationGUI_RevolDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "GenerationGUI_RevolDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopExp.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-
-#include <gp_Lin.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepPrimAPI_MakeRevol.hxx>
 #include <TopExp_Explorer.hxx>
-#include "GEOMImpl_Types.hxx"
-
-#include <qlabel.h>
-#include <qcheckbox.h>
 
-#include "utilities.h"
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : GenerationGUI_RevolDlg()
-// purpose  : Constructs a GenerationGUI_RevolDlg which is a child of 'parent', with the 
+// purpose  : Constructs a GenerationGUI_RevolDlg which is 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.
 //=================================================================================
-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)
+GenerationGUI_RevolDlg::GenerationGUI_RevolDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl)
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_REVOL")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_REVOL")));
+  QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_REVOLUTION_TITLE"));
+  setWindowTitle(tr("GEOM_REVOLUTION_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_REVOLUTION"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_REVOLUTION"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
   myBothway = false;
 
-  GroupPoints = new DlgRef_2Sel1Spin2Check(this, "GroupPoints");
+  GroupPoints = new DlgRef_2Sel1Spin2Check(centralWidget());
   GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   GroupPoints->TextLabel1->setText(tr("GEOM_OBJECT"));
   GroupPoints->TextLabel2->setText(tr("GEOM_AXIS"));
   GroupPoints->TextLabel3->setText(tr("GEOM_ANGLE"));
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->PushButton2->setPixmap(image1);
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
+  GroupPoints->PushButton1->setIcon(image1);
+  GroupPoints->PushButton2->setIcon(image1);
+  GroupPoints->LineEdit1->setReadOnly(true);
+  GroupPoints->LineEdit2->setReadOnly(true);
   GroupPoints->CheckButton1->setText(tr("GEOM_BOTHWAY"));
   GroupPoints->CheckButton2->setText(tr("GEOM_REVERSE"));
 
-  Layout1->addWidget(GroupPoints, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
   /***************************************************************/
 
   setHelpFileName("create_revolution_page.html");
 
-  /* Initialisations */
+  // Initialisation
   Init();
 }
 
-
 //=================================================================================
 // function : ~GenerationGUI_RevolDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -106,49 +101,56 @@ GenerationGUI_RevolDlg::~GenerationGUI_RevolDlg()
   // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void GenerationGUI_RevolDlg::Init()
 {
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
+  // min, max, step and decimals for spin boxes & initial values
+  double SpecificStep = 5;
+  initSpinBox(GroupPoints->SpinBox_DX, -360.0, 360.0, SpecificStep, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupPoints->SpinBox_DX->setValue(45.0);
 
-  myOkBase = myOkAxis = false;
+  // init variables
+  GroupPoints->LineEdit1->setReadOnly(true);
+  GroupPoints->LineEdit2->setReadOnly(true);
 
-  double SpecificStep = 5;
-  /* min, max, step and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, SpecificStep, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox_DX->SetValue(45.0);
+  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit2->setText("");
+  myBase = myAxis = GEOM::GEOM_Object::_nil();
+  myOkBase = myOkAxis = false;
 
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton1,  SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton2,  SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
 
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit1,    SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit2,    SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
 
   connect(GroupPoints->SpinBox_DX,   SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
   connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)),        this, SLOT(onBothway()));
   connect(GroupPoints->CheckButton2, SIGNAL(toggled(bool)),        this, SLOT(onReverse()));
 
-  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
-
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double)));
 
   initName(tr("GEOM_REVOLUTION"));
 
-  globalSelection( GEOM_ALLSHAPES );
+  GroupPoints->PushButton1->click();
+  SelectionIntoArgument();
 }
 
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void GenerationGUI_RevolDlg::SetDoubleSpinBoxStep (double step)
+{
+  GroupPoints->SpinBox_DX->setSingleStep(step);
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -156,21 +158,22 @@ void GenerationGUI_RevolDlg::Init()
 //=================================================================================
 void GenerationGUI_RevolDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool GenerationGUI_RevolDlg::ClickOnApply()
 {
-  if ( !onAccept() )
+  if (!onAccept())
     return false;
 
   initName();
+  // activate selection and connect selection manager
+  GroupPoints->PushButton1->click();
   return true;
 }
 
@@ -178,10 +181,9 @@ bool GenerationGUI_RevolDlg::ClickOnApply()
 //function : isAcceptableBase
 //purpose  : return true if theBase can be used as algo argument
 //=======================================================================
-
-static bool isAcceptableBase(const TopoDS_Shape& theBase)
+static bool isAcceptableBase (const TopoDS_Shape& theBase)
 {
-  switch ( theBase.ShapeType() ) {
+  switch (theBase.ShapeType()) {
   case TopAbs_VERTEX:
   case TopAbs_EDGE:
   case TopAbs_WIRE:
@@ -192,7 +194,7 @@ static bool isAcceptableBase(const TopoDS_Shape& theBase)
   case TopAbs_COMPSOLID:
     return false;
   case TopAbs_COMPOUND: {
-    TopExp_Explorer exp( theBase, TopAbs_SOLID);
+    TopExp_Explorer exp(theBase, TopAbs_SOLID);
     return !exp.More();
   }
   default:
@@ -203,87 +205,89 @@ static bool isAcceptableBase(const TopoDS_Shape& theBase)
 
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed or other case
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void GenerationGUI_RevolDlg::SelectionIntoArgument()
 {
   erasePreview();
   myEditCurrentArgument->setText("");
-  
-  if(IObjectCount() != 1) {
-    if(myEditCurrentArgument == GroupPoints->LineEdit1)
-      myOkBase = false;        
-    else if(myEditCurrentArgument == GroupPoints->LineEdit2)
-      myOkAxis = false;
+  if      (myEditCurrentArgument == GroupPoints->LineEdit1) myOkBase = false;
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) myOkAxis = false;
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1)
     return;
-  }
-  
+
   // nbSel == 1
   Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
-  QString aName = GEOMBase::GetName( aSelectedObject );
-  
-  if (!testResult)
+  GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+
+  if (!testResult || aSelectedObject->_is_nil())
+    return;
+
+  TopoDS_Shape S;
+  if (!GEOMBase::GetShape(aSelectedObject, S) || S.IsNull())
     return;
 
-  if(myEditCurrentArgument == GroupPoints->LineEdit1) {
-    TopoDS_Shape S;
-    myOkBase = false;
-    
-    if ( !GEOMBase::GetShape(aSelectedObject, S) || !isAcceptableBase( S ) )
+  QString aName = GEOMBase::GetName(aSelectedObject);
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
+    if (!isAcceptableBase(S))
       return;
-    
+
     myBase = aSelectedObject;
     myOkBase = true;
+    myEditCurrentArgument->setText(aName);
+    if (!myOkAxis)
+      GroupPoints->PushButton2->click();
   }
-  else if(myEditCurrentArgument == GroupPoints->LineEdit2) {
-    if ( testResult && !aSelectedObject->_is_nil() )
-      {
-       TopoDS_Shape aShape;
-       
-       if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
-         {
-           LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-             TColStd_IndexedMapOfInteger aMap;
-             aSelMgr->GetIndexes( firstIObject(), aMap );
-             if ( aMap.Extent() == 1 )
-               {
-
-                 int anIndex = aMap( 1 );
-                 aName.append( ":edge_" + QString::number( anIndex ) );
-
-                 //Find SubShape Object in Father
-                 GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
-                 
-                 if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-                   GEOM::GEOM_IShapesOperations_var aShapesOp =
-                     getGeomEngine()->GetIShapesOperations( getStudyId() );
-                   myAxis = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-                   myOkAxis = true;
-                 }
-                 else {
-                   myAxis = aFindedObject;
-                   myOkAxis = true;
-                 }
-               }
-             else {
-               myOkAxis = true;
-               if (aShape.ShapeType() != TopAbs_EDGE) {
-                 aSelectedObject = GEOM::GEOM_Object::_nil();
-                 aName = "";
-                 myOkAxis = false;
-               }
-               myAxis = aSelectedObject;
-             }
-         }
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
+    TColStd_IndexedMapOfInteger aMap;
+    aSelMgr->GetIndexes(aSelList.First(), aMap);
+    if (aMap.Extent() == 1) {
+      int anIndex = aMap(1);
+      aName.append(":edge_" + QString::number(anIndex));
+
+      //Find SubShape Object in Father
+      GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
+
+      if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+        GEOM::GEOM_IShapesOperations_var aShapesOp =
+          getGeomEngine()->GetIShapesOperations(getStudyId());
+        myAxis = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+        myOkAxis = true;
       }
+      else {
+        myAxis = aFindedObject;
+        myOkAxis = true;
+      }
+    }
+    else {
+      myOkAxis = true;
+      if (S.ShapeType() != TopAbs_EDGE) {
+        aSelectedObject = GEOM::GEOM_Object::_nil();
+        aName = "";
+        myOkAxis = false;
+      }
+      myAxis = aSelectedObject;
+    }
+    myEditCurrentArgument->setText(aName);
+    if (myOkAxis && !myOkBase)
+      GroupPoints->PushButton1->click();
   }
-  myEditCurrentArgument->setText( aName );
+
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
   displayPreview();
 }
 
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -291,37 +295,47 @@ void GenerationGUI_RevolDlg::SelectionIntoArgument()
 void GenerationGUI_RevolDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  globalSelection( GEOM_ALLSHAPES );
 
-  if(send == GroupPoints->PushButton1) {
-    GroupPoints->LineEdit1->setFocus();
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  globalSelection(GEOM_ALLSHAPES);
+  if (send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
   }
-  else if(send == GroupPoints->PushButton2) {
-    GroupPoints->LineEdit2->setFocus();
+  else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
     localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
   }
-  SelectionIntoArgument();
-}
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
+  myEditCurrentArgument->setFocus();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
+}
 
 //=================================================================================
 // function : LineEditReturnPressed()
 // purpose  :
 //=================================================================================
 void GenerationGUI_RevolDlg::LineEditReturnPressed()
-{  
+{
   QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1 ||
-     send == GroupPoints->LineEdit2)
-    {
-      myEditCurrentArgument = send;
-      GEOMBase_Skeleton::LineEditReturnPressed();
-    }
+  if (send == GroupPoints->LineEdit1 ||
+      send == GroupPoints->LineEdit2) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
 }
 
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -329,25 +343,22 @@ void GenerationGUI_RevolDlg::LineEditReturnPressed()
 void GenerationGUI_RevolDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  globalSelection( GEOM_ALLSHAPES );
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-  GroupPoints->LineEdit1->setFocus();
-  myEditCurrentArgument = GroupPoints->LineEdit1;
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
   displayPreview();
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void GenerationGUI_RevolDlg::enterEvent(QEvent* e)
+void GenerationGUI_RevolDlg::enterEvent (QEvent*)
 {
-  if ( !GroupConstructors->isEnabled() )
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-
 //=================================================================================
 // function : ValueChangedInSpinBox()
 // purpose  :
@@ -357,14 +368,13 @@ void GenerationGUI_RevolDlg::ValueChangedInSpinBox()
   displayPreview();
 }
 
-
 //=================================================================================
 // function : getAngle()
 // purpose  :
 //=================================================================================
 double GenerationGUI_RevolDlg::getAngle() const
 {
-  return GroupPoints->SpinBox_DX->GetValue();
+  return GroupPoints->SpinBox_DX->value();
 }
 
 //=================================================================================
@@ -373,48 +383,58 @@ double GenerationGUI_RevolDlg::getAngle() const
 //=================================================================================
 GEOM::GEOM_IOperations_ptr GenerationGUI_RevolDlg::createOperation()
 {
-  return getGeomEngine()->GetI3DPrimOperations( getStudyId() );
+  return getGeomEngine()->GetI3DPrimOperations(getStudyId());
 }
 
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool GenerationGUI_RevolDlg::isValid( QString& )
+bool GenerationGUI_RevolDlg::isValid (QString& msg)
 {
-  return myOkBase && myOkAxis;
+  bool ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() );
+  return myOkBase && myOkAxis && ok;
 }
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool GenerationGUI_RevolDlg::execute( ObjectList& objects )
+bool GenerationGUI_RevolDlg::execute (ObjectList& objects)
 {
   GEOM::GEOM_Object_var anObj;
 
-  if (!myBothway)
-    anObj = GEOM::GEOM_I3DPrimOperations::_narrow(
-      getOperation() )->MakeRevolutionAxisAngle( myBase, myAxis, getAngle() * PI180 );
-  else
-    anObj = GEOM::GEOM_I3DPrimOperations::_narrow(
-      getOperation() )->MakeRevolutionAxisAngle2Ways( myBase, myAxis, getAngle() * PI180 );
+  if (!myBothway) {
+    anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+      MakeRevolutionAxisAngle(myBase, myAxis, getAngle() * PI180);
+  }
+  else {
+    anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+      MakeRevolutionAxisAngle2Ways(myBase, myAxis, getAngle() * PI180);
+  }
 
-  if ( !anObj->_is_nil() )
-    objects.push_back( anObj._retn() );
+  if (!anObj->_is_nil())
+  {
+    if (!IsPreview())
+    {
+      QStringList aParameters;
+      aParameters << GroupPoints->SpinBox_DX->text();
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    }
+    objects.push_back(anObj._retn());
+  }
 
   return true;
 }
 
-
 //=================================================================================
 // function :  onReverse()
 // purpose  :
 //=================================================================================
 void GenerationGUI_RevolDlg::onReverse()
 {
-  double anOldValue = GroupPoints->SpinBox_DX->GetValue();
-  GroupPoints->SpinBox_DX->SetValue( -anOldValue );
+  double anOldValue = GroupPoints->SpinBox_DX->value();
+  GroupPoints->SpinBox_DX->setValue(-anOldValue);
 }
 
 //=================================================================================
@@ -425,7 +445,7 @@ void GenerationGUI_RevolDlg::onBothway()
 {
   bool anOldValue = myBothway;
   myBothway = !anOldValue;
-  GroupPoints->CheckButton2->setEnabled(!myBothway);  
+  GroupPoints->CheckButton2->setEnabled(!myBothway);
   displayPreview();
 }
 
@@ -439,5 +459,5 @@ void GenerationGUI_RevolDlg::addSubshapesToStudy()
 
   objMap[GroupPoints->LineEdit2->text()] = myAxis;
 
-  addSubshapesToFather( objMap );
+  addSubshapesToFather(objMap);
 }
index c7004e51d2b1d230d6d5bc9ba434d74f4b33e402..89318effcd93df8f08c4204287439e72df4e2fff 100644 (file)
@@ -1,83 +1,79 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : GenerationGUI_RevolDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_REVOLUTION_H
-#define DIALOGBOX_REVOLUTION_H
-
-#include "GenerationGUI.h"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : GenerationGUI_RevolDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef GENERATIONGUI_REVOLUTIONDLG_H
+#define GENERATIONGUI_REVOLUTIONDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel1Spin2Check.h"
+#include <GEOMBase_Skeleton.h>
 
-#include <gp_Dir.hxx>
+class DlgRef_2Sel1Spin2Check;
 
 //=================================================================================
 // class    : GenerationGUI_RevolDlg
 // purpose  :
 //=================================================================================
-class GENERATIONGUI_EXPORT GenerationGUI_RevolDlg : public GEOMBase_Skeleton
+class GenerationGUI_RevolDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    GenerationGUI_RevolDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                          const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~GenerationGUI_RevolDlg();
+  GenerationGUI_RevolDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~GenerationGUI_RevolDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& msg );
-    virtual bool execute( ObjectList& objects );    
-    virtual void addSubshapesToStudy();
-
-private :
-    void Init();
-    void enterEvent(QEvent* e);
-    double getAngle() const;
-
-    GEOM::GEOM_Object_var myBase; /* Base shape */
-    GEOM::GEOM_Object_var myAxis; /* Axis of the revolution */
-    bool myOkBase; 
-    bool myOkAxis;
-    bool myBothway;
-
-    DlgRef_2Sel1Spin2Check* GroupPoints;
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );    
+  virtual void                       addSubshapesToStudy();
 
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  double                             getAngle() const;
+  
+private:
+  GEOM::GEOM_Object_var              myBase; /* Base shape */
+  GEOM::GEOM_Object_var              myAxis; /* Axis of the revolution */
+  bool                               myOkBase; 
+  bool                               myOkAxis;
+  bool                               myBothway;
+  
+  DlgRef_2Sel1Spin2Check*            GroupPoints;
+    
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ValueChangedInSpinBox();
-    void onReverse();
-    void onBothway();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ValueChangedInSpinBox();
+  void                               SetDoubleSpinBoxStep( double );
+  void                               onReverse();
+  void                               onBothway();
 };
 
-#endif // DIALOGBOX_REVOLUTION_H
+#endif // GENERATIONGUI_REVOLUTIONDLG_H
index d7885317fec4aaa2b29c75e7521828681afba850..8fd63002e37a3126812f634a1ba7fcfcbf3ea252 100644 (file)
@@ -1,83 +1,88 @@
-#  GEOM GENERATIONGUI : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM GENERATIONGUI : 
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : GenerationGUI
 #
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
 lib_LTLIBRARIES = libGenerationGUI.la
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =                        \
+       GenerationGUI.h                 \
+       GenerationGUI_PrismDlg.h        \
+       GenerationGUI_RevolDlg.h        \
+       GenerationGUI_FillingDlg.h      \
+       GenerationGUI_PipeDlg.h
 
-dist_libGenerationGUI_la_SOURCES = \
-       GenerationGUI.cxx \
-       GenerationGUI_PrismDlg.cxx \
-       GenerationGUI_RevolDlg.cxx \
-       GenerationGUI_FillingDlg.cxx \
+dist_libGenerationGUI_la_SOURCES =     \
+       GenerationGUI.h                 \
+       GenerationGUI_PrismDlg.h        \
+       GenerationGUI_RevolDlg.h        \
+       GenerationGUI_FillingDlg.h      \
+       GenerationGUI_PipeDlg.h         \
+                                       \
+       GenerationGUI.cxx               \
+       GenerationGUI_PrismDlg.cxx      \
+       GenerationGUI_RevolDlg.cxx      \
+       GenerationGUI_FillingDlg.cxx    \
        GenerationGUI_PipeDlg.cxx
 
-MOC_FILES = \
-       GenerationGUI_PrismDlg_moc.cxx \
-       GenerationGUI_RevolDlg_moc.cxx \
-       GenerationGUI_FillingDlg_moc.cxx \
+MOC_FILES =                                    \
+       GenerationGUI_PrismDlg_moc.cxx          \
+       GenerationGUI_RevolDlg_moc.cxx          \
+       GenerationGUI_FillingDlg_moc.cxx        \
        GenerationGUI_PipeDlg_moc.cxx
 
-nodist_libGenerationGUI_la_SOURCES= \
+nodist_libGenerationGUI_la_SOURCES =   \
        $(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl
-
-#LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libGenerationGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../DlgRef \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(srcdir)/../GEOMFiltersSelection \
-       -I$(top_builddir)/idl \
+libGenerationGUI_la_CPPFLAGS =                 \
+       $(QT_INCLUDES)                          \
+       $(VTK_INCLUDES)                         \
+       $(CAS_CPPFLAGS)                         \
+       $(PYTHON_INCLUDES)                      \
+       $(BOOST_CPPFLAGS)                       \
+       $(KERNEL_CXXFLAGS)                      \
+       $(GUI_CXXFLAGS)                         \
+       $(CORBA_CXXFLAGS)                       \
+       $(CORBA_INCLUDES)                       \
+       -I$(srcdir)/../GEOMGUI                  \
+       -I$(srcdir)/../DlgRef                   \
+       -I$(srcdir)/../GEOMBase                 \
+       -I$(srcdir)/../OBJECT                   \
+       -I$(srcdir)/../GEOMClient               \
+       -I$(srcdir)/../GEOMImpl                 \
+       -I$(srcdir)/../GEOMFiltersSelection     \
+       -I$(top_builddir)/src/DlgRef            \
+       -I$(top_builddir)/idl                   \
        -I$(top_builddir)/salome_adm/unix
 
-libGenerationGUI_la_LDFLAGS  = \
-       ../GEOMFiltersSelection/libGEOMFiltersSelection.la \
-       ../GEOMBase/libGEOMBase.la \
+libGenerationGUI_la_LDFLAGS  =                                 \
+       ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \
+       ../GEOMBase/libGEOMBase.la                              \
        $(CAS_LDPATH) -lTKOffset 
index e335605c6325fae08ffae8f37b88280921088392..89d84ebf2161500b249aafc4f17ff0faefe3aada 100644 (file)
@@ -1,49 +1,48 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GroupGUI.cxx
+// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
 //
-//  File   : GroupGUI.cxx
-//  Author : Sergey ANIKIN
-//  Module : GEOM
-//  $Header$
-
 #include "GroupGUI.h"
 #include "GroupGUI_GroupDlg.h" 
 
-#include "GEOMImpl_Types.hxx"
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+#include <GEOMImpl_Types.hxx>
 
-#include "SUIT_Session.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_MessageBox.h"
-#include "SalomeApp_Application.h"
-#include "SalomeApp_Study.h"
-#include "LightApp_SelectionMgr.h"
+#include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_MessageBox.h>
+#include <SalomeApp_Application.h>
+#include <SalomeApp_Study.h>
+#include <LightApp_SelectionMgr.h>
 
 //=======================================================================
 // function : GroupGUI()
 // purpose  : Constructor
 //=======================================================================
-GroupGUI::GroupGUI(GeometryGUI* parent)
-: GEOMGUI(parent)
+GroupGUI::GroupGUI( GeometryGUI* parent )
+  : GEOMGUI( parent )
 {
 }
 
@@ -67,24 +66,23 @@ bool GroupGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 
   getGeometryGUI()->EmitSignalDeactivateDialog();
 
-  QDialog* aDlg = NULL;
+  QDialog* aDlg = 0;
 
-  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>(app->activeStudy());
+  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
   if ( !appStudy ) return false;
   _PTR(Study) aStudy = appStudy->studyDS();
 
   if ( aStudy->GetProperties()->IsLocked() ) {
-    SUIT_MessageBox::warn1 ( parent,
-                            QObject::tr("WRN_WARNING"), 
-                            QObject::tr("WRN_STUDY_LOCKED"),
-                            QObject::tr("BUT_OK") );
+    SUIT_MessageBox::warning( parent,
+                             tr( "WRN_WARNING" ), 
+                             tr( "WRN_STUDY_LOCKED" ) );
     return false;
   }
 
   switch ( theCommandID ) {
   case 800: 
   case 8001: // CREATE GROUP
-    aDlg = new GroupGUI_GroupDlg (GroupGUI_GroupDlg::CreateGroup, getGeometryGUI(), parent); 
+    aDlg = new GroupGUI_GroupDlg( GroupGUI_GroupDlg::CreateGroup, getGeometryGUI(), parent ); 
     break;
   case 801:  // EDIT GROUP
     {
@@ -92,29 +90,32 @@ bool GroupGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
       aList.Clear();
 
       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, getGeometryGUI(), 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::warning( parent, tr( "WRN_WARNING" ), tr( "NO_GROUP" ) );
       break;
     }
   default: 
-    app->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); 
+    app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); 
     break;
   }
 
-  if (aDlg != NULL)
+  if ( aDlg ) {
+    aDlg->updateGeometry();
+    aDlg->resize( aDlg->minimumSizeHint() );
     aDlg->show();
+  }
 
   return true;
 }
@@ -124,11 +125,11 @@ bool GroupGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 //=====================================================================================
 extern "C"
 {
-#ifdef WNT
-       __declspec( dllexport )
+#ifdef WIN32
+  __declspec( dllexport )
 #endif
-  GEOMGUI* GetLibGUI(GeometryGUI* p)
+  GEOMGUI* GetLibGUI( GeometryGUI* p )
   {
-    return new GroupGUI(p);
+    return new GroupGUI( p );
   }
 }
index 71bac9677968738b4e09ddafe7b0a72592bf71fd..a0e97d9480558d20c3f60d6b2e292dd270ddb077 100644 (file)
@@ -1,34 +1,32 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2004  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GroupGUI.h
+// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
 //
-//  File   : GroupGUI.h
-//  Author : Sergey ANIKIN
-//  Module : GEOM
-
 #ifndef GROUPGUI_H
 #define GROUPGUI_H
 
-#include "GEOMGUI.h"
+#include <GEOMGUI.h>
 
 //=================================================================================
 // class    : GroupGUI
@@ -39,10 +37,10 @@ class GroupGUI : public GEOMGUI
   Q_OBJECT
 
 public:
-  GroupGUI(GeometryGUI* parent);
+  GroupGUI( GeometryGUI* );
   ~GroupGUI();
 
-  bool OnGUIEvent( int theCommandID, SUIT_Desktop* parent );
+  bool OnGUIEvent( int, SUIT_Desktop* );
 };
 
-#endif
+#endif // GROUPGUI_H
index 5aafaee7cc99427dfbb32aefcd46516faf85ca34..e17b859aae2c66b9e8545265e56bc0690a437720 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2004  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GroupGUI_GroupDlg.cxx
+// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
 //
-//  File   : GroupGUI_GroupDlg.cxx
-//  Author : Sergey ANIKIN
-//  Module : GEOM
-//  $Header$
-
 #include "GroupGUI_GroupDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "SalomeApp_Study.h"
-#include "LightApp_SelectionMgr.h"
-
-#include "GEOMBase.h"
-
-#include "GEOMImpl_Types.hxx"
-
-#include <qlabel.h>
-#include <qlistbox.h>
-#include <qlineedit.h>
-#include <qmap.h>
+#include <LightApp_SelectionMgr.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_OverrideCursor.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <SalomeApp_Study.h>
+
+#include <DlgRef.h>
+#include <GEOMBase.h>
+#include <GeometryGUI.h>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Displayer.h>
+
+#include <QLabel>
+#include <QListWidget>
+#include <QLineEdit>
+#include <QMap>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TColStd_MapOfInteger.hxx>
+#include <TColStd_DataMapIteratorOfDataMapOfIntegerInteger.hxx>
 
+enum { ALL_SUBSHAPES = 0, GET_IN_PLACE, SUBSHAPES_OF_SHAPE2, SUBSHAPES_OF_INVISIBLE_SHAPE2 };
 
-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 )
+GroupGUI_GroupDlg::GroupGUI_GroupDlg( Mode mode, GeometryGUI* theGeometryGUI, QWidget* parent )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, false ),
+    myMode( mode ),
+    myBusy( false )
 {
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
 
-  QPixmap image0     (resMgr->loadPixmap("GEOM", tr("ICON_OBJBROWSER_VERTEX")));
-  QPixmap image1     (resMgr->loadPixmap("GEOM", tr("ICON_OBJBROWSER_EDGE")));
-  QPixmap image2     (resMgr->loadPixmap("GEOM", tr("ICON_OBJBROWSER_FACE")));
-  QPixmap image3     (resMgr->loadPixmap("GEOM", tr("ICON_OBJBROWSER_SOLID")));
-  QPixmap iconSelect (resMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
+  QPixmap image0     ( resMgr->loadPixmap( "GEOM", tr( "ICON_OBJBROWSER_VERTEX" ) ) );
+  QPixmap image1     ( resMgr->loadPixmap( "GEOM", tr( "ICON_OBJBROWSER_EDGE" ) ) );
+  QPixmap image2     ( resMgr->loadPixmap( "GEOM", tr( "ICON_OBJBROWSER_FACE" ) ) );
+  QPixmap image3     ( resMgr->loadPixmap( "GEOM", tr( "ICON_OBJBROWSER_SOLID" ) ) );
+  QPixmap iconSelect ( resMgr->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption( myMode == CreateGroup ? tr( "CREATE_GROUP_TITLE" ) : tr( "EDIT_GROUP_TITLE" ) );
+  setWindowTitle( myMode == CreateGroup ? tr( "CREATE_GROUP_TITLE" ) : tr( "EDIT_GROUP_TITLE" ) );
 
   // Shape type button group
-  GroupConstructors->setEnabled( myMode == CreateGroup );
-  GroupConstructors->setTitle( tr( "SHAPE_TYPE" ) );
-  RadioButton1->setPixmap( image0 );
-  RadioButton2->setPixmap( image1 );
-  RadioButton3->setPixmap( image2 );
-  RadioButton4->setPixmap( image3 );
-  RadioButton4->show();
+  mainFrame()->GroupConstructors->setEnabled( myMode == CreateGroup );
+  mainFrame()->GroupConstructors->setTitle( tr( "SHAPE_TYPE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setIcon( image1 );
+  mainFrame()->RadioButton3->setIcon( image2 );
+  mainFrame()->RadioButton4->setIcon( image3 );
+  mainFrame()->RadioButton4->show();
 
   // Group name
-  GroupBoxName->setTitle( tr( "GROUP_NAME" ) );
+  mainFrame()->GroupBoxName->setTitle( tr( "GROUP_NAME" ) );
 
   // Main shape and sub-shapes
-  GroupMedium = new QGroupBox( 1, Qt::Vertical, tr( "MAIN_SUB_SHAPES" ), this );
-  GroupMedium->setInsideMargin( 10 );
-  Layout1->addWidget( GroupMedium, 2, 0 );
-
-  QWidget* aFrame = new QWidget( GroupMedium );
-  QGridLayout* aMedLayout = new QGridLayout( aFrame, 4, 4, 0, 6 );
-
-  QLabel* aMainLabel = new QLabel( tr( "MAIN_SHAPE" ), aFrame );
-
-  mySelBtn = new QPushButton( aFrame );
-  mySelBtn->setPixmap( iconSelect );
+  QGroupBox* GroupMedium = new QGroupBox( tr( "MAIN_SUB_SHAPES" ), centralWidget() );
+  QGridLayout* aMedLayout = new QGridLayout( GroupMedium );
+  aMedLayout->setMargin( 9 );
+  aMedLayout->setSpacing( 6 );
+  
+  QLabel* aMainLabel = new QLabel( tr( "MAIN_SHAPE" ), GroupMedium );
+
+  mySelBtn = new QPushButton( GroupMedium );
+  mySelBtn->setIcon( iconSelect );
   mySelBtn->setEnabled( myMode == CreateGroup );
 
-  myMainName = new QLineEdit( aFrame );
+  myMainName = new QLineEdit( GroupMedium );
   myMainName->setReadOnly( true );
   myMainName->setEnabled( myMode == CreateGroup );
 
-  mySelSubBtn = new QRadioButton (tr( "SELECT_SUB_SHAPES" ), aFrame  );
-  mySelAllBtn = new QPushButton( tr( "SELECT_ALL" ), aFrame );
-  myAddBtn    = new QPushButton( tr( "ADD" ), aFrame );
-  myRemBtn    = new QPushButton( tr( "REMOVE" ), aFrame );
-  myIdList    = new QListBox( aFrame );
-
-  myIdList->setSelectionMode( QListBox::Extended );
-  myIdList->setRowMode( QListBox::FitToWidth );
-
-  aMedLayout->addWidget( aMainLabel, 0, 0 );
-  aMedLayout->addWidget( mySelBtn, 0, 1 );
-  aMedLayout->addMultiCellWidget( myMainName, 0, 0, 2, 3 );
-  aMedLayout->addMultiCellWidget( mySelSubBtn, 1, 1, 0, 2 );
-  aMedLayout->addWidget( mySelAllBtn, 1, 3 );
-  aMedLayout->addMultiCellWidget( myIdList, 2, 3, 0, 2 );
-  aMedLayout->addWidget( myAddBtn, 2, 3 );
-  aMedLayout->addWidget( myRemBtn, 3, 3 );
-
-  setHelpFileName("work_with_groups_page.html");
+  QLabel* aSecondLabel = new QLabel( tr( "SECOND_SHAPE" ), GroupMedium );
+
+  mySelBtn2 = new QPushButton( GroupMedium );
+  mySelBtn2->setIcon( iconSelect );
+  mySelBtn2->setEnabled( false );
+
+  myShape2Name = new QLineEdit( GroupMedium );
+  myShape2Name->setReadOnly( true );
+  myShape2Name->setEnabled( false );
+
+  mySelectionWayGroupBox = new QGroupBox( tr("SHAPE_SEL_RESTR"), GroupMedium );
+  mySelectionWayGroup = new QButtonGroup( mySelectionWayGroupBox );
+  QRadioButton* allSubs     = new QRadioButton( tr( "NO_RESTR" )            , mySelectionWayGroupBox );
+  QRadioButton* inPlaceSubs = new QRadioButton( tr( "GEOM_PARTS_OF_SHAPE2" ), mySelectionWayGroupBox );
+  QRadioButton* shape2Subs  = new QRadioButton( tr( "SUBSHAPES_OF_SHAPE2" ) , mySelectionWayGroupBox );
+  QVBoxLayout* mySelWayLayout = new QVBoxLayout( mySelectionWayGroupBox );
+  mySelWayLayout->setMargin( 9 );
+  mySelWayLayout->setSpacing( 6 );
+  mySelWayLayout->addWidget( allSubs );
+  mySelWayLayout->addWidget( inPlaceSubs );
+  mySelWayLayout->addWidget( shape2Subs );
+  mySelectionWayGroup->addButton( allSubs,     ALL_SUBSHAPES );
+  mySelectionWayGroup->addButton( inPlaceSubs, GET_IN_PLACE );
+  mySelectionWayGroup->addButton( shape2Subs,  SUBSHAPES_OF_SHAPE2 );
+  allSubs->setChecked( true );
+
+  mySelAllBtn = new QPushButton( tr( "SELECT_ALL" ), GroupMedium );
+  myAddBtn    = new QPushButton( tr( "ADD" ), GroupMedium );
+  myRemBtn    = new QPushButton( tr( "REMOVE" ), GroupMedium );
+  myIdList    = new QListWidget( GroupMedium );
+
+  myIdList->setSelectionMode( QAbstractItemView::ExtendedSelection );
+  myIdList->setFlow( QListView::TopToBottom );
+  myIdList->setWrapping( true );
+
+  aMedLayout->addWidget( aMainLabel,             0, 0 );
+  aMedLayout->addWidget( mySelBtn,               0, 1 );
+  aMedLayout->addWidget( myMainName,             0, 2, 1, 2 );
+  aMedLayout->addWidget( aSecondLabel,           1, 0 );
+  aMedLayout->addWidget( mySelBtn2,              1, 1 );
+  aMedLayout->addWidget( myShape2Name,           1, 2, 1, 2 );
+  aMedLayout->addWidget( mySelectionWayGroupBox, 2, 0, 3, 3 );
+  aMedLayout->addWidget( mySelAllBtn,            2, 3 );
+  aMedLayout->addWidget( myAddBtn,               3, 3 );
+  aMedLayout->addWidget( myRemBtn,               4, 3 );
+  aMedLayout->addWidget( myIdList,               5, 0, 1, 4 );
+  aMedLayout->setRowStretch( 5, 1 );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupMedium );
+
+  setHelpFileName( "work_with_groups_page.html" );
 
   Init();
 }
@@ -120,7 +154,6 @@ GroupGUI_GroupDlg::~GroupGUI_GroupDlg()
 {
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
@@ -128,65 +161,66 @@ GroupGUI_GroupDlg::~GroupGUI_GroupDlg()
 void GroupGUI_GroupDlg::Init()
 {
   // san -- TODO: clear selected sub-shapes...
-  mySelSubBtn->setChecked( true );
+  //mySelSubBtn->setChecked( true );
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+
   if ( myMode == CreateGroup ) {
     initName( tr( "GROUP_PREFIX" ) );
 
     // Get ready for main shape selection
     myEditCurrentArgument = myMainName;
 
-    connect( GroupConstructors, SIGNAL( clicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
+    connect( this, SIGNAL( constructorsClicked( int ) ),  this, SLOT( ConstructorsClicked( int ) ) );
     connect( mySelBtn,          SIGNAL( clicked() ),      this, SLOT( SetEditCurrentArgument() ) );
+    connect( mySelBtn2,         SIGNAL( clicked() ),      this, SLOT( SetEditCurrentArgument() ) );
   }
-  else if ( myMode == EditGroup && IObjectCount() ) {
-    Standard_Boolean aResult = Standard_False;
-    GEOM::GEOM_Object_var anObj =
-      GEOMBase::ConvertIOinGEOMObject( firstIObject(), aResult );
+  else if (myMode == EditGroup) {
+    SALOME_ListIO aSelList;
+    aSelMgr->selectedObjects(aSelList);
 
-    if ( aResult && !CORBA::is_nil( anObj ) && anObj->GetType() == GEOM_GROUP ) {
-      myGroup = anObj;
+    if (aSelList.Extent()) {
+      Standard_Boolean aResult = Standard_False;
+      GEOM::GEOM_Object_var anObj =
+        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
 
-      ResultName->setText( GEOMBase::GetName( myGroup ) );
+      if ( aResult && !CORBA::is_nil( anObj ) && anObj->GetType() == GEOM_GROUP ) {
+        myGroup = anObj;
 
-      GEOM::GEOM_IGroupOperations_var anOp = GEOM::GEOM_IGroupOperations::_narrow( getOperation() );
-      myMainObj = anOp->GetMainShape( myGroup );
-      if ( !CORBA::is_nil( myMainObj ) )
-        myMainName->setText( GEOMBase::GetName( myMainObj ) );
+        mainFrame()->ResultName->setText( GEOMBase::GetName( myGroup ) );
 
-      setShapeType( (TopAbs_ShapeEnum)anOp->GetType( myGroup ) );
+        GEOM::GEOM_IGroupOperations_var anOp = GEOM::GEOM_IGroupOperations::_narrow( getOperation() );
+        myMainObj = anOp->GetMainShape( myGroup );
+        if ( !CORBA::is_nil( myMainObj ) )
+          myMainName->setText( GEOMBase::GetName( myMainObj ) );
 
-      GEOM::ListOfLong_var aCurrList = anOp->GetObjects( myGroup );
-      QListBoxItem* anItem;
-      for ( int i = 0, n = aCurrList->length(); i < n; i++ ) {
-        anItem = new QListBoxText( QString( "%1" ).arg(aCurrList[i] ) );
-        myIdList->insertItem( anItem );
-      }
+        setShapeType( (TopAbs_ShapeEnum)anOp->GetType( myGroup ) );
 
-      myEditCurrentArgument = 0;
+        GEOM::ListOfLong_var aCurrList = anOp->GetObjects( myGroup );
+        for ( int i = 0, n = aCurrList->length(); i < n; i++ )
+          myIdList->addItem( new QListWidgetItem( QString( "%1" ).arg( aCurrList[i] ) ) );
+
+        myEditCurrentArgument = 0;
+      }
+      connect( mySelBtn2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
     }
   }
 
-  LightApp_SelectionMgr* aSelMgr =
-    ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr();
+  connect( aSelMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()) );
 
-  connect( aSelMgr,     SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk()    ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
-  connect( buttonOk   , SIGNAL( clicked() ), this, SLOT( ClickOnOk()    ) );
-  connect( buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+  connect( mySelectionWayGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( mySelAllBtn,         SIGNAL( clicked() ),            this, SLOT( SetEditCurrentArgument() ) );
+  connect( myAddBtn,            SIGNAL( clicked() ),            this, SLOT( add() ) );
+  connect( myRemBtn,            SIGNAL( clicked() ),            this, SLOT( remove() ) );
+  connect( myIdList,            SIGNAL( selectionChanged() ),   this, SLOT( selectionChanged() ) );
 
-  connect( mySelSubBtn, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
-  connect( mySelAllBtn, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
-  connect( myAddBtn,    SIGNAL( clicked() ), this, SLOT( add() ) );
-  connect( myRemBtn,    SIGNAL( clicked() ), this, SLOT( remove() ) );
-  connect( myIdList,    SIGNAL( selectionChanged() ), this, SLOT( selectionChanged() ) );
+  setInPlaceObj(GEOM::GEOM_Object::_nil());
 
+  myBusy = true; // just activate but do not select in the list
   activateSelection();
-  // activate subshapes selection if Main Shape is Selected
-  if ( !CORBA::is_nil( myMainObj ) ) {
-    myEditCurrentArgument = 0;
-    activateSelection();
-    updateState();
-  }
+  myBusy = false;
 }
 
 //=================================================================================
@@ -195,8 +229,20 @@ void GroupGUI_GroupDlg::Init()
 //=================================================================================
 void GroupGUI_GroupDlg::enterEvent( QEvent* e )
 {
-  if ( !buttonCancel->isEnabled() )
-    this->ActivateThisDialog();
+  if ( !buttonCancel()->isEnabled() )
+    ActivateThisDialog();
+}
+
+//=======================================================================
+//function : closeEvent
+//purpose  : remove temporary geom object
+//=======================================================================
+
+void GroupGUI_GroupDlg::closeEvent( QCloseEvent* e )
+{
+  setInPlaceObj( GEOM::GEOM_Object::_nil() );
+
+  GEOMBase_Skeleton::closeEvent( e );
 }
 
 //=================================================================================
@@ -222,13 +268,13 @@ bool GroupGUI_GroupDlg::ClickOnApply()
     {
       initName();
       myIdList->clear();
+      ConstructorsClicked( getConstructorId() );
     }
   else
     activateSelection();
   return true;
 }
 
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -261,7 +307,6 @@ void GroupGUI_GroupDlg::LineEditReturnPressed()
   updateState();
 }
 
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -270,19 +315,137 @@ void GroupGUI_GroupDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
 
-  if ( send == mySelBtn )
+  if ( send == mySelBtn ) {
     myEditCurrentArgument = myMainName;
-  else if ( (QRadioButton*)sender() == mySelSubBtn || send == mySelAllBtn )
+    myShape2Name->setText( "" );
+  }
+  else if ( /*(QRadioButton*)sender() == mySelSubBtn ||*/ send == mySelAllBtn )
     myEditCurrentArgument = 0;
+  else if ( send == mySelBtn2 || sender() == mySelectionWayGroup ) {
+    setInPlaceObj( GEOM::GEOM_Object::_nil() );
+    //if ( myPlaceCheckBox->isChecked() )
+    myShape2Name->setText( "" );
+    if ( subSelectionWay() != ALL_SUBSHAPES )
+    {
+      myEditCurrentArgument = myShape2Name;
+    }
+    else {
+      //myEditCurrentArgument = myMainName;
+      myEditCurrentArgument = 0;
+    }
+  }
 
   activateSelection();
 
-  if ( send == mySelAllBtn )
+  if ( send == mySelAllBtn ) {
+//     myShape2Name->setText( "" );
+//     myPlaceCheckBox->setChecked( false );
+//     mySelBtn2->setEnabled( false );
+//     myShape2Name->setEnabled( false );
     selectAllSubShapes();
+  }
   else
     updateState();
 }
 
+//=================================================================================
+// function : onGetInPlace()
+// purpose  :
+//=================================================================================
+void GroupGUI_GroupDlg::onGetInPlace()
+{
+  setInPlaceObj( GEOM::GEOM_Object::_nil() );
+  myEditCurrentArgument->setText( "" );
+
+  bool isBlocked = myIdList->signalsBlocked();
+  myIdList->blockSignals( true );
+  myIdList->clearSelection();
+  myIdList->blockSignals( isBlocked );
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1)
+    return;
+
+  Standard_Boolean aResult = Standard_False;
+  GEOM::GEOM_Object_var anObj =
+    GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+  if (aResult && !anObj->_is_nil() && GEOMBase::IsShape(anObj)) {
+    if (!anObj->_is_equivalent(myMainObj) && !anObj->_is_equivalent(myGroup)) {
+      SUIT_OverrideCursor wc;
+      myEditCurrentArgument->setText(GEOMBase::GetName(anObj));
+      GEOM::GEOM_IShapesOperations_var aShapesOp =
+        getGeomEngine()->GetIShapesOperations(getStudyId());
+      if ( subSelectionWay() == GET_IN_PLACE ) {
+        GEOM::GEOM_Object_var aGetInPlaceObj = aShapesOp->GetInPlace(myMainObj, anObj);
+        setInPlaceObj( aGetInPlaceObj );
+      }
+      else {
+        bool isVisible = true;
+        if ( SALOME_View* view = GEOM_Displayer::GetActiveView() )
+          isVisible = view->isVisible( aSelList.First() );
+        setInPlaceObj( anObj, isVisible );
+      }
+      myEditCurrentArgument = 0;
+      //myBusy = true; // just activate but do not select in the list
+      activateSelection();
+      //myBusy = false;
+    }
+  }
+}
+
+//=======================================================================
+//function : setInPlaceObj
+//purpose  : temporarily add an object to study and remove old InPlaceObj
+//=======================================================================
+
+void GroupGUI_GroupDlg::setInPlaceObj( GEOM::GEOM_Object_var theObj, const bool isVisible )
+{
+  if ( ! myInPlaceObj->_is_equivalent( theObj ) )
+  {
+    const char* tmpName = "__InPlaceObj__";
+    // remove old InPlaceObj
+    if ( !myInPlaceObj->_is_nil() ) {
+      if ( myInPlaceObjSelectState == GET_IN_PLACE ||
+           myInPlaceObjSelectState == SUBSHAPES_OF_INVISIBLE_SHAPE2 ) {
+        // hide temporary object or initially invisible shape 2 (issue 0014047)
+        GEOM_Displayer aDisplayer(getStudy());
+        aDisplayer.Erase( myInPlaceObj, true );
+      }
+      if (_PTR(SObject) SO = getStudy()->studyDS()->FindObject( tmpName )) {
+        getStudy()->studyDS()->NewBuilder()->RemoveObjectWithChildren( SO );
+        getGeomEngine()->RemoveObject(myInPlaceObj);
+      }
+    }
+    // publish InPlaceObj to enable localSelection(InPlaceObj)
+    if ( !theObj->_is_nil() && subSelectionWay() == GET_IN_PLACE ) {
+      SALOMEDS::Study_var aStudyDS = GeometryGUI::ClientStudyToStudy(getStudy()->studyDS());
+      SALOMEDS::SObject_var aSO =
+        getGeomEngine()->AddInStudy(aStudyDS, theObj, tmpName, myMainObj);
+    }
+    myInPlaceObj = theObj;
+  }
+  // build map of indices
+  myMain2InPlaceIndices.Clear();
+  if ( !myInPlaceObj->_is_nil() ) {
+    GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
+    GEOM::GEOM_ILocalOperations_var aLocOp = getGeomEngine()->GetILocalOperations( getStudyId() );
+
+    GEOM::ListOfGO_var aSubObjects = aShapesOp->MakeExplode( myInPlaceObj, getShapeType(), false);
+    for (int i = 0; i < aSubObjects->length(); i++)
+    {
+      CORBA::Long aMainIndex = aLocOp->GetSubShapeIndex( myMainObj, aSubObjects[i] );
+      CORBA::Long aPlaceIndex = aLocOp->GetSubShapeIndex( myInPlaceObj, aSubObjects[i] );
+      if ( aMainIndex >= 0 && aPlaceIndex > 0)
+        myMain2InPlaceIndices.Bind( aMainIndex, aPlaceIndex );
+    }
+  }
+  myInPlaceObjSelectState = subSelectionWay();
+  if ( myInPlaceObjSelectState == SUBSHAPES_OF_SHAPE2 && !isVisible )
+    myInPlaceObjSelectState = SUBSHAPES_OF_INVISIBLE_SHAPE2;
+}
 
 //=================================================================================
 // function : SelectionIntoArgument()
@@ -290,31 +453,42 @@ void GroupGUI_GroupDlg::SetEditCurrentArgument()
 //=================================================================================
 void GroupGUI_GroupDlg::SelectionIntoArgument()
 {
-  if ( myEditCurrentArgument ) {  // Selection of a main shape is active
-    myEditCurrentArgument->setText( "" );
+//   if (myPlaceCheckBox->isChecked() && myEditCurrentArgument == myShape2Name )
+  if (subSelectionWay() != ALL_SUBSHAPES && myEditCurrentArgument == myShape2Name) {
+    onGetInPlace();
+    return;
+  }
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (myEditCurrentArgument == myMainName) {  // Selection of a main shape is active
+    myEditCurrentArgument->setText("");
     myIdList->clear();
 
-    if ( IObjectCount() == 1 ) {
+    if (aSelList.Extent() == 1) {
       Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject( firstIObject(), aResult );
+       GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
 
       if ( aResult && !anObj->_is_nil() && GEOMBase::IsShape( anObj ) ) {
-        myMainObj = anObj;
-        myEditCurrentArgument->setText( GEOMBase::GetName( anObj ) );
+       myMainObj = anObj;
+       myEditCurrentArgument->setText( GEOMBase::GetName( anObj ) );
        // activate subshapes selection by default
        myEditCurrentArgument = 0;
        activateSelection();
        updateState();
-        return;
+       return;
       }
     }
 
     myMainObj = GEOM::GEOM_Object::_nil();
   }
   else { // an attempt to synchronize list box selection with 3d viewer
-    if ( myBusy )
+    if ( myBusy ) {
       return;
+    }
 
     bool isBlocked = myIdList->signalsBlocked();
     myIdList->blockSignals( true );
@@ -322,24 +496,34 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
 
     TColStd_IndexedMapOfInteger aMapIndex;
 
-    SALOME_ListIO aSelIOs;
-    SalomeApp_Application* app = myGeomGUI->getApp();
-    if (app) {
-      LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
-      if (aSelMgr) {
-        QMap<QString, TColStd_IndexedMapOfInteger> aMap;
-        aSelMgr->selectedSubOwners(aMap);
-        if (aMap.size() == 1)
-          aMapIndex = aMap.begin().data();
+    LightApp_SelectionMgr::MapEntryOfMapOfInteger aMap;
+    aSelMgr->selectedSubOwners( aMap );
+    if ( aMap.Size() == 1 )
+      aMapIndex = LightApp_SelectionMgr::MapEntryOfMapOfInteger::Iterator( aMap ).Value();
+    bool subselected = aMapIndex.Extent();
+
+    // convert inPlace indices to main indices
+    //if ( subselected && myPlaceCheckBox->isChecked() )
+    if ( subselected && subSelectionWay() != ALL_SUBSHAPES )
+    {
+      TColStd_IndexedMapOfInteger aMapIndex2;
+      
+      TColStd_DataMapIteratorOfDataMapOfIntegerInteger m2ip( myMain2InPlaceIndices );
+      for ( ; m2ip.More(); m2ip.Next() ) {
+        int inPlaceId = m2ip.Value();
+        if ( aMapIndex.Contains( inPlaceId )) {
+          aMapIndex2.Add( m2ip.Key() );
+        }
       }
+      aMapIndex = aMapIndex2;
     }
 
     // try to find out and process the object browser selection
-    if ( !aMapIndex.Extent() ) {
+    if ( !subselected ) {
       globalSelection( GEOM_ALLSHAPES );
 
       GEOM::ListOfGO anObjects;
-      GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), anObjects);
+      GEOMBase::ConvertListOfIOInListOfGO(aSelList, anObjects);
 
       GEOM::GEOM_ILocalOperations_var aLocOp = getGeomEngine()->GetILocalOperations( getStudyId() );
       GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
@@ -364,15 +548,23 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
           TopoDS_Shape aShape;
           if ( GEOMBase::GetShape(aSubObjects[i], aShape, getShapeType()) )
           {
-            CORBA::Long anIndex = aLocOp->GetSubShapeIndex( myMainObj, aSubObjects[i] );
-            if ( anIndex >= 0 )
+           CORBA::Long anIndex;
+           anIndex = aLocOp->GetSubShapeIndex( myMainObj, aSubObjects[i] );
+            if ( anIndex >= 0 ) {
+              //if ( myPlaceCheckBox->isChecked() && ! myMain2InPlaceIndices.IsBound( anIndex ))
+              if ( subSelectionWay() != ALL_SUBSHAPES &&
+                   ! myMain2InPlaceIndices.IsBound( anIndex ))
+                continue;
               aMapIndex.Add( anIndex );
+            }
           }
         }
       }
-
-      if ( !myMainObj->_is_nil() )
-        localSelection( myMainObj, getShapeType() );
+      if ( !myMainObj->_is_nil() /*&& mySelSubBtn->isChecked()*/)
+        if ( subSelectionWay() == ALL_SUBSHAPES )
+          localSelection( myMainObj, getShapeType() );
+        else if ( !myInPlaceObj->_is_nil() )
+          localSelection( myInPlaceObj, getShapeType() );
     }
 
     if (aMapIndex.Extent() >= 1) {
@@ -382,7 +574,7 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
 
       for ( int ii = 1, nn = aMapIndex.Extent(); ii <= nn; ii++ ) {
         if ( aMap.contains( aMapIndex( ii ) ) )
-          myIdList->setSelected( aMap[aMapIndex( ii )], true );
+          myIdList->item( aMap[aMapIndex( ii )])->setSelected( true );
       }
     }
     myIdList->blockSignals( isBlocked );
@@ -400,6 +592,7 @@ void GroupGUI_GroupDlg::ConstructorsClicked( int constructorId )
   myIdList->clear();
   activateSelection();
   updateState();
+  setInPlaceObj( myInPlaceObj ); // to rebuild myMain2InPlaceIndices
 }
 
 //=================================================================================
@@ -411,30 +604,48 @@ void GroupGUI_GroupDlg::selectAllSubShapes()
   if ( CORBA::is_nil( myMainObj ) )
     return;
 
-  GEOM::GEOM_IShapesOperations_var aShOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
-
-  GEOM::ListOfLong_var aSubShapes = aShOp->SubShapeAllIDs(myMainObj, getShapeType(), false);
-  if ( !aShOp->IsDone() )
-    return;
+  GEOM::ListOfLong_var aSubShapes;
+//   if ( !myPlaceCheckBox->isChecked() )
+  if ( subSelectionWay() == ALL_SUBSHAPES )
+  {
+    myIdList->clear();
+    GEOM::GEOM_IShapesOperations_var aShOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
+    aSubShapes = aShOp->SubShapeAllIDs(myMainObj, getShapeType(), false);
 
+    if ( !aShOp->IsDone() )
+      return;
+  }
+  else
+  {
+    aSubShapes = new GEOM::ListOfLong();
+    aSubShapes->length( myMain2InPlaceIndices.Extent() );
+    TColStd_DataMapIteratorOfDataMapOfIntegerInteger m2ip( myMain2InPlaceIndices );
+    for ( int i = 0; m2ip.More(); i++, m2ip.Next() )
+      aSubShapes[ i ] = m2ip.Key();
+  }
   bool isBlocked = myIdList->signalsBlocked();
   myIdList->blockSignals( true );
-  myIdList->clear();
 
-  QListBoxItem* anItem;
   for ( int i = 0, n = aSubShapes->length(); i < n; i++ ) {
     CORBA::Long anIndex = aSubShapes[i];
     if ( anIndex < 0 )
       continue;
 
-    anItem = new QListBoxText( QString( "%1" ).arg( anIndex ) );
-    myIdList->insertItem( anItem );
-    myIdList->setSelected( anItem, true );
+    QListWidgetItem* anItem = 0;
+    QString text = QString( "%1" ).arg( anIndex );
+    if ( !myInPlaceObj->_is_nil() ) {
+      QList<QListWidgetItem*> found = myIdList->findItems( text, Qt::MatchExactly );
+      if ( found.count() ) anItem = found[0];
+    }
+    if ( !anItem ) {
+      anItem = new QListWidgetItem( text );
+      myIdList->addItem( anItem );
+    }
+    anItem->setSelected( true );
   }
 
   myIdList->blockSignals( isBlocked );
   highlightSubShapes();
-  //updateState(); // already done in highlightSubShapes()
 }
 
 //=================================================================================
@@ -451,20 +662,33 @@ void GroupGUI_GroupDlg::add()
 
   SALOME_ListIO aSelIOs;
   SalomeApp_Application* app = myGeomGUI->getApp();
-  if (app) {
+  if ( app ) {
     LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
-    if (aSelMgr) {
-      QMap<QString, TColStd_IndexedMapOfInteger> aMap;
-      aSelMgr->selectedSubOwners(aMap);
-      if (aMap.size() == 1)
-        aMapIndex = aMap.begin().data();
+    if ( aSelMgr ) {
+      LightApp_SelectionMgr::MapEntryOfMapOfInteger aMap;
+      aSelMgr->selectedSubOwners( aMap );
+      if ( aMap.Size() == 1 )
+        aMapIndex = LightApp_SelectionMgr::MapEntryOfMapOfInteger::Iterator( aMap ).Value();
     }
   }
+  GEOM::ListOfGO anObjects;
+  // get selected sub-shapes of myInPlaceObj
+  if ( aMapIndex.Extent() > 0 && !myInPlaceObj->_is_nil() )
+  {
+    GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
 
-  // try to find out and process the object browser selection
-  if ( !aMapIndex.Extent() ) {
-    GEOM::ListOfGO anObjects;
-    GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), anObjects);
+    anObjects.length( aMapIndex.Extent() );
+    for ( int i = 1; i <= aMapIndex.Extent(); i++ )
+      anObjects[ i-1 ] = aShapesOp->GetSubShape( myInPlaceObj, aMapIndex( i ));
+
+    aMapIndex.Clear();
+  }
+
+  // try to find out and process the object browser selection or InPlace sub-shapes
+  if ( !aMapIndex.Extent() )
+  {
+    if ( anObjects.length() == 0 )
+      GEOMBase::ConvertListOfIOInListOfGO(aSelIOs, anObjects);
 
     GEOM::GEOM_ILocalOperations_var aLocOp = getGeomEngine()->GetILocalOperations( getStudyId() );
     GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
@@ -489,7 +713,8 @@ void GroupGUI_GroupDlg::add()
         TopoDS_Shape aShape;
         if ( GEOMBase::GetShape(aSubObjects[i], aShape, getShapeType()) )
         {
-          CORBA::Long anIndex = aLocOp->GetSubShapeIndex( myMainObj, aSubObjects[i] );
+         CORBA::Long anIndex;
+           anIndex = aLocOp->GetSubShapeIndex( myMainObj, aSubObjects[i] );
           if ( anIndex >= 0 )
             aMapIndex.Add( anIndex );
         }
@@ -498,7 +723,6 @@ void GroupGUI_GroupDlg::add()
   }
 
   if ( aMapIndex.Extent() >= 1 ) {
-    QListBoxItem* anItem;
     bool isBlocked = myIdList->signalsBlocked();
     myIdList->blockSignals( true );
 
@@ -506,9 +730,9 @@ void GroupGUI_GroupDlg::add()
       if ( aMap.Contains( aMapIndex( i ) ) )
         continue;
 
-      anItem = new QListBoxText( QString( "%1" ).arg( aMapIndex( i ) ) );
-      myIdList->insertItem( anItem );
-      myIdList->setSelected( anItem, true );
+      QListWidgetItem* anItem = new QListWidgetItem( QString( "%1" ).arg( aMapIndex( i ) ) );
+      myIdList->addItem( anItem );
+      anItem->setSelected( true );
     }
 
     myIdList->blockSignals( isBlocked );
@@ -526,24 +750,23 @@ void GroupGUI_GroupDlg::remove()
   bool isBlocked = myIdList->signalsBlocked();
   myIdList->blockSignals( true );
 
-  for ( int i = myIdList->count() - 1; i >= 0; i-- ) {
-    if ( myIdList->isSelected( i ) )
-      myIdList->removeItem( i );
-  }
+  QListIterator<QListWidgetItem*> it( myIdList->selectedItems() );
+  while ( it.hasNext() )
+    delete it.next();
 
   myIdList->blockSignals( isBlocked );
 
   highlightSubShapes();
 }
 
+//=======================================================================
+//function : subSelectionWay
+//purpose  : 
+//=======================================================================
 
-//=================================================================================
-// function : getConstructorId()
-// purpose  :
-//=================================================================================
-int GroupGUI_GroupDlg::getConstructorId() const
+int GroupGUI_GroupDlg::subSelectionWay() const
 {
-  return GroupConstructors->id( GroupConstructors->selected() );
+  return mySelectionWayGroup->checkedId();
 }
 
 //=================================================================================
@@ -574,7 +797,7 @@ void GroupGUI_GroupDlg::setShapeType( const TopAbs_ShapeEnum theType )
   case TopAbs_FACE:   anId = 2; break;
   case TopAbs_SOLID:  anId = 3; break;
   }
-  GroupConstructors->setButton( anId );
+  setConstructorId( anId );
 }
 
 
@@ -586,8 +809,13 @@ void GroupGUI_GroupDlg::activateSelection()
 {
   globalSelection( GEOM_ALLSHAPES );
 
-  if ( !myMainObj->_is_nil() && !myEditCurrentArgument ) {
-    localSelection( myMainObj, getShapeType() );
+  // local selection
+  if ( !myMainObj->_is_nil() && !myEditCurrentArgument/* && mySelSubBtn->isChecked()*/) {
+//     if ( !myPlaceCheckBox->isChecked() )
+    if ( subSelectionWay() == ALL_SUBSHAPES )
+      localSelection( myMainObj, getShapeType() );
+    else if ( !myInPlaceObj->_is_nil() )
+      localSelection( myInPlaceObj, getShapeType() );
   }
 
   SelectionIntoArgument();
@@ -605,13 +833,13 @@ void GroupGUI_GroupDlg::updateState()
 
   SALOME_ListIO aSelIOs;
   SalomeApp_Application* app = myGeomGUI->getApp();
-  if (app) {
+  if ( app ) {
     LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
-    if (aSelMgr) {
-      QMap<QString, TColStd_IndexedMapOfInteger> aMap;
-      aSelMgr->selectedSubOwners(aMap);
-      if (aMap.size() == 1)
-        aMapIndex = aMap.begin().data();
+    if ( aSelMgr ) {
+      LightApp_SelectionMgr::MapEntryOfMapOfInteger aMap;
+      aSelMgr->selectedSubOwners( aMap );
+      if ( aMap.Size() == 1 )
+        aMapIndex = LightApp_SelectionMgr::MapEntryOfMapOfInteger::Iterator( aMap ).Value();
     }
   }
 
@@ -649,7 +877,8 @@ void GroupGUI_GroupDlg::updateState()
         aSubObjects[i];
         if ( GEOMBase::GetShape(aSubObjects[i], aShape, getShapeType()) )
         {
-          CORBA::Long anIndex = aLocOp->GetSubShapeIndex( myMainObj, aSubObjects[i] );
+         CORBA::Long anIndex;
+         anIndex = aLocOp->GetSubShapeIndex( myMainObj, aSubObjects[i] );
           if ( anIndex >= 0 )
             aMapIndex.Add( anIndex );
           else
@@ -673,12 +902,19 @@ void GroupGUI_GroupDlg::updateState()
   isAdd = aMapIndex.Extent() > 0;
 
   myAddBtn->setEnabled( !myEditCurrentArgument && !CORBA::is_nil( myMainObj ) && isAdd );
-  bool hasSel = false;
-  for ( int ii = 0, nn = myIdList->count(); !hasSel && ii < nn; ii++ )
-    hasSel =  myIdList->isSelected( ii );
+  bool hasSel = myIdList->selectedItems().count() > 0;
   myRemBtn->setEnabled( hasSel );
-  mySelSubBtn->setEnabled( !CORBA::is_nil( myMainObj ) );
+  //mySelSubBtn->setEnabled( !CORBA::is_nil( myMainObj ) );
+  //myPlaceCheckBox->setEnabled( !CORBA::is_nil( myMainObj ) );
+  mySelectionWayGroupBox->setEnabled( !CORBA::is_nil( myMainObj ) );
   mySelAllBtn->setEnabled( !CORBA::is_nil( myMainObj ) );
+//   mySelBtn2->setEnabled( myPlaceCheckBox->isChecked() );
+//   myShape2Name->setEnabled( myPlaceCheckBox->isChecked() );
+  mySelBtn2->setEnabled(    subSelectionWay() != ALL_SUBSHAPES );
+  myShape2Name->setEnabled( subSelectionWay() != ALL_SUBSHAPES );
+//   if ( !myPlaceCheckBox->isChecked() )
+  if ( subSelectionWay() == ALL_SUBSHAPES )
+    setInPlaceObj( GEOM::GEOM_Object::_nil() );
 }
 
 //=================================================================================
@@ -700,7 +936,13 @@ void GroupGUI_GroupDlg::highlightSubShapes()
     return;
 
   Standard_Boolean isOk;
-  char* objIOR = GEOMBase::GetIORFromObject( myMainObj );
+  char* objIOR;
+
+  if ( myInPlaceObj->_is_nil() )
+    objIOR = GEOMBase::GetIORFromObject( myMainObj );
+  else
+    objIOR = GEOMBase::GetIORFromObject( myInPlaceObj );
+
   Handle(GEOM_AISShape) aSh = GEOMBase::ConvertIORinGEOMAISShape( objIOR, isOk, true );
   free( objIOR );
   if ( !isOk || aSh.IsNull() )
@@ -712,21 +954,32 @@ void GroupGUI_GroupDlg::highlightSubShapes()
 
   int ii = 0, nn = myIdList->count();
   for ( ; ii < nn; ii++ )
-    if ( myIdList->isSelected( ii ) )
-      anIds.Add( myIdList->item( ii )->text().toInt() );
-
+  {
+    if ( myIdList->item( ii )->isSelected() ) {
+      int id = myIdList->item( ii )->text().toInt();
+      //       if ( myPlaceCheckBox->isChecked() )
+      if ( subSelectionWay() != ALL_SUBSHAPES )
+      {
+        if ( myMain2InPlaceIndices.IsBound( id ) )
+          id = myMain2InPlaceIndices( id );
+        else {
+          myIdList->item( ii )->setSelected( false );
+          continue;
+        }
+      }
+      anIds.Add( id );
+    }
+  }
   SalomeApp_Application* app = myGeomGUI->getApp();
   LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
   aSelMgr->clearSelected();
-  //if (nn < 3000) aSelMgr->AddOrRemoveIndex(aSh->getIO(), anIds, false);
+
   aSelMgr->AddOrRemoveIndex(aSh->getIO(), anIds, false);
 
   myBusy = false;
 
-  //updateState();
-  if (nn < 3000) {
+  if (nn < 3000)
     updateState();
-  }
   else {
     myAddBtn->setEnabled( true );
     myRemBtn->setEnabled( true );
@@ -766,7 +1019,7 @@ bool GroupGUI_GroupDlg::isValid( QString& theMessage )
   }
 
   QString aName (getNewObjectName());
-  RETURN_WITH_MSG  ( !aName.stripWhiteSpace().isEmpty(), tr( "EMPTY_NAME" ) )
+  RETURN_WITH_MSG  ( !aName.trimmed().isEmpty(), tr( "EMPTY_NAME" ) )
 
   RETURN_WITH_MSG  ( myIdList->count(), tr( "EMPTY_LIST" ) )
   return true;
@@ -778,6 +1031,8 @@ bool GroupGUI_GroupDlg::isValid( QString& theMessage )
 //=================================================================================
 bool GroupGUI_GroupDlg::execute( ObjectList& objects )
 {
+  setInPlaceObj( GEOM::GEOM_Object::_nil() );
+
   GEOM::GEOM_IGroupOperations_var anOp = GEOM::GEOM_IGroupOperations::_narrow(getOperation());
 
   GEOM::GEOM_Object_var aGroup;
@@ -816,13 +1071,13 @@ bool GroupGUI_GroupDlg::execute( ObjectList& objects )
   SalomeApp_Study* study = getStudy();
   if ( study ) {
     char* objIOR = GEOMBase::GetIORFromObject( aGroup );
-    string IOR( objIOR );
+    std::string IOR( objIOR );
     free( objIOR );
     if ( IOR != "" ) {
       _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) );
       if ( SO ) {
         _PTR(StudyBuilder) aBuilder (study->studyDS()->NewBuilder());
-        aBuilder->SetName( SO, getNewObjectName() );
+        aBuilder->SetName( SO, getNewObjectName().toLatin1().constData() );
       }
     }
   }
index 98c1e604d2c0c81b92e4867e728d9400c005ed24..5edccedcdb0486cc14521b1fad76282daed53644 100644 (file)
@@ -1,41 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2004  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : GroupGUI_GroupDlg.h
+// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
 //
-//  File   : GroupGUI_GroupDlg.h
-//  Author : Sergey ANIKIN
-//  Module : GEOM
-
 #ifndef GROUPGUI_GROUPDLG_H
 #define GROUPGUI_GROUPDLG_H
 
-#include "GEOMBase_Skeleton.h"
+#include <GEOMBase_Skeleton.h>
 
 #include <TopAbs_ShapeEnum.hxx>
+#include <TColStd_DataMapOfIntegerInteger.hxx>
 
 class QGroupBox;
 class QLineEdit;
-class QListBox;
-class QRadioButton;
+class QListWidget;
+class QButtonGroup;
 
 //=================================================================================
 // class    : GroupGUI_GroupDlg
@@ -43,62 +42,71 @@ class QRadioButton;
 //=================================================================================
 class GroupGUI_GroupDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    typedef enum {
-      CreateGroup,
-      EditGroup
-    } Mode;
+  typedef enum {
+    CreateGroup,
+    EditGroup
+  } Mode;
 
-    GroupGUI_GroupDlg(Mode mode, GeometryGUI*, QWidget* parent = 0);
-    ~GroupGUI_GroupDlg();
+  GroupGUI_GroupDlg( Mode mode, GeometryGUI*, QWidget* parent = 0 );
+  ~GroupGUI_GroupDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& msg );
-    virtual bool execute( ObjectList& objects );
-    virtual GEOM::GEOM_Object_ptr getFather( GEOM::GEOM_Object_ptr theObj );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr  createOperation();
+  virtual bool                        isValid( QString& );
+  virtual bool                        execute( ObjectList& );
+  virtual GEOM::GEOM_Object_ptr       getFather( GEOM::GEOM_Object_ptr );
+  
+  void                                closeEvent( QCloseEvent* );
 
 private slots:
-    void                                ClickOnOk();
-    bool                                ClickOnApply();
-    void                                ActivateThisDialog();
-    void                                LineEditReturnPressed();
-    void                                SelectionIntoArgument();
-    void                                SetEditCurrentArgument();
-    void                                ConstructorsClicked( int constructorId );
-
-    void                                selectAllSubShapes();
-    void                                add();
-    void                                remove();
-    void                                selectionChanged();
-
+  void                                ClickOnOk();
+  bool                                ClickOnApply();
+  void                                ActivateThisDialog();
+  void                                LineEditReturnPressed();
+  void                                SelectionIntoArgument();
+  void                                SetEditCurrentArgument();
+  void                                ConstructorsClicked( int );
+  
+  void                                selectAllSubShapes();
+  void                                add();
+  void                                remove();
+  void                                selectionChanged();
+  
 private:
-    void                                Init();
-    void                                enterEvent( QEvent* e );
-    int                                 getConstructorId() const;    
-    TopAbs_ShapeEnum                    getShapeType() const;
-    void                                setShapeType( const TopAbs_ShapeEnum );
-    void                                activateSelection();
-    void                                updateState();
-    void                                highlightSubShapes();
+  void                                Init();
+  void                                enterEvent( QEvent* );
+  int                                 subSelectionWay() const;    
+  TopAbs_ShapeEnum                    getShapeType() const;
+  void                                setShapeType( const TopAbs_ShapeEnum );
+  void                                activateSelection();
+  void                                updateState();
+  void                                highlightSubShapes();
+  void                                onGetInPlace();
+  void                                setInPlaceObj( GEOM::GEOM_Object_var, const bool isVisible=1);
 
 private:
-    Mode                  myMode;
-    bool                  myBusy;
-    GEOM::GEOM_Object_var myMainObj;
-    GEOM::GEOM_Object_var myGroup;
+  Mode                                myMode;
+  bool                                myBusy;
+  GEOM::GEOM_Object_var               myMainObj;
+  GEOM::GEOM_Object_var               myGroup;
+  GEOM::GEOM_Object_var               myInPlaceObj;
+  int                                 myInPlaceObjSelectState;
+  TColStd_DataMapOfIntegerInteger     myMain2InPlaceIndices;
 
-    QGroupBox*            GroupMedium;
-    QPushButton*          mySelBtn;
-    QLineEdit*            myMainName;
-    QRadioButton*         mySelSubBtn;
-    QPushButton*          mySelAllBtn;
-    QPushButton*          myAddBtn;
-    QPushButton*          myRemBtn;
-    QListBox*             myIdList;
+  QPushButton*                        mySelBtn;
+  QLineEdit*                          myMainName;
+  QPushButton*                        mySelBtn2;
+  QLineEdit*                          myShape2Name;
+  QGroupBox*                          mySelectionWayGroupBox;
+  QButtonGroup*                       mySelectionWayGroup;
+  QPushButton*                        mySelAllBtn;
+  QPushButton*                        myAddBtn;
+  QPushButton*                        myRemBtn;
+  QListWidget*                        myIdList;
 };
 
 #endif
index 101b660f7e437fec67c9524ef6a4fc48046925c8..0a93e2c4dd3863e075936c36be8887109de3c01f 100755 (executable)
@@ -1,77 +1,75 @@
-#  GEOM BUILDGUI : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM GROUPGUI : 
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : GroupGUI
 #
-#  File   : Makefile.in
-#  Author : Sergey ANIKIN (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
 lib_LTLIBRARIES = libGroupGUI.la
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =                \
+       GroupGUI.h              \
+       GroupGUI_GroupDlg.h
 
-dist_libGroupGUI_la_SOURCES = \
-       GroupGUI.cxx \
-       GroupGUI_GroupDlg.cxx 
+dist_libGroupGUI_la_SOURCES =  \
+       GroupGUI.h              \
+       GroupGUI_GroupDlg.h     \
+       GroupGUI.cxx            \
+       GroupGUI_GroupDlg.cxx
 
-MOC_FILES = \
-       GroupGUI_moc.cxx \
+MOC_FILES =                    \
+       GroupGUI_moc.cxx        \
        GroupGUI_GroupDlg_moc.cxx 
 
-nodist_libGroupGUI_la_SOURCES= \
+nodist_libGroupGUI_la_SOURCES =        \
        $(MOC_FILES)
 
-# LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl
-
-# LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libGroupGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../DlgRef \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(srcdir)/../GEOMFiltersSelection \
-       -I$(top_builddir)/idl \
+libGroupGUI_la_CPPFLAGS =                      \
+       $(QT_INCLUDES)                          \
+       $(VTK_INCLUDES)                         \
+       $(CAS_CPPFLAGS)                         \
+       $(PYTHON_INCLUDES)                      \
+       $(BOOST_CPPFLAGS)                       \
+       $(KERNEL_CXXFLAGS)                      \
+       $(GUI_CXXFLAGS)                         \
+       $(CORBA_CXXFLAGS)                       \
+       $(CORBA_INCLUDES)                       \
+       -I$(srcdir)/../GEOMGUI                  \
+       -I$(srcdir)/../DlgRef                   \
+       -I$(srcdir)/../GEOMBase                 \
+       -I$(srcdir)/../OBJECT                   \
+       -I$(srcdir)/../GEOMClient               \
+       -I$(srcdir)/../GEOMImpl                 \
+       -I$(srcdir)/../GEOMFiltersSelection     \
+       -I$(top_builddir)/src/DlgRef            \
+       -I$(top_builddir)/idl                   \
        -I$(top_builddir)/salome_adm/unix
 
-libGroupGUI_la_LDFLAGS         = \
-       ../GEOMFiltersSelection/libGEOMFiltersSelection.la \
+libGroupGUI_la_LDFLAGS         =                                       \
+       ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \
        ../GEOMBase/libGEOMBase.la
index e4a0316509bd816b4bea91e31beedffc23e9818c..475b41db284d32f3394a6a0eacb73ddd4b798b51 100644 (file)
@@ -1,27 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       IGESExport.cxx
 // Created:    Wed May 19 14:49:45 2004
 // Author:     Pavel TELKOV
 //             <ptv@mutex.nnov.opencascade.com>
-
+//
 #include "utilities.h"
 
 #include <IGESControl_Controller.hxx>
diff --git a/src/IGESExport/IGESExport.pro b/src/IGESExport/IGESExport.pro
new file mode 100644 (file)
index 0000000..9e0e6b3
--- /dev/null
@@ -0,0 +1,49 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = IGESExport
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+STDLIB = -lstdc++
+
+CAS_LDPATH = -L$$(CASROOT)/Linux/lib
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS}
+
+LIBS += $${STDLIB} $${CAS_LDPATH} -lTKIGES $${KERNEL_LDFLAGS} -lSALOMELocalTrace 
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += IGESEXPORT_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+SOURCES  = IGESExport.cxx
index 8eb7a855dda4773cfc6a0267fe9153bd35456651..317442f8af52ba48265982692bcdedb6d42224ec 100644 (file)
@@ -1,43 +1,45 @@
-#  Copyright (C) 2003  CEA
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it 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
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
+#  Copyright (C) 2003-2007  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 : Pavel TELKOV
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
 lib_LTLIBRARIES = libIGESExport.la
 
-dist_libIGESExport_la_SOURCES = \
+dist_libIGESExport_la_SOURCES =        \
        IGESExport.cxx
 
-# additionnal information to compil and link file
-libIGESExport_la_CPPFLAGS = \
-       $(CAS_CPPFLAGS) \
+# additional information to compile and link file
+
+libIGESExport_la_CPPFLAGS =    \
+       $(CAS_CPPFLAGS)         \
        $(KERNEL_CXXFLAGS)
 
-libIGESExport_la_LDFLAGS  = \
-       $(STDLIB) \
-       $(CAS_LDPATH) -lTKIGES \
+libIGESExport_la_LDFLAGS  =    \
+       $(STDLIB)               \
+       $(CAS_LDPATH) -lTKIGES  \
        $(KERNEL_LDFLAGS) -lSALOMELocalTrace
index c5fe987cac93f5518d145cc15e108502caca7d5d..4830e774348d38e69d0c6c2ea15859e206842711 100644 (file)
@@ -1,27 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       IGESImport.cxx
 // Created:    Wed May 19 14:36:35 2004
 // Author:     Pavel TELKOV
 //             <ptv@mutex.nnov.opencascade.com>
-
+//
 #include "utilities.h"
 
 #include <IFSelect_ReturnStatus.hxx>
diff --git a/src/IGESImport/IGESImport.pro b/src/IGESImport/IGESImport.pro
new file mode 100644 (file)
index 0000000..33db636
--- /dev/null
@@ -0,0 +1,49 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = IGESImport
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+STDLIB = -lstdc++
+
+CAS_LDPATH = -L$$(CASROOT)/Linux/lib
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS}
+
+LIBS += $${STDLIB} $${CAS_LDPATH} -lTKIGES $${KERNEL_LDFLAGS} -lSALOMELocalTrace 
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += IGESIMPORT_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+SOURCES  = IGESImport.cxx
index 9675012eb8acce868da6e237962382fe4cda4f70..0252162d6474e1fa4ae16d0d806cdd1746385fbb 100644 (file)
@@ -1,43 +1,45 @@
-#  Copyright (C) 2003  CEA
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it 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
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
+#  Copyright (C) 2003-2007  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 : Pavel TELKOV
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
 lib_LTLIBRARIES = libIGESImport.la
 
-dist_libIGESImport_la_SOURCES = \
+dist_libIGESImport_la_SOURCES =        \
        IGESImport.cxx
 
-# additionnal information to compil and link file
-libIGESImport_la_CPPFLAGS = \
-       $(CAS_CPPFLAGS) \
+# additional information to compile and link file
+
+libIGESImport_la_CPPFLAGS =    \
+       $(CAS_CPPFLAGS)         \
        $(KERNEL_CXXFLAGS)
 
-libIGESImport_la_LDFLAGS  = \
-       $(STDLIB) \
-       $(CAS_LDPATH) -lTKIGES \
+libIGESImport_la_LDFLAGS  =    \
+       $(STDLIB)               \
+       $(CAS_LDPATH) -lTKIGES  \
        $(KERNEL_LDFLAGS) -lSALOMELocalTrace
index 5a9503b9453f98993e2727858404e0b779ec969e..88531e27ce9be3e8cc7b9e50168d0e46652236a6 100644 (file)
@@ -1,32 +1,49 @@
-#  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
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
+#  Copyright (C) 2003-2007  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.
 #
-#  File   : Makefile.am
-#  Author : Patrick GOLDBRONN (CEA)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header$
-
-SUBDIRS = ARCHIMEDE NMTDS NMTTools GEOMAlgo SKETCHER GEOM BREPExport BREPImport IGESExport IGESImport STEPExport STEPImport STLExport ShHealOper GEOMImpl GEOM_I GEOMClient GEOM_I_Superv GEOM_SWIG
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY 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.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : src (source files directory)
+#
+SUBDIRS = ARCHIMEDE NMTDS NMTTools GEOMAlgo SKETCHER GEOM BREPExport   \
+          BREPImport IGESExport IGESImport STEPExport STEPImport       \
+          STLExport ShHealOper GEOMImpl GEOM_I GEOMClient GEOM_I_Superv        \
+          GEOM_SWIG
 
 if GEOM_ENABLE_GUI
-  SUBDIRS+= OBJECT DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI RepairGUI MeasureGUI GroupGUI BlocksGUI GEOM_SWIG_WITHIHM
+  SUBDIRS += OBJECT DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI  \
+             DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI \
+             BooleanGUI TransformationGUI OperationGUI RepairGUI MeasureGUI    \
+             GroupGUI BlocksGUI GEOM_SWIG_WITHIHM
 endif
+
+DIST_SUBDIRS = ARCHIMEDE NMTDS NMTTools GEOMAlgo SKETCHER GEOM BREPExport      \
+               BREPImport IGESExport IGESImport STEPExport STEPImport STLExport \
+               ShHealOper GEOMImpl GEOM_I GEOMClient GEOM_I_Superv GEOM_SWIG   \
+               OBJECT DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI        \
+               DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI                \
+               BuildGUI BooleanGUI TransformationGUI OperationGUI RepairGUI    \
+               MeasureGUI GroupGUI BlocksGUI GEOM_SWIG_WITHIHM
+
+#######################################
+# Not used packages are listed below
+#######################################
+# GEOMDS NMTAlgo PARTITION
diff --git a/src/MeasureGUI/GEOM_MeasureGUI.hxx b/src/MeasureGUI/GEOM_MeasureGUI.hxx
deleted file mode 100755 (executable)
index fd447a2..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-//  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_MeasureGUI.hxx
-//  Author : Alexander A. BORODIN
-//  Module : GEOM
-
-#ifndef _GEOM_MeasureGUI_HXX_
-#define _GEOM_MeasureGUI_HXX_
-
-#ifdef WNT
- #if defined MEASUREGUI_EXPORTS
-  #if defined WIN32
-   #define GEOM_MEASUREGUI_EXPORT __declspec( dllexport )
-  #else
-   #define GEOM_MEASUREGUI_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define GEOM_MEASUREGUI_EXPORT __declspec( dllimport )
-  #else
-   #define GEOM_MEASUREGUI_EXPORT
-  #endif
- #endif
-#else
- #define GEOM_MEASUREGUI_EXPORT
-#endif
-
-#endif
index e2462292fc323abc7f993b32d8017133de9add65..3e5229249c3499ae62e0437c5e3e2a6382b72c17 100644 (file)
-#  GEOM MEASUREGUI : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM MEASUREGUI : 
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : MeasureGUI
 #
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =                                \
+       MeasureGUI.h                            \
+       MeasureGUI_Widgets.h                    \
+       MeasureGUI_Skeleton.h                   \
+       MeasureGUI_PropertiesDlg.h              \
+       MeasureGUI_CenterMassDlg.h              \
+       MeasureGUI_NormaleDlg.h                 \
+       MeasureGUI_InertiaDlg.h                 \
+       MeasureGUI_BndBoxDlg.h                  \
+       MeasureGUI_DistanceDlg.h                \
+       MeasureGUI_AngleDlg.h                   \
+       MeasureGUI_MaxToleranceDlg.h            \
+       MeasureGUI_WhatisDlg.h                  \
+       MeasureGUI_CheckShapeDlg.h              \
+       MeasureGUI_CheckCompoundOfBlocksDlg.h   \
+       MeasureGUI_PointDlg.h
 
 # Libraries targets
 lib_LTLIBRARIES = libMeasureGUI.la
 
-dist_libMeasureGUI_la_SOURCES = \
-       MeasureGUI.cxx \
-       MeasureGUI_Skeleton_QTD.cxx \
-       MeasureGUI_1Sel3LineEdit_QTD.cxx \
-       MeasureGUI_1Sel6LineEdit_QTD.cxx \
-       MeasureGUI_1Sel12LineEdit_QTD.cxx \
-       MeasureGUI_1Sel1TextView_QTD.cxx \
-       MeasureGUI_2Sel1LineEdit_QTD.cxx \
-       MeasureGUI_2Sel4LineEdit_QTD.cxx \
-       MeasureGUI_Skeleton.cxx \
-       MeasureGUI_PropertiesDlg.cxx \
-       MeasureGUI_CenterMassDlg.cxx \
-       MeasureGUI_NormaleDlg.cxx \
-       MeasureGUI_InertiaDlg.cxx \
-       MeasureGUI_BndBoxDlg.cxx \
-       MeasureGUI_DistanceDlg.cxx \
-       MeasureGUI_AngleDlg.cxx \
-       MeasureGUI_MaxToleranceDlg.cxx \
-       MeasureGUI_WhatisDlg.cxx \
-       MeasureGUI_CheckShapeDlg.cxx \
+dist_libMeasureGUI_la_SOURCES =                        \
+       MeasureGUI.cxx                          \
+       MeasureGUI_Widgets.cxx                  \
+       MeasureGUI_Skeleton.cxx                 \
+       MeasureGUI_PropertiesDlg.cxx            \
+       MeasureGUI_CenterMassDlg.cxx            \
+       MeasureGUI_NormaleDlg.cxx               \
+       MeasureGUI_InertiaDlg.cxx               \
+       MeasureGUI_BndBoxDlg.cxx                \
+       MeasureGUI_DistanceDlg.cxx              \
+       MeasureGUI_AngleDlg.cxx                 \
+       MeasureGUI_MaxToleranceDlg.cxx          \
+       MeasureGUI_WhatisDlg.cxx                \
+       MeasureGUI_CheckShapeDlg.cxx            \
        MeasureGUI_CheckCompoundOfBlocksDlg.cxx \
        MeasureGUI_PointDlg.cxx
 
-MOC_FILES = \
-       MeasureGUI_Skeleton_QTD_moc.cxx \
-       MeasureGUI_1Sel3LineEdit_QTD_moc.cxx \
-       MeasureGUI_1Sel6LineEdit_QTD_moc.cxx \
-       MeasureGUI_1Sel12LineEdit_QTD_moc.cxx \
-       MeasureGUI_1Sel1TextView_QTD_moc.cxx \
-       MeasureGUI_2Sel1LineEdit_QTD_moc.cxx \
-       MeasureGUI_2Sel4LineEdit_QTD_moc.cxx \
-       MeasureGUI_Skeleton_moc.cxx \
-       MeasureGUI_PropertiesDlg_moc.cxx \
-       MeasureGUI_CenterMassDlg_moc.cxx \
-       MeasureGUI_NormaleDlg_moc.cxx \
-       MeasureGUI_InertiaDlg_moc.cxx \
-       MeasureGUI_BndBoxDlg_moc.cxx \
-       MeasureGUI_DistanceDlg_moc.cxx \
-       MeasureGUI_AngleDlg_moc.cxx \
-       MeasureGUI_MaxToleranceDlg_moc.cxx \
-       MeasureGUI_WhatisDlg_moc.cxx \
-       MeasureGUI_CheckShapeDlg_moc.cxx \
-       MeasureGUI_CheckCompoundOfBlocksDlg_moc.cxx \
-       MeasureGUI_PointDlg_moc.cxx    
+MOC_FILES =                                            \
+       MeasureGUI_Widgets_moc.cxx                      \
+       MeasureGUI_Skeleton_moc.cxx                     \
+       MeasureGUI_PropertiesDlg_moc.cxx                \
+       MeasureGUI_CenterMassDlg_moc.cxx                \
+       MeasureGUI_NormaleDlg_moc.cxx                   \
+       MeasureGUI_InertiaDlg_moc.cxx                   \
+       MeasureGUI_BndBoxDlg_moc.cxx                    \
+       MeasureGUI_DistanceDlg_moc.cxx                  \
+       MeasureGUI_AngleDlg_moc.cxx                     \
+       MeasureGUI_MaxToleranceDlg_moc.cxx              \
+       MeasureGUI_WhatisDlg_moc.cxx                    \
+       MeasureGUI_CheckShapeDlg_moc.cxx                \
+       MeasureGUI_CheckCompoundOfBlocksDlg_moc.cxx     \
+       MeasureGUI_PointDlg_moc.cxx
 
-nodist_libMeasureGUI_la_SOURCES= \
+nodist_libMeasureGUI_la_SOURCES =                      \
        $(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
+UIC_FILES =                                            \
+       ui_MeasureGUI_1Sel12LineEdit_QTD.h              \
+       ui_MeasureGUI_1Sel1TextView1Check_QTD.h         \
+       ui_MeasureGUI_1Sel1TextView2ListBox_QTD.h       \
+       ui_MeasureGUI_1Sel1TextView_QTD.h               \
+       ui_MeasureGUI_1Sel3LineEdit_QTD.h               \
+       ui_MeasureGUI_1Sel6LineEdit_QTD.h               \
+       ui_MeasureGUI_2Sel1LineEdit_QTD.h               \
+       ui_MeasureGUI_2Sel4LineEdit_QTD.h               \
+       ui_MeasureGUI_SkeletonBox_QTD.h
 
-#LIB_SERVER_IDL =  
+BUILT_SOURCES = $(UIC_FILES)
 
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libMeasureGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../DlgRef \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(top_builddir)/idl \
+libMeasureGUI_la_CPPFLAGS =            \
+       $(QT_INCLUDES)                  \
+       $(VTK_INCLUDES)                 \
+       $(CAS_CPPFLAGS)                 \
+       $(PYTHON_INCLUDES)              \
+       $(BOOST_CPPFLAGS)               \
+       $(KERNEL_CXXFLAGS)              \
+       $(GUI_CXXFLAGS)                 \
+       $(CORBA_CXXFLAGS)               \
+       $(CORBA_INCLUDES)               \
+       -I$(srcdir)/../GEOMGUI          \
+       -I$(srcdir)/../DlgRef           \
+       -I$(srcdir)/../GEOMBase         \
+       -I$(srcdir)/../OBJECT           \
+       -I$(srcdir)/../GEOMClient       \
+       -I$(srcdir)/../GEOMImpl         \
+       -I$(srcdir)/../GEOM             \
+       -I$(top_builddir)/src/DlgRef    \
+       -I$(top_builddir)/idl           \
        -I$(top_builddir)/salome_adm/unix
 
-libMeasureGUI_la_LDFLAGS  = \
+libMeasureGUI_la_LDFLAGS  =            \
        ../GEOMBase/libGEOMBase.la
 
index 84571cf769f95d984818de17a00abdcb9cc80ceb..a240d7562abbcd72791a228a3490923c76cce137 100644 (file)
@@ -1,37 +1,33 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : MeasureGUI.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "MeasureGUI.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
 
-#include "SalomeApp_Tools.h"
-#include "SalomeApp_Application.h"
+#include <GeometryGUI.h>
+#include <SUIT_Desktop.h>
+#include <SalomeApp_Application.h>
 
 #include "MeasureGUI_PropertiesDlg.h"    // Method PROPERTIES
 #include "MeasureGUI_CenterMassDlg.h"    // Method CENTER MASS
@@ -46,6 +42,8 @@
 #include "MeasureGUI_CheckCompoundOfBlocksDlg.h" // Method CHECKCOMPOUND
 #include "MeasureGUI_PointDlg.h"         // Method POINTCOORDINATES
 
+#include <QApplication>
+
 //=======================================================================
 // function : MeasureGUI()
 // purpose  : Constructor
@@ -74,24 +72,52 @@ bool MeasureGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 
   getGeometryGUI()->EmitSignalDeactivateDialog();
 
-  switch ( theCommandID )
-  {
-    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 704 : new MeasureGUI_NormaleDlg     (getGeometryGUI(), parent); break; // NORMALE
-    case 7041: new MeasureGUI_BndBoxDlg      (getGeometryGUI(), parent); break; // BOUNDING BOX
-    case 7042: new MeasureGUI_DistanceDlg    (getGeometryGUI(), parent); break; // MIN DISTANCE
-    case 7043: new MeasureGUI_AngleDlg       (getGeometryGUI(), parent); break; // ANGLE
-    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: 
-      app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); 
-      break;
+  QDialog* dlg = 0;
+  switch ( theCommandID ) {
+  case 701:
+    dlg = new MeasureGUI_PropertiesDlg( getGeometryGUI(), parent );
+    break; // LENGTH, AREA AND VOLUME
+  case 702:
+    dlg = new MeasureGUI_CenterMassDlg( getGeometryGUI(), parent );
+    break; // CENTER MASS
+  case 703:
+    dlg = new MeasureGUI_InertiaDlg( getGeometryGUI(), parent );
+    break; // INERTIA
+  case 704 : 
+    dlg = new MeasureGUI_NormaleDlg( getGeometryGUI(), parent );
+    break; // NORMALE
+  case 7041:
+    dlg = new MeasureGUI_BndBoxDlg( getGeometryGUI(), parent );
+    break; // BOUNDING BOX
+  case 7042:
+    dlg = new MeasureGUI_DistanceDlg( getGeometryGUI(), parent );
+    break; // MIN DISTANCE
+  case 7043: 
+    dlg = new MeasureGUI_AngleDlg( getGeometryGUI(), parent );
+    break; // ANGLE
+  case 705: 
+    dlg = new MeasureGUI_MaxToleranceDlg( getGeometryGUI(), parent );
+    break; // MAXTOLERANCE
+  case 706:
+    dlg = new MeasureGUI_WhatisDlg( getGeometryGUI(), parent );
+    break; // WHATIS
+  case 707:
+    dlg = new MeasureGUI_CheckShapeDlg( getGeometryGUI(), parent );
+    break; // CHECKSHAPE
+  case 7072:
+    dlg = new MeasureGUI_CheckCompoundOfBlocksDlg( getGeometryGUI(), parent );
+    break; // CHECKCOMPOUND
+  case 708:
+    dlg = new MeasureGUI_PointDlg( getGeometryGUI(), parent );
+    break; // POINT COORDINATES
+  default: 
+    app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); 
+    break;
+  }
+  if ( dlg ) {
+    dlg->updateGeometry();
+    dlg->resize( dlg->minimumSizeHint() );
+    dlg->show();
   }
   return true;
 }
@@ -102,7 +128,9 @@ bool MeasureGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 //=====================================================================================
 extern "C"
 {
-GEOM_MEASUREGUI_EXPORT
+#ifdef WIN32
+  __declspec( dllexport )
+#endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
     return new MeasureGUI( parent );
index 295c3a742312b803d429e7a2fb574a0b12fc1611..71d34a71b6654e8672e123f9445dc9562af25e29 100644 (file)
@@ -1,48 +1,44 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : MeasureGUI.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
 #ifndef MEASUREGUI_H
 #define MEASUREGUI_H
 
-#include "GEOM_MeasureGUI.hxx"
-
-#include "GEOMGUI.h"
+#include <GEOMGUI.h>
 
 //=================================================================================
 // class    : MeasureGUI
 // purpose  :
 //=================================================================================
-class GEOM_MEASUREGUI_EXPORT MeasureGUI : public GEOMGUI
+class MeasureGUI : public GEOMGUI
 {
 public:
-  MeasureGUI( GeometryGUI* parent ); 
+  MeasureGUI( GeometryGUI* ); 
   ~MeasureGUI();
 
-  bool OnGUIEvent( int , SUIT_Desktop* );
+  bool OnGUIEvent( int, SUIT_Desktop* );
 };
 
-#endif
+#endif // MEASUREGUI_H
diff --git a/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.cxx b/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.cxx
deleted file mode 100644 (file)
index a8c11ca..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'MeasureGUI_1Sel12LineEdit_QTD.ui'
-**
-** Created: mar oct 28 16:11:14 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "MeasureGUI_1Sel12LineEdit_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a MeasureGUI_1Sel12LineEdit_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-MeasureGUI_1Sel12LineEdit_QTD::MeasureGUI_1Sel12LineEdit_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "MeasureGUI_1Sel12LineEdit_QTD" );
-    resize( 131, 171 ); 
-    setCaption( trUtf8( "MeasureGUI_1Sel12LineEdit_QTD" ) );
-    MeasureGUI_1Sel12LineEdit_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "MeasureGUI_1Sel12LineEdit_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupBox1->sizePolicy().hasHeightForWidth() ) );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    LineEdit12 = new QLineEdit( GroupBox1, "LineEdit12" );
-
-    Layout2->addWidget( LineEdit12, 0, 2 );
-
-    LineEdit11 = new QLineEdit( GroupBox1, "LineEdit11" );
-
-    Layout2->addWidget( LineEdit11, 0, 1 );
-
-    LineEdit42 = new QLineEdit( GroupBox1, "LineEdit42" );
-
-    Layout2->addWidget( LineEdit42, 3, 2 );
-
-    TextLabel5 = new QLabel( GroupBox1, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-    TextLabel5->setText( trUtf8( "TL5" ) );
-
-    Layout2->addWidget( TextLabel5, 3, 0 );
-
-    LineEdit31 = new QLineEdit( GroupBox1, "LineEdit31" );
-
-    Layout2->addWidget( LineEdit31, 2, 1 );
-
-    LineEdit41 = new QLineEdit( GroupBox1, "LineEdit41" );
-
-    Layout2->addWidget( LineEdit41, 3, 1 );
-
-    LineEdit23 = new QLineEdit( GroupBox1, "LineEdit23" );
-
-    Layout2->addWidget( LineEdit23, 1, 3 );
-
-    LineEdit33 = new QLineEdit( GroupBox1, "LineEdit33" );
-
-    Layout2->addWidget( LineEdit33, 2, 3 );
-
-    LineEdit43 = new QLineEdit( GroupBox1, "LineEdit43" );
-
-    Layout2->addWidget( LineEdit43, 3, 3 );
-
-    LineEdit22 = new QLineEdit( GroupBox1, "LineEdit22" );
-
-    Layout2->addWidget( LineEdit22, 1, 2 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout2->addWidget( TextLabel2, 0, 0 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout2->addWidget( TextLabel4, 2, 0 );
-
-    LineEdit13 = new QLineEdit( GroupBox1, "LineEdit13" );
-
-    Layout2->addWidget( LineEdit13, 0, 3 );
-
-    LineEdit32 = new QLineEdit( GroupBox1, "LineEdit32" );
-
-    Layout2->addWidget( LineEdit32, 2, 2 );
-
-    LineEdit21 = new QLineEdit( GroupBox1, "LineEdit21" );
-
-    Layout2->addWidget( LineEdit21, 1, 1 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout2->addWidget( TextLabel3, 1, 0 );
-
-    Layout1->addMultiCellLayout( Layout2, 1, 1, 0, 2 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 40, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 2, 2 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    MeasureGUI_1Sel12LineEdit_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-MeasureGUI_1Sel12LineEdit_QTD::~MeasureGUI_1Sel12LineEdit_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.h b/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.h
deleted file mode 100644 (file)
index 92462c9..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'MeasureGUI_1Sel12LineEdit_QTD.ui'
-**
-** Created: mar oct 28 16:11:14 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef MEASUREGUI_1SEL12LINEEDIT_QTD_H
-#define MEASUREGUI_1SEL12LINEEDIT_QTD_H
-
-#include "GEOM_MeasureGUI.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_1Sel12LineEdit_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    MeasureGUI_1Sel12LineEdit_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~MeasureGUI_1Sel12LineEdit_QTD();
-
-    QGroupBox* GroupBox1;
-    QLineEdit* LineEdit12;
-    QLineEdit* LineEdit11;
-    QLineEdit* LineEdit42;
-    QLabel* TextLabel5;
-    QLineEdit* LineEdit31;
-    QLineEdit* LineEdit41;
-    QLineEdit* LineEdit23;
-    QLineEdit* LineEdit33;
-    QLineEdit* LineEdit43;
-    QLineEdit* LineEdit22;
-    QLabel* TextLabel2;
-    QLabel* TextLabel4;
-    QLineEdit* LineEdit13;
-    QLineEdit* LineEdit32;
-    QLineEdit* LineEdit21;
-    QLabel* TextLabel3;
-    QLineEdit* LineEdit1;
-    QPushButton* PushButton1;
-    QLabel* TextLabel1;
-
-
-protected:
-    QGridLayout* MeasureGUI_1Sel12LineEdit_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QGridLayout* Layout2;
-};
-
-#endif // MEASUREGUI_1SEL12LINEEDIT_QTD_H
diff --git a/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.ui b/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.ui
new file mode 100644 (file)
index 0000000..7ad9f5c
--- /dev/null
@@ -0,0 +1,197 @@
+<ui version="4.0" >
+ <class>MeasureGUI_1Sel12LineEdit_QTD</class>
+ <widget class="QWidget" name="MeasureGUI_1Sel12LineEdit_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>196</width>
+    <height>162</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" >
+        <property name="minimumSize" >
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="3" >
+       <layout class="QGridLayout" >
+        <property name="leftMargin" >
+         <number>0</number>
+        </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>6</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>6</number>
+        </property>
+        <item row="2" column="2" >
+         <widget class="QLineEdit" name="LineEdit32" />
+        </item>
+        <item row="1" column="2" >
+         <widget class="QLineEdit" name="LineEdit22" />
+        </item>
+        <item row="0" column="0" >
+         <widget class="QLabel" name="TextLabel2" >
+          <property name="text" >
+           <string>TL2</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" >
+         <widget class="QLineEdit" name="LineEdit11" />
+        </item>
+        <item row="2" column="0" >
+         <widget class="QLabel" name="TextLabel4" >
+          <property name="text" >
+           <string>TL4</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1" >
+         <widget class="QLineEdit" name="LineEdit21" />
+        </item>
+        <item row="1" column="3" >
+         <widget class="QLineEdit" name="LineEdit23" />
+        </item>
+        <item row="2" column="1" >
+         <widget class="QLineEdit" name="LineEdit31" />
+        </item>
+        <item row="3" column="1" >
+         <widget class="QLineEdit" name="LineEdit41" />
+        </item>
+        <item row="3" column="3" >
+         <widget class="QLineEdit" name="LineEdit43" />
+        </item>
+        <item row="0" column="3" >
+         <widget class="QLineEdit" name="LineEdit13" />
+        </item>
+        <item row="3" column="0" >
+         <widget class="QLabel" name="TextLabel5" >
+          <property name="text" >
+           <string>TL5</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="2" >
+         <widget class="QLineEdit" name="LineEdit42" />
+        </item>
+        <item row="0" column="2" >
+         <widget class="QLineEdit" name="LineEdit12" />
+        </item>
+        <item row="2" column="3" >
+         <widget class="QLineEdit" name="LineEdit33" />
+        </item>
+        <item row="1" column="0" >
+         <widget class="QLabel" name="TextLabel3" >
+          <property name="text" >
+           <string>TL3</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>LineEdit11</tabstop>
+  <tabstop>LineEdit12</tabstop>
+  <tabstop>LineEdit13</tabstop>
+  <tabstop>LineEdit21</tabstop>
+  <tabstop>LineEdit22</tabstop>
+  <tabstop>LineEdit23</tabstop>
+  <tabstop>LineEdit31</tabstop>
+  <tabstop>LineEdit32</tabstop>
+  <tabstop>LineEdit33</tabstop>
+  <tabstop>LineEdit41</tabstop>
+  <tabstop>LineEdit42</tabstop>
+  <tabstop>LineEdit43</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/MeasureGUI/MeasureGUI_1Sel1TextView1Check_QTD.ui b/src/MeasureGUI/MeasureGUI_1Sel1TextView1Check_QTD.ui
new file mode 100644 (file)
index 0000000..3070500
--- /dev/null
@@ -0,0 +1,92 @@
+<ui version="4.0" >
+ <class>MeasureGUI_1Sel1TextView1Check_QTD</class>
+ <widget class="QWidget" name="MeasureGUI_1Sel1TextView1Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>322</width>
+    <height>253</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="0" colspan="3" >
+       <widget class="QTextBrowser" name="TextView1" >
+        <property name="minimumSize" >
+         <size>
+          <width>300</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckBox1" >
+        <property name="text" >
+         <string>Check also geometry</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>TextView1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/MeasureGUI/MeasureGUI_1Sel1TextView2ListBox_QTD.ui b/src/MeasureGUI/MeasureGUI_1Sel1TextView2ListBox_QTD.ui
new file mode 100644 (file)
index 0000000..eb01d02
--- /dev/null
@@ -0,0 +1,123 @@
+<ui version="4.0" >
+ <class>MeasureGUI_1Sel1TextView2ListBox_QTD</class>
+ <widget class="QWidget" name="MeasureGUI_1Sel1TextView2ListBox_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>235</width>
+    <height>274</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="3" column="2" >
+       <widget class="QListWidget" name="ListBox2" />
+      </item>
+      <item row="3" column="0" colspan="2" >
+       <widget class="QListWidget" name="ListBox1" />
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" >
+        <property name="minimumSize" >
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="3" >
+       <widget class="QTextBrowser" name="TextView1" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>TextView1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.cxx b/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.cxx
deleted file mode 100644 (file)
index c812dad..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'MeasureGUI_1Sel1TextView_QTD.ui'
-**
-** Created: mar oct 28 14:01:15 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "MeasureGUI_1Sel1TextView_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qtextedit.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a MeasureGUI_1Sel1TextView_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-MeasureGUI_1Sel1TextView_QTD::MeasureGUI_1Sel1TextView_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "MeasureGUI_1Sel1TextView_QTD" );
-    resize( 130, 160 ); 
-    setCaption( trUtf8( "MeasureGUI_1Sel1TextView_QTD" ) );
-    MeasureGUI_1Sel1TextView_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "MeasureGUI_1Sel1TextView_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupBox1->sizePolicy().hasHeightForWidth() ) );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    TextEdit1 = new QTextEdit( GroupBox1, "TextEdit1" );
-
-    Layout1->addMultiCellWidget( TextEdit1, 1, 1, 0, 2 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    MeasureGUI_1Sel1TextView_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-MeasureGUI_1Sel1TextView_QTD::~MeasureGUI_1Sel1TextView_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.h b/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.h
deleted file mode 100644 (file)
index 749da70..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'MeasureGUI_1Sel1TextView_QTD.ui'
-**
-** Created: mar oct 28 14:01:14 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef MEASUREGUI_1SEL1TEXTVIEW_QTD_H
-#define MEASUREGUI_1SEL1TEXTVIEW_QTD_H
-
-#include "GEOM_MeasureGUI.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QTextEdit;
-
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_1Sel1TextView_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    MeasureGUI_1Sel1TextView_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~MeasureGUI_1Sel1TextView_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel1;
-    QTextEdit* TextEdit1;
-    QLineEdit* LineEdit1;
-    QPushButton* PushButton1;
-
-
-protected:
-    QGridLayout* MeasureGUI_1Sel1TextView_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-};
-
-#endif // MEASUREGUI_1SEL1TEXTVIEW_QTD_H
diff --git a/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.ui b/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.ui
new file mode 100644 (file)
index 0000000..a5849b6
--- /dev/null
@@ -0,0 +1,103 @@
+<ui version="4.0" >
+ <class>MeasureGUI_1Sel1TextView_QTD</class>
+ <widget class="QWidget" name="MeasureGUI_1Sel1TextView_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>196</width>
+    <height>148</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" >
+        <property name="minimumSize" >
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="3" >
+       <widget class="QTextBrowser" name="TextView1" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>TextView1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.cxx b/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.cxx
deleted file mode 100644 (file)
index fe73bf1..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'MeasureGUI_1Sel3LineEdit_QTD.ui'
-**
-** Created: mar oct 28 16:11:13 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "MeasureGUI_1Sel3LineEdit_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a MeasureGUI_1Sel3LineEdit_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-MeasureGUI_1Sel3LineEdit_QTD::MeasureGUI_1Sel3LineEdit_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "MeasureGUI_1Sel3LineEdit_QTD" );
-    resize( 129, 141 ); 
-    setCaption( trUtf8( "MeasureGUI_1Sel3LineEdit_QTD" ) );
-    MeasureGUI_1Sel3LineEdit_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "MeasureGUI_1Sel3LineEdit_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupBox1->sizePolicy().hasHeightForWidth() ) );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout2->addWidget( TextLabel1, 0, 0 );
-
-    LineEdit4 = new QLineEdit( GroupBox1, "LineEdit4" );
-
-    Layout2->addMultiCellWidget( LineEdit4, 3, 3, 1, 2 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout2->addWidget( TextLabel3, 2, 0 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout2->addMultiCellWidget( LineEdit2, 1, 1, 1, 2 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 80, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout2->addItem( spacer, 4, 2 );
-
-    LineEdit3 = new QLineEdit( GroupBox1, "LineEdit3" );
-
-    Layout2->addMultiCellWidget( LineEdit3, 2, 2, 1, 2 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout2->addWidget( LineEdit1, 0, 2 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout2->addWidget( TextLabel4, 3, 0 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout2->addWidget( TextLabel2, 1, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout2->addWidget( PushButton1, 0, 1 );
-
-    GroupBox1Layout->addLayout( Layout2, 0, 0 );
-
-    MeasureGUI_1Sel3LineEdit_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-MeasureGUI_1Sel3LineEdit_QTD::~MeasureGUI_1Sel3LineEdit_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.h b/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.h
deleted file mode 100644 (file)
index 5bd97c8..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'MeasureGUI_1Sel3LineEdit_QTD.ui'
-**
-** Created: mar oct 28 16:11:13 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef MEASUREGUI_1SEL3LINEEDIT_QTD_H
-#define MEASUREGUI_1SEL3LINEEDIT_QTD_H
-
-#include "GEOM_MeasureGUI.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_1Sel3LineEdit_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    MeasureGUI_1Sel3LineEdit_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~MeasureGUI_1Sel3LineEdit_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel1;
-    QLineEdit* LineEdit4;
-    QLabel* TextLabel3;
-    QLineEdit* LineEdit2;
-    QLineEdit* LineEdit3;
-    QLineEdit* LineEdit1;
-    QLabel* TextLabel4;
-    QLabel* TextLabel2;
-    QPushButton* PushButton1;
-
-
-protected:
-    QGridLayout* MeasureGUI_1Sel3LineEdit_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout2;
-};
-
-#endif // MEASUREGUI_1SEL3LINEEDIT_QTD_H
diff --git a/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.ui b/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.ui
new file mode 100644 (file)
index 0000000..020dc0a
--- /dev/null
@@ -0,0 +1,132 @@
+<ui version="4.0" >
+ <class>MeasureGUI_1Sel3LineEdit_QTD</class>
+ <widget class="QWidget" name="MeasureGUI_1Sel3LineEdit_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>196</width>
+    <height>132</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="3" column="1" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit4" />
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit3" />
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" >
+        <property name="minimumSize" >
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>LineEdit3</tabstop>
+  <tabstop>LineEdit4</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.cxx b/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.cxx
deleted file mode 100644 (file)
index 88629b6..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'MeasureGUI_1Sel6LineEdit_QTD.ui'
-**
-** Created: mar oct 28 16:11:14 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "MeasureGUI_1Sel6LineEdit_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a MeasureGUI_1Sel6LineEdit_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-MeasureGUI_1Sel6LineEdit_QTD::MeasureGUI_1Sel6LineEdit_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "MeasureGUI_1Sel6LineEdit_QTD" );
-    resize( 129, 163 ); 
-    setCaption( trUtf8( "MeasureGUI_1Sel6LineEdit_QTD" ) );
-    MeasureGUI_1Sel6LineEdit_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "MeasureGUI_1Sel6LineEdit_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupBox1->sizePolicy().hasHeightForWidth() ) );
-    GroupBox1->setTitle( trUtf8( "" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-    QSpacerItem* spacer = new QSpacerItem( 0, 50, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 2, 2 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    LineEdit22 = new QLineEdit( GroupBox1, "LineEdit22" );
-
-    Layout2->addWidget( LineEdit22, 2, 2 );
-
-    LineEdit32 = new QLineEdit( GroupBox1, "LineEdit32" );
-
-    Layout2->addWidget( LineEdit32, 3, 2 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout2->addWidget( TextLabel4, 1, 0 );
-
-    LineEdit31 = new QLineEdit( GroupBox1, "LineEdit31" );
-
-    Layout2->addWidget( LineEdit31, 3, 1 );
-
-    TextLabel5 = new QLabel( GroupBox1, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-    TextLabel5->setText( trUtf8( "TL5" ) );
-
-    Layout2->addWidget( TextLabel5, 2, 0 );
-
-    LineEdit11 = new QLineEdit( GroupBox1, "LineEdit11" );
-
-    Layout2->addWidget( LineEdit11, 1, 1 );
-
-    TextLabel6 = new QLabel( GroupBox1, "TextLabel6" );
-    TextLabel6->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel6->sizePolicy().hasHeightForWidth() ) );
-    TextLabel6->setText( trUtf8( "TL6" ) );
-
-    Layout2->addWidget( TextLabel6, 3, 0 );
-
-    LineEdit12 = new QLineEdit( GroupBox1, "LineEdit12" );
-
-    Layout2->addWidget( LineEdit12, 1, 2 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout2->addWidget( TextLabel2, 0, 1 );
-
-    LineEdit21 = new QLineEdit( GroupBox1, "LineEdit21" );
-
-    Layout2->addWidget( LineEdit21, 2, 1 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout2->addWidget( TextLabel3, 0, 2 );
-
-    Layout1->addMultiCellLayout( Layout2, 1, 1, 0, 2 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    MeasureGUI_1Sel6LineEdit_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-MeasureGUI_1Sel6LineEdit_QTD::~MeasureGUI_1Sel6LineEdit_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
diff --git a/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.h b/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.h
deleted file mode 100644 (file)
index 6805664..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'MeasureGUI_1Sel6LineEdit_QTD.ui'
-**
-** Created: mar oct 28 16:11:13 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef MEASUREGUI_1SEL6LINEEDIT_QTD_H
-#define MEASUREGUI_1SEL6LINEEDIT_QTD_H
-
-#include "GEOM_MeasureGUI.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_1Sel6LineEdit_QTD : public QWidget
-{ 
-    Q_OBJECT
-
-public:
-    MeasureGUI_1Sel6LineEdit_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~MeasureGUI_1Sel6LineEdit_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel1;
-    QLineEdit* LineEdit22;
-    QLineEdit* LineEdit32;
-    QLabel* TextLabel4;
-    QLineEdit* LineEdit31;
-    QLabel* TextLabel5;
-    QLineEdit* LineEdit11;
-    QLabel* TextLabel6;
-    QLineEdit* LineEdit12;
-    QLabel* TextLabel2;
-    QLineEdit* LineEdit21;
-    QLabel* TextLabel3;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit1;
-
-
-protected:
-    QGridLayout* MeasureGUI_1Sel6LineEdit_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QGridLayout* Layout2;
-};
-
-#endif // MEASUREGUI_1SEL6LINEEDIT_QTD_H
diff --git a/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.ui b/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.ui
new file mode 100644 (file)
index 0000000..8b05a51
--- /dev/null
@@ -0,0 +1,180 @@
+<ui version="4.0" >
+ <class>MeasureGUI_1Sel6LineEdit_QTD</class>
+ <widget class="QWidget" name="MeasureGUI_1Sel6LineEdit_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>196</width>
+    <height>160</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="1" column="0" colspan="3" >
+       <layout class="QGridLayout" >
+        <property name="leftMargin" >
+         <number>0</number>
+        </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
+        <property name="horizontalSpacing" >
+         <number>6</number>
+        </property>
+        <property name="verticalSpacing" >
+         <number>6</number>
+        </property>
+        <item row="1" column="1" >
+         <widget class="QLineEdit" name="LineEdit11" />
+        </item>
+        <item row="2" column="2" >
+         <widget class="QLineEdit" name="LineEdit22" />
+        </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="TextLabel2" >
+          <property name="text" >
+           <string>TL2</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1" >
+         <widget class="QLineEdit" name="LineEdit21" />
+        </item>
+        <item row="1" column="2" >
+         <widget class="QLineEdit" name="LineEdit12" />
+        </item>
+        <item row="3" column="2" >
+         <widget class="QLineEdit" name="LineEdit32" />
+        </item>
+        <item row="1" column="0" >
+         <widget class="QLabel" name="TextLabel4" >
+          <property name="text" >
+           <string>TL4</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2" >
+         <widget class="QLabel" name="TextLabel3" >
+          <property name="text" >
+           <string>TL3</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0" >
+         <widget class="QLabel" name="TextLabel6" >
+          <property name="text" >
+           <string>TL6</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0" >
+         <widget class="QLabel" name="TextLabel5" >
+          <property name="text" >
+           <string>TL5</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1" >
+         <widget class="QLineEdit" name="LineEdit31" />
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" >
+        <property name="minimumSize" >
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>LineEdit11</tabstop>
+  <tabstop>LineEdit12</tabstop>
+  <tabstop>LineEdit21</tabstop>
+  <tabstop>LineEdit22</tabstop>
+  <tabstop>LineEdit31</tabstop>
+  <tabstop>LineEdit32</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.cxx b/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.cxx
deleted file mode 100644 (file)
index ad4fba9..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-** Form implementation generated from reading ui file 'MeasureGUI_2Sel1LineEdit_QTD.ui'
-**
-** Created: Tue Oct 9 14:45:59 2007
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#include "MeasureGUI_2Sel1LineEdit_QTD.h"
-
-#include <qvariant.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/*
- *  Constructs a MeasureGUI_2Sel1LineEdit_QTD as a child of 'parent', with the
- *  name 'name' and widget flags set to 'f'.
- */
-MeasureGUI_2Sel1LineEdit_QTD::MeasureGUI_2Sel1LineEdit_QTD( QWidget* parent, const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "MeasureGUI_2Sel1LineEdit_QTD" );
-    MeasureGUI_2Sel1LineEdit_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "MeasureGUI_2Sel1LineEdit_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupBox1->sizePolicy().hasHeightForWidth() ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel3, 2, 0 );
-
-    LineEdit3 = new QLineEdit( GroupBox1, "LineEdit3" );
-
-    Layout1->addMultiCellWidget( LineEdit3, 2, 2, 1, 2 );
-    Spacer8 = new QSpacerItem( 0, 60, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( Spacer8, 3, 2 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    MeasureGUI_2Sel1LineEdit_QTDLayout->addWidget( GroupBox1, 0, 0 );
-    languageChange();
-    resize( QSize(129, 115).expandedTo(minimumSizeHint()) );
-    clearWState( WState_Polished );
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-MeasureGUI_2Sel1LineEdit_QTD::~MeasureGUI_2Sel1LineEdit_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_2Sel1LineEdit_QTD::languageChange()
-{
-}
-
diff --git a/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.h b/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.h
deleted file mode 100644 (file)
index d0adf8e..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-** Form interface generated from reading ui file 'MeasureGUI_2Sel1LineEdit_QTD.ui'
-**
-** Created: Tue Oct 9 14:45:55 2007
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#ifndef MEASUREGUI_2SEL1LINEEDIT_QTD_H
-#define MEASUREGUI_2SEL1LINEEDIT_QTD_H
-
-#include "GEOM_MeasureGUI.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QSpacerItem;
-class QGroupBox;
-class QLabel;
-class QPushButton;
-class QLineEdit;
-
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_2Sel1LineEdit_QTD : public QWidget
-{
-    Q_OBJECT
-
-public:
-    MeasureGUI_2Sel1LineEdit_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~MeasureGUI_2Sel1LineEdit_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel1;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit1;
-    QLabel* TextLabel2;
-    QPushButton* PushButton2;
-    QLineEdit* LineEdit2;
-    QLabel* TextLabel3;
-    QLineEdit* LineEdit3;
-
-protected:
-    QGridLayout* MeasureGUI_2Sel1LineEdit_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QSpacerItem* Spacer8;
-
-protected slots:
-    virtual void languageChange();
-
-};
-
-#endif // MEASUREGUI_2SEL1LINEEDIT_QTD_H
diff --git a/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.ui b/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.ui
new file mode 100644 (file)
index 0000000..b618716
--- /dev/null
@@ -0,0 +1,142 @@
+<ui version="4.0" >
+ <class>MeasureGUI_2Sel1LineEdit_QTD</class>
+ <widget class="QWidget" name="MeasureGUI_2Sel1LineEdit_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>196</width>
+    <height>108</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
+       <number>9</number>
+      </property>
+      <property name="topMargin" >
+       <number>9</number>
+      </property>
+      <property name="rightMargin" >
+       <number>9</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>9</number>
+      </property>
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit3" />
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" >
+        <property name="minimumSize" >
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" >
+        <property name="minimumSize" >
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>LineEdit3</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/MeasureGUI/MeasureGUI_2Sel4LineEdit_QTD.cxx b/src/MeasureGUI/MeasureGUI_2Sel4LineEdit_QTD.cxx
deleted file mode 100644 (file)
index 3c5563c..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-/****************************************************************************
-** Form implementation generated from reading ui file 'MeasureGUI_2Sel4LineEdit_QTD.ui'
-**
-** Created: Tue Oct 9 14:32:18 2007
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#include "MeasureGUI_2Sel4LineEdit_QTD.h"
-
-#include <qvariant.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/*
- *  Constructs a MeasureGUI_2Sel4LineEdit_QTD as a child of 'parent', with the
- *  name 'name' and widget flags set to 'f'.
- */
-MeasureGUI_2Sel4LineEdit_QTD::MeasureGUI_2Sel4LineEdit_QTD( QWidget* parent, const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "MeasureGUI_2Sel4LineEdit_QTD" );
-    MeasureGUI_2Sel4LineEdit_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "MeasureGUI_2Sel4LineEdit_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupBox1->sizePolicy().hasHeightForWidth() ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    PushButton2 = new QPushButton( GroupBox1, "PushButton2" );
-    PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( PushButton2, 1, 1 );
-
-    LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" );
-
-    Layout1->addWidget( LineEdit2, 1, 2 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel3, 2, 0 );
-
-    LineEdit3 = new QLineEdit( GroupBox1, "LineEdit3" );
-
-    Layout1->addMultiCellWidget( LineEdit3, 2, 2, 1, 2 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel4, 3, 0 );
-
-    LineEdit4 = new QLineEdit( GroupBox1, "LineEdit4" );
-
-    Layout1->addMultiCellWidget( LineEdit4, 3, 3, 1, 2 );
-
-    TextLabel5 = new QLabel( GroupBox1, "TextLabel5" );
-    TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel5, 4, 0 );
-
-    LineEdit5 = new QLineEdit( GroupBox1, "LineEdit5" );
-
-    Layout1->addMultiCellWidget( LineEdit5, 4, 4, 1, 2 );
-
-    TextLabel6 = new QLabel( GroupBox1, "TextLabel6" );
-    TextLabel6->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel6->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( TextLabel6, 5, 0 );
-
-    LineEdit6 = new QLineEdit( GroupBox1, "LineEdit6" );
-
-    Layout1->addMultiCellWidget( LineEdit6, 5, 5, 1, 2 );
-    Spacer8 = new QSpacerItem( 0, 60, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( Spacer8, 6, 2 );
-
-    GroupBox1Layout->addLayout( Layout1, 0, 0 );
-
-    MeasureGUI_2Sel4LineEdit_QTDLayout->addWidget( GroupBox1, 0, 0 );
-    languageChange();
-    resize( QSize(129, 163).expandedTo(minimumSizeHint()) );
-    clearWState( WState_Polished );
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-MeasureGUI_2Sel4LineEdit_QTD::~MeasureGUI_2Sel4LineEdit_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_2Sel4LineEdit_QTD::languageChange()
-{
-}
-
diff --git a/src/MeasureGUI/MeasureGUI_2Sel4LineEdit_QTD.h b/src/MeasureGUI/MeasureGUI_2Sel4LineEdit_QTD.h
deleted file mode 100644 (file)
index 0378ca3..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-** Form interface generated from reading ui file 'MeasureGUI_2Sel4LineEdit_QTD.ui'
-**
-** Created: Tue Oct 9 14:31:27 2007
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#ifndef MEASUREGUI_2SEL4LINEEDIT_QTD_H
-#define MEASUREGUI_2SEL4LINEEDIT_QTD_H
-
-#include "GEOM_MeasureGUI.hxx"
-
-#include <qvariant.h>
-#include <qwidget.h>
-
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QSpacerItem;
-class QGroupBox;
-class QLabel;
-class QPushButton;
-class QLineEdit;
-
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_2Sel4LineEdit_QTD : public QWidget
-{
-    Q_OBJECT
-
-public:
-    MeasureGUI_2Sel4LineEdit_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~MeasureGUI_2Sel4LineEdit_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel1;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit1;
-    QLabel* TextLabel2;
-    QPushButton* PushButton2;
-    QLineEdit* LineEdit2;
-    QLabel* TextLabel3;
-    QLineEdit* LineEdit3;
-    QLabel* TextLabel4;
-    QLineEdit* LineEdit4;
-    QLabel* TextLabel5;
-    QLineEdit* LineEdit5;
-    QLabel* TextLabel6;
-    QLineEdit* LineEdit6;
-
-protected:
-    QGridLayout* MeasureGUI_2Sel4LineEdit_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout1;
-    QSpacerItem* Spacer8;
-
-protected slots:
-    virtual void languageChange();
-
-};
-
-#endif // MEASUREGUI_2SEL4LINEEDIT_QTD_H
diff --git a/src/MeasureGUI/MeasureGUI_2Sel4LineEdit_QTD.ui b/src/MeasureGUI/MeasureGUI_2Sel4LineEdit_QTD.ui
new file mode 100644 (file)
index 0000000..d63fb5a
--- /dev/null
@@ -0,0 +1,189 @@
+<ui version="4.0" >
+ <class>MeasureGUI_2Sel4LineEdit_QTD</class>
+ <widget class="QWidget" name="MeasureGUI_2Sel4LineEdit_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>198</width>
+    <height>197</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupBox1" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" >
+        <property name="minimumSize" >
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" >
+        <property name="minimumSize" >
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit3" />
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="TextLabel4" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit4" />
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="TextLabel5" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL5</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit5" />
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="TextLabel6" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL6</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1" colspan="2" >
+       <widget class="QLineEdit" name="LineEdit6" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
index de13dd70b45305e71bb6b080a39e325d4e1ef369..6c6cff6482eae7a6ed1c0b55858107fa7df83039 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//
-//
+// GEOM GEOMGUI : GUI for Geometry component
 //  File   : MeasureGUI_AngleDlg.cxx
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-//  $Header$
-
+//  Author : Julia DOROVSKIKH, Open CASCADE S.A.S.
+//
 #include "MeasureGUI_AngleDlg.h"
-
-#include "MeasureGUI_2Sel1LineEdit_QTD.h"
-
-#include "GEOMBase.h"
-#include "GEOM_Displayer.h"
-#include "DlgRef_SpinBox.h"
-#include "GeometryGUI.h"
-
-#include "SUIT_Session.h"
-#include "SUIT_ViewWindow.h"
-#include "SUIT_MessageBox.h"
-#include "SOCC_Prs.h"
-#include "SOCC_ViewModel.h"
-#include "SalomeApp_Tools.h"
-#include "SalomeApp_Application.h"
+#include "MeasureGUI_Widgets.h"
+
+#include <DlgRef.h>
+#include <GEOMBase.h>
+#include <GeometryGUI.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_ViewManager.h>
+#include <SOCC_Prs.h>
+#include <SOCC_ViewModel.h>
+#include <SalomeApp_Tools.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <AIS_AngleDimension.hxx>
@@ -55,6 +54,7 @@
 #include <Geom_Plane.hxx>
 #include <gce_MakePln.hxx>
 #include <Precision.hxx>
+#include <AIS.hxx>
 
 // QT Includes
 #include <qlineedit.h>
 //            TRUE to construct a modal dialog.
 //=================================================================================
 MeasureGUI_AngleDlg::MeasureGUI_AngleDlg (GeometryGUI* GUI, QWidget* parent)
-  : MeasureGUI_Skeleton(GUI, parent, "MeasureGUI_AngleDlg")
+  : MeasureGUI_Skeleton(GUI, parent)
 {
-  QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_ANGLE")));
-  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_ANGLE")));
+  QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_MEASURE_ANGLE_TITLE"));
+  setWindowTitle(tr("GEOM_MEASURE_ANGLE_TITLE"));
 
-  // Widgets
+  /***************************************************************/
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_MEASURE_ANGLE_ANGLE"));
+  mainFrame()->RadioButton1->setIcon(image0);
 
-  GroupConstructors->setTitle(tr("GEOM_MEASURE_ANGLE_ANGLE"));
-  RadioButton1->setPixmap(image0);
-
-  myGrp = new MeasureGUI_2Sel1LineEdit_QTD(this, "myGrp");
+  myGrp = new MeasureGUI_2Sel1LineEdit(centralWidget());
   myGrp->GroupBox1->setTitle(tr("GEOM_MEASURE_ANGLE_OBJ"));
   myGrp->TextLabel1->setText(tr("GEOM_OBJECT_I").arg("1"));
   myGrp->TextLabel2->setText(tr("GEOM_OBJECT_I").arg("2"));
   myGrp->TextLabel3->setText(tr("GEOM_MEASURE_ANGLE_IS"));
-  myGrp->LineEdit3->setReadOnly(TRUE);
-  myGrp->PushButton1->setPixmap(image1);
-  myGrp->PushButton2->setPixmap(image1);
+  myGrp->LineEdit3->setReadOnly(true);
+  myGrp->PushButton1->setIcon(image1);
+  myGrp->PushButton2->setIcon(image1);
   myGrp->LineEdit1->setReadOnly(true);
   myGrp->LineEdit2->setReadOnly(true);
 
-  Layout1->addWidget(myGrp, 1, 0);
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(myGrp);
+  /***************************************************************/
 
   // Help page reference
   myHelpFileName = "using_measurement_tools_page.html#angle_anchor";
@@ -125,6 +128,11 @@ MeasureGUI_AngleDlg::~MeasureGUI_AngleDlg()
 //=================================================================================
 void MeasureGUI_AngleDlg::Init()
 {
+  // init variables
+  myGrp->LineEdit1->setText("");
+  myGrp->LineEdit2->setText("");
+  myObj = myObj2 = GEOM::GEOM_Object::_nil();
+
   mySelBtn   = myGrp->PushButton1;
   mySelEdit  = myGrp->LineEdit1;
   mySelBtn2  = myGrp->PushButton2;
@@ -132,31 +140,49 @@ void MeasureGUI_AngleDlg::Init()
 
   myEditCurrentArgument = mySelEdit;
 
+  // signals and slots connections
   connect(mySelEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(mySelBtn2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(mySelBtn2,  SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
 
   globalSelection(GEOM_LINE);
   MeasureGUI_Skeleton::Init();
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection has changed
 //=================================================================================
 void MeasureGUI_AngleDlg::SelectionIntoArgument()
 {
-  Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult);
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
 
-  if (!testResult)
-    aSelectedObject = GEOM::GEOM_Object::_nil();
+  GEOM::GEOM_Object_var aSelectedObject = GEOM::GEOM_Object::_nil();
 
-  if (myEditCurrentArgument == mySelEdit)
+  if (aSelList.Extent() > 0) {
+    Standard_Boolean testResult = Standard_False;
+    aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    if (!testResult)
+      aSelectedObject = GEOM::GEOM_Object::_nil();
+  }
+
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  if (myEditCurrentArgument == mySelEdit) {
     myObj = aSelectedObject;
-  else
+    if (!myObj->_is_nil() && myObj2->_is_nil())
+      myGrp->PushButton2->click();
+  }
+  else {
     myObj2 = aSelectedObject;
+    if (!myObj2->_is_nil() && myObj->_is_nil())
+      myGrp->PushButton1->click();
+  }
 
   processObject();
 }
@@ -171,13 +197,11 @@ void MeasureGUI_AngleDlg::processObject()
   myGrp->LineEdit2->setText(!myObj2->_is_nil() ? GEOMBase::GetName(myObj2) : "");
 
   double anAngle = 0.;
-  if (getParameters(anAngle))
-  {
-    myGrp->LineEdit3->setText(DlgRef_SpinBox::PrintDoubleValue(anAngle));
+  if (getParameters(anAngle)) {
+    myGrp->LineEdit3->setText(DlgRef::PrintDoubleValue(anAngle));
     redisplayPreview();
   }
-  else
-  {
+  else {
     myGrp->LineEdit3->setText("");
     erasePreview();
   }
@@ -202,10 +226,9 @@ bool MeasureGUI_AngleDlg::getParameters (double& theAngle)
     bool isDone = getOperation()->IsDone();
     if (!isDone) {
       CORBA::String_var aMsg = getOperation()->GetErrorCode();
-      SUIT_MessageBox::warn1((QWidget*)myGeomGUI->getApp()->desktop(),
-                             QObject::tr("WRN_WARNING"),
-                             QObject::tr(aMsg.in()),
-                             QObject::tr("BUT_OK"));
+      SUIT_MessageBox::warning(this,
+                               QObject::tr("WRN_WARNING"),
+                               QObject::tr(aMsg.in()));
     }
     return isDone;
   }
@@ -221,17 +244,32 @@ void MeasureGUI_AngleDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
 
-  if (send == mySelBtn) {
-    mySelEdit->setFocus();
-    myEditCurrentArgument = mySelEdit;
+  if (send == myGrp->PushButton1) {
+    myEditCurrentArgument = myGrp->LineEdit1;
+
+    myGrp->PushButton2->setDown(false);
+    myGrp->LineEdit2->setEnabled(false);
   }
   else {
-    mySelEdit2->setFocus();
-    myEditCurrentArgument = mySelEdit2;
+    myEditCurrentArgument = myGrp->LineEdit2;
+
+    myGrp->PushButton1->setDown(false);
+    myGrp->LineEdit1->setEnabled(false);
   }
 
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
   globalSelection(GEOM_LINE);
-  SelectionIntoArgument();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
+  myEditCurrentArgument->setFocus();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  redisplayPreview();
 }
 
 //=================================================================================
@@ -247,7 +285,11 @@ void MeasureGUI_AngleDlg::LineEditReturnPressed()
   else
     myEditCurrentArgument = mySelEdit2;
 
-  if (GEOMBase::SelectionByNameInDialogs(this, mySelEdit->text(), selectedIO()))
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (GEOMBase::SelectionByNameInDialogs(this, mySelEdit->text(), aSelList))
     mySelEdit->setText(mySelEdit->text());
 }
 
@@ -262,20 +304,17 @@ SALOME_Prs* MeasureGUI_AngleDlg::buildPrs()
   SUIT_ViewWindow* vw = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
 
   if (myObj->_is_nil() || myObj2->_is_nil() || !getParameters(anAngle) ||
-      vw->getViewManager()->getType() != OCCViewer_Viewer::Type())
+       vw->getViewManager()->getType() != OCCViewer_Viewer::Type())
     return 0;
 
-  if (anAngle > Precision::Angular())
-  {
-    try
-    {
+  if (anAngle > Precision::Angular()) {
+    try {
 #if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
       OCC_CATCH_SIGNALS;
 #endif
       TopoDS_Shape S1, S2;
       if (GEOMBase::GetShape(myObj , S1, TopAbs_EDGE) &&
-          GEOMBase::GetShape(myObj2, S2, TopAbs_EDGE))
-      {
+           GEOMBase::GetShape(myObj2, S2, TopAbs_EDGE)) {
         TopoDS_Edge anEdge1 = TopoDS::Edge(S1);
         TopoDS_Edge anEdge2 = TopoDS::Edge(S2);
 
@@ -303,7 +342,7 @@ SALOME_Prs* MeasureGUI_AngleDlg::buildPrs()
         //    *P21
         gp_Pnt aP3 (aP22.XYZ() + aP11.XYZ() - aP21.XYZ());
 
-        gce_MakePln gce_MP (aP11, aP12, aP3);
+        gce_MakePln gce_MP(aP11, aP12, aP3);
         Handle(Geom_Plane) aPlane = new Geom_Plane(gce_MP.Value());
 
         // Build the angle dimension presentation
@@ -312,7 +351,32 @@ SALOME_Prs* MeasureGUI_AngleDlg::buildPrs()
 
         Handle(AIS_AngleDimension) anIO = new AIS_AngleDimension
           (anEdge1, anEdge2, aPlane, anAngle * PI180,
-           TCollection_ExtendedString((Standard_CString)aLabel.latin1()));
+            TCollection_ExtendedString((Standard_CString)aLabel.toLatin1().data()));
+        Handle(Geom_Line) geom_lin1,geom_lin2;
+        gp_Pnt ptat11,ptat12,ptat21,ptat22;
+        Standard_Boolean isInfinite1,isInfinite2;
+        Handle(Geom_Curve) extCurv;
+        Standard_Integer extShape;
+        if (AIS::ComputeGeometry(anEdge1,
+                                  anEdge2,
+                                  extShape,
+                                  geom_lin1,
+                                  geom_lin2,
+                                  ptat11,
+                                  ptat12,
+                                  ptat21,
+                                  ptat22,
+                                  extCurv,
+                                  isInfinite1,
+                                  isInfinite2,
+                                  aPlane)) {
+          Standard_Real arrSize1 = anIO->ArrowSize();
+          Standard_Real arrSize2 = anIO->ArrowSize();
+          if (!isInfinite1) arrSize1 = ptat11.Distance(ptat12)/10.;
+          if (!isInfinite2) arrSize2 = ptat21.Distance(ptat22)/10.;
+          Standard_Real arrowSize = Max(arrSize1,arrSize2);
+          anIO->SetArrowSize(arrowSize);
+        }
 
         SOCC_Prs* aPrs =
           dynamic_cast<SOCC_Prs*>(((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0));
@@ -323,8 +387,7 @@ SALOME_Prs* MeasureGUI_AngleDlg::buildPrs()
         return aPrs;
       }
     }
-    catch(Standard_Failure)
-    {
+    catch(Standard_Failure) {
     }
   }
 
@@ -335,7 +398,7 @@ SALOME_Prs* MeasureGUI_AngleDlg::buildPrs()
 // function : isValid()
 // purpose  :
 //=================================================================================
-bool MeasureGUI_AngleDlg::isValid(QString& msg)
+bool MeasureGUI_AngleDlg::isValid (QString& msg)
 {
   return MeasureGUI_Skeleton::isValid(msg) && !myObj2->_is_nil();
 }
index 0ef32abc449b3289649e6991651c057d86c2d89b..ae9de088c4f3a94e8aba1820ed8008de3c406e24 100644 (file)
@@ -1,49 +1,45 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : MeasureGUI_AngleDlg.h
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-
-#ifndef DIALOGBOX_ANGLE_H
-#define DIALOGBOX_ANGLE_H
-
-#include "GEOM_MeasureGUI.hxx"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_AngleDlg.h
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S.
+//
+#ifndef MEASUREGUI_ANGLEDLG_H
+#define MEASUREGUI_ANGLEDLG_H
 
 #include "MeasureGUI_Skeleton.h"
 
-class MeasureGUI_2Sel1LineEdit_QTD;
+class MeasureGUI_2Sel1LineEdit;
 
 //=================================================================================
 // class    : MeasureGUI_AngleDlg
 // purpose  :
 //=================================================================================
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_AngleDlg : public MeasureGUI_Skeleton
+class MeasureGUI_AngleDlg : public MeasureGUI_Skeleton
 { 
   Q_OBJECT
 
 public:
-  MeasureGUI_AngleDlg (GeometryGUI* GUI, QWidget* parent);
+  MeasureGUI_AngleDlg( GeometryGUI*, QWidget* );
   ~MeasureGUI_AngleDlg();
 
 protected:
@@ -53,19 +49,19 @@ protected:
   virtual void                  SelectionIntoArgument();
   virtual void                  LineEditReturnPressed();
   virtual void                  SetEditCurrentArgument();
-  virtual bool                  isValid (QString& msg);
+  virtual bool                  isValid( QString& );
 
 private:
   void                          Init();
-  bool                          getParameters (double& theAngle);
+  bool                          getParameters( double& );
 
 private:
   QLineEdit*                    myEditCurrentArgument;
   QLineEdit*                    mySelEdit2;
   QPushButton*                  mySelBtn2;
-  MeasureGUI_2Sel1LineEdit_QTD* myGrp;
+  MeasureGUI_2Sel1LineEdit*     myGrp;
 
   GEOM::GEOM_Object_var         myObj2;
 };
 
-#endif // DIALOGBOX_ANGLE_H
+#endif // MEASUREGUI_ANGLEDLG_H
index 7023827cdea0cccf03dd2777ea864f08a8e1fed2..a3d718caf04e012e06827f688769794c3a4ff916 100644 (file)
@@ -1,73 +1,78 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_BndBoxDlg.cxx
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
 //
-//  File   : MeasureGUI_BndBoxDlg.cxx
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
-
 #include "MeasureGUI_BndBoxDlg.h"
-#include "MeasureGUI_1Sel6LineEdit_QTD.h"
+#include "MeasureGUI_Widgets.h"
 
-#include "GEOMBase.h"
-#include "GEOM_Displayer.h"
+#include <GEOMBase.h>
 
-#include <BRepPrimAPI_MakeBox.hxx>
+#include <GEOM_Function.hxx>
+#include <GEOM_Object.hxx>
 
-#include "utilities.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Tools.h"
-
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <BRepPrimAPI_MakeBox.hxx>
+#include <BRepAdaptor_Surface.hxx>
+#include <BRep_Tool.hxx>
+#include <BRep_TFace.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopExp_Explorer.hxx>
+
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Tools.h>
+
+// #include <qlineedit.h>
+// #include <qlabel.h>
+// #include <qlayout.h>
+// #include <qpushbutton.h>
+// #include <qradiobutton.h>
+// #include <qbuttongroup.h>
 
 //=================================================================================
 // class    : MeasureGUI_BndBoxDlg()
 // purpose  : Constructs a MeasureGUI_BndBoxDlg which is 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.
+//            true to construct a modal dialog.
 //=================================================================================
 MeasureGUI_BndBoxDlg::MeasureGUI_BndBoxDlg( GeometryGUI* GUI, QWidget* parent )
-: MeasureGUI_Skeleton( GUI, parent, "MeasureGUI_PropertiesDlg" )
+  : MeasureGUI_Skeleton( GUI, parent )
 {
   QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap(
-    "GEOM",tr( "ICON_DLG_BOUNDING_BOX" ) ) );
+    "GEOM", tr( "ICON_DLG_BOUNDING_BOX" ) ) );
   QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap(
-    "GEOM",tr( "ICON_SELECT" ) ) );
+    "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption( tr( "GEOM_BNDBOX_TITLE" ) );
+  setWindowTitle( tr( "GEOM_BNDBOX_TITLE" ) );
 
   /***************************************************************/
   
-  GroupConstructors->setTitle( tr( "GEOM_BNDBOX" ) );
-  RadioButton1->setPixmap( image0 );
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_BNDBOX" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
 
-  myGrp = new MeasureGUI_1Sel6LineEdit_QTD( this, "myGrp" );
+  myGrp = new MeasureGUI_1Sel6LineEdit( centralWidget() );
   myGrp->GroupBox1->setTitle( tr( "GEOM_BNDBOX_OBJDIM" ) );
   myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) );
   myGrp->TextLabel2->setText( tr( "GEOM_MIN" ) );
@@ -75,16 +80,18 @@ MeasureGUI_BndBoxDlg::MeasureGUI_BndBoxDlg( GeometryGUI* GUI, QWidget* parent )
   myGrp->TextLabel4->setText( tr( "GEOM_X" ) );
   myGrp->TextLabel5->setText( tr( "GEOM_Y" ) );
   myGrp->TextLabel6->setText( tr( "GEOM_Z" ) );
-  myGrp->LineEdit11->setReadOnly( TRUE );
-  myGrp->LineEdit12->setReadOnly( TRUE );
-  myGrp->LineEdit21->setReadOnly( TRUE );
-  myGrp->LineEdit22->setReadOnly( TRUE );
-  myGrp->LineEdit31->setReadOnly( TRUE );
-  myGrp->LineEdit32->setReadOnly( TRUE );
-  myGrp->PushButton1->setPixmap( image1 );
+  myGrp->LineEdit11->setReadOnly( true );
+  myGrp->LineEdit12->setReadOnly( true );
+  myGrp->LineEdit21->setReadOnly( true );
+  myGrp->LineEdit22->setReadOnly( true );
+  myGrp->LineEdit31->setReadOnly( true );
+  myGrp->LineEdit32->setReadOnly( true );
+  myGrp->PushButton1->setIcon( image1 );
   myGrp->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget( myGrp, 1, 0 );
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( myGrp );
   
   /***************************************************************/
 
@@ -123,8 +130,7 @@ void MeasureGUI_BndBoxDlg::processObject()
 {
   double aXMin, aXMax, aYMin, aYMax, aZMin, aZMax;
 
-  if ( !getParameters( aXMin, aXMax, aYMin, aYMax, aZMin, aZMax ) )
-  {
+  if ( !getParameters( aXMin, aXMax, aYMin, aYMax, aZMin, aZMax ) ) {
     mySelEdit->setText( "" );
     myGrp->LineEdit11->setText( "" );
     myGrp->LineEdit12->setText( "" );
@@ -133,9 +139,7 @@ void MeasureGUI_BndBoxDlg::processObject()
     myGrp->LineEdit31->setText( "" );
     myGrp->LineEdit32->setText( "" );
   }
-  else
-  {
-    
+  else {
     myGrp->LineEdit11->setText( tr( "%1" ).arg( aXMin, 12, 'f', 6 ) );
     myGrp->LineEdit12->setText( tr( "%1" ).arg( aXMax, 12, 'f', 6 ) );
 
@@ -157,15 +161,68 @@ bool MeasureGUI_BndBoxDlg::getParameters( double& theXmin, double& theXmax,
 {
   if ( myObj->_is_nil() )
     return false;
-  else
-  {
-    try
-    {
+  else {
+    try {
+      Handle(Poly_Triangulation) Trtn = 0; 
+
+      Handle(GEOM_Object) anObject = GEOM_Engine::GetEngine()->GetObject(myObj->GetStudyID(), myObj->GetEntry());
+      if (!anObject.IsNull())
+      {
+       Handle(GEOM_Function) aRefShape = anObject->GetLastFunction();
+       if (!aRefShape.IsNull())
+       {
+         TopoDS_Shape aShape = aRefShape->GetValue();
+         if (!aShape.IsNull())
+         {
+           TopLoc_Location l;
+           Handle(Poly_Triangulation) T;
+           TopExp_Explorer ex;
+           for (ex.Init(aShape,TopAbs_FACE); ex.More(); ex.Next()) {
+             const TopoDS_Face& F = TopoDS::Face(ex.Current());
+             
+             BRepAdaptor_Surface surf(F);
+             if (surf.GetType() == GeomAbs_Sphere)
+             {
+               T = BRep_Tool::Triangulation(F, l);
+               if (!T.IsNull()) {
+                 Handle(Poly_Triangulation) NullTrtn = 0;
+                 (*((Handle(BRep_TFace)*)&F.TShape()))->Triangulation(NullTrtn);
+                 Trtn = T;
+                 break;
+               }
+             }
+             else
+               break;
+           }
+         }
+       }
+      }
+
       GEOM::GEOM_IMeasureOperations::_narrow( getOperation() )->GetBoundingBox(
         myObj, theXmin, theXmax, theYmin, theYmax, theZmin, theZmax );
+      
+      if (!Trtn.IsNull())
+      {
+       Handle(GEOM_Function) aRefShape = anObject->GetLastFunction();
+       if (!aRefShape.IsNull())
+       {
+         TopoDS_Shape aShape = aRefShape->GetValue();
+         if (!aShape.IsNull())
+         {
+           TopLoc_Location l;
+           Handle(Poly_Triangulation) T;
+           TopExp_Explorer ex;
+           for (ex.Init(aShape,TopAbs_FACE); ex.More(); ex.Next()) {
+             const TopoDS_Face& F = TopoDS::Face(ex.Current());
+             (*((Handle(BRep_TFace)*)&F.TShape()))->Triangulation(Trtn);
+             break;
+           }
+         }
+       }
+      }
+
     }
-    catch( const SALOME::SALOME_Exception& e )
-    {
+    catch( const SALOME::SALOME_Exception& e ) {
       SalomeApp_Tools::QtCatchCorbaException( e );
       return false;
     }
index cd563a115b3593cd71d802db32b0338da9cab68c..9d12e3de670cfcf4787863e80927f91367abfe3d 100644 (file)
@@ -1,65 +1,60 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : MeasureGUI_BndBoxDlg.h
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_BNDBOX_H
-#define DIALOGBOX_BNDBOX_H
-
-#include "GEOM_MeasureGUI.hxx"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_BndBoxDlg.h
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
+//
+#ifndef MEASUREGUI_BNDBOXDLG_H
+#define MEASUREGUI_BNDBOXDLG_H
 
 #include "MeasureGUI_Skeleton.h"
 
-class MeasureGUI_1Sel6LineEdit_QTD;
+class MeasureGUI_1Sel6LineEdit;
 
 //=================================================================================
 // class    : DialogBox_PROPERTIES
 // purpose  :
 //=================================================================================
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_BndBoxDlg : public MeasureGUI_Skeleton
+class MeasureGUI_BndBoxDlg : public MeasureGUI_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    MeasureGUI_BndBoxDlg(GeometryGUI* GUI,
-                        QWidget*     parent);
-    ~MeasureGUI_BndBoxDlg();
+  MeasureGUI_BndBoxDlg( GeometryGUI*, QWidget* );
+  ~MeasureGUI_BndBoxDlg();
 
 protected:
-    // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
-    virtual void                        processObject();
-    virtual SALOME_Prs*                 buildPrs();
+  // 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 );
+  void                                Init();
+  bool                                getParameters( double&, double&,
+                                                    double&, double&,
+                                                    double&, double& );
 
 private:
-    MeasureGUI_1Sel6LineEdit_QTD*       myGrp;
+  MeasureGUI_1Sel6LineEdit*           myGrp;
 };
 
-#endif // DIALOGBOX_BNDBOX_H
+#endif // MEASUREGUI_BNDBOXDLG_H
index 77fa1e87241b0cfe6f5b12c052746769f99f4eda..fe3a2c06fd0d3b0a973e4c92f6fe076d5b2d1f19 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_CenterMassDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//
-//  File   : MeasureGUI_CenterMassDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "MeasureGUI_CenterMassDlg.h"
-#include "MeasureGUI_1Sel3LineEdit_QTD.h"
+#include "MeasureGUI_Widgets.h"
+
+#include <DlgRef.h>
+#include <GEOMBase.h>
 
-#include "DlgRef_SpinBox.h"
+#include <GeometryGUI.h>
 
-#include "utilities.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SalomeApp_Tools.h"
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <SalomeApp_Tools.h>
 
 #include <BRep_Tool.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS.hxx>
 #include <gp_Pnt.hxx>
 
-#include <qlabel.h>
-
 //=================================================================================
 // class    : MeasureGUI_CenterMassDlg()
 // purpose  : Constructs a MeasureGUI_CenterMassDlg which is 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.
+//            true to construct a modal dialog.
 //=================================================================================
 MeasureGUI_CenterMassDlg::MeasureGUI_CenterMassDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
-  : GEOMBase_Skeleton(theGeometryGUI, parent, "MeasureGUI_CenterMassDlg", false,
-                      WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+  : GEOMBase_Skeleton( theGeometryGUI, parent, false )
 {
-  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" ) );
+  setWindowTitle( tr( "GEOM_CMASS_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle( tr( "GEOM_CMASS" ) );
-  RadioButton1->setPixmap( image0 );
-  RadioButton2->close( TRUE );
-  RadioButton3->close( TRUE );
-
-  myGrp = new MeasureGUI_1Sel3LineEdit_QTD( this, "myGrp" );
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_CMASS" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  myGrp = new MeasureGUI_1Sel3LineEdit( centralWidget() );
   myGrp->GroupBox1->setTitle( tr( "GEOM_CENTER" ) );
   myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) );
   myGrp->TextLabel2->setText( tr( "GEOM_X" ) );
   myGrp->TextLabel3->setText( tr( "GEOM_Y" ) );
   myGrp->TextLabel4->setText( tr( "GEOM_Z" ) );
-  myGrp->LineEdit2->setReadOnly( TRUE );
-  myGrp->LineEdit3->setReadOnly( TRUE );
-  myGrp->LineEdit4->setReadOnly( TRUE );
-  myGrp->PushButton1->setPixmap( image1 );
+  myGrp->LineEdit2->setReadOnly( true );
+  myGrp->LineEdit3->setReadOnly( true );
+  myGrp->LineEdit4->setReadOnly( true );
+  myGrp->PushButton1->setIcon( image1 );
   myGrp->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget( myGrp, 2, 0 );
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( myGrp );
+
   /***************************************************************/
 
   myHelpFileName = "using_measurement_tools_page.html#center_mass_anchor";
@@ -107,22 +109,18 @@ void MeasureGUI_CenterMassDlg::Init()
   myEditCurrentArgument = myGrp->LineEdit1;
 
    /* signals and slots connections */
-  connect( buttonOk, SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
-  connect( buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+  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( myGrp->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( myGrp->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   initName( tr( "GEOM_POINT") );
   globalSelection();
   SelectionIntoArgument();
-
-  /* displays Dialog */
-  myGrp->show();
-  this->show();
 }
 
 
@@ -162,18 +160,20 @@ void MeasureGUI_CenterMassDlg::SelectionIntoArgument()
   erasePreview();
   myObj = GEOM::GEOM_Object::_nil();
 
-  if ( IObjectCount() != 1 )
-  {
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
     processObject();
     return;
   }
 
   Standard_Boolean testResult = Standard_False;
   GEOM::GEOM_Object_var aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
+    GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
-  if ( !testResult || aSelectedObject->_is_nil() )
-  {
+  if (!testResult || aSelectedObject->_is_nil()) {
     processObject();
     return;
   }
@@ -183,7 +183,6 @@ void MeasureGUI_CenterMassDlg::SelectionIntoArgument()
   displayPreview();
 }
 
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -203,8 +202,7 @@ void MeasureGUI_CenterMassDlg::SetEditCurrentArgument()
 void MeasureGUI_CenterMassDlg::LineEditReturnPressed()
 {
   QLineEdit* send = ( QLineEdit* )sender();
-  if ( send == myGrp->LineEdit1 )
-  {
+  if ( send == myGrp->LineEdit1 ) {
     myEditCurrentArgument = myGrp->LineEdit1;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
@@ -219,8 +217,8 @@ void MeasureGUI_CenterMassDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 
+          SIGNAL(currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   globalSelection();
   displayPreview();
@@ -232,24 +230,22 @@ void MeasureGUI_CenterMassDlg::ActivateThisDialog()
 //=================================================================================
 void MeasureGUI_CenterMassDlg::processObject()
 {
-  if ( myObj->_is_nil() )
-  {
+  if ( myObj->_is_nil() ) {
     myGrp->LineEdit1->setText( "" );
     myGrp->LineEdit2->setText( "" );
     myGrp->LineEdit3->setText( "" );
     myGrp->LineEdit4->setText( "" );
     erasePreview();
   }
-  else
-  {
+  else {
     double x = 0, y = 0, z = 0;
     
     getParameters( x, y, z );
     
     myGrp->LineEdit1->setText( GEOMBase::GetName( myObj ) );
-    myGrp->LineEdit2->setText( DlgRef_SpinBox::PrintDoubleValue( x ) );
-    myGrp->LineEdit3->setText( DlgRef_SpinBox::PrintDoubleValue( y ) );
-    myGrp->LineEdit4->setText( DlgRef_SpinBox::PrintDoubleValue( z ) );
+    myGrp->LineEdit2->setText( DlgRef::PrintDoubleValue( x ) );
+    myGrp->LineEdit3->setText( DlgRef::PrintDoubleValue( y ) );
+    myGrp->LineEdit4->setText( DlgRef::PrintDoubleValue( z ) );
 
     displayPreview();
   }
@@ -260,9 +256,9 @@ void MeasureGUI_CenterMassDlg::processObject()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void MeasureGUI_CenterMassDlg::enterEvent( QEvent* )
+void MeasureGUI_CenterMassDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
@@ -292,10 +288,8 @@ bool MeasureGUI_CenterMassDlg::getParameters( double& theX, double& theY, double
 {
   if ( myObj->_is_nil() )
     return false;
-  else
-  {
-    try
-    {
+  else {
+    try {
       GEOM::GEOM_Object_var anObj;
       anObj = GEOM::GEOM_IMeasureOperations::_narrow( getOperation() )->GetCentreOfMass( myObj );
       if ( !getOperation()->IsDone() )
@@ -317,8 +311,7 @@ bool MeasureGUI_CenterMassDlg::getParameters( double& theX, double& theY, double
 
       return true;
     }
-    catch( const SALOME::SALOME_Exception& e )
-    {
+    catch( const SALOME::SALOME_Exception& e ) {
       SalomeApp_Tools::QtCatchCorbaException( e );
       return false;
     }
index 943aee4c3fd4784b99768a702538065756bb07d4..4de61e99a02d8b0e09de99a6334b0f6c1b766cc1 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_CenterMassDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//
-//  File   : MeasureGUI_CenterMassDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_CMASS_H
-#define DIALOGBOX_CMASS_H
-
-#include "GEOM_MeasureGUI.hxx"
+#ifndef MEASUREGUI_CENTERMASSDLG_H
+#define MEASUREGUI_CENTERMASSDLG_H
 
-#include "GEOMBase_Skeleton.h"
+#include <GEOMBase_Skeleton.h>
 
-class MeasureGUI_1Sel3LineEdit_QTD;
+class MeasureGUI_1Sel3LineEdit;
 
 //=================================================================================
 // class    : MeasureGUI_CenterMassDlg
 // purpose  :
 //=================================================================================
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_CenterMassDlg : public GEOMBase_Skeleton
+class MeasureGUI_CenterMassDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    MeasureGUI_CenterMassDlg( GeometryGUI* GUI,
-                             QWidget*     parent );
-    ~MeasureGUI_CenterMassDlg();
+  MeasureGUI_CenterMassDlg( GeometryGUI*, QWidget* );
+  ~MeasureGUI_CenterMassDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr  createOperation();
-    virtual bool                        isValid( QString& msg );
-    virtual bool                        execute( ObjectList& objects );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr  createOperation();
+  virtual bool                        isValid( QString& );
+  virtual bool                        execute( ObjectList& );
 
 private slots:
-    void                                ClickOnOk();
-    bool                                ClickOnApply();
-    void                                ActivateThisDialog();
-    void                                LineEditReturnPressed();
-    void                                SelectionIntoArgument();
-    void                                SetEditCurrentArgument();
-
+  void                                ClickOnOk();
+  bool                                ClickOnApply();
+  void                                ActivateThisDialog();
+  void                                LineEditReturnPressed();
+  void                                SelectionIntoArgument();
+  void                                SetEditCurrentArgument();
+  
 private:
-    void                                Init( );
-    void                                enterEvent( QEvent* e );
-    void                                processObject();
-    bool                                getParameters( double&, double&, double& );
-
+  void                                Init();
+  void                                enterEvent( QEvent* );
+  void                                processObject();
+  bool                                getParameters( double&, double&, double& );
+  
 private:
-    GEOM::GEOM_Object_var               myObj;
-    MeasureGUI_1Sel3LineEdit_QTD*       myGrp;
+  GEOM::GEOM_Object_var               myObj;
+  MeasureGUI_1Sel3LineEdit*           myGrp;
 };
 
-#endif // DIALOGBOX_CMASS_H
+#endif // MEASUREGUI_CENTERMASSDLG_H
index 4244affb13fdcdf77c72a2725ac12355ef88f764..90c6adf71b23645e7d3bb11a70870df4a72615ed 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_CheckCompoundOfBlocksDlg.cxx
+// Author : Vladimir KLYACHIN, Open CASCADE S.A.S. (vladimir.klyachin@opencascade.com)
 //
-//
-//  File   : MeasureGUI_CheckCompoundOfBlocksDlg.cxx
-//  Author : VKN
-//  Module : GEOM
-//  $Header$
-
 #include "MeasureGUI_CheckCompoundOfBlocksDlg.h"
-#include "MeasureGUI_1Sel1TextView_QTD.h"
+#include "MeasureGUI_Widgets.h"
 
-#include "utilities.h"
-#include "SUIT_Session.h"
-#include "LightApp_SelectionMgr.h"
-#include "SalomeApp_Tools.h"
-#include "SalomeApp_Application.h"
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <LightApp_SelectionMgr.h>
+#include <SalomeApp_Tools.h>
+#include <SalomeApp_Application.h>
 
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopExp.hxx>
 #include <TColStd_MapOfInteger.hxx>
-#include "GEOMBase.h"
-#include "GEOMImpl_Types.hxx"
-
-#include <qtextedit.h>
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
-// QT Includes
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qvaluelist.h>
-
-//VRV: porting on Qt 3.0.5
-#if QT_VERSION >= 0x030005
-#include <qlistbox.h>
-#endif
-//VRV: porting on Qt 3.0.5
+
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+#include <GEOMImpl_Types.hxx>
 
 #define TEXTEDIT_FONT_FAMILY "Courier"
 #define TEXTEDIT_FONT_SIZE 11
 // purpose  : Constructs a MeasureGUI_CheckCompoundOfBlocksDlg which is 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.
+//            true to construct a modal dialog.
 //=================================================================================
 MeasureGUI_CheckCompoundOfBlocksDlg::MeasureGUI_CheckCompoundOfBlocksDlg( GeometryGUI* GUI, QWidget* parent )
-  : GEOMBase_Skeleton(GUI, parent, "MeasureGUI_CheckCompoundOfBlocksDlg", false, WStyle_Customize |
-                      WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose)
+  : GEOMBase_Skeleton( GUI, parent, false )
 {
   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")));
+  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" ) );
+  setWindowTitle( 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" );
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_CHECK_BLOCKS_COMPOUND" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  myGrp = new MeasureGUI_1Sel1TextView2ListBox( centralWidget() );
   myGrp->GroupBox1->setTitle( tr( "GEOM_CHECK_INFOS" ) );
   myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) );
 
-  myGrp->TextEdit1->setReadOnly( TRUE );
+  myGrp->TextView1->setReadOnly( true );
   QFont aFont( TEXTEDIT_FONT_FAMILY, TEXTEDIT_FONT_SIZE );
   aFont.setStyleHint( QFont::TypeWriter, QFont::PreferAntialias );
-  myGrp->TextEdit1->setFont( aFont );
+  myGrp->TextView1->setFont( aFont );
 
-  myGrp->PushButton1->setPixmap( image1 );
+  myGrp->PushButton1->setIcon( image1 );
   myGrp->LineEdit1->setReadOnly( true );
 
-  /***************************************************************/
-  QGridLayout* aGBLayout = new QGridLayout( myGrp->GroupBox1->layout() );
-  aGBLayout->setAlignment( Qt::AlignTop );
-  QGridLayout* Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-  myErrorsLbl = new QLabel( tr( "GEOM_CHECK_BLOCKS_COMPOUND_ERRORS" ), myGrp, "Errors" );
-  Layout2->addWidget( myErrorsLbl, 0, 0 );
-
-  myErrorsLBox = new QListBox( myGrp, "ListBlockCompoundErrors" );
-  myErrorsLBox->setMinimumSize( 100, 100 );
-  Layout2->addWidget( myErrorsLBox, 1, 0 );
-
-  mySubShapesLbl = new QLabel( tr( "GEOM_CHECK_BLOCKS_COMPOUND_SUBSHAPES" ),
-                               myGrp, "BlockCompoundSubShapes" );
-  Layout2->addWidget( mySubShapesLbl, 0, 1 );
-
-  mySubShapesLBox = new QListBox( myGrp, "ListSubShapes" );
-  mySubShapesLBox->setMinimumSize( 100, 100 );
-  mySubShapesLBox->setSelectionMode(QListBox::Extended);
-  Layout2->addWidget( mySubShapesLBox, 1, 1 );
-  aGBLayout->addLayout( Layout2, 1, 0 );
-
-  Layout1->addWidget( myGrp, 2, 0 );
-
-  connect( myErrorsLBox, SIGNAL( selectionChanged() ), SLOT( onErrorsListSelectionChanged() ) );
-  connect( mySubShapesLBox, SIGNAL( selectionChanged() ), SLOT( onSubShapesListSelectionChanged() ) );
+  myGrp->TextLabel2->setText( tr( "GEOM_CHECK_BLOCKS_COMPOUND_ERRORS" ) );
+  myGrp->TextLabel3->setText( tr( "GEOM_CHECK_BLOCKS_COMPOUND_SUBSHAPES" ) );
+
+  myGrp->ListBox2->setSelectionMode( QAbstractItemView::ExtendedSelection );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( myGrp );
+
+  connect( myGrp->ListBox1, SIGNAL( itemSelectionChanged() ), SLOT( onErrorsListSelectionChanged() ) );
+  connect( myGrp->ListBox2, SIGNAL( itemSelectionChanged() ), SLOT( onSubShapesListSelectionChanged() ) );
+
   /***************************************************************/
 
   myHelpFileName = "using_measurement_tools_page.html#check_compound_anchor";
@@ -146,23 +117,20 @@ 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( 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( myGrp->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( myGrp->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
 
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), 
+          this, SLOT( SelectionIntoArgument() ) );
 
   initName( tr( "GEOM_BLOCKS_COMPOUND") );
-  buttonOk->setEnabled(false);
-  buttonApply->setEnabled(false);
+  buttonOk()->setEnabled( false );
+  buttonApply()->setEnabled( false );
   activateSelection();
   SelectionIntoArgument();
-
-  // displays Dialog
-  this->show();
 }
 
 //=================================================================================
@@ -171,7 +139,7 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::Init()
 //=================================================================================
 void MeasureGUI_CheckCompoundOfBlocksDlg::ClickOnOk()
 {
-  if (ClickOnApply())
+  if ( ClickOnApply() )
     ClickOnCancel();
 }
 
@@ -197,24 +165,28 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::SelectionIntoArgument()
   erasePreview();
   myObj = GEOM::GEOM_Object::_nil();
 
-  if (IObjectCount() != 1) {
-    myGrp->LineEdit1->setText("");
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
+    myGrp->LineEdit1->setText( "" );
     processObject();
     return;
   }
 
   Standard_Boolean testResult = Standard_False;
   GEOM::GEOM_Object_var aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
+    GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
-  if (!testResult || aSelectedObject->_is_nil()) {
-    myGrp->LineEdit1->setText("");
+  if ( !testResult || aSelectedObject->_is_nil() ) {
+    myGrp->LineEdit1->setText( "" );
     processObject();
     return;
   }
 
   myObj = aSelectedObject;
-  myGrp->LineEdit1->setText(GEOMBase::GetName(myObj));
+  myGrp->LineEdit1->setText( GEOMBase::GetName( myObj ) );
   processObject();
   displayPreview();
 }
@@ -237,7 +209,7 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::SetEditCurrentArgument()
 void MeasureGUI_CheckCompoundOfBlocksDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if (send == myGrp->LineEdit1) {
+  if ( send == myGrp->LineEdit1 ) {
     myEditCurrentArgument = myGrp->LineEdit1;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
@@ -252,8 +224,8 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::ActivateThisDialog()
   GEOMBase_Skeleton::ActivateThisDialog();
 
   LightApp_SelectionMgr* aSel = myGeomGUI->getApp()->selectionMgr();
-  if (aSel)
-    connect(aSel, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  if ( aSel )
+    connect( aSel, SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   activateSelection();
   displayPreview();
@@ -268,17 +240,14 @@ bool MeasureGUI_CheckCompoundOfBlocksDlg::getBCErrors( bool& theIsCompoundOfBloc
 {
   if ( myObj->_is_nil() )
     return false;
-  else
-  {
-    try
-    {
+  else {
+    try {
       GEOM::GEOM_IBlocksOperations::BCErrors_var aErrs;
       theIsCompoundOfBlocks =
        GEOM::GEOM_IBlocksOperations::_narrow( getOperation() )->CheckCompoundOfBlocks( myObj, aErrs );
       theErrors = aErrs;
     }
-    catch( const SALOME::SALOME_Exception& e )
-    {
+    catch ( const SALOME::SALOME_Exception& e ) {
       SalomeApp_Tools::QtCatchCorbaException( e );
       return false;
     }
@@ -293,28 +262,28 @@ bool MeasureGUI_CheckCompoundOfBlocksDlg::getBCErrors( bool& theIsCompoundOfBloc
 //=================================================================================
 void MeasureGUI_CheckCompoundOfBlocksDlg::processObject()
 {
-  QString aMsg ("");
+  QString aMsg ( "" );
   bool isCompoundOfBlocks;
   GEOM::GEOM_IBlocksOperations::BCErrors aErrs;
-  if ( !getBCErrors( isCompoundOfBlocks, aErrs ) )
-  {
-    myGrp->TextEdit1->setText( aMsg );
-    myErrorsLBox->clear();
-    mySubShapesLBox->clear();
+  if ( !getBCErrors( isCompoundOfBlocks, aErrs ) ) {
+    myGrp->TextView1->setText( aMsg );
+    myGrp->ListBox1->clear();
+    myGrp->ListBox2->clear();
     erasePreview();
     return;
   }
 
-  if (isCompoundOfBlocks) {
+  if ( isCompoundOfBlocks ) {
     aMsg += tr( "GEOM_CHECK_BLOCKS_COMPOUND_HAS_NO_ERRORS" );
-    buttonOk->setEnabled(false);
-    buttonApply->setEnabled(false);
-  } else {
+    buttonOk()->setEnabled( false );
+    buttonApply()->setEnabled( false );
+  } 
+  else {
     aMsg += tr( "GEOM_CHECK_BLOCKS_COMPOUND_HAS_ERRORS" );
-    buttonOk->setEnabled(true);
-    buttonApply->setEnabled(true);
+    buttonOk()->setEnabled( true );
+    buttonApply()->setEnabled( true );
   }
-  myGrp->TextEdit1->setText(aMsg);
+  myGrp->TextView1->setText( aMsg );
 
   QStringList aErrList;
   QString aErrStr( "" );
@@ -322,11 +291,9 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::processObject()
   QString aGluedSfx( " # " );
   int aConNum = 1;
   int aGluedNum = 1;
-  for ( int i = 0, n = aErrs.length(); i < n; i++ )
-  {
+  for ( int i = 0, n = aErrs.length(); i < n; i++ ) {
     aErrStr = "";
-    switch ( aErrs[i].error )
-    {
+    switch ( aErrs[i].error ) {
       case GEOM::GEOM_IBlocksOperations::NOT_BLOCK :
        aErrStr = "Not a Block";
         break;
@@ -336,7 +303,7 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::processObject()
       case GEOM::GEOM_IBlocksOperations::INVALID_CONNECTION :
        aErrStr = "Invalid Connection";
        aErrStr += aConSfx;
-       aErrStr += QString::number(aConNum);
+       aErrStr += QString::number( aConNum );
        aConNum++;
         break;
       case GEOM::GEOM_IBlocksOperations::NOT_CONNECTED :
@@ -345,7 +312,7 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::processObject()
       case GEOM::GEOM_IBlocksOperations::NOT_GLUED :
        aErrStr = "Not Glued";
        aErrStr += aGluedSfx;
-       aErrStr += QString::number(aGluedNum);
+       aErrStr += QString::number( aGluedNum );
        aGluedNum++;
         break;
       default :
@@ -353,12 +320,12 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::processObject()
        break;
     }
     if ( !aErrStr.isEmpty() )
-      aErrList.append(aErrStr);
+      aErrList.append( aErrStr );
   }
 
-  myErrorsLBox->clear();
-  mySubShapesLBox->clear();
-  myErrorsLBox->insertStringList(aErrList);
+  myGrp->ListBox1->clear();
+  myGrp->ListBox2->clear();
+  myGrp->ListBox1->addItems( aErrList );
 }
 
 //=================================================================================
@@ -367,7 +334,7 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::processObject()
 //=================================================================================
 GEOM::GEOM_IOperations_ptr MeasureGUI_CheckCompoundOfBlocksDlg::createOperation()
 {
-  return getGeomEngine()->GetIBlocksOperations(getStudyId());
+  return getGeomEngine()->GetIBlocksOperations( getStudyId() );
 }
 
 //=================================================================================
@@ -377,16 +344,15 @@ GEOM::GEOM_IOperations_ptr MeasureGUI_CheckCompoundOfBlocksDlg::createOperation(
 void MeasureGUI_CheckCompoundOfBlocksDlg::onErrorsListSelectionChanged()
 {
   erasePreview();
-  int aCurItem = myErrorsLBox->currentItem();
+  int aCurItem = myGrp->ListBox1->currentRow();
   if ( aCurItem < 0 )
     return;
   bool isCompoundOfBlocks;
   GEOM::GEOM_IBlocksOperations::BCErrors aErrs;
-  if ( !getBCErrors( isCompoundOfBlocks, aErrs ) )
-  {
-    myGrp->TextEdit1->setText( "" );
-    myErrorsLBox->clear();
-    mySubShapesLBox->clear();
+  if ( !getBCErrors( isCompoundOfBlocks, aErrs ) ) {
+    myGrp->TextView1->setText( "" );
+    myGrp->ListBox1->clear();
+    myGrp->ListBox2->clear();
     return;
   }
   
@@ -396,23 +362,21 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::onErrorsListSelectionChanged()
   TopoDS_Shape aSubShape; 
   TopTools_IndexedMapOfShape anIndices;
   QStringList aSubShapeList;
-  QString aSubShapeName("");
+  QString aSubShapeName( "" );
   Standard_CString aTypeString;
-  if ( !myObj->_is_nil() && GEOMBase::GetShape( myObj, aSelShape ) )
-  {
+  if ( !myObj->_is_nil() && GEOMBase::GetShape( myObj, aSelShape ) ) {
     TopExp::MapShapes( aSelShape, anIndices);
-    for ( int i = 0, n = aObjLst.length(); i < n; i++ )
-    {
+    for ( int i = 0, n = aObjLst.length(); i < n; i++ ) {
       aSubShapeName = "";
       aSubShape = anIndices.FindKey(aObjLst[i]);
       if ( GEOMBase::GetShapeTypeString( aSubShape, aTypeString ) )    
-       aSubShapeName = QString(aTypeString) + QString("_") + QString::number(aObjLst[i]);      
+       aSubShapeName = QString( aTypeString ) + QString( "_" ) + QString::number( aObjLst[i] );        
       if ( !aSubShapeName.isEmpty() )
-      aSubShapeList.append(aSubShapeName);
+      aSubShapeList.append( aSubShapeName );
     }
   }
-  mySubShapesLBox->clear();
-  mySubShapesLBox->insertStringList(aSubShapeList);
+  myGrp->ListBox2->clear();
+  myGrp->ListBox2->addItems( aSubShapeList );
 }
 
 //=================================================================================
@@ -422,24 +386,22 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::onErrorsListSelectionChanged()
 void MeasureGUI_CheckCompoundOfBlocksDlg::onSubShapesListSelectionChanged()
 {
   erasePreview();
-  int aErrCurItem = myErrorsLBox->currentItem();
+  int aErrCurItem = myGrp->ListBox1->currentRow();
   if ( aErrCurItem < 0 )
     return;
-  QValueList<int> aIds;
-  for ( int i = 0, n = mySubShapesLBox->count(); i < n; i++ )
-  {
-    if ( mySubShapesLBox->isSelected( i ) ) 
+  QList<int> aIds;
+  for ( int i = 0, n = myGrp->ListBox2->count(); i < n; i++ ) {
+    if ( myGrp->ListBox2->item( i )->isSelected() ) 
       aIds.append( i );
   }
   if ( aIds.count() < 1 )
     return;
   bool isCompoundOfBlocks;
   GEOM::GEOM_IBlocksOperations::BCErrors aErrs;
-  if ( !getBCErrors( isCompoundOfBlocks, aErrs ) )
-  {
-    myGrp->TextEdit1->setText( "" );
-    myErrorsLBox->clear();
-    mySubShapesLBox->clear();
+  if ( !getBCErrors( isCompoundOfBlocks, aErrs ) ) {
+    myGrp->TextView1->setText( "" );
+    myGrp->ListBox1->clear();
+    myGrp->ListBox2->clear();
     return;
   }
   
@@ -448,21 +410,17 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::onSubShapesListSelectionChanged()
   TopoDS_Shape aSelShape;
   TopoDS_Shape aSubShape; 
   TopTools_IndexedMapOfShape anIndices;
-  if ( !myObj->_is_nil() && GEOMBase::GetShape( myObj, aSelShape ) )
-  {
+  if ( !myObj->_is_nil() && GEOMBase::GetShape( myObj, aSelShape ) ) {
     QString aMess;
-    if ( !isValid( aMess ) )
-    {
+    if ( !isValid( aMess ) ) {
       return;
     }
     SALOME_Prs* aPrs = 0;
     TopExp::MapShapes( aSelShape, anIndices);
-    QValueList<int>::iterator it;
-    for ( it = aIds.begin(); it != aIds.end(); ++it )
-    {
+    QList<int>::iterator it;
+    for ( it = aIds.begin(); it != aIds.end(); ++it ) {
       aSubShape = anIndices.FindKey(aObjLst[(*it)]);
-      try
-      {
+      try {
         getDisplayer()->SetColor( Quantity_NOC_RED );
         getDisplayer()->SetWidth( 3 );
         getDisplayer()->SetToActivate( false );
@@ -470,8 +428,7 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::onSubShapesListSelectionChanged()
         if ( aPrs )
          displayPreview( aPrs, true );
       }
-      catch( const SALOME::SALOME_Exception& e )
-      {
+      catch ( const SALOME::SALOME_Exception& e ) {
         SalomeApp_Tools::QtCatchCorbaException( e );
       }
     }
@@ -494,9 +451,9 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::activateSelection()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void MeasureGUI_CheckCompoundOfBlocksDlg::enterEvent(QEvent* e)
+void MeasureGUI_CheckCompoundOfBlocksDlg::enterEvent( QEvent* )
 {
-  if (!GroupConstructors->isEnabled())
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
@@ -517,10 +474,10 @@ bool MeasureGUI_CheckCompoundOfBlocksDlg::execute( ObjectList& objects )
 {
   GEOM::GEOM_Object_var anObj;
 
-  anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->CheckAndImprove(myObj);
+  anObj = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() )->CheckAndImprove( myObj );
 
-  if (!anObj->_is_nil())
-    objects.push_back(anObj._retn());
+  if ( !anObj->_is_nil() )
+    objects.push_back( anObj._retn() );
 
   return true;
 }
index 58c1b274994b787c6404be86524cd0d5086ccfe0..4de051f6eb19fe768503984814aea91e06c305a8 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_CheckCompoundOfBlocksDlg.h
+// Author : Vladimir KLYACHIN, Open CASCADE S.A.S. (vladimir.klyachin@opencascade.com)
 //
-//
-//  File   : MeasureGUI_CheckCompoundOfBlocksDlg.h
-//  Author : VKN
-//  Module : GEOM
-
-#ifndef DIALOGBOX_CHECKCOMPOUNDOFBLOCKSDLG_H
-#define DIALOGBOX_CHECKCOMPOUNDOFBLOCKSDLG_H
+#ifndef MEASUREGUI_CHECKCOMPOUNDOFBLOCKSDLG_H
+#define MEASUREGUI_CHECKCOMPOUNDOFBLOCKSDLG_H
 
-#include "GEOM_MeasureGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-
-class MeasureGUI_1Sel1TextView_QTD;
-class QListBox;
-class QLabel;
+class MeasureGUI_1Sel1TextView2ListBox;
 
 //=================================================================================
 // class    : MeasureGUI_CheckCompoundOfBlocksDlg
 // purpose  :
 //=================================================================================
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_CheckCompoundOfBlocksDlg : public GEOMBase_Skeleton
+
+class MeasureGUI_CheckCompoundOfBlocksDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    MeasureGUI_CheckCompoundOfBlocksDlg(GeometryGUI* GUI, QWidget* theParent);
-    ~MeasureGUI_CheckCompoundOfBlocksDlg();
-
+  MeasureGUI_CheckCompoundOfBlocksDlg( GeometryGUI*, QWidget* );
+  ~MeasureGUI_CheckCompoundOfBlocksDlg();
+  
 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();
+  // redefined from GEOMBase_Helper and GEOMBase_Skeleton
+  virtual GEOM::GEOM_IOperations_ptr  createOperation();
+  virtual bool                        isValid( QString& );
+  virtual bool                        execute( ObjectList& );
+  virtual void                        processObject();
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-
-    void onErrorsListSelectionChanged();
-    void onSubShapesListSelectionChanged();
-
+  void                                ClickOnOk();
+  bool                                ClickOnApply();
+  void                                ActivateThisDialog();
+  void                                LineEditReturnPressed();
+  void                                SelectionIntoArgument();
+  void                                SetEditCurrentArgument();
+  
+  void                                onErrorsListSelectionChanged();
+  void                                onSubShapesListSelectionChanged();
+  
 private:
-    void                          Init();
-    void                          enterEvent( QEvent* e );
-    bool                          getBCErrors( bool& theIsCompoundOfBlocks,
-                                              GEOM::GEOM_IBlocksOperations::BCErrors& theErrors);
-    void                          activateSelection();
+  void                                Init();
+  void                                enterEvent( QEvent* );
+  bool                                getBCErrors( bool&,
+                                                  GEOM::GEOM_IBlocksOperations::BCErrors& );
+  void                                activateSelection();
 
 private:
-    GEOM::GEOM_Object_var         myObj;
-    MeasureGUI_1Sel1TextView_QTD* myGrp;
-
-    QLabel*                       myErrorsLbl;
-    QListBox*                     myErrorsLBox;
-    QLabel*                       mySubShapesLbl;
-    QListBox*                     mySubShapesLBox;
+  GEOM::GEOM_Object_var               myObj;
+  MeasureGUI_1Sel1TextView2ListBox*   myGrp;
 };
 
-#endif // DIALOGBOX_CHECKCOMPOUNDOFBLOCKSDLG_H
+#endif // MEASUREGUI_CHECKCOMPOUNDOFBLOCKSDLG_H
index 8d78176f49c99bcd7867582e44beca508fae89ea..9fd3c222843e10ade455649185ac54889334a3db 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_CheckShapeDlg.cxx
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
 //
-//
-//  File   : MeasureGUI_CheckShapeDlg.cxx
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
-
 #include "MeasureGUI_CheckShapeDlg.h"
+#include "MeasureGUI_Widgets.h"
 
-#include "utilities.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Tools.h"
-
-#include <qtextedit.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Tools.h>
 
 #define TEXTEDIT_FONT_FAMILY "Courier"
 #define TEXTEDIT_FONT_SIZE 11
 
-MeasureGUI_1Sel1TextView1Check_QTD::MeasureGUI_1Sel1TextView1Check_QTD(QWidget* parent,
-                                                                       const char* name, WFlags fl)
-  : MeasureGUI_1Sel1TextView_QTD(parent, name, fl)
-{
-  CheckBoxGeom = new QCheckBox(GroupBox1, "CheckBoxGeom");
-  CheckBoxGeom->setText(tr("CHECK_SHAPE_GEOMETRY"));
-  Layout1->addMultiCellWidget(CheckBoxGeom, 2, 2, 0, 2);
-
-  CheckBoxGeom->setChecked(false);
-}
-
-MeasureGUI_1Sel1TextView1Check_QTD::~MeasureGUI_1Sel1TextView1Check_QTD()
-{
-  // no need to delete child widgets, Qt does it all for us
-}
-
 //=================================================================================
 // class    : MeasureGUI_CheckShapeDlg()
 // purpose  : Constructs a MeasureGUI_CheckShapeDlg which is 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.
+//            true to construct a modal dialog.
 //=================================================================================
 MeasureGUI_CheckShapeDlg::MeasureGUI_CheckShapeDlg( GeometryGUI* GUI, QWidget* parent )
-: MeasureGUI_Skeleton( GUI, parent, "MeasureGUI_CheckShapeDlg" )
+  : MeasureGUI_Skeleton( GUI, parent )
 {
   QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap(
-    "GEOM",tr( "ICON_DLG_CHECKSHAPE" ) ) );
+    "GEOM", tr( "ICON_DLG_CHECKSHAPE" ) ) );
   QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap(
-    "GEOM",tr( "ICON_SELECT" ) ) );
+    "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption( tr( "GEOM_CHECK_TITLE" ) );
+  setWindowTitle( tr( "GEOM_CHECK_TITLE" ) );
 
   /***************************************************************/
 
-  GroupConstructors->setTitle( tr( "GEOM_CHECK_SHAPE" ) );
-  RadioButton1->setPixmap( image0 );
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_CHECK_SHAPE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
 
-  myGrp = new MeasureGUI_1Sel1TextView1Check_QTD( this, "myGrp" );
+  myGrp = new MeasureGUI_1Sel1TextView1Check( centralWidget() );
   myGrp->GroupBox1->setTitle( tr( "GEOM_CHECK_INFOS" ) );
   myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) );
-  myGrp->TextEdit1->setReadOnly( TRUE );
+  myGrp->TextView1->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->TextView1->setFont( aFont );
+  myGrp->PushButton1->setIcon( image1 );
   myGrp->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget( myGrp, 1, 0 );
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( myGrp );
 
   /***************************************************************/
 
@@ -122,8 +97,8 @@ void MeasureGUI_CheckShapeDlg::Init()
   mySelEdit = myGrp->LineEdit1;
   MeasureGUI_Skeleton::Init();
 
-  connect(myGrp->CheckBoxGeom, SIGNAL(toggled(bool)), 
-          this, SLOT(SelectionIntoArgument()));
+  connect( myGrp->CheckBox1, SIGNAL( toggled( bool) ), 
+          this, SLOT( SelectionIntoArgument() ) );
 }
 
 //=================================================================================
@@ -134,22 +109,19 @@ bool MeasureGUI_CheckShapeDlg::getParameters ( bool& theIsValid, QString& theMsg
 {
   if ( myObj->_is_nil() )
     return false;
-  else
-  {
-    try
-    {
+  else {
+    try {
       char* aMsg;
-      bool isCheckGeometry = myGrp->CheckBoxGeom->isChecked();
+      bool isCheckGeometry = myGrp->CheckBox1->isChecked();
       GEOM::GEOM_IMeasureOperations_ptr aMeasureOp =
         GEOM::GEOM_IMeasureOperations::_narrow( getOperation() );
-      if (isCheckGeometry)
-        theIsValid = aMeasureOp->CheckShapeWithGeometry(myObj, aMsg);
+      if ( isCheckGeometry )
+        theIsValid = aMeasureOp->CheckShapeWithGeometry( myObj, aMsg );
       else
-        theIsValid = aMeasureOp->CheckShape(myObj, aMsg);
+        theIsValid = aMeasureOp->CheckShape( myObj, aMsg );
       theMsg = aMsg;
     }
-    catch( const SALOME::SALOME_Exception& e )
-    {
+    catch( const SALOME::SALOME_Exception& e ) {
       SalomeApp_Tools::QtCatchCorbaException( e );
       return false;
     }
@@ -167,18 +139,18 @@ void MeasureGUI_CheckShapeDlg::processObject()
 {
   bool isShapeValid;
   QString aMsg;
-  if ( !getParameters( isShapeValid, aMsg ) )
-  {
-    myGrp->TextEdit1->setText( "" );
+  if ( !getParameters( isShapeValid, aMsg ) ) {
+    myGrp->TextView1->setText( "" );
     return;
   }
 
-  if (isShapeValid) {
-    myGrp->TextEdit1->setText("This Shape seems to be valid.");
-  } else {
-    QString aDescr ("This Shape is not valid.\n");
+  if ( isShapeValid ) {
+    myGrp->TextView1->setText( "This Shape seems to be valid." );
+  } 
+  else {
+    QString aDescr ( "This Shape is not valid.\n" );
     aDescr += aMsg;
-    myGrp->TextEdit1->setText(aDescr);
-//    myGrp->TextEdit1->setText("This Shape is not valid.");
+    myGrp->TextView1->setText( aDescr );
+//    myGrp->TextView1->setText("This Shape is not valid.");
   }
 }
index ba89aff2b02e9166e0a61473525b3e1207aa6f0f..5a1619bd2112328ef749681a89f1dedfb95a9a7f 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_CheckShapeDlg.h
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
 //
-//
-//  File   : MeasureGUI_CheckShapeDlg.h
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_CHECKSHAPEDLG_H
-#define DIALOGBOX_CHECKSHAPEDLG_H
-
-#include "GEOM_MeasureGUI.hxx"
+#ifndef MEASUREGUI_CHECKSHAPEDLG_H
+#define MEASUREGUI_CHECKSHAPEDLG_H
 
 #include "MeasureGUI_Skeleton.h"
-#include "MeasureGUI_1Sel1TextView_QTD.h"
 
-class QCheckBox;
-
-//=================================================================================
-// class    : MeasureGUI_1Sel1TextView1Check_QTD
-// purpose  :
-//=================================================================================
-class MeasureGUI_1Sel1TextView1Check_QTD : public MeasureGUI_1Sel1TextView_QTD
-{ 
-    Q_OBJECT
-
-public:
-    MeasureGUI_1Sel1TextView1Check_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~MeasureGUI_1Sel1TextView1Check_QTD();
-
-    QCheckBox* CheckBoxGeom;
-};
+class MeasureGUI_1Sel1TextView1Check;
 
 //=================================================================================
 // class    : MeasureGUI_CheckShapeDlg
 // purpose  :
 //=================================================================================
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_CheckShapeDlg : public MeasureGUI_Skeleton
+class MeasureGUI_CheckShapeDlg : public MeasureGUI_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    MeasureGUI_CheckShapeDlg(GeometryGUI* GUI, QWidget* parent);
-    ~MeasureGUI_CheckShapeDlg();
+  MeasureGUI_CheckShapeDlg( GeometryGUI*, QWidget* );
+  ~MeasureGUI_CheckShapeDlg();
 
 protected:
-    // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
-    virtual void processObject();
+  // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
+  virtual void                    processObject();
 
 private:
-    void Init();
-    bool getParameters(bool& theIsValid, QString& theMsg);
+  void                            Init();
+  bool                            getParameters( bool&, QString& );
 
 private:
-    MeasureGUI_1Sel1TextView1Check_QTD* myGrp;
+  MeasureGUI_1Sel1TextView1Check* myGrp;
 };
 
-#endif // DIALOGBOX_CHECKSHAPEDLG_H
+#endif // MEASUREGUI_CHECKSHAPEDLG_H
index 2591b69816106c7265681166db520e37b512d112..a684ce804282220ef60c33962a5ad964273c1410 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_DistanceDlg.cxx
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
 //
-//
-//  File   : MeasureGUI_DistanceDlg.cxx
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
-
 #include "MeasureGUI_DistanceDlg.h"
-#include "MeasureGUI_2Sel4LineEdit_QTD.h"
-#include "GEOMBase.h"
-#include "GEOM_Displayer.h"
-#include "DlgRef_SpinBox.h"
-
-#include "SUIT_Session.h"
-#include "SUIT_ViewWindow.h"
-#include "SOCC_Prs.h"
-#include "SOCC_ViewModel.h"
-#include "SalomeApp_Tools.h"
-
+#include "MeasureGUI_Widgets.h"
+
+#include <DlgRef.h>
+#include <GEOMBase.h>
+#include <GeometryGUI.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_ViewManager.h>
+#include <SOCC_Prs.h>
+#include <SOCC_ViewModel.h>
+#include <SalomeApp_Tools.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+
+// OCCT Includes
 #include <Geom_Plane.hxx>
-#include <TopoDS_Edge.hxx>
 #include <AIS_LengthDimension.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
-#include <AIS_ListIteratorOfListOfInteractive.hxx>
 #include <gce_MakePln.hxx>
 #include <Precision.hxx>
 
-#include "utilities.h"
-
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
-
 //=================================================================================
 // class    : MeasureGUI_DistanceDlg()
 // purpose  : Constructs a MeasureGUI_DistanceDlg which is 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.
+//            true to construct a modal dialog.
 //=================================================================================
-MeasureGUI_DistanceDlg::MeasureGUI_DistanceDlg( GeometryGUI* GUI, QWidget* parent )
-: MeasureGUI_Skeleton( GUI, parent, "MeasureGUI_DistanceDlg" )
+MeasureGUI_DistanceDlg::MeasureGUI_DistanceDlg (GeometryGUI* GUI, QWidget* parent)
+  : MeasureGUI_Skeleton(GUI, parent)
 {
-  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap(
-    "GEOM",tr( "ICON_DLG_MINDIST" ) ) );
-  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_MINDIST")));
+  QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption( tr( "GEOM_MINDIST_TITLE" ) );
+  setWindowTitle(tr("GEOM_MINDIST_TITLE"));
 
   /***************************************************************/
-  
-  GroupConstructors->setTitle( tr( "GEOM_DISTANCE" ) );
-  RadioButton1->setPixmap( image0 );
-
-  myGrp = new MeasureGUI_2Sel4LineEdit_QTD( this, "myGrp" );
-  myGrp->GroupBox1->setTitle( tr( "GEOM_MINDIST_OBJ" ) );
-  myGrp->TextLabel1->setText( tr( "GEOM_OBJECT_I" ).arg( "1" ) );
-  myGrp->TextLabel2->setText( tr( "GEOM_OBJECT_I" ).arg( "2" ) );
-  myGrp->TextLabel3->setText( tr( "GEOM_LENGTH" ) );
-  myGrp->TextLabel4->setText( tr( "GEOM_DX" ) );
-  myGrp->TextLabel5->setText( tr( "GEOM_DY" ) );
-  myGrp->TextLabel6->setText( tr( "GEOM_DZ" ) );
-  myGrp->LineEdit3->setReadOnly( TRUE );
-  myGrp->LineEdit4->setReadOnly( TRUE );
-  myGrp->LineEdit5->setReadOnly( TRUE );
-  myGrp->LineEdit6->setReadOnly( TRUE );
-  myGrp->PushButton1->setPixmap( image1 );
-  myGrp->PushButton2->setPixmap( image1 );
-  myGrp->LineEdit1->setReadOnly( true );
-  myGrp->LineEdit2->setReadOnly( true );
-
-  Layout1->addWidget( myGrp, 1, 0 );
-
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_DISTANCE"));
+  mainFrame()->RadioButton1->setIcon(image0);
+
+  myGrp = new MeasureGUI_2Sel4LineEdit(centralWidget());
+  myGrp->GroupBox1->setTitle(tr("GEOM_MINDIST_OBJ"));
+  myGrp->TextLabel1->setText(tr("GEOM_OBJECT_I").arg("1"));
+  myGrp->TextLabel2->setText(tr("GEOM_OBJECT_I").arg("2"));
+  myGrp->TextLabel3->setText(tr("GEOM_LENGTH"));
+  myGrp->TextLabel4->setText(tr("GEOM_DX"));
+  myGrp->TextLabel5->setText(tr("GEOM_DY"));
+  myGrp->TextLabel6->setText(tr("GEOM_DZ"));
+  myGrp->LineEdit3->setReadOnly(true);
+  myGrp->PushButton1->setIcon(image1);
+  myGrp->PushButton2->setIcon(image1);
+  myGrp->LineEdit1->setReadOnly(true);
+  myGrp->LineEdit2->setReadOnly(true);
+  myGrp->LineEdit4->setReadOnly(true);
+  myGrp->LineEdit5->setReadOnly(true);
+  myGrp->LineEdit6->setReadOnly(true);
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(myGrp);
   /***************************************************************/
 
   myHelpFileName = "using_measurement_tools_page.html#min_distance_anchor";
 
-  /* Initialisation */
+  // Initialisation
   Init();
 }
 
-
 //=================================================================================
 // function : ~MeasureGUI_DistanceDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -114,44 +105,64 @@ MeasureGUI_DistanceDlg::~MeasureGUI_DistanceDlg()
 {
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void MeasureGUI_DistanceDlg::Init()
 {
+  // init variables
+  myGrp->LineEdit1->setText("");
+  myGrp->LineEdit2->setText("");
+  myObj = myObj2 = GEOM::GEOM_Object::_nil();
+
   mySelBtn   = myGrp->PushButton1;
   mySelEdit  = myGrp->LineEdit1;
-  mySelBtn2  = myGrp->PushButton2;
-  mySelEdit2 = myGrp->LineEdit2;
 
-  myEditCurrentArgument = mySelEdit;
+  myEditCurrentArgument = myGrp->LineEdit1;
 
-  connect( mySelEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
-  connect( mySelBtn2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  // signals and slots connections
+  connect(myGrp->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(myGrp->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
 
   MeasureGUI_Skeleton::Init();
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection has changed
 //=================================================================================
 void MeasureGUI_DistanceDlg::SelectionIntoArgument()
 {
-  Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  GEOM::GEOM_Object_var aSelectedObject = GEOM::GEOM_Object::_nil();
 
-  if ( !testResult )
-    aSelectedObject = GEOM::GEOM_Object::_nil();
+  if (aSelList.Extent() > 0) {
+    Standard_Boolean testResult = Standard_False;
+    aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    if (!testResult)
+      aSelectedObject = GEOM::GEOM_Object::_nil();
+  }
+
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
-  if ( myEditCurrentArgument == mySelEdit )
-      myObj = aSelectedObject;
-    else
-      myObj2 = aSelectedObject;
+  if (myEditCurrentArgument == myGrp->LineEdit1) {
+    myObj = aSelectedObject;
+    if (!myObj->_is_nil() && myObj2->_is_nil())
+      myGrp->PushButton2->click();
+  }
+  else {
+    myObj2 = aSelectedObject;
+    if (!myObj2->_is_nil() && myObj->_is_nil())
+      myGrp->PushButton1->click();
+  }
 
   processObject();
 }
@@ -162,28 +173,26 @@ void MeasureGUI_DistanceDlg::SelectionIntoArgument()
 //=================================================================================
 void MeasureGUI_DistanceDlg::processObject()
 {
-  myGrp->LineEdit1->setText( !myObj->_is_nil()  ? GEOMBase::GetName( myObj  ) : "" );
-  myGrp->LineEdit2->setText( !myObj2->_is_nil() ? GEOMBase::GetName( myObj2 ) : "" );
+  myGrp->LineEdit1->setText(!myObj->_is_nil()  ? GEOMBase::GetName(myObj ) : "");
+  myGrp->LineEdit2->setText(!myObj2->_is_nil() ? GEOMBase::GetName(myObj2) : "");
 
   gp_Pnt aPnt1, aPnt2;
   double aDist = 0.;
-  if (getParameters(aDist, aPnt1, aPnt2))
-  {
-    myGrp->LineEdit3->setText( DlgRef_SpinBox::PrintDoubleValue( aDist ) );
+  if (getParameters(aDist, aPnt1, aPnt2)) {
+    myGrp->LineEdit3->setText(DlgRef::PrintDoubleValue(aDist));
 
     gp_XYZ aVec = aPnt2.XYZ() - aPnt1.XYZ();
-    myGrp->LineEdit4->setText( DlgRef_SpinBox::PrintDoubleValue( aVec.X() ) );
-    myGrp->LineEdit5->setText( DlgRef_SpinBox::PrintDoubleValue( aVec.Y() ) );
-    myGrp->LineEdit6->setText( DlgRef_SpinBox::PrintDoubleValue( aVec.Z() ) );
+    myGrp->LineEdit4->setText(DlgRef::PrintDoubleValue(aVec.X()));
+    myGrp->LineEdit5->setText(DlgRef::PrintDoubleValue(aVec.Y()));
+    myGrp->LineEdit6->setText(DlgRef::PrintDoubleValue(aVec.Z()));
 
     redisplayPreview();
   }
-  else
-  {
-    myGrp->LineEdit3->setText( "" );
-    myGrp->LineEdit4->setText( "" );
-    myGrp->LineEdit5->setText( "" );
-    myGrp->LineEdit6->setText( "" );
+  else {
+    myGrp->LineEdit3->setText("");
+    myGrp->LineEdit4->setText("");
+    myGrp->LineEdit5->setText("");
+    myGrp->LineEdit6->setText("");
     erasePreview();
   }
 }
@@ -192,34 +201,30 @@ void MeasureGUI_DistanceDlg::processObject()
 // function : getParameters()
 // purpose  : Get distance between objects
 //=================================================================================
-bool MeasureGUI_DistanceDlg::getParametersdouble& theDistance,
+bool MeasureGUI_DistanceDlg::getParameters (double& theDistance,
                                             gp_Pnt& thePnt1,
-                                            gp_Pnt& thePnt2 )
+                                            gp_Pnt& thePnt2)
 {
   QString msg;
-  if ( !isValid( msg ) )
-    return false;
-  else
-  {
-    try
-    {
+  if (isValid(msg)) {
+    try {
       double x1, y1, z1, x2, y2, z2;
-      theDistance = GEOM::GEOM_IMeasureOperations::_narrow( getOperation() )->GetMinDistance(
-        myObj, myObj2, x1, y1, z1, x2, y2, z2 );
+      theDistance = GEOM::GEOM_IMeasureOperations::_narrow(getOperation())->
+        GetMinDistance(myObj, myObj2, x1, y1, z1, x2, y2, z2);
 
-      thePnt1.SetCoord( x1, y1, z1 );
-      thePnt2.SetCoord( x2, y2, z2 );
+      thePnt1.SetCoord(x1, y1, z1);
+      thePnt2.SetCoord(x2, y2, z2);
     }
-    catch( const SALOME::SALOME_Exception& e )
-    {
-      SalomeApp_Tools::QtCatchCorbaException( e );
+    catch(const SALOME::SALOME_Exception& e) {
+      SalomeApp_Tools::QtCatchCorbaException(e);
       return false;
     }
 
     return getOperation()->IsDone();
   }
-}
 
+  return false;
+}
 
 //=================================================================================
 // function : SetEditCurrentArgument()
@@ -227,22 +232,30 @@ bool MeasureGUI_DistanceDlg::getParameters( double& theDistance,
 //=================================================================================
 void MeasureGUI_DistanceDlg::SetEditCurrentArgument()
 {
-  QPushButton* send = ( QPushButton* )sender();
+  QPushButton* send = (QPushButton*)sender();
 
-  if( send == mySelBtn )
-  {
-    mySelEdit->setFocus();
-    myEditCurrentArgument = mySelEdit;
+  if (send == myGrp->PushButton1) {
+    myEditCurrentArgument = myGrp->LineEdit1;
+
+    myGrp->PushButton2->setDown(false);
+    myGrp->LineEdit2->setEnabled(false);
   }
-  else
-  {
-    mySelEdit2->setFocus();
-    myEditCurrentArgument = mySelEdit2;
+  else {
+    myEditCurrentArgument = myGrp->LineEdit2;
+
+    myGrp->PushButton1->setDown(false);
+    myGrp->LineEdit1->setEnabled(false);
   }
 
-  SelectionIntoArgument();
-}
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
+  myEditCurrentArgument->setFocus();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
 
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  redisplayPreview();
+}
 
 //=================================================================================
 // function : LineEditReturnPressed()
@@ -250,17 +263,19 @@ void MeasureGUI_DistanceDlg::SetEditCurrentArgument()
 //=================================================================================
 void MeasureGUI_DistanceDlg::LineEditReturnPressed()
 {
-  QLineEdit* send = ( QLineEdit* )sender();
+  QLineEdit* send = (QLineEdit*)sender();
 
-  if( send == mySelEdit )
-    myEditCurrentArgument = mySelEdit;
-  else
-    myEditCurrentArgument = mySelEdit2;
+  if (send == myGrp->LineEdit1 || send == myGrp->LineEdit2) {
+    myEditCurrentArgument = send;
 
-  if ( GEOMBase::SelectionByNameInDialogs( this, mySelEdit->text(), selectedIO() ) )
-    mySelEdit->setText( mySelEdit->text() );
-}
+    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+    SALOME_ListIO aSelList;
+    aSelMgr->selectedObjects(aSelList);
 
+    if (GEOMBase::SelectionByNameInDialogs(this, myGrp->LineEdit1->text(), aSelList))
+      myGrp->LineEdit1->setText(myGrp->LineEdit1->text());
+  }
+}
 
 //=================================================================================
 // function : buildPrs()
@@ -269,61 +284,57 @@ void MeasureGUI_DistanceDlg::LineEditReturnPressed()
 SALOME_Prs* MeasureGUI_DistanceDlg::buildPrs()
 {
   double aDist = 0.;
-  gp_Pnt aPnt1( 0, 0, 0 ), aPnt2( 0, 0, 0 );
+  gp_Pnt aPnt1(0, 0, 0), aPnt2(0, 0, 0);
 
   SUIT_ViewWindow* vw = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
 
-  if ( myObj->_is_nil() || myObj2->_is_nil() ||
-       !getParameters( aDist, aPnt1, aPnt2 ) ||
-       vw->getViewManager()->getType() != OCCViewer_Viewer::Type() )
+  if (myObj->_is_nil() || myObj2->_is_nil() ||
+       !getParameters(aDist, aPnt1, aPnt2) ||
+       vw->getViewManager()->getType() != OCCViewer_Viewer::Type())
     return 0;
 
   try
   {
-    if( aDist <= 1.e-9 )
-    {
-      BRepBuilderAPI_MakeVertex aMaker( aPnt1 );
-      return getDisplayer()->BuildPrs( aMaker.Vertex() );
+    if (aDist <= 1.e-9) {
+      BRepBuilderAPI_MakeVertex aMaker(aPnt1);
+      return getDisplayer()->BuildPrs(aMaker.Vertex());
     }
-    else
-    {
-      BRepBuilderAPI_MakeEdge MakeEdge( aPnt1, aPnt2 );
-      TopoDS_Vertex aVert1 = BRepBuilderAPI_MakeVertex( aPnt1 );
-      TopoDS_Vertex aVert2 = BRepBuilderAPI_MakeVertex( aPnt2 );
+    else {
+      BRepBuilderAPI_MakeEdge MakeEdge(aPnt1, aPnt2);
+      TopoDS_Vertex aVert1 = BRepBuilderAPI_MakeVertex(aPnt1);
+      TopoDS_Vertex aVert2 = BRepBuilderAPI_MakeVertex(aPnt2);
 
       QString aLabel;
-      aLabel.sprintf( "%.1f", aDist );
+      aLabel.sprintf("%.1f", aDist);
 
-      gp_Pnt aPnt3( ( aPnt1.X() + aPnt2.X() ) / 2,
-                    ( aPnt1.Y() + aPnt2.Y() ) / 2,
-                    ( aPnt1.Z() + aPnt2.Z() ) / 2 + 100 );
+      gp_Pnt aPnt3((aPnt1.X() + aPnt2.X()) / 2,
+                    (aPnt1.Y() + aPnt2.Y()) / 2,
+                    (aPnt1.Z() + aPnt2.Z()) / 2);
 
-      gp_Vec va( aPnt3, aPnt1 );
-      gp_Vec vb( aPnt3, aPnt2 );
+      gp_Vec va(aPnt3, aPnt1);
+      gp_Vec vb(aPnt3, aPnt2);
 
-      if ( va.IsParallel( vb, Precision::Angular() ) )
-      {
-        aPnt3.SetY( ( aPnt1.Y() + aPnt2.Y() ) / 2 + 100 );
-        aPnt3.SetZ( ( aPnt1.Z() + aPnt2.Z() ) / 2 );
+      if (va.IsParallel(vb, Precision::Angular())) {
+        aPnt3.SetY((aPnt1.Y() + aPnt2.Y()) / 2 + 100);
+        aPnt3.SetZ((aPnt1.Z() + aPnt2.Z()) / 2);
       }
 
-      gce_MakePln gce_MP( aPnt1, aPnt2, aPnt3 );
-      Handle( Geom_Plane ) P = new Geom_Plane( gce_MP.Value() );
+      gce_MakePln gce_MP(aPnt1, aPnt2, aPnt3);
+      Handle(Geom_Plane) P = new Geom_Plane(gce_MP.Value());
 
-      Handle( AIS_LengthDimension ) anIO = new AIS_LengthDimension
-        (aVert1, aVert2, P, aDist, TCollection_ExtendedString((Standard_CString)aLabel.latin1()));
+      Handle(AIS_LengthDimension) anIO = new AIS_LengthDimension(
+        aVert1, aVert2, P, aDist, TCollection_ExtendedString((Standard_CString)aLabel.toLatin1().constData()));
+      anIO->SetArrowSize(aDist/20);
 
-      SOCC_Prs* aPrs =
-        dynamic_cast<SOCC_Prs*>( ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs( 0 ) );
+      SOCC_Prs* aPrs = dynamic_cast<SOCC_Prs*>(((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0));
 
-      if ( aPrs )
-        aPrs->AddObject( anIO );
+      if (aPrs)
+        aPrs->AddObject(anIO);
 
       return aPrs;
     }
   }
-  catch( Standard_Failure )
-  {
+  catch(Standard_Failure) {
     return 0;
   }
 }
@@ -332,7 +343,7 @@ SALOME_Prs* MeasureGUI_DistanceDlg::buildPrs()
 // function : isValid()
 // purpose  :
 //=================================================================================
-bool MeasureGUI_DistanceDlg::isValid( QString& msg )
+bool MeasureGUI_DistanceDlg::isValid (QString& msg)
 {
-  return MeasureGUI_Skeleton::isValid( msg ) && !myObj2->_is_nil();
+  return MeasureGUI_Skeleton::isValid(msg) && !myObj2->_is_nil();
 }
index 43202a187405722093fd1ca4fb13b242a6220d5b..08f00cdbc775a45e018b9b5d4e6a95e14a9820cb 100644 (file)
@@ -1,78 +1,70 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : MeasureGUI_DistanceDlg.h
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
-
-#ifndef DIALOGBOX_DISTANCE_H
-#define DIALOGBOX_DISTANCE_H
-
-#include "GEOM_MeasureGUI.hxx"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_DistanceDlg.h
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
+//
+#ifndef MEASUREGUI_DISTANCEDLG_H
+#define MEASUREGUI_DISTANCEDLG_H
 
 #include "MeasureGUI_Skeleton.h"
 
-class MeasureGUI_2Sel4LineEdit_QTD;
+class MeasureGUI_2Sel4LineEdit;
 class gp_Pnt;
 
 //=================================================================================
 // class    : MeasureGUI_DistanceDlg
 // purpose  :
 //=================================================================================
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_DistanceDlg : public MeasureGUI_Skeleton
-{ 
-    Q_OBJECT
 
+class MeasureGUI_DistanceDlg : public MeasureGUI_Skeleton
+{ 
+  Q_OBJECT
+    
 public:
-                                        MeasureGUI_DistanceDlg( GeometryGUI* GUI,
-                                                               QWidget*     parent );
-                                        ~MeasureGUI_DistanceDlg();
-protected:
+  MeasureGUI_DistanceDlg( GeometryGUI*, QWidget* );
+  ~MeasureGUI_DistanceDlg();
 
-    // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
-    virtual void                        processObject();
-    virtual SALOME_Prs*                 buildPrs();
-    virtual void                        SelectionIntoArgument();
-    virtual void                        LineEditReturnPressed();
-    virtual void                        SetEditCurrentArgument();
-    virtual bool                        isValid( QString& msg );
+protected:
+  // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
+  virtual void                        processObject();
+  virtual SALOME_Prs*                 buildPrs();
+  virtual void                        SelectionIntoArgument();
+  virtual void                        LineEditReturnPressed();
+  virtual void                        SetEditCurrentArgument();
+  virtual bool                        isValid( QString& );
 
 private:
-
-    void                                Init();
-    bool                                getParameters( double& theDistance,
-                                                       gp_Pnt& thePnt1,
-                                                       gp_Pnt& thePnt2  );
+  void                                Init();
+  bool                                getParameters( double&,
+                                                    gp_Pnt&,
+                                                    gp_Pnt& );
 private:
-
-    QLineEdit*                          myEditCurrentArgument;
-    QLineEdit*                          mySelEdit2;
-    QPushButton*                        mySelBtn2;
-
-    MeasureGUI_2Sel4LineEdit_QTD*       myGrp;
-    GEOM::GEOM_Object_var               myObj2;
-
+  QLineEdit*                          myEditCurrentArgument;
+  QLineEdit*                          mySelEdit2;
+  QPushButton*                        mySelBtn2;
+  
+  MeasureGUI_2Sel4LineEdit*           myGrp;
+  GEOM::GEOM_Object_var               myObj2;
 };
 
-#endif // DIALOGBOX_DISTANCE_H
+#endif // MEASUREGUI_DISTANCEDLG_H
index 8caa6f25abbe6a001770a3dbdbacdf9d477ffc44..2ff5495be9fdc6db0c2dbb6b690a15adfb2e3b6e 100644 (file)
@@ -1,98 +1,87 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_InertiaDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : MeasureGUI_InertiaDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
 #include "MeasureGUI_InertiaDlg.h"
-#include "MeasureGUI_1Sel12LineEdit_QTD.h"
+#include "MeasureGUI_Widgets.h"
 
-#include "GEOMBase.h"
+#include <GEOMBase.h>
 
-#include <BRepGProp.hxx>
-#include <GProp_GProps.hxx>
-#include <GProp_PrincipalProps.hxx>
 #include <gp_XYZ.hxx>
-#include <TopoDS_Shape.hxx>
-
-#include "utilities.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Tools.h"
 
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Tools.h>
 
 //=================================================================================
 // class    : MeasureGUI_InertiaDlg()
 // purpose  : Constructs a MeasureGUI_InertiaDlg which is 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.
+//            true to construct a modal dialog.
 //=================================================================================
 
 MeasureGUI_InertiaDlg::MeasureGUI_InertiaDlg( GeometryGUI* GUI, QWidget* parent )
-: MeasureGUI_Skeleton( GUI, parent, "MeasureGUI_InertiaDlg" )
+  : MeasureGUI_Skeleton( GUI, parent )
 {
   QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap(
     "GEOM",tr( "ICON_DLG_INERTIA" ) ) );
   QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap(
     "GEOM",tr( "ICON_SELECT" ) ) );
 
-  setCaption( tr( "GEOM_INERTIA_TITLE" ) );
+  setWindowTitle( tr( "GEOM_INERTIA_TITLE" ) );
 
   /***************************************************************/
   
-  GroupConstructors->setTitle( tr( "GEOM_INERTIA_CONSTR" ) );
-  RadioButton1->setPixmap( image0 );
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_INERTIA_CONSTR" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
 
-  myGrp = new MeasureGUI_1Sel12LineEdit_QTD( this, "myGrp" );
+  myGrp = new MeasureGUI_1Sel12LineEdit( centralWidget() );
   myGrp->GroupBox1->setTitle( tr( "GEOM_MATRIX" ) );
   myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) );
   myGrp->TextLabel2->setText( tr( "GEOM_INERTIA_I" ).arg( "1" ) );
   myGrp->TextLabel3->setText( tr( "GEOM_INERTIA_I" ).arg( "2" ) );
   myGrp->TextLabel4->setText( tr( "GEOM_INERTIA_I" ).arg( "3" ) );
   myGrp->TextLabel5->setText( tr( "GEOM_INERTIA_IXYZ" ) );
-  myGrp->LineEdit11->setReadOnly( TRUE );
-  myGrp->LineEdit12->setReadOnly( TRUE );
-  myGrp->LineEdit13->setReadOnly( TRUE );
-  myGrp->LineEdit21->setReadOnly( TRUE );
-  myGrp->LineEdit22->setReadOnly( TRUE );
-  myGrp->LineEdit23->setReadOnly( TRUE );
-  myGrp->LineEdit31->setReadOnly( TRUE );
-  myGrp->LineEdit32->setReadOnly( TRUE );
-  myGrp->LineEdit33->setReadOnly( TRUE );
-  myGrp->LineEdit41->setReadOnly( TRUE );
-  myGrp->LineEdit42->setReadOnly( TRUE );
-  myGrp->LineEdit43->setReadOnly( TRUE );
-  myGrp->PushButton1->setPixmap( image1 );
+  myGrp->LineEdit11->setReadOnly( true );
+  myGrp->LineEdit12->setReadOnly( true );
+  myGrp->LineEdit13->setReadOnly( true );
+  myGrp->LineEdit21->setReadOnly( true );
+  myGrp->LineEdit22->setReadOnly( true );
+  myGrp->LineEdit23->setReadOnly( true );
+  myGrp->LineEdit31->setReadOnly( true );
+  myGrp->LineEdit32->setReadOnly( true );
+  myGrp->LineEdit33->setReadOnly( true );
+  myGrp->LineEdit41->setReadOnly( true );
+  myGrp->LineEdit42->setReadOnly( true );
+  myGrp->LineEdit43->setReadOnly( true );
+  myGrp->PushButton1->setIcon( image1 );
   myGrp->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget( myGrp, 1, 0 );
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( myGrp );
   
   /***************************************************************/
 
@@ -132,8 +121,7 @@ void MeasureGUI_InertiaDlg::processObject()
   gp_XYZ anIXYZ;
   gp_Mat aMat;
 
-  if ( !getParameters( aMat, anIXYZ ) )
-  {
+  if ( !getParameters( aMat, anIXYZ ) ) {
     mySelEdit->setText( "" );
     
     myGrp->LineEdit11->setText( "" );
@@ -152,8 +140,7 @@ void MeasureGUI_InertiaDlg::processObject()
     myGrp->LineEdit42->setText( "" );
     myGrp->LineEdit43->setText( "" );
   }
-  else
-  {
+  else {
     myGrp->LineEdit11->setText( QString( "%1" ).arg( aMat( 1, 1 ), 12, 'e', 4 ) );
     myGrp->LineEdit12->setText( QString( "%1" ).arg( aMat( 1, 2 ), 12, 'e', 4 ) );
     myGrp->LineEdit13->setText( QString( "%1" ).arg( aMat( 1, 3 ), 12, 'e', 4 ) );
@@ -181,10 +168,8 @@ bool MeasureGUI_InertiaDlg::getParameters( gp_Mat& I,
 {
   if ( myObj->_is_nil() )
     return false;
-  else
-  {
-    try
-    {
+  else {
+    try {
       double x, y, z;
       GEOM::GEOM_IMeasureOperations::_narrow( getOperation() )->GetInertia( myObj,
         I( 1, 1 ), I( 1, 2 ), I( 1, 3 ),
@@ -194,8 +179,7 @@ bool MeasureGUI_InertiaDlg::getParameters( gp_Mat& I,
 
         theIXYZ.SetCoord( x, y, z );
     }
-    catch( const SALOME::SALOME_Exception& e )
-    {
+    catch ( const SALOME::SALOME_Exception& e ) {
       SalomeApp_Tools::QtCatchCorbaException( e );
       return false;
     }
index 0905d52199bcf8ced7bec7669b32a211cc0a436d..1187fa5691320af774a7fa3daab2d2deb30c40d9 100644 (file)
@@ -1,39 +1,34 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : MeasureGUI_InertiaDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
-#ifndef DIALOGBOX_INERTIA_H
-#define DIALOGBOX_INERTIA_H
-
-#include "GEOM_MeasureGUI.hxx"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_InertiaDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef MEASUREGUI_INERTIADLG_H
+#define MEASUREGUI_INERTIADLG_H
 
 #include "MeasureGUI_Skeleton.h"
 
-class MeasureGUI_1Sel12LineEdit_QTD;
+class MeasureGUI_1Sel12LineEdit;
 class gp_XYZ;
 class gp_Mat;
 
@@ -42,28 +37,24 @@ class gp_Mat;
 // purpose  : Dialog for displaying moment of inertia
 //=================================================================================
 
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_InertiaDlg : public MeasureGUI_Skeleton
+class MeasureGUI_InertiaDlg : public MeasureGUI_Skeleton
 { 
-    Q_OBJECT
-
+  Q_OBJECT
+      
 public:
-                                        MeasureGUI_InertiaDlg( GeometryGUI* GUI,
-                                                              QWidget*     parent );
-                                        ~MeasureGUI_InertiaDlg();
-protected:
-
-    // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
-    virtual void                        processObject();
+  MeasureGUI_InertiaDlg( GeometryGUI*, QWidget* );
+  ~MeasureGUI_InertiaDlg();
 
+protected:
+  // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
+  virtual void                        processObject();
+  
 private:
-
-    void                                Init();
-    bool                                getParameters( gp_Mat& theMatrix,
-                                                       gp_XYZ& theMoment );
-
+  void                                Init();
+  bool                                getParameters( gp_Mat&, gp_XYZ& );
+  
 private:
-      
-    MeasureGUI_1Sel12LineEdit_QTD*      myGrp;
+  MeasureGUI_1Sel12LineEdit*          myGrp;
 };
 
-#endif // DIALOGBOX_INERTIA_H
+#endif // MEASUREGUI_INERTIADLG_H
index 5d364c386b23c6420b02ce53ee1d880057ffad4f..59630ab7dee82958c88d62266f22ac9125cfa59b 100644 (file)
@@ -1,68 +1,58 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_MaxToleranceDlg.cxx
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
 //
-//  File   : MeasureGUI_MaxToleranceDlg.cxx
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
-
 #include "MeasureGUI_MaxToleranceDlg.h"
-#include "MeasureGUI_1Sel6LineEdit_QTD.h"
-
-#include "utilities.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Tools.h"
+#include "MeasureGUI_Widgets.h"
 
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Tools.h>
 
 //=================================================================================
 // class    : MeasureGUI_MaxToleranceDlg()
 // purpose  : Constructs a MeasureGUI_MaxToleranceDlg which is 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.
+//            true to construct a modal dialog.
 //=================================================================================
 MeasureGUI_MaxToleranceDlg::MeasureGUI_MaxToleranceDlg( GeometryGUI* GUI, QWidget* parent )
-: MeasureGUI_Skeleton( GUI, parent, "MeasureGUI_MaxToleranceDlg" )
+  : MeasureGUI_Skeleton( GUI, parent )
 {
   QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap(
-    "GEOM",tr( "ICON_DLG_TOLERANCE" ) ) );
+    "GEOM", tr( "ICON_DLG_TOLERANCE" ) ) );
   QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap(
-    "GEOM",tr( "ICON_SELECT" ) ) );
+    "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption( tr( "GEOM_TOLERANCE_TITLE" ) );
+  setWindowTitle( tr( "GEOM_TOLERANCE_TITLE" ) );
 
   /***************************************************************/
   
-  GroupConstructors->setTitle( tr( "GEOM_TOLERANCE" ) );
-  RadioButton1->setPixmap( image0 );
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_TOLERANCE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
 
-  myGrp = new MeasureGUI_1Sel6LineEdit_QTD( this, "myGrp" );
+  myGrp = new MeasureGUI_1Sel6LineEdit( centralWidget() );
   myGrp->GroupBox1->setTitle( tr( "GEOM_TOLERANCE_CONSTR" ) );
   myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) );
   myGrp->TextLabel2->setText( tr( "GEOM_MIN" ) );
@@ -70,16 +60,18 @@ MeasureGUI_MaxToleranceDlg::MeasureGUI_MaxToleranceDlg( GeometryGUI* GUI, QWidge
   myGrp->TextLabel4->setText( tr( "GEOM_TOLERANCE_FACE" ) );
   myGrp->TextLabel5->setText( tr( "GEOM_TOLERANCE_EDGE" ) );
   myGrp->TextLabel6->setText( tr( "GEOM_TOLERANCE_VERTEX" ) );
-  myGrp->LineEdit11->setReadOnly( TRUE );
-  myGrp->LineEdit12->setReadOnly( TRUE );
-  myGrp->LineEdit21->setReadOnly( TRUE );
-  myGrp->LineEdit22->setReadOnly( TRUE );
-  myGrp->LineEdit31->setReadOnly( TRUE );
-  myGrp->LineEdit32->setReadOnly( TRUE );
-  myGrp->PushButton1->setPixmap( image1 );
+  myGrp->LineEdit11->setReadOnly( true );
+  myGrp->LineEdit12->setReadOnly( true );
+  myGrp->LineEdit21->setReadOnly( true );
+  myGrp->LineEdit22->setReadOnly( true );
+  myGrp->LineEdit31->setReadOnly( true );
+  myGrp->LineEdit32->setReadOnly( true );
+  myGrp->PushButton1->setIcon( image1 );
   myGrp->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget( myGrp, 1, 0 );
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( myGrp );
   
   /***************************************************************/
 
@@ -122,8 +114,7 @@ void MeasureGUI_MaxToleranceDlg::processObject()
   
   if ( !getParameters( aMinFaceToler, aMaxFaceToler,
                        aMinEdgeToler, aMaxEdgeToler,
-                       aMinVertexToler, aMaxVertexToler ) )
-  {
+                       aMinVertexToler, aMaxVertexToler ) ) {
     myGrp->LineEdit11->setText( "" );
     myGrp->LineEdit12->setText( "" );
 
@@ -164,16 +155,13 @@ bool MeasureGUI_MaxToleranceDlg::getParameters( double& theMinFaceToler,
 {
   if ( myObj->_is_nil() )
     return false;
-  else
-  {
-    try
-    {
+  else {
+    try {
       GEOM::GEOM_IMeasureOperations::_narrow( getOperation() )->GetTolerance( myObj,
-        theMinFaceToler, theMaxFaceToler, theMinEdgeToler,
-        theMaxEdgeToler, theMinVertexToler, theMaxVertexToler  );
+        theMinFaceToler, theMaxFaceToler,   theMinEdgeToler,
+        theMaxEdgeToler, theMinVertexToler, theMaxVertexToler );
     }
-    catch( const SALOME::SALOME_Exception& e )
-    {
+    catch( const SALOME::SALOME_Exception& e ) {
       SalomeApp_Tools::QtCatchCorbaException( e );
       return false;
     }
index 1b36bca03ade6d41154c1bbd46e0c4e39e3ff093..65ed53617e2d17e7e3893ffc55f5df51df7795d7 100644 (file)
@@ -1,76 +1,61 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : MeasureGUI_MaxToleranceDlg.h
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
-
-#ifndef DIALOGBOX_MAXTOLERANCE_H
-#define DIALOGBOX_MAXTOLERANCE_H
-
-#include "GEOM_MeasureGUI.hxx"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_MaxToleranceDlg.h
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
+//
+#ifndef MEASUREGUI_MAXTOLERANCEDLG_H
+#define MEASUREGUI_MAXTOLERANCEDLG_H
 
 #include "MeasureGUI_Skeleton.h"
 
-class  MeasureGUI_1Sel6LineEdit_QTD;
+class MeasureGUI_1Sel6LineEdit;
 
 //=================================================================================
 // class    : DialogBox_PROPERTIES
 // purpose  :
 //=================================================================================
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_MaxToleranceDlg : public MeasureGUI_Skeleton
+class MeasureGUI_MaxToleranceDlg : public MeasureGUI_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-                                        MeasureGUI_MaxToleranceDlg( GeometryGUI* GUI,
-                                                                   QWidget*     parent );
-                                        ~MeasureGUI_MaxToleranceDlg();
+  MeasureGUI_MaxToleranceDlg( GeometryGUI*, QWidget* );
+  ~MeasureGUI_MaxToleranceDlg();
 
 protected:
-
-    // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
-    virtual void                        processObject();
+  // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
+  virtual void                        processObject();
 
 private:
-
-    void                                Init();
-    bool                                getParameters( double& theMinFaceToler,
-                                                       double& theMaxFaceToler,
-                                                       double& theMinEdgeToler,
-                                                       double& theMaxEdgeToler,
-                                                       double& theMinVertexToler,
-                                                       double& theMaxVertexToler );
-                                                       
-
-
+  void                                Init();
+  bool                                getParameters( double&, double&, double&, 
+                                                    double&, double&, double& );
+  
 private:
-
-    MeasureGUI_1Sel6LineEdit_QTD*       myGrp;
+  MeasureGUI_1Sel6LineEdit*           myGrp;
 };
 
-#endif // DIALOGBOX_MAXTOLERANCE_H
+#endif // MEASUREGUI_MAXTOLERANCEDLG_H
 
 
 
index 6714e4fb19f18696f67f95cc58a1ae1a0fbad428..b5207d79085cad49da643ee102a14c75520f6407 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_NormaleDlg.cxx
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S.
 //
-//
-//  File   : MeasureGUI_NormaleDlg.cxx
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-//  $Header$
-
 #include "MeasureGUI_NormaleDlg.h"
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GEOMBase.h>
+#include <GeometryGUI.h>
 
-#include <qlabel.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
-#include "GEOMImpl_Types.hxx"
+// OCCT Includes
+#include <TopoDS_Shape.hxx>
+#include <TopoDS.hxx>
+#include <TopExp.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
 
-#include "utilities.h"
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : MeasureGUI_NormaleDlg()
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-MeasureGUI_NormaleDlg::MeasureGUI_NormaleDlg (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)
+MeasureGUI_NormaleDlg::MeasureGUI_NormaleDlg (GeometryGUI* theGeometryGUI, QWidget* parent)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, false)
 {
   SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
   QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_NORMALE")));
   QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_NORMALE_TITLE"));
+  setWindowTitle(tr("GEOM_NORMALE_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_NORMALE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupArgs = new DlgRef_2Sel_QTD (this, "GroupArgs");
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_NORMALE"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
+
+  GroupArgs = new DlgRef_2Sel (centralWidget());
   GroupArgs->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
 
   GroupArgs->TextLabel1->setText(tr("GEOM_FACE"));
   GroupArgs->TextLabel2->setText(tr("GEOM_POINT"));
 
-  GroupArgs->PushButton1->setPixmap(image1);
-  GroupArgs->PushButton2->setPixmap(image1);
+  GroupArgs->PushButton1->setIcon(image1);
+  GroupArgs->PushButton2->setIcon(image1);
 
-  Layout1->addWidget(GroupArgs, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupArgs);
   /***************************************************************/
 
   setHelpFileName("using_measurement_tools_page.html#normale_anchor");
@@ -85,7 +92,6 @@ MeasureGUI_NormaleDlg::MeasureGUI_NormaleDlg (GeometryGUI* theGeometryGUI, QWidg
 //=================================================================================
 MeasureGUI_NormaleDlg::~MeasureGUI_NormaleDlg()
 {
-  // no need to delete child widgets, Qt does it all for us
 }
 
 //=================================================================================
@@ -94,37 +100,28 @@ MeasureGUI_NormaleDlg::~MeasureGUI_NormaleDlg()
 //=================================================================================
 void MeasureGUI_NormaleDlg::Init()
 {
-  /* init variables */
+  // init variables
   GroupArgs->LineEdit1->setReadOnly(true);
   GroupArgs->LineEdit2->setReadOnly(true);
 
-  myFace = GEOM::GEOM_Object::_nil();
-  myPoint = GEOM::GEOM_Object::_nil();
+  GroupArgs->LineEdit1->setText("");
+  GroupArgs->LineEdit2->setText("");
+  myFace = myPoint = GEOM::GEOM_Object::_nil();
 
-  myEditCurrentArgument = GroupArgs->LineEdit1;
-  globalSelection(GEOM_FACE);
-
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
 
   connect(GroupArgs->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupArgs->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
 
-  connect(GroupArgs->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupArgs->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect(GroupArgs->LineEdit1,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupArgs->LineEdit2,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
 
   initName(tr("GEOM_VECTOR_NORMALE"));
 
-  //ConstructorsClicked(0);
+  GroupArgs->PushButton1->click();
   SelectionIntoArgument();
-
-  /* displays Dialog */
-  GroupArgs->show();
-  this->show();
 }
 
 //=================================================================================
@@ -147,12 +144,14 @@ bool MeasureGUI_NormaleDlg::ClickOnApply()
     return false;
 
   initName();
+  // activate first line edit
+  GroupArgs->PushButton1->click();
   return true;
 }
 
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed or other case
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void MeasureGUI_NormaleDlg::SelectionIntoArgument()
 {
@@ -166,42 +165,91 @@ void MeasureGUI_NormaleDlg::SelectionIntoArgument()
     myPoint = GEOM::GEOM_Object::_nil();
   }
 
-  if (IObjectCount() != 1)
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1)
     return;
 
   // nbSel == 1
   Standard_Boolean testResult = Standard_False;
   GEOM::GEOM_Object_var aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult);
+    GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
-  if (!testResult)
+  if (!testResult || CORBA::is_nil(aSelectedObject))
     return;
 
+  QString aName = GEOMBase::GetName(aSelectedObject);
+
   if (myEditCurrentArgument == GroupArgs->LineEdit1) {
+    TopoDS_Shape aShape;
+    if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
+    {
+      TColStd_IndexedMapOfInteger aMap;
+      aSelMgr->GetIndexes(aSelList.First(), aMap);
+      if (aMap.Extent() == 1) // Local Selection
+      {
+        GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
+        int anIndex = aMap(1);
+        aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+        aName += QString(":face_%1").arg(anIndex);
+      }
+      else // Global Selection
+      {
+        if (aShape.ShapeType() != TopAbs_FACE) {
+          aSelectedObject = GEOM::GEOM_Object::_nil();
+          aName = "";
+        }
+      }
+    }
     myFace = aSelectedObject;
+    myEditCurrentArgument->setText(aName);
+
+    // clear selection
+    disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+    myGeomGUI->getApp()->selectionMgr()->clearSelected();
+    connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+            this, SLOT(SelectionIntoArgument()));
+
+    if (!myFace->_is_nil() && myPoint->_is_nil())
+      GroupArgs->PushButton2->click();
   }
   else if (myEditCurrentArgument == GroupArgs->LineEdit2) {
+    TopoDS_Shape aShape;
+    if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
+    {
+      TColStd_IndexedMapOfInteger aMap;
+      aSelMgr->GetIndexes(aSelList.First(), aMap);
+      if (aMap.Extent() == 1) // Local Selection
+      {
+        GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
+        int anIndex = aMap(1);
+        aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+        aName += QString(":vertex_%1").arg(anIndex);
+      }
+      else // Global Selection
+      {
+        if (aShape.ShapeType() != TopAbs_VERTEX) {
+          aSelectedObject = GEOM::GEOM_Object::_nil();
+          aName = "";
+        }
+      }
+    }
     myPoint = aSelectedObject;
-  }
-
-  myEditCurrentArgument->setText(GEOMBase::GetName(aSelectedObject));
+    myEditCurrentArgument->setText(aName);
 
-  displayPreview();
-}
+    // clear selection
+    disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+    myGeomGUI->getApp()->selectionMgr()->clearSelected();
+    connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+            this, SLOT(SelectionIntoArgument()));
 
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose  :
-//=================================================================================
-void MeasureGUI_NormaleDlg::LineEditReturnPressed()
-{
-  QLineEdit* send = (QLineEdit*)sender();
-  if (send == GroupArgs->LineEdit1 ||
-      send == GroupArgs->LineEdit2)
-  {
-    myEditCurrentArgument = send;
-    GEOMBase_Skeleton::LineEditReturnPressed();
+    if (!myPoint->_is_nil() && myFace->_is_nil())
+      GroupArgs->PushButton1->click();
   }
+
+  displayPreview();
 }
 
 //=================================================================================
@@ -212,17 +260,50 @@ void MeasureGUI_NormaleDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
 
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  globalSelection(GEOM_FACE);
+
   if (send == GroupArgs->PushButton1) {
     myEditCurrentArgument = GroupArgs->LineEdit1;
-    globalSelection(GEOM_FACE);
+
+    GroupArgs->PushButton2->setDown(false);
+    GroupArgs->LineEdit2->setEnabled(false);
+
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_FACE);
   }
   else if (send == GroupArgs->PushButton2) {
     myEditCurrentArgument = GroupArgs->LineEdit2;
-    globalSelection(GEOM_POINT);
+
+    GroupArgs->PushButton1->setDown(false);
+    GroupArgs->LineEdit1->setEnabled(false);
+
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
   }
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
+}
+
+//=================================================================================
+// function : LineEditReturnPressed()
+// purpose  :
+//=================================================================================
+void MeasureGUI_NormaleDlg::LineEditReturnPressed()
+{
+  QLineEdit* send = (QLineEdit*)sender();
+  if (send == GroupArgs->LineEdit1 ||
+      send == GroupArgs->LineEdit2) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
 }
 
 //=================================================================================
@@ -232,17 +313,19 @@ void MeasureGUI_NormaleDlg::SetEditCurrentArgument()
 void MeasureGUI_NormaleDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  SelectionIntoArgument();
+  displayPreview();
 }
 
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void MeasureGUI_NormaleDlg::enterEvent (QEvent* e)
+void MeasureGUI_NormaleDlg::enterEvent (QEvent*)
 {
-  if (!GroupConstructors->isEnabled())
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
index 757c755d9c526b51893a2fe87342dbeef72b1b57..60eef7b17e83ab785e10861acaa4e8904209e1d5 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_NormaleDlg.h
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S.
 //
-//
-//  File   : MeasureGUI_NormaleDlg.h
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-
-#ifndef DIALOGBOX_NORMALE_H
-#define DIALOGBOX_NORMALE_H
+#ifndef MEASUREGUI_NORMALEDLG_H
+#define MEASUREGUI_NORMALEDLG_H
 
-#include "GEOM_MeasureGUI.hxx"
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel_QTD.h"
+class DlgRef_2Sel;
 
 //=================================================================================
 // class    : MeasureGUI_NormaleDlg
 // purpose  :
 //=================================================================================
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_NormaleDlg : public GEOMBase_Skeleton
+class MeasureGUI_NormaleDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    MeasureGUI_NormaleDlg (GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                          const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~MeasureGUI_NormaleDlg();
+  MeasureGUI_NormaleDlg( GeometryGUI*, QWidget* );
+  ~MeasureGUI_NormaleDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid (QString& msg);
-    virtual bool execute (ObjectList& objects);
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
 
 private:
-    void Init();
-    void enterEvent (QEvent* e);
+  void                               Init();
+  void                               enterEvent( QEvent* );
 
-    GEOM::GEOM_Object_var myFace;
-    GEOM::GEOM_Object_var myPoint;
+private:
+  GEOM::GEOM_Object_var              myFace;
+  GEOM::GEOM_Object_var              myPoint;
 
-    DlgRef_2Sel_QTD* GroupArgs;
+  DlgRef_2Sel*                       GroupArgs;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
 
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // DIALOGBOX_NORMALE_H
+#endif // MEASUREGUI_NORMALEDLG_H
index 415aca74d71c25039b2106a5051007df019fb30d..bba75ea596ea58f266fb29d7e7863cb9194066d9 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_PointDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : MeasureGUI_PointDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "MeasureGUI_PointDlg.h"
-#include "GEOMBase.h"
+#include "MeasureGUI_Widgets.h"
 
-#include "DlgRef_SpinBox.h"
+#include <GEOMBase.h>
+#include <DlgRef.h>
 
-#include "utilities.h"
+#include <GeometryGUI.h>
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
-#include <TColStd_MapOfInteger.hxx>
-#include <TopAbs_ShapeEnum.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <BRep_Tool.hxx>
 #include <TopExp.hxx>
-#include <TopAbs_ShapeEnum.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <gp_Pnt.hxx>
 
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
-#include <qapplication.h>
-
 //=================================================================================
 // class    : MeasureGUI_PointDlg()
 // purpose  : Constructs a MeasureGUI_PointDlg which is a child of 'parent'
+//            
 //=================================================================================
 MeasureGUI_PointDlg::MeasureGUI_PointDlg( GeometryGUI* GUI, QWidget* parent )
-: MeasureGUI_Skeleton( GUI, parent, "MeasureGUI_PointDlg" )
+  : MeasureGUI_Skeleton( GUI, parent )
 {
   QPixmap iconPnt( SUIT_Session::session()->resourceMgr()->loadPixmap(
-    "GEOM",tr( "ICON_DLG_POINT" ) ) );
-
+    "GEOM", tr( "ICON_DLG_POINT" ) ) );
+  
   QPixmap iconSelect( SUIT_Session::session()->resourceMgr()->loadPixmap(
-    "GEOM",tr( "ICON_SELECT" ) ) );
-
-  setCaption( tr( "CAPTION" ) );
-
-  GroupConstructors->setTitle( tr( "CAPTION" ) );
-  RadioButton1->setPixmap( iconPnt );
+    "GEOM", tr( "ICON_SELECT" ) ) );
 
-  QGroupBox* aGrp = new QGroupBox( 2, Qt::Horizontal, tr( "COORDINATES" ), this );
+  setWindowTitle( tr( "CAPTION" ) );
 
-  new QLabel( tr( "POINT" ), aGrp );
-  QFrame* aFrame = new QFrame( aGrp );
-  mySelBtn = new QPushButton( aFrame );
-  mySelBtn->setPixmap( iconSelect );
-  mySelEdit = new QLineEdit( aFrame );
-  QHBoxLayout* aLay = new QHBoxLayout( aFrame, 0, 10 );
-  aLay->addWidget( mySelBtn );
-  aLay->addWidget( mySelEdit );
+  mainFrame()->GroupConstructors->setTitle( tr( "CAPTION" ) );
+  mainFrame()->RadioButton1->setIcon( iconPnt );
 
-  new QLabel( tr( "X" ), aGrp );
-  myX = new QLineEdit( aGrp );
-  new QLabel( tr( "Y" ), aGrp );
-  myY = new QLineEdit( aGrp );
-  new QLabel( tr( "Z" ), aGrp );
-  myZ = new QLineEdit( aGrp );
+  myGrp = new MeasureGUI_1Sel3LineEdit( centralWidget() );
+  myGrp->TextLabel1->setText( tr( "POINT" ) );
+  myGrp->PushButton1->setIcon( iconSelect );
+  myGrp->LineEdit1->setReadOnly( true );
+  myGrp->TextLabel2->setText( tr( "X" ) );
+  myGrp->TextLabel3->setText( tr( "Y" ) );
+  myGrp->TextLabel4->setText( tr( "Z" ) );
+  myGrp->LineEdit2->setReadOnly( true );
+  myGrp->LineEdit3->setReadOnly( true );
+  myGrp->LineEdit4->setReadOnly( true );
 
-  mySelEdit->setReadOnly( true );
-  myX->setReadOnly( true );
-  myY->setReadOnly( true );
-  myZ->setReadOnly( true );
-
-  Layout1->addWidget( aGrp, 1, 0 );
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( myGrp );
 
   myHelpFileName = "using_measurement_tools_page.html#point_coord_anchor";
 
@@ -110,7 +88,7 @@ MeasureGUI_PointDlg::MeasureGUI_PointDlg( GeometryGUI* GUI, QWidget* parent )
 //=================================================================================
 // function : ~MeasureGUI_PointDlg()
 // purpose  : Destroys the object and frees any allocated resources
-//=================================================================================
+//======================myGrp->LineEdit2->setReadOnly( true );===========================================================
 MeasureGUI_PointDlg::~MeasureGUI_PointDlg()
 {
 }
@@ -142,26 +120,31 @@ void MeasureGUI_PointDlg::activateSelection()
 //=================================================================================
 void MeasureGUI_PointDlg::SelectionIntoArgument()
 {
-  try
-  {
+  try {
     myObj = GEOM::GEOM_Object::_nil();
-    mySelEdit->setText( "" );
-    myX->setText( "" );
-    myY->setText( "" );
-    myZ->setText( "" );
+    myGrp->LineEdit1->setText( "" );
+    myGrp->LineEdit2->setText( "" );
+    myGrp->LineEdit3->setText( "" );
+    myGrp->LineEdit4->setText( "" );
+
+    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+    SALOME_ListIO aSelList;
+    aSelMgr->selectedObjects(aSelList);
+
+    if (aSelList.Extent() < 1)
+      return;
 
     Standard_Boolean testResult = Standard_False;
     GEOM::GEOM_Object_var aSelectedObject =
-      GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
+      GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
-    if( !testResult || aSelectedObject->_is_nil() )
+    if (!testResult || aSelectedObject->_is_nil())
       return;
 
     myObj = aSelectedObject;
 
     TColStd_IndexedMapOfInteger anIndexes;
-    ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->
-      selectionMgr()->GetIndexes( firstIObject(), anIndexes );
+    aSelMgr->GetIndexes(aSelList.First(), anIndexes);
 
     TopoDS_Shape aShape;
     if ( anIndexes.Extent() > 1 || !GEOMBase::GetShape( myObj, aShape ) || aShape.IsNull() )
@@ -169,39 +152,36 @@ void MeasureGUI_PointDlg::SelectionIntoArgument()
 
     TopoDS_Vertex aPoint;
     QString aName = GEOMBase::GetName( myObj );
-    if ( anIndexes.Extent() == 0 )
-    {
+    if ( anIndexes.Extent() == 0 ) {
       if ( aShape.ShapeType() == TopAbs_VERTEX )
         aPoint = TopoDS::Vertex( aShape );
     }
-    else
-    {
+    else {
       int i = anIndexes( 1 );
 
       TopTools_IndexedMapOfShape aShapes;
       TopExp::MapShapes( aShape, aShapes );
-
+      
       if ( aShape != aShapes( i ) )
         aName += QString( ":%1" ).arg( i );
 
       aPoint = TopoDS::Vertex( aShapes( i ) );
     }
 
-    if ( !aPoint.IsNull() )
-    {
+    if ( !aPoint.IsNull() ) {
       gp_Pnt aPnt = BRep_Tool::Pnt( aPoint );
-      mySelEdit->setText( aName );
-      myX->setText(DlgRef_SpinBox::PrintDoubleValue(aPnt.X()));
-      myY->setText(DlgRef_SpinBox::PrintDoubleValue(aPnt.Y()));
-      myZ->setText(DlgRef_SpinBox::PrintDoubleValue(aPnt.Z()));
+      myGrp->LineEdit1->setText( aName );
+      myGrp->LineEdit2->setText( DlgRef::PrintDoubleValue( aPnt.X() ) );
+      myGrp->LineEdit3->setText( DlgRef::PrintDoubleValue( aPnt.Y() ) );
+      myGrp->LineEdit4->setText( DlgRef::PrintDoubleValue( aPnt.Z() ) );
     }
   }
   catch( ... )
   {
     myObj = GEOM::GEOM_Object::_nil();
-    mySelEdit->setText( "" );
-    myX->setText( "" );
-    myY->setText( "" );
-    myZ->setText( "" );
+    myGrp->LineEdit1->setText( "" );
+    myGrp->LineEdit2->setText( "" );
+    myGrp->LineEdit3->setText( "" );
+    myGrp->LineEdit4->setText( "" );
   }
 }
index ca27898166fbbce81903e22b34ac4b820edcc8bc..09989c456cbe00e7b0a5d162a7cdc53ebbec9d8f 100644 (file)
@@ -1,81 +1,58 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_PointDlg.h
+// Author : Sergey LITONIN, Open CASCADE S.A.S. (sergey.litonin@opencascade.com)
 //
-//  File   : MeasureGUI_PointDlg.h
-//  Author : Sergey LITONIN
-//  Module : GEOM
-
 #ifndef MEASUREGUI_POINTDLG_H
 #define MEASUREGUI_POINTDLG_H
 
-#include "GEOM_MeasureGUI.hxx"
-
 #include "MeasureGUI_Skeleton.h"
 
-class QLineEdit;
+class MeasureGUI_1Sel3LineEdit;
 
 //=================================================================================
 // class    : MeasureGUI_PointDlg
 // purpose  : Dialog for displaying point coordinates
 //=================================================================================
 
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_PointDlg : public MeasureGUI_Skeleton
+class MeasureGUI_PointDlg : public MeasureGUI_Skeleton
 { 
   Q_OBJECT
 
 public:
-                                      MeasureGUI_PointDlg( GeometryGUI* GUI,
-                                                          QWidget*     parent );
-                                      ~MeasureGUI_PointDlg();
+  MeasureGUI_PointDlg( GeometryGUI*, QWidget* );
+  ~MeasureGUI_PointDlg();
 
 protected:
-
   // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
   virtual void                        activateSelection();
   virtual void                        SelectionIntoArgument();
-
+  
 private:
-
   void                                Init();
-private:
-  QLineEdit*                          myX;
-  QLineEdit*                          myY;
-  QLineEdit*                          myZ;
 
+private:
+  MeasureGUI_1Sel3LineEdit*           myGrp;
 };
 
-#endif // DIALOGBOX_PROPERTIES_H
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#endif // MEASUREGUI_POINTDLG_H
index 80aed8c5d01be07a8d4f550e3fadeccc4b306b27..7f45b5a802c1f2f629ccc0a3204a8cfa31320318 100644 (file)
@@ -1,86 +1,78 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_PropertiesDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : MeasureGUI_PropertiesDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "MeasureGUI_PropertiesDlg.h"
-#include "MeasureGUI_1Sel3LineEdit_QTD.h"
-#include "GEOM_Displayer.h"
-#include "GEOMImpl_Types.hxx"
-#include "GEOMBase.h"
-#include "DlgRef_SpinBox.h"
+#include "MeasureGUI_Widgets.h"
 
-#include "SalomeApp_Tools.h"
-#include "utilities.h"
-#include "SUIT_Session.h"
+#include <GEOMImpl_Types.hxx>
+#include <GEOMBase.h>
+#include <DlgRef.h>
 
-#include <TColStd_MapOfInteger.hxx>
+#include <SalomeApp_Tools.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
 
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <TColStd_MapOfInteger.hxx>
 
 //=================================================================================
 // class    : MeasureGUI_PropertiesDlg()
 // purpose  : Constructs a MeasureGUI_PropertiesDlg which is 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.
+//            true to construct a modal dialog.
 //=================================================================================
 MeasureGUI_PropertiesDlg::MeasureGUI_PropertiesDlg( GeometryGUI* GUI, QWidget* parent )
-: MeasureGUI_Skeleton( GUI, parent, "MeasureGUI_PropertiesDlg" )
+  : MeasureGUI_Skeleton( GUI, parent )
 {
   QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap(
-    "GEOM",tr( "ICON_DLG_BASICPROPERTIES" ) ) );
+    "GEOM", tr( "ICON_DLG_BASICPROPERTIES" ) ) );
   QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap(
-    "GEOM",tr( "ICON_SELECT" ) ) );
+    "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption( tr( "GEOM_PROPERTIES_TITLE" ) );
+  setWindowTitle( tr( "GEOM_PROPERTIES_TITLE" ) );
 
   /***************************************************************/
   
-  GroupConstructors->setTitle( tr( "GEOM_PROPERTIES" ) );
-  RadioButton1->setPixmap( image0 );
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_PROPERTIES" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
 
-  myGrp = new MeasureGUI_1Sel3LineEdit_QTD( this, "myGrp"  );
+  myGrp = new MeasureGUI_1Sel3LineEdit( centralWidget()  );
   myGrp->GroupBox1->setTitle( tr( "GEOM_PROPERTIES_CONSTR" ) );
   myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) );
   myGrp->TextLabel2->setText( tr( "GEOM_LENGTH" ) );
   myGrp->TextLabel3->setText( tr( "GEOM_PROPERTIES_SURFACE" ) );
   myGrp->TextLabel4->setText( tr( "GEOM_PROPERTIES_VOLUME" ) );
-  myGrp->LineEdit2->setReadOnly( TRUE );
-  myGrp->LineEdit3->setReadOnly( TRUE );
-  myGrp->LineEdit4->setReadOnly( TRUE );
-  myGrp->PushButton1->setPixmap( image1 );
   myGrp->LineEdit1->setReadOnly( true );
-
-  Layout1->addWidget( myGrp, 1, 0 );
+  myGrp->PushButton1->setIcon( image1 );
+  myGrp->LineEdit2->setReadOnly( true );
+  myGrp->LineEdit3->setReadOnly( true );
+  myGrp->LineEdit4->setReadOnly( true );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( myGrp );
   
   /***************************************************************/
 
@@ -118,10 +110,9 @@ void MeasureGUI_PropertiesDlg::Init()
 void MeasureGUI_PropertiesDlg::activateSelection()
 {
   static TColStd_MapOfInteger aTypes;
-  if ( aTypes.IsEmpty() )
-  {
+  if ( aTypes.IsEmpty() ) {
     aTypes.Add( GEOM_COMPOUND );
-//    aTypes.Add( TopAbs_COMPSOLID );
+    //    aTypes.Add( TopAbs_COMPSOLID );
     aTypes.Add( GEOM_SOLID );
     aTypes.Add( GEOM_SHELL );
     aTypes.Add( GEOM_FACE );
@@ -140,18 +131,16 @@ void MeasureGUI_PropertiesDlg::processObject()
 {
   double aLength, anArea, aVolume;
   
-  if ( !getParameters( aLength, anArea, aVolume ) )
-  {
+  if ( !getParameters( aLength, anArea, aVolume ) ) {
     mySelEdit->setText( "" );
     myGrp->LineEdit2->setText( "" );
     myGrp->LineEdit3->setText( "" );
     myGrp->LineEdit4->setText( "" );
   }
-  else
-  {
-    myGrp->LineEdit2->setText( DlgRef_SpinBox::PrintDoubleValue( aLength ) );
-    myGrp->LineEdit3->setText( DlgRef_SpinBox::PrintDoubleValue( anArea ) );
-    myGrp->LineEdit4->setText( DlgRef_SpinBox::PrintDoubleValue( aVolume ) );
+  else {
+    myGrp->LineEdit2->setText( DlgRef::PrintDoubleValue( aLength ) );
+    myGrp->LineEdit3->setText( DlgRef::PrintDoubleValue( anArea ) );
+    myGrp->LineEdit4->setText( DlgRef::PrintDoubleValue( aVolume ) );
   }
 }
 
@@ -165,15 +154,12 @@ bool MeasureGUI_PropertiesDlg::getParameters( double& theLength,
 {
   if ( myObj->_is_nil() )
     return false;
-  else
-  {
-    try
-    {
+  else {
+    try {
       GEOM::GEOM_IMeasureOperations::_narrow( getOperation() )->GetBasicProperties(
         myObj, theLength, theArea, theVolume );
     }
-    catch( const SALOME::SALOME_Exception& e )
-    {
+    catch( const SALOME::SALOME_Exception& e ) {
       SalomeApp_Tools::QtCatchCorbaException( e );
       return false;
     }
@@ -191,7 +177,7 @@ SALOME_Prs* MeasureGUI_PropertiesDlg::buildPrs()
   TopoDS_Shape aShape, aResult;
   
   if ( myObj->_is_nil() ||
-       !GEOMBase::GetShape( myObj, aShape )||
+       !GEOMBase::GetShape( myObj, aShape ) ||
        aShape.IsNull() ||
        aShape.ShapeType() != TopAbs_EDGE ||
        !GEOMBase::CreateArrowForLinearEdge( aShape, aResult ) ||
index 0689c580654d99d9bb63be4416eb37f021cdf2c6..20eaac7485920a622938cb23bce15880a766167f 100644 (file)
@@ -1,83 +1,62 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : MeasureGUI_PropertiesDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_PROPERTIES_H
-#define DIALOGBOX_PROPERTIES_H
-
-#include "GEOM_MeasureGUI.hxx"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_PropertiesDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S. 
+//
+#ifndef MEASUREGUI_PROPERTIESDLG_H
+#define MEASUREGUI_PROPERTIESDLG_H
 
 #include "MeasureGUI_Skeleton.h"
-class MeasureGUI_1Sel3LineEdit_QTD;
+
+class MeasureGUI_1Sel3LineEdit;
 
 //=================================================================================
 // class    : MeasureGUI_PropertiesDlg
 // purpose  : Dialog for displaying length, area and volume
 //=================================================================================
 
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_PropertiesDlg : public MeasureGUI_Skeleton
+class MeasureGUI_PropertiesDlg : public MeasureGUI_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-                                        MeasureGUI_PropertiesDlg( GeometryGUI* GUI,
-                                                                 QWidget*     parent );
-                                        ~MeasureGUI_PropertiesDlg();
-
+  MeasureGUI_PropertiesDlg( GeometryGUI*, QWidget* );
+  ~MeasureGUI_PropertiesDlg();
+  
 protected:
-
-    // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
-    virtual void                        processObject();
-    virtual void                        activateSelection();
-    virtual SALOME_Prs*                 buildPrs();
+  // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
+  virtual void                        processObject();
+  virtual void                        activateSelection();
+  virtual SALOME_Prs*                 buildPrs();
 
 private:
-
-    void                                Init();
-    bool                                getParameters( double& theLength,
-                                                       double& theArea,
-                                                       double& theVolume );
+  void                                Init();
+  bool                                getParameters( double&,
+                                                    double&,
+                                                    double& );
 
 private:    
-
-    MeasureGUI_1Sel3LineEdit_QTD*       myGrp;
+  MeasureGUI_1Sel3LineEdit*           myGrp;
 };
 
-#endif // DIALOGBOX_PROPERTIES_H
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#endif // MEASUREGUI_PROPERTIESDLG_H
index def236c386b04e011220b6e42934931fe55f4601..96cb3b82af5af051af59ec7ed6bd5439400e2acd 100644 (file)
@@ -1,50 +1,45 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_Skeleton.cxx
+// Author : Damine COQUERET, Open CASCADE S.A.S.
 //
-//  File   : MeasureGUI_Skeleton.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "MeasureGUI_Skeleton.h"
-#include "GEOMBase.h"
-#include "GEOM_Displayer.h"
-#include "GeometryGUI.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"
-
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
-#include <qapplication.h>
+#include "MeasureGUI_Widgets.h"
+
+#include <GEOMBase.h>
+#include <GEOM_Displayer.h>
+#include <GeometryGUI.h>
+
+#include <LightApp_SelectionMgr.h>
+#include <SalomeApp_Application.h>
+#include <SalomeApp_Tools.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_Session.h>
+#include <SUIT_OverrideCursor.h>
+
+#include <QKeyEvent>
 
 //=================================================================================
 // class    : MeasureGUI_Skeleton()
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-MeasureGUI_Skeleton::MeasureGUI_Skeleton( GeometryGUI*      GUI,
-                                         QWidget*          parent,
-                                          const char*       name )
-: MeasureGUI_Skeleton_QTD( parent, name, false,
-                          WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose ),
-  GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
-  myGeomGUI( GUI )
+MeasureGUI_Skeleton::MeasureGUI_Skeleton( GeometryGUI* GUI, QWidget* parent,
+                                         bool modal, Qt::WindowFlags f )
+  : QDialog( parent, f ),
+    GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
+    myGeomGUI( GUI )
 {
+  myMainFrame = new MeasureGUI_SkeletonBox( this );
+  QVBoxLayout* topLayout = new QVBoxLayout( this );
+  topLayout->setMargin( 9 ); topLayout->setSpacing( 0 );
+  topLayout->addWidget( myMainFrame );
+
+  setAttribute( Qt::WA_DeleteOnClose );
+  setModal( modal );
   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 );
-
-  resize( 350, 0 );
+  
+  buttonClose()->setText( tr( "GEOM_BUT_CLOSE" ) );
+  buttonHelp()->setText( tr( "GEOM_BUT_HELP" ) );
 }
 
 
@@ -84,7 +77,8 @@ MeasureGUI_Skeleton::MeasureGUI_Skeleton( GeometryGUI*      GUI,
 //=================================================================================
 MeasureGUI_Skeleton::~MeasureGUI_Skeleton()
 {
-  myGeomGUI->SetActiveDialogBox( 0 );
+  if ( myGeomGUI )
+    myGeomGUI->SetActiveDialogBox( 0 );
   delete myDisplayer;
 }
 
@@ -96,39 +90,46 @@ MeasureGUI_Skeleton::~MeasureGUI_Skeleton()
 void MeasureGUI_Skeleton::Init()
 {
   /* init variables */
-  myGeomGUI->SetActiveDialogBox((QDialog*)this);
+  if ( myGeomGUI )
+    myGeomGUI->SetActiveDialogBox( (QDialog*)this );
 
   /* signals and slots connections */
   
-  connect( buttonClose, SIGNAL( clicked() ),
-          this,         SLOT( ClickOnCancel() ) );
+  connect( buttonClose(), SIGNAL( clicked() ),
+          this,          SLOT( ClickOnCancel() ) );
 
-  connect( buttonHelp,  SIGNAL( clicked() ), 
-          this,        SLOT( ClickOnHelp() ) );
+  connect( buttonHelp(),  SIGNAL( clicked() ), 
+          this,          SLOT( ClickOnHelp() ) );
   
-  connect( myGeomGUI,   SIGNAL( SignalDeactivateActiveDialog() ),
-           this,        SLOT  ( DeactivateActiveDialog() ) );
-           
-  connect( myGeomGUI,   SIGNAL( SignalCloseAllDialogs() ),
-           this,        SLOT  ( ClickOnCancel() ) );
-
-  connect( mySelEdit,   SIGNAL( returnPressed() ),
-           this,        SLOT( LineEditReturnPressed() ) );
-           
-  connect( mySelBtn,    SIGNAL( clicked() ),
-           this,        SLOT  ( SetEditCurrentArgument() ) );
-
-  LightApp_SelectionMgr* aSel = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr();
-  if ( aSel )
+  if ( myGeomGUI ) {
+    connect( myGeomGUI,   SIGNAL( SignalDeactivateActiveDialog() ),
+            this,        SLOT  ( DeactivateActiveDialog() ) );
+    
+    connect( myGeomGUI,   SIGNAL( SignalCloseAllDialogs() ),
+            this,        SLOT  ( ClickOnCancel() ) );
+  }
+  
+  if ( mySelEdit ) {
+    connect( mySelEdit,   SIGNAL( returnPressed() ),
+            this,        SLOT( LineEditReturnPressed() ) );
+  }
+   
+  if ( mySelBtn ) {
+    connect( mySelBtn,    SIGNAL( clicked() ),
+            this,        SLOT  ( SetEditCurrentArgument() ) );
+  }
+
+  LightApp_SelectionMgr* aSel = ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr();
+  if ( aSel ) {
     connect( aSel, SIGNAL( currentSelectionChanged() ), 
             this, SLOT  ( SelectionIntoArgument() ) ) ;
+  }
 
   /* displays Dialog */
-  RadioButton1->setChecked( TRUE );
+  mainFrame()->RadioButton1->setChecked( true );
 
   activateSelection();
   SelectionIntoArgument();
-  show();
 }
 
 
@@ -147,20 +148,20 @@ void MeasureGUI_Skeleton::ClickOnCancel()
 //=================================================================================
 void MeasureGUI_Skeleton::ClickOnHelp()
 {
-  LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
-  if (app) 
-    app->onHelpContextModule(myGeomGUI ? app->moduleName(myGeomGUI->moduleName()) : QString(""), myHelpFileName);
+  LightApp_Application* app = (LightApp_Application*)( SUIT_Session::session()->activeApplication() );
+  if ( app ) {
+    app->onHelpContextModule( myGeomGUI ? app->moduleName( myGeomGUI->moduleName() ) : QString( "" ), myHelpFileName );
+  }
   else {
-               QString platform;
+    QString platform;
 #ifdef WIN32
-               platform = "winapplication";
+    platform = "winapplication";
 #else
-               platform = "application";
+    platform = "application";
 #endif
-    SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"),
-                          QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
-                          arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName),
-                          QObject::tr("BUT_OK"));
+    SUIT_MessageBox::warning( this, tr( "WRN_WARNING" ),
+                             tr( "EXTERNAL_BROWSER_CANNOT_SHOW_PAGE" ).
+                             arg( app->resourceMgr()->stringValue( "ExternalBrowser", platform ) ).arg( myHelpFileName ) );
   }
 }
 
@@ -174,11 +175,17 @@ void MeasureGUI_Skeleton::LineEditReturnPressed()
   /* If successfull the selection is changed and signal emitted... */
   /* so SelectionIntoArgument() is automatically called.           */
   
-  const QString objectUserName = mySelEdit->text();
-  QWidget* thisWidget = ( QWidget* )this;
-  
-  if ( GEOMBase::SelectionByNameInDialogs( thisWidget, objectUserName, selectedIO() ) )
-    mySelEdit->setText( objectUserName );
+  if ( mySelEdit ) {
+    const QString objectUserName = mySelEdit->text();
+    QWidget* thisWidget = ( QWidget* )this;
+    
+    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+    SALOME_ListIO aSelList;
+    aSelMgr->selectedObjects(aSelList);
+
+    if (GEOMBase::SelectionByNameInDialogs(thisWidget, objectUserName, aSelList))
+      mySelEdit->setText(objectUserName);
+  }
 }
 
 
@@ -190,7 +197,7 @@ void MeasureGUI_Skeleton::DeactivateActiveDialog()
 {
   setEnabled( false );
   
-  LightApp_SelectionMgr* aSel = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr();
+  LightApp_SelectionMgr* aSel = ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr();
   if ( aSel )
     disconnect( aSel, 0, this, 0 );
   
@@ -212,7 +219,7 @@ void MeasureGUI_Skeleton::ActivateThisDialog()
   
   myGeomGUI->SetActiveDialogBox( ( QDialog* )this );
 
-  LightApp_SelectionMgr* aSel = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr();
+  LightApp_SelectionMgr* aSel = ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr();
   if ( aSel )
     connect( aSel, SIGNAL( currentSelectionChanged() ), 
             this, SLOT  ( SelectionIntoArgument() ) ) ;
@@ -238,21 +245,29 @@ void MeasureGUI_Skeleton::SetEditCurrentArgument()
 void MeasureGUI_Skeleton::SelectionIntoArgument()
 {
   myObj = GEOM::GEOM_Object::_nil();
-  
-  Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
-  
-  if( !testResult || aSelectedObject->_is_nil() )
-  {
-    mySelEdit->setText( "" );
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  GEOM::GEOM_Object_var aSelectedObject = GEOM::GEOM_Object::_nil();
+
+  if (aSelList.Extent() > 0) {
+    Standard_Boolean testResult = Standard_False;
+    aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    if (!testResult)
+      aSelectedObject = GEOM::GEOM_Object::_nil();
+  }
+
+  if (aSelectedObject->_is_nil()) {
+    mySelEdit->setText("");
     processObject();
     erasePreview();
     return;
   }
 
   myObj = aSelectedObject;
-  mySelEdit->setText( GEOMBase::GetName( myObj ) );
+  mySelEdit->setText(GEOMBase::GetName(myObj));
   processObject();
   redisplayPreview();
 }
@@ -272,7 +287,7 @@ void MeasureGUI_Skeleton::processObject()
 //=================================================================================
 void MeasureGUI_Skeleton::closeEvent( QCloseEvent* e )
 {
-  LightApp_SelectionMgr* aSel = ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr();
+  LightApp_SelectionMgr* aSel = ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr();
   if ( aSel )
     disconnect( aSel, 0, this, 0 );
   QDialog::closeEvent( e );
@@ -282,9 +297,9 @@ void MeasureGUI_Skeleton::closeEvent( QCloseEvent* e )
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void MeasureGUI_Skeleton::enterEvent(QEvent* e)
+void MeasureGUI_Skeleton::enterEvent( QEvent* )
 {
-  if ( GroupConstructors->isEnabled() )
+  if ( mainFrame()->GroupConstructors->isEnabled() )
     return;
     
   ActivateThisDialog();
@@ -306,16 +321,14 @@ SALOME_Prs* MeasureGUI_Skeleton::buildPrs()
 void MeasureGUI_Skeleton::redisplayPreview()
 {
   QString aMess;
-  if ( !isValid( aMess ) )
-  {
+  if ( !isValid( aMess ) ) {
     erasePreview( true );
     return;
   }
 
   erasePreview( false );
 
-  try
-  {
+  try {
     SUIT_OverrideCursor();
 
     getDisplayer()->SetColor( Quantity_NOC_VIOLET );
@@ -324,8 +337,7 @@ void MeasureGUI_Skeleton::redisplayPreview()
     if ( SALOME_Prs* aPrs = buildPrs() )
       displayPreview( aPrs );
   }
-  catch( const SALOME::SALOME_Exception& e )
-  {
+  catch ( const SALOME::SALOME_Exception& e ) {
     SalomeApp_Tools::QtCatchCorbaException( e );
   }
   
@@ -379,9 +391,28 @@ void MeasureGUI_Skeleton::keyPressEvent( QKeyEvent* e )
   if ( e->isAccepted() )
     return;
 
-  if ( e->key() == Key_F1 )
-    {
-      e->accept();
-      ClickOnHelp();
-    }
+  if ( e->key() == Qt::Key_F1 ) {
+    e->accept();
+    ClickOnHelp();
+  }
+}
+
+MeasureGUI_SkeletonBox* MeasureGUI_Skeleton::mainFrame() const
+{
+  return myMainFrame;
+}
+
+QWidget* MeasureGUI_Skeleton::centralWidget() const
+{
+  return mainFrame()->GroupMedium;
+}
+
+QPushButton* MeasureGUI_Skeleton::buttonClose() const
+{
+  return mainFrame()->buttonClose;
+}
+
+QPushButton* MeasureGUI_Skeleton::buttonHelp() const
+{
+  return mainFrame()->buttonHelp;
 }
index 79d5ade2166926092139a9453e6542ec86133efa..01633884f0adf4ace3e07bd04dabff2661107a8b 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_Skeleton.h
+// Author : Damine COQUERET, Open CASCADE S.A.S.
 //
-//  File   : MeasureGUI_Skeleton.h
-//  Author : Damine COQUERET
-//  Module : GEOM
-//  $Header: 
-
 #ifndef MEASUREGUI_SKELETON_H
 #define MEASUREGUI_SKELETON_H
 
-#include "GEOM_MeasureGUI.hxx"
-
-#include "MeasureGUI_Skeleton_QTD.h"
-#include "GEOMBase_Helper.h"
+#include <QDialog>
+#include <GEOMBase_Helper.h>
 
 class GeometryGUI;
-class QWidget;
+class MeasureGUI_SkeletonBox;
 class QLineEdit;
 class QPushButton;
 class GEOM_Displayer;
 
-class GEOM_MEASUREGUI_EXPORT 
-    MeasureGUI_Skeleton : public MeasureGUI_Skeleton_QTD,
-                          public GEOMBase_Helper
+class MeasureGUI_Skeleton : public QDialog, public GEOMBase_Helper
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-                              MeasureGUI_Skeleton( GeometryGUI*      GUI,
-                                                  QWidget*          parent,
-                                                   const char*       name );
-                              ~MeasureGUI_Skeleton();
-
+  MeasureGUI_Skeleton( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~MeasureGUI_Skeleton();
+  
 protected slots:
-
-    virtual void              ClickOnCancel();
-    virtual void              ClickOnHelp(); 
-    virtual void              DeactivateActiveDialog();
-    virtual void              ActivateThisDialog();
-    virtual void              SelectionIntoArgument();
-    virtual void              LineEditReturnPressed();
-    virtual void              SetEditCurrentArgument();                              
+  virtual void                       ClickOnCancel();
+  virtual void                       ClickOnHelp(); 
+  virtual void                       DeactivateActiveDialog();
+  virtual void                       ActivateThisDialog();
+  virtual void                       SelectionIntoArgument();
+  virtual void                       LineEditReturnPressed();
+  virtual void                       SetEditCurrentArgument();                              
 
 protected:
-
-    void                      Init();
-
-    void                      enterEvent( QEvent* e );
-    void                      closeEvent( QCloseEvent* e );
-    void                      keyPressEvent( QKeyEvent* e );
-    void                      redisplayPreview();
-    GEOM_Displayer*           getDisplayer();
-
-    virtual bool              isValid( QString& msg );
-    virtual SALOME_Prs*       buildPrs();
-    virtual void              processObject();
-    virtual void              activateSelection();
-
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
+  void                               Init();
+  
+  void                               enterEvent( QEvent* );
+  void                               closeEvent( QCloseEvent* );
+  void                               keyPressEvent( QKeyEvent* );
+  void                               redisplayPreview();
+  GEOM_Displayer*                    getDisplayer();
+  
+  virtual bool                       isValid( QString& );
+  virtual SALOME_Prs*                buildPrs();
+  virtual void                       processObject();
+  virtual void                       activateSelection();
+  
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+
+  MeasureGUI_SkeletonBox*            mainFrame() const;
+  QWidget*                           centralWidget() const;
+  QPushButton*                       buttonClose() const;
+  QPushButton*                       buttonHelp() const;
 
 protected:    
-    
-    QPushButton*              mySelBtn;
-    QLineEdit*                mySelEdit;
-    GEOM::GEOM_Object_var     myObj;
-    
-    GeometryGUI*              myGeomGUI;
-    GEOM_Displayer*           myDisplayer;
-
-    QString                   myHelpFileName;
+  QPushButton*                       mySelBtn;
+  QLineEdit*                         mySelEdit;
+  GEOM::GEOM_Object_var              myObj;
+  
+  GeometryGUI*                       myGeomGUI;
+  GEOM_Displayer*                    myDisplayer;
+  
+  QString                            myHelpFileName;
+  MeasureGUI_SkeletonBox*            myMainFrame;
 };
-
 #endif // MEASUREGUI_SKELETON_H
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/MeasureGUI/MeasureGUI_SkeletonBox_QTD.ui b/src/MeasureGUI/MeasureGUI_SkeletonBox_QTD.ui
new file mode 100644 (file)
index 0000000..f723ac8
--- /dev/null
@@ -0,0 +1,93 @@
+<ui version="4.0" >
+ <class>MeasureGUI_SkeletonBox_QTD</class>
+ <widget class="QWidget" name="MeasureGUI_SkeletonBox_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>200</width>
+    <height>92</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="2" column="0" >
+    <widget class="QGroupBox" name="GroupButtons" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QPushButton" name="buttonClose" >
+        <property name="text" >
+         <string>&amp;Close</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="buttonHelp" >
+        <property name="text" >
+         <string>&amp;Help</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QWidget" native="1" name="GroupMedium" />
+   </item>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="GroupConstructors" >
+     <property name="title" >
+      <string/>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QRadioButton" name="RadioButton1" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/MeasureGUI/MeasureGUI_Skeleton_QTD.cxx b/src/MeasureGUI/MeasureGUI_Skeleton_QTD.cxx
deleted file mode 100644 (file)
index 5a01f58..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'MeasureGUI_Skeleton_QTD.ui'
-**
-** Created: Tue Mar 13 14:20:24 2007
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#include "MeasureGUI_Skeleton_QTD.h"
-
-#include <qvariant.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/*
- *  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 )
-    : QDialog( parent, name, modal, fl )
-{
-    if ( !name )
-       setName( "MeasureGUI_Skeleton_QTD" );
-    setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
-    setSizeGripEnabled( TRUE );
-    MeasureGUI_Skeleton_QTDLayout = new QGridLayout( this, 1, 1, 11, 6, "MeasureGUI_Skeleton_QTDLayout"); 
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    GroupButtons = new QGroupBox( this, "GroupButtons" );
-    GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) );
-    GroupButtons->setColumnLayout(0, Qt::Vertical );
-    GroupButtons->layout()->setSpacing( 6 );
-    GroupButtons->layout()->setMargin( 11 );
-    GroupButtonsLayout = new QGridLayout( GroupButtons->layout() );
-    GroupButtonsLayout->setAlignment( Qt::AlignTop );
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-    Spacer1 = new QSpacerItem( 120, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
-    Layout3->addItem( Spacer1, 0, 1 );
-
-    buttonClose = new QPushButton( GroupButtons, "buttonClose" );
-
-    Layout3->addWidget( buttonClose, 0, 0 );
-
-    buttonHelp = new QPushButton( GroupButtons, "buttonHelp" );
-
-    Layout3->addWidget( buttonHelp, 0, 2 );
-
-    GroupButtonsLayout->addLayout( Layout3, 0, 0 );
-
-    Layout1->addWidget( GroupButtons, 2, 0 );
-
-    GroupConstructors = new QButtonGroup( this, "GroupConstructors" );
-    GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) );
-    GroupConstructors->setColumnLayout(0, Qt::Vertical );
-    GroupConstructors->layout()->setSpacing( 6 );
-    GroupConstructors->layout()->setMargin( 11 );
-    GroupConstructorsLayout = new QGridLayout( GroupConstructors->layout() );
-    GroupConstructorsLayout->setAlignment( Qt::AlignTop );
-
-    Layout2 = new QHBoxLayout( 0, 0, 6, "Layout2"); 
-
-    RadioButton1 = new QRadioButton( GroupConstructors, "RadioButton1" );
-    Layout2->addWidget( RadioButton1 );
-
-    GroupConstructorsLayout->addLayout( Layout2, 0, 0 );
-
-    Layout1->addWidget( GroupConstructors, 0, 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()
-{
-    // 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()
-{
-}
-
diff --git a/src/MeasureGUI/MeasureGUI_Skeleton_QTD.h b/src/MeasureGUI/MeasureGUI_Skeleton_QTD.h
deleted file mode 100644 (file)
index 990f0a6..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-// 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
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'MeasureGUI_Skeleton_QTD.ui'
-**
-** Created: Tue Mar 13 14:20:20 2007
-**      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
-
-#include "GEOM_MeasureGUI.hxx"
-
-#include <qvariant.h>
-#include <qdialog.h>
-
-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:
-    MeasureGUI_Skeleton_QTD( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
-    ~MeasureGUI_Skeleton_QTD();
-
-    QGroupBox* GroupButtons;
-    QPushButton* buttonClose;
-    QPushButton* buttonHelp;
-    QButtonGroup* GroupConstructors;
-    QRadioButton* RadioButton1;
-
-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
index 8820931dd1230ffcdb81f7d0113e69e4d8e952de..202b3faf31d69e43a1447a9e9a0f7d3ca0b7f39a 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_WhatisDlg.cxx
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
 //
-//  File   : MeasureGUI_WhatisDlg.cxx
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
-
 #include "MeasureGUI_WhatisDlg.h"
-#include "MeasureGUI_1Sel1TextView_QTD.h"
-#include "GEOMBase.h"
+#include "MeasureGUI_Widgets.h"
 
-#include <TopTools_MapOfShape.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Iterator.hxx>
+#include <DlgRef.h>
+#include <GEOMBase.h>
 
-#include <BRep_Tool.hxx>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Tools.h>
 
-#include "utilities.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Tools.h"
+#include <QGroupBox>
+#include <QScrollBar>
+#include <QMessageBox>
 
-#include <qtextedit.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
+class MeasureGUI_WhatisDlg::Whatis : public QGroupBox
+{ 
+public:
+  Whatis( QWidget* parent );
+  ~Whatis();
+
+  QLabel*      TextLabel1;
+  QPushButton* PushButton1;
+  QLineEdit*   LineEdit1;
+  
+  QTextEdit*   TextEdit1;
+  
+  QLabel*      TextLabel2;
+  QLineEdit*   LineEdit2;
+  QPushButton* PushButton2;
+};
+
+//=================================================================================
+// Constructs a MeasureGUI_Whatis_QTD which is a child of 'parent', with the
+// name 'name' and widget flags set to 'f'
+//=================================================================================
+MeasureGUI_WhatisDlg::Whatis::Whatis( QWidget* parent )
+  : QGroupBox( parent )
+{
+  QGridLayout* topLayout = new QGridLayout( this );
+  topLayout->setMargin( 11 );
+  topLayout->setSpacing( 6 );
+
+  TextLabel1  = new QLabel( this );
+  PushButton1 = new QPushButton( this );
+  LineEdit1   = new QLineEdit( this );
+  TextEdit1   = new QTextEdit( this );
+  TextLabel2  = new QLabel( this );
+  LineEdit2   = new QLineEdit( this);
+  PushButton2 = new QPushButton( this );
+
+  topLayout->addWidget( TextLabel1,  0, 0 );
+  topLayout->addWidget( PushButton1, 0, 1 );
+  topLayout->addWidget( LineEdit1,   0, 2, 1, 2 );
+  topLayout->addWidget( TextEdit1,   1, 0, 1, 4 );
+  topLayout->addWidget( TextLabel2 , 2, 0 );
+  topLayout->addWidget( LineEdit2  , 2, 1, 1, 2 );
+  topLayout->addWidget( PushButton2, 2, 3 );
+}
+
+//=================================================================================
+// Destroys the object and frees any allocated resources
+//=================================================================================
+MeasureGUI_WhatisDlg::Whatis::~Whatis()
+{
+}
 
 //=================================================================================
 // class    : MeasureGUI_WhatisDlg( )
 // purpose  : Constructs a MeasureGUI_WhatisDlg which is 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.
+//            true to construct a modal dialog.
 //=================================================================================
-MeasureGUI_WhatisDlg::MeasureGUI_WhatisDlg (GeometryGUI* GUI, QWidget* parent)
-  : MeasureGUI_Skeleton(GUI, parent, "MeasureGUI_WhatisDlg")
+MeasureGUI_WhatisDlg::MeasureGUI_WhatisDlg( GeometryGUI* GUI, QWidget* parent )
+  : MeasureGUI_Skeleton( GUI, parent )
 {
-  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap(
-    "GEOM",tr( "ICON_DLG_WHATIS" ) ) );
-  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap(
-    "GEOM",tr( "ICON_SELECT" ) ) );
+  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+  QPixmap image0( resMgr->loadPixmap( "GEOM", tr( "ICON_DLG_WHATIS" ) ) );
+  QPixmap image1( resMgr->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption( tr( "GEOM_WHATIS_TITLE" ) );
+  setWindowTitle( tr( "GEOM_WHATIS_TITLE" ) );
 
   /***************************************************************/
+  
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_WHATIS" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
 
-  GroupConstructors->setTitle( tr( "GEOM_WHATIS" ) );
-  RadioButton1->setPixmap( image0 );
+  myGrp = new Whatis( this );
+
+  myGrp->setTitle( tr( "GEOM_WHATIS_OBJECT" ) );
 
-  myGrp = new MeasureGUI_1Sel1TextView_QTD( this, "myGrp" );
-  myGrp->GroupBox1->setTitle( tr( "GEOM_WHATIS_OBJECT" ) );
   myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) );
+  myGrp->PushButton1->setIcon( image1 );
+  myGrp->PushButton1->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) );
+  myGrp->LineEdit1->setReadOnly( true );
 
-  myGrp->TextEdit1->setReadOnly( TRUE );
+  myGrp->TextEdit1->setReadOnly( true );
   // fix height to fit all text
-  myGrp->TextEdit1->setWordWrap(QTextEdit::NoWrap);
-  myGrp->TextEdit1->setTextFormat(Qt::PlainText);
+  myGrp->TextEdit1->setLineWrapMode( QTextEdit::NoWrap );
+  // myGrp->TextEdit1->setTextFormat( Qt::PlainText ); // VSR : TODO
   QString allLines ("\n\n\n\n\n\n\n\n\n"); // 10 lines
-  myGrp->TextEdit1->setText(allLines);
+  myGrp->TextEdit1->setText( allLines );
   int sbHeight = myGrp->TextEdit1->horizontalScrollBar()->height();
-  myGrp->TextEdit1->setFixedHeight(myGrp->TextEdit1->contentsHeight() + sbHeight);
+  myGrp->TextEdit1->setFixedHeight( myGrp->TextEdit1->document()->size().height() + sbHeight );
 
-  myGrp->PushButton1->setPixmap( image1 );
-  myGrp->LineEdit1->setReadOnly( true );
+  myGrp->TextLabel2->setText( tr( "GEOM_KIND_OF_SHAPE" ) );
+  myGrp->LineEdit2->setReadOnly( true );
+  myGrp->LineEdit2->setMinimumWidth( 150 );
+  myGrp->PushButton2->setText( tr( "GEOM_PROPERTIES" ) );
+  myGrp->PushButton2->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) );
 
-  Layout1->addWidget( myGrp, 1, 0 );
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( myGrp );
+
+  // Properties dialog
+  myParamsDlg = new QMessageBox(QMessageBox::Information, "", "", QMessageBox::Ok, this);
+  myParamsDlg->setModal( false );
 
   /***************************************************************/
 
@@ -99,7 +150,6 @@ MeasureGUI_WhatisDlg::MeasureGUI_WhatisDlg (GeometryGUI* GUI, QWidget* parent)
   Init();
 }
 
-
 //=================================================================================
 // function : ~MeasureGUI_WhatisDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -108,7 +158,6 @@ MeasureGUI_WhatisDlg::~MeasureGUI_WhatisDlg()
 {
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
@@ -117,10 +166,12 @@ void MeasureGUI_WhatisDlg::Init()
 {
   mySelBtn = myGrp->PushButton1;
   mySelEdit = myGrp->LineEdit1;
+
+  connect( myGrp->PushButton2, SIGNAL( clicked() ), this, SLOT( ClickOnProperties() ) );
+
   MeasureGUI_Skeleton::Init();
 }
 
-
 //=================================================================================
 // function : processObject
 // purpose  :
@@ -128,9 +179,25 @@ void MeasureGUI_WhatisDlg::Init()
 void MeasureGUI_WhatisDlg::processObject()
 {
   QString aText;
-  myGrp->TextEdit1->setText( getParameters( aText ) ? aText : QString("") );
+  myGrp->TextEdit1->setText( getParameters( aText ) ? aText : QString( "" ) );
+
+  QString aParameters;
+  QString aKind = getKindOfShape( aParameters );
+  myGrp->LineEdit2->setText( aKind );
+  myGrp->PushButton2->setEnabled( !aParameters.isEmpty());
+  myParamsDlg->setWindowTitle(aKind + " " + tr("GEOM_PROPERTIES"));
+  myParamsDlg->setText(aParameters);
+  myParamsDlg->adjustSize();
 }
 
+//=================================================================================
+// function : ClickOnProperties()
+// purpose  :
+//=================================================================================
+void MeasureGUI_WhatisDlg::ClickOnProperties()
+{
+  myParamsDlg->show();
+}
 
 //=================================================================================
 // function : getParameters
@@ -140,18 +207,388 @@ bool MeasureGUI_WhatisDlg::getParameters( QString& theText )
 {
   if ( myObj->_is_nil() )
     return false;
-  else
+
+  try
   {
-    try
-    {
-      theText = GEOM::GEOM_IMeasureOperations::_narrow( getOperation() )->WhatIs( myObj );
-    }
-    catch( const SALOME::SALOME_Exception& e )
-    {
-      SalomeApp_Tools::QtCatchCorbaException( e );
-      return false;
-    }
-
-    return getOperation()->IsDone();
+    theText = GEOM::GEOM_IMeasureOperations::_narrow( getOperation() )->WhatIs( myObj );
   }
+  catch( const SALOME::SALOME_Exception& e )
+  {
+    SalomeApp_Tools::QtCatchCorbaException( e );
+    return false;
+  }
+
+  return getOperation()->IsDone();
+}
+
+//=================================================================================
+// function : getKindOfShape
+// purpose  :
+//=================================================================================
+QString MeasureGUI_WhatisDlg::getKindOfShape( QString& theParameters )
+{
+  QString aKindStr("");
+  theParameters = "";
+
+  if ( myObj->_is_nil() )
+    return aKindStr;
+
+  GEOM::GEOM_IKindOfShape::shape_kind aKind;
+  GEOM::ListOfLong_var anInts;
+  GEOM::ListOfDouble_var aDbls;
+
+  GEOM::GEOM_IMeasureOperations_var anOp = GEOM::GEOM_IMeasureOperations::_narrow( getOperation() );
+
+  try
+  {
+    aKind = anOp->KindOfShape( myObj, anInts, aDbls );
+  }
+  catch( const SALOME::SALOME_Exception& e ) {
+    SalomeApp_Tools::QtCatchCorbaException( e );
+    return aKindStr;
+  }
+
+  if ( !anOp->IsDone() )
+    return aKindStr;
+
+#define PRINT_DOUBLE(val) QString(" %1").arg( DlgRef::PrintDoubleValue( val ) )
+  switch ( aKind )
+  {
+  case GEOM::GEOM_IKindOfShape::COMPOUND:
+    aKindStr = tr( "GEOM_COMPOUND" );
+    break;
+  case GEOM::GEOM_IKindOfShape::COMPSOLID:
+    aKindStr = tr( "GEOM_COMPOUNDSOLID" );
+    break;
+  case GEOM::GEOM_IKindOfShape::SHELL:
+    aKindStr = tr( "GEOM_SHELL" );
+    if ( anInts[0] == 1 )
+      theParameters = tr( "GEOM_CLOSED" );
+    else if ( anInts[0] == 2 )
+      theParameters = tr( "GEOM_UNCLOSED" );
+    else
+      theParameters = tr( "GEOM_CLOSEDUNCLOSED" );
+    break;
+  case GEOM::GEOM_IKindOfShape::WIRE:
+    aKindStr = tr( "GEOM_WIRE" );
+    if ( anInts[0] == 1 )
+      theParameters = tr( "GEOM_CLOSED" );
+    else if ( anInts[0] == 2 )
+      theParameters = tr( "GEOM_UNCLOSED" );
+    else
+      theParameters = tr( "GEOM_CLOSEDUNCLOSED" );
+    break;
+  // SOLIDs
+  case GEOM::GEOM_IKindOfShape::SPHERE:
+    aKindStr = tr( "GEOM_SPHERE" );
+    theParameters = tr( "GEOM_CENTER" )       +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )   +
+      "\n" +        tr( "GEOM_RADIUS" )       + PRINT_DOUBLE( aDbls[3] );
+    break;
+  case GEOM::GEOM_IKindOfShape::CYLINDER:
+    aKindStr = tr( "GEOM_CYLINDER" );
+    theParameters = tr( "GEOM_CENTER" )       +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_AXIS" )         +
+      "\n" +        tr( "GEOM_DX" )           + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )           + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )           + PRINT_DOUBLE( aDbls[5] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )   +
+      "\n" +        tr( "GEOM_RADIUS" )       + PRINT_DOUBLE( aDbls[6] ) +
+      "\n" +        tr( "GEOM_HEIGHT" )       + PRINT_DOUBLE( aDbls[7] );
+    break;
+  case GEOM::GEOM_IKindOfShape::BOX:
+    aKindStr = tr( "GEOM_BOX" );
+    theParameters = tr( "GEOM_CENTER") +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )   +
+      "\n" +        "Ax :"                    + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        "Ay :"                    + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        "Az :"                    + PRINT_DOUBLE( aDbls[5] );
+    break;
+  case GEOM::GEOM_IKindOfShape::ROTATED_BOX:
+    aKindStr = tr( "GEOM_BOX" );
+    theParameters = tr( "GEOM_CENTER" )         +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 )   + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 )   + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 )   + PRINT_DOUBLE( aDbls[2] ) +
+      "\nZ Axis:"                               +
+      "\n" +        "Zx :"                      + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        "Zy :"                      + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        "Zz :"                      + PRINT_DOUBLE( aDbls[5] ) +
+      "\nX Axis:"                               +
+      "\n" +        tr( "GEOM_X_I" ).arg( "x" ) + PRINT_DOUBLE( aDbls[6] ) +
+      "\n" +        tr( "GEOM_X_I" ).arg( "y" ) + PRINT_DOUBLE( aDbls[7] ) +
+      "\n" +        tr( "GEOM_X_I" ).arg( "z" ) + PRINT_DOUBLE( aDbls[8] ) +
+      "\nDimensions along local axes:"          +
+      "\n" +        "Ax :"                      + PRINT_DOUBLE( aDbls[9] ) +
+      "\n" +        "Ay :"                      + PRINT_DOUBLE( aDbls[10] ) +
+      "\n" +        "Az :"                      + PRINT_DOUBLE( aDbls[11] );
+    break;
+  case GEOM::GEOM_IKindOfShape::TORUS:
+    aKindStr = tr( "GEOM_TORUS" );
+    theParameters = tr( "GEOM_CENTER" )            +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 )      + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 )      + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 )      + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_AXIS" )              +
+      "\n" +        tr( "GEOM_DX" )                + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )                + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )                + PRINT_DOUBLE( aDbls[5] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )        +
+      "\n" +        tr( "GEOM_RADIUS_I" ).arg( 1 ) + PRINT_DOUBLE( aDbls[6] ) +
+      "\n" +        tr( "GEOM_RADIUS_I" ).arg( 2 ) + PRINT_DOUBLE( aDbls[7] );
+    break;
+  case GEOM::GEOM_IKindOfShape::CONE:
+    aKindStr = tr( "GEOM_CONE" );
+    theParameters = tr( "GEOM_CENTER" )            +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 )      + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 )      + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 )      + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_AXIS" )              +
+      "\n" +        tr( "GEOM_DX" )                + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )                + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )                + PRINT_DOUBLE( aDbls[5] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )        +
+      "\n" +        tr( "GEOM_RADIUS_I" ).arg( 1 ) + PRINT_DOUBLE( aDbls[6] ) +
+      "\n" +        tr( "GEOM_RADIUS_I" ).arg( 2 ) + PRINT_DOUBLE( aDbls[7] ) +
+      "\n" +        tr( "GEOM_HEIGHT" )            + PRINT_DOUBLE( aDbls[8] );
+    break;
+  case GEOM::GEOM_IKindOfShape::POLYHEDRON:
+    aKindStr = tr( "GEOM_POLYHEDRON" );
+    break;
+  case GEOM::GEOM_IKindOfShape::SOLID:
+    aKindStr = tr( "GEOM_SOLID" );
+    break;
+  // FACEs
+  case GEOM::GEOM_IKindOfShape::SPHERE2D:
+    aKindStr = tr( "GEOM_SURFSPHERE" );
+    theParameters = tr( "GEOM_CENTER" )       +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )   +
+      "\n" +        tr( "GEOM_RADIUS" )       + PRINT_DOUBLE( aDbls[3] );
+    break;
+  case GEOM::GEOM_IKindOfShape::CYLINDER2D:
+    aKindStr = tr( "GEOM_SURFCYLINDER" );
+    theParameters = tr( "GEOM_CENTER" )       +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_AXIS" )         +
+      "\n" +        tr( "GEOM_DX" )           + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )           + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )           + PRINT_DOUBLE( aDbls[5] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )   +
+      "\n" +        tr( "GEOM_RADIUS" )       + PRINT_DOUBLE( aDbls[6] ) +
+      "\n" +        tr( "GEOM_HEIGHT" )       + PRINT_DOUBLE( aDbls[7] );
+    break;
+  case GEOM::GEOM_IKindOfShape::TORUS2D:
+    aKindStr = tr( "GEOM_SURFTORUS" );
+    theParameters = tr( "GEOM_CENTER" )            +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 )      + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 )      + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 )      + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_AXIS" )              +
+      "\n" +        tr( "GEOM_DX" )                + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )                + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )                + PRINT_DOUBLE( aDbls[5] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )        +
+      "\n" +        tr( "GEOM_RADIUS_I" ).arg( 1 ) + PRINT_DOUBLE( aDbls[6] ) +
+      "\n" +        tr( "GEOM_RADIUS_I" ).arg( 2 ) + PRINT_DOUBLE( aDbls[7] );
+    break;
+  case GEOM::GEOM_IKindOfShape::CONE2D:
+    aKindStr = tr( "GEOM_SURFCONE" );
+    theParameters = tr( "GEOM_CENTER" )            +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 )      + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 )      + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 )      + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_AXIS" )              +
+      "\n" +        tr( "GEOM_DX" )                + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )                + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )                + PRINT_DOUBLE( aDbls[5] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )        +
+      "\n" +        tr( "GEOM_RADIUS_I" ).arg( 1 ) + PRINT_DOUBLE( aDbls[6] ) +
+      "\n" +        tr( "GEOM_RADIUS_I" ).arg( 2 ) + PRINT_DOUBLE( aDbls[7] ) +
+      "\n" +        tr( "GEOM_HEIGHT" )            + PRINT_DOUBLE( aDbls[8] );
+    break;
+  case GEOM::GEOM_IKindOfShape::DISK_CIRCLE:
+    aKindStr = tr( "GEOM_DISK_CIRCLE" );
+    theParameters = tr( "GEOM_CENTER" )       +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_NORMAL" )       +
+      "\n" +        tr( "GEOM_DX" )           + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )           + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )           + PRINT_DOUBLE( aDbls[5] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )   +
+      "\n" +        tr( "GEOM_RADIUS" )      + PRINT_DOUBLE( aDbls[6] );
+    break;
+  case GEOM::GEOM_IKindOfShape::DISK_ELLIPSE:
+    aKindStr = tr( "GEOM_DISK_ELLIPSE" );
+    theParameters = tr( "GEOM_CENTER" )         +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 )   + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 )   + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 )   + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_NORMAL" )         +
+      "\n" +        tr( "GEOM_DX" )             + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )             + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )             + PRINT_DOUBLE( aDbls[5] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )     +
+      "\n" +        tr( "GEOM_RADIUS_MAJOR" )   + PRINT_DOUBLE( aDbls[6] ) +
+      "\n" +        tr( "GEOM_RADIUS_MINOR" )   + PRINT_DOUBLE( aDbls[7] );
+    break;
+  case GEOM::GEOM_IKindOfShape::POLYGON:
+    aKindStr = tr( "GEOM_POLYGON" );
+    theParameters = tr( "GEOM_CENTER" )       +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_NORMAL" )       +
+      "\n" +        tr( "GEOM_DX" )           + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )           + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )           + PRINT_DOUBLE( aDbls[5] );
+    break;
+  case GEOM::GEOM_IKindOfShape::PLANE:
+    aKindStr = tr( "GEOM_PLANE" );
+    theParameters = tr( "GEOM_CENTER" )       +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_NORMAL" )       +
+      "\n" +        tr( "GEOM_DX" )           + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )           + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )           + PRINT_DOUBLE( aDbls[5] );
+    break;
+  case GEOM::GEOM_IKindOfShape::PLANAR:
+    aKindStr = tr( "GEOM_PLANAR_FACE" );
+    theParameters = tr( "GEOM_CENTER" )       +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_NORMAL" )       +
+      "\n" +        tr( "GEOM_DX" )           + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )           + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )           + PRINT_DOUBLE( aDbls[5] );
+    break;
+  case GEOM::GEOM_IKindOfShape::FACE:
+    aKindStr = tr( "GEOM_FACE" );
+    break;
+  // EDGEs
+  case GEOM::GEOM_IKindOfShape::CIRCLE:
+    aKindStr = tr( "GEOM_CIRCLE" );
+    theParameters = tr( "GEOM_CENTER" )       +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_NORMAL" )       +
+      "\n" +        tr( "GEOM_DX" )           + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )           + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )           + PRINT_DOUBLE( aDbls[5] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )   +
+      "\n" +        tr( "GEOM_RADIUS" )       + PRINT_DOUBLE( aDbls[6] );
+    break;
+  case GEOM::GEOM_IKindOfShape::ARC_CIRCLE:
+    aKindStr = tr( "GEOM_ARC" );
+    theParameters = tr( "GEOM_CENTER" )           +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 )     + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 )     + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 )     + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_NORMAL" )           +
+      "\n" +        tr( "GEOM_DX" )               + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )               + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )               + PRINT_DOUBLE( aDbls[5] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )       +
+      "\n" +        tr( "GEOM_RADIUS" )           + PRINT_DOUBLE( aDbls[6] ) +
+      "\n" +        tr( "GEOM_POINT_I" ).arg( 1 ) +
+      "\n" +        tr( "GEOM_X_I" ).arg( 1 )     + PRINT_DOUBLE( aDbls[7] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 1 )     + PRINT_DOUBLE( aDbls[8] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 1 )     + PRINT_DOUBLE( aDbls[9] ) +
+      "\n" +        tr( "GEOM_POINT_I" ).arg( 2 ) +
+      "\n" +        tr( "GEOM_X_I" ).arg( 2 )     + PRINT_DOUBLE( aDbls[10] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 2 )     + PRINT_DOUBLE( aDbls[11] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 2 )     + PRINT_DOUBLE( aDbls[12] );
+    break;
+  case GEOM::GEOM_IKindOfShape::ELLIPSE:
+    aKindStr = tr( "GEOM_ELLIPSE" );
+    theParameters = tr( "GEOM_CENTER" )         +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 )   + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 )   + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 )   + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_NORMAL" )         +
+      "\n" +        tr( "GEOM_DX" )             + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )             + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )             + PRINT_DOUBLE( aDbls[5] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )     +
+      "\n" +        tr( "GEOM_RADIUS_MAJOR" )   + PRINT_DOUBLE( aDbls[6] ) +
+      "\n" +        tr( "GEOM_RADIUS_MINOR" )   + PRINT_DOUBLE( aDbls[7] );
+    break;
+  case GEOM::GEOM_IKindOfShape::ARC_ELLIPSE:
+    aKindStr = tr( "GEOM_ARC_ELLIPSE" );
+    theParameters = tr( "GEOM_CENTER" )           +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 )     + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 )     + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 )     + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_NORMAL" )           +
+      "\n" +        tr( "GEOM_DX" )               + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )               + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )               + PRINT_DOUBLE( aDbls[5] ) +
+      "\n" +        tr( "GEOM_DIMENSIONS" )       +
+      "\n" +        tr( "GEOM_RADIUS_MAJOR" )     + PRINT_DOUBLE( aDbls[6] ) +
+      "\n" +        tr( "GEOM_RADIUS_MINOR" )     + PRINT_DOUBLE( aDbls[7] ) +
+      "\n" +        tr( "GEOM_POINT_I" ).arg( 1 ) +
+      "\n" +        tr( "GEOM_X_I" ).arg( 1 )     + PRINT_DOUBLE( aDbls[8] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 1 )     + PRINT_DOUBLE( aDbls[9] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 1 )     + PRINT_DOUBLE( aDbls[10] ) +
+      "\n" +        tr( "GEOM_POINT_I" ).arg( 2 ) +
+      "\n" +        tr( "GEOM_X_I" ).arg( 2 )     + PRINT_DOUBLE( aDbls[11] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 2 )     + PRINT_DOUBLE( aDbls[12] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 2 )     + PRINT_DOUBLE( aDbls[13] );
+    break;
+  case GEOM::GEOM_IKindOfShape::LINE:
+    aKindStr = tr( "GEOM_LINE" );
+    theParameters = tr( "GEOM_POSITION" )     +
+      "\n" +        tr( "GEOM_X_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 0 ) + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_DIRECTION" )    +
+      "\n" +        tr( "GEOM_DX" )           + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_DY" )           + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_DZ" )           + PRINT_DOUBLE( aDbls[5] );
+    break;
+  case GEOM::GEOM_IKindOfShape::SEGMENT:
+    aKindStr = tr( "GEOM_SEGMENT" );
+    theParameters = tr( "GEOM_POINT_I" ).arg( 1 ) +
+      "\n" +        tr( "GEOM_X_I" ).arg( 1 )     + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 1 )     + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 1 )     + PRINT_DOUBLE( aDbls[2] ) +
+      "\n" +        tr( "GEOM_POINT_I" ).arg( 2 ) +
+      "\n" +        tr( "GEOM_X_I" ).arg( 2 )     + PRINT_DOUBLE( aDbls[3] ) +
+      "\n" +        tr( "GEOM_Y_I" ).arg( 2 )     + PRINT_DOUBLE( aDbls[4] ) +
+      "\n" +        tr( "GEOM_Z_I" ).arg( 2 )     + PRINT_DOUBLE( aDbls[5] );
+    break;
+  case GEOM::GEOM_IKindOfShape::EDGE:
+    aKindStr = tr( "GEOM_EDGE" );
+    break;
+  case GEOM::GEOM_IKindOfShape::VERTEX:
+    aKindStr = tr( "GEOM_VERTEX" );
+    theParameters = tr( "GEOM_COORDINATES" ) +
+      "\n" +        tr( "GEOM_X" )           + PRINT_DOUBLE( aDbls[0] ) +
+      "\n" +        tr( "GEOM_Y" )           + PRINT_DOUBLE( aDbls[1] ) +
+      "\n" +        tr( "GEOM_Z" )           + PRINT_DOUBLE( aDbls[2] );
+    break;
+  default:
+    break;
+  }
+
+  return aKindStr;
 }
index 10f3ccf71b5fdba50df372538640e4efb17289c0..432cdd82ddaf8343b23a5c8ee0693a39a58b03f6 100644 (file)
@@ -1,67 +1,64 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : MeasureGUI_WhatisDlg.h
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
-
-#ifndef DIALOGBOX_WHATIS_H
-#define DIALOGBOX_WHATIS_H
-
-#include "GEOM_MeasureGUI.hxx"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_WhatisDlg.h
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
+//
+#ifndef MEASUREGUI_WHATISDLG_H
+#define MEASUREGUI_WHATISDLG_H
 
 #include "MeasureGUI_Skeleton.h"
 
-class MeasureGUI_1Sel1TextView_QTD;
+class QMessageBox;
 
 //=================================================================================
-// class    : DialogBox_PROPERTIES
+// class    : MeasureGUI_WhatisDlg
 // purpose  :
 //=================================================================================
-class GEOM_MEASUREGUI_EXPORT MeasureGUI_WhatisDlg : public MeasureGUI_Skeleton
+class MeasureGUI_WhatisDlg : public MeasureGUI_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
+  class Whatis;
+      
 public:
-                                        MeasureGUI_WhatisDlg( GeometryGUI* GUI,
-                                                             QWidget*     parent );
-                                        ~MeasureGUI_WhatisDlg();
+  MeasureGUI_WhatisDlg( GeometryGUI*, QWidget* );
+  ~MeasureGUI_WhatisDlg();
 
 protected:
-
-    // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
-    virtual void                        processObject();
+  // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
+  virtual void                        processObject();
+  
+protected slots:
+  virtual void                        ClickOnProperties();
 
 private:
-
-    void                                Init();
-    bool                                getParameters( QString& );
-
+  void                                Init();
+  bool                                getParameters( QString& );
+  QString                             getKindOfShape( QString& );
+  
 private:
-
-    MeasureGUI_1Sel1TextView_QTD*       myGrp;
-
+  Whatis*                             myGrp;
+  QMessageBox*                        myParamsDlg;
 };
 
-#endif // DIALOGBOX_WHATIS_H
+#endif // MEASUREGUI_WHATISDLG_H
diff --git a/src/MeasureGUI/MeasureGUI_Widgets.cxx b/src/MeasureGUI/MeasureGUI_Widgets.cxx
new file mode 100644 (file)
index 0000000..bac7f4a
--- /dev/null
@@ -0,0 +1,152 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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   : MeasureGUI_Widgets.cxx
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
+//
+#include "MeasureGUI_Widgets.h"
+
+//////////////////////////////////////////
+// MeasureGUI_1Sel12LineEdit
+//////////////////////////////////////////
+
+MeasureGUI_1Sel12LineEdit::MeasureGUI_1Sel12LineEdit( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+MeasureGUI_1Sel12LineEdit::~MeasureGUI_1Sel12LineEdit()
+{
+}
+
+//////////////////////////////////////////
+// MeasureGUI_1Sel1TextView1Check
+//////////////////////////////////////////
+
+MeasureGUI_1Sel1TextView1Check::MeasureGUI_1Sel1TextView1Check( QWidget* parent, 
+                                                               Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+MeasureGUI_1Sel1TextView1Check::~MeasureGUI_1Sel1TextView1Check()
+{
+}
+
+//////////////////////////////////////////
+// MeasureGUI_1Sel1TextView2ListBox
+//////////////////////////////////////////
+
+MeasureGUI_1Sel1TextView2ListBox::MeasureGUI_1Sel1TextView2ListBox( QWidget* parent, 
+                                                                   Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+MeasureGUI_1Sel1TextView2ListBox::~MeasureGUI_1Sel1TextView2ListBox()
+{
+}
+
+//////////////////////////////////////////
+// MeasureGUI_1Sel1TextView
+//////////////////////////////////////////
+
+MeasureGUI_1Sel1TextView::MeasureGUI_1Sel1TextView( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+MeasureGUI_1Sel1TextView::~MeasureGUI_1Sel1TextView()
+{
+}
+
+//////////////////////////////////////////
+// MeasureGUI_1Sel3LineEdit
+//////////////////////////////////////////
+
+MeasureGUI_1Sel3LineEdit::MeasureGUI_1Sel3LineEdit( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+MeasureGUI_1Sel3LineEdit::~MeasureGUI_1Sel3LineEdit()
+{
+}
+
+//////////////////////////////////////////
+// MeasureGUI_1Sel6LineEdit
+//////////////////////////////////////////
+
+MeasureGUI_1Sel6LineEdit::MeasureGUI_1Sel6LineEdit( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+MeasureGUI_1Sel6LineEdit::~MeasureGUI_1Sel6LineEdit()
+{
+}
+
+//////////////////////////////////////////
+// MeasureGUI_2Sel1LineEdit
+//////////////////////////////////////////
+
+MeasureGUI_2Sel1LineEdit::MeasureGUI_2Sel1LineEdit( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+MeasureGUI_2Sel1LineEdit::~MeasureGUI_2Sel1LineEdit()
+{
+}
+
+//////////////////////////////////////////
+// MeasureGUI_2Sel4LineEdit
+//////////////////////////////////////////
+
+MeasureGUI_2Sel4LineEdit::MeasureGUI_2Sel4LineEdit( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+MeasureGUI_2Sel4LineEdit::~MeasureGUI_2Sel4LineEdit()
+{
+}
+
+//////////////////////////////////////////
+// MeasureGUI_SkeletonBox
+//////////////////////////////////////////
+
+MeasureGUI_SkeletonBox::MeasureGUI_SkeletonBox( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+MeasureGUI_SkeletonBox::~MeasureGUI_SkeletonBox()
+{
+}
diff --git a/src/MeasureGUI/MeasureGUI_Widgets.h b/src/MeasureGUI/MeasureGUI_Widgets.h
new file mode 100644 (file)
index 0000000..8ef4837
--- /dev/null
@@ -0,0 +1,172 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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   : MeasureGUI_Widgets.h
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
+//
+#ifndef MEASUREGUI_WIDGETS_H
+#define MEASUREGUI_WIDGETS_H
+
+//////////////////////////////////////////
+// MeasureGUI_1Sel12LineEdit
+//////////////////////////////////////////
+
+#include "ui_MeasureGUI_1Sel12LineEdit_QTD.h"
+
+class MeasureGUI_1Sel12LineEdit : public QWidget, 
+                                  public Ui::MeasureGUI_1Sel12LineEdit_QTD
+{
+  Q_OBJECT
+
+public:
+  MeasureGUI_1Sel12LineEdit( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~MeasureGUI_1Sel12LineEdit();
+};
+
+//////////////////////////////////////////
+// MeasureGUI_1Sel1TextView1Check
+//////////////////////////////////////////
+
+#include "ui_MeasureGUI_1Sel1TextView1Check_QTD.h"
+
+class MeasureGUI_1Sel1TextView1Check : public QWidget, 
+                                       public Ui::MeasureGUI_1Sel1TextView1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  MeasureGUI_1Sel1TextView1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~MeasureGUI_1Sel1TextView1Check();
+};
+
+//////////////////////////////////////////
+// MeasureGUI_1Sel1TextView2ListBox
+//////////////////////////////////////////
+
+#include "ui_MeasureGUI_1Sel1TextView2ListBox_QTD.h"
+
+class MeasureGUI_1Sel1TextView2ListBox : public QWidget, 
+                                         public Ui::MeasureGUI_1Sel1TextView2ListBox_QTD
+{
+  Q_OBJECT
+
+public:
+  MeasureGUI_1Sel1TextView2ListBox( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~MeasureGUI_1Sel1TextView2ListBox();
+};
+
+//////////////////////////////////////////
+// MeasureGUI_1Sel1TextView
+//////////////////////////////////////////
+
+#include "ui_MeasureGUI_1Sel1TextView_QTD.h"
+
+class MeasureGUI_1Sel1TextView : public QWidget, 
+                                 public Ui::MeasureGUI_1Sel1TextView_QTD
+{
+  Q_OBJECT
+
+public:
+  MeasureGUI_1Sel1TextView( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~MeasureGUI_1Sel1TextView();
+};
+
+//////////////////////////////////////////
+// MeasureGUI_1Sel3LineEdit
+//////////////////////////////////////////
+
+#include "ui_MeasureGUI_1Sel3LineEdit_QTD.h"
+
+class MeasureGUI_1Sel3LineEdit : public QWidget, 
+                                 public Ui::MeasureGUI_1Sel3LineEdit_QTD
+{
+  Q_OBJECT
+
+public:
+  MeasureGUI_1Sel3LineEdit( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~MeasureGUI_1Sel3LineEdit();
+};
+
+//////////////////////////////////////////
+// MeasureGUI_1Sel6LineEdit
+//////////////////////////////////////////
+
+#include "ui_MeasureGUI_1Sel6LineEdit_QTD.h"
+
+class MeasureGUI_1Sel6LineEdit : public QWidget, 
+                                 public Ui::MeasureGUI_1Sel6LineEdit_QTD
+{
+  Q_OBJECT
+
+public:
+  MeasureGUI_1Sel6LineEdit( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~MeasureGUI_1Sel6LineEdit();
+};
+
+//////////////////////////////////////////
+// MeasureGUI_2Sel1LineEdit
+//////////////////////////////////////////
+
+#include "ui_MeasureGUI_2Sel1LineEdit_QTD.h"
+
+class MeasureGUI_2Sel1LineEdit : public QWidget, 
+                                 public Ui::MeasureGUI_2Sel1LineEdit_QTD
+{
+  Q_OBJECT
+
+public:
+  MeasureGUI_2Sel1LineEdit( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~MeasureGUI_2Sel1LineEdit();
+};
+
+//////////////////////////////////////////
+// MeasureGUI_2Sel4LineEdit
+//////////////////////////////////////////
+
+#include "ui_MeasureGUI_2Sel4LineEdit_QTD.h"
+
+class MeasureGUI_2Sel4LineEdit : public QWidget, 
+                                 public Ui::MeasureGUI_2Sel4LineEdit_QTD
+{
+  Q_OBJECT
+
+public:
+  MeasureGUI_2Sel4LineEdit( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~MeasureGUI_2Sel4LineEdit();
+};
+
+//////////////////////////////////////////
+// MeasureGUI_SkeletonBox
+//////////////////////////////////////////
+
+#include "ui_MeasureGUI_SkeletonBox_QTD.h"
+
+class MeasureGUI_SkeletonBox : public QWidget, 
+                               public Ui::MeasureGUI_SkeletonBox_QTD
+{
+  Q_OBJECT
+
+public:
+  MeasureGUI_SkeletonBox( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~MeasureGUI_SkeletonBox();
+};
+
+#endif // MEASUREGUI_WIDGETS_H
diff --git a/src/MeasureGUI/UIFiles/MeasureGUI_1Sel12LineEdit_QTD.ui b/src/MeasureGUI/UIFiles/MeasureGUI_1Sel12LineEdit_QTD.ui
deleted file mode 100644 (file)
index 505b87b..0000000
+++ /dev/null
@@ -1,268 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>MeasureGUI_1Sel12LineEdit_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>MeasureGUI_1Sel12LineEdit_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>131</width>
-            <height>171</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>MeasureGUI_1Sel12LineEdit_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>7</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLineEdit" row="0" column="2">
-                                    <property name="name">
-                                        <cstring>LineEdit12</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>LineEdit11</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="3" column="2">
-                                    <property name="name">
-                                        <cstring>LineEdit42</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="3" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel5</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL5</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="2" column="1">
-                                    <property name="name">
-                                        <cstring>LineEdit31</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="3" column="1">
-                                    <property name="name">
-                                        <cstring>LineEdit41</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="1" column="3">
-                                    <property name="name">
-                                        <cstring>LineEdit23</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="2" column="3">
-                                    <property name="name">
-                                        <cstring>LineEdit33</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="3" column="3">
-                                    <property name="name">
-                                        <cstring>LineEdit43</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="1" column="2">
-                                    <property name="name">
-                                        <cstring>LineEdit22</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="2" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="0" column="3">
-                                    <property name="name">
-                                        <cstring>LineEdit13</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="2" column="2">
-                                    <property name="name">
-                                        <cstring>LineEdit32</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>LineEdit21</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <spacer row="2" column="2">
-                            <property name="name">
-                                <cstring>Spacer8</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>40</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/MeasureGUI/UIFiles/MeasureGUI_1Sel1TextView_QTD.ui b/src/MeasureGUI/UIFiles/MeasureGUI_1Sel1TextView_QTD.ui
deleted file mode 100644 (file)
index d8e2458..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>MeasureGUI_1Sel1TextView_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>MeasureGUI_1Sel1TextView_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>130</width>
-            <height>160</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>MeasureGUI_1Sel1TextView_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>7</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QTextEdit" row="1" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>TextEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/MeasureGUI/UIFiles/MeasureGUI_1Sel3LineEdit_QTD.ui b/src/MeasureGUI/UIFiles/MeasureGUI_1Sel3LineEdit_QTD.ui
deleted file mode 100644 (file)
index 07db7bf..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>MeasureGUI_1Sel3LineEdit_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>MeasureGUI_1Sel3LineEdit_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>129</width>
-            <height>141</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>MeasureGUI_1Sel3LineEdit_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>7</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout2</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>LineEdit4</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="2" column="0">
-                            <property name="name">
-                                <cstring>TextLabel3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL3</string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <spacer row="4" column="2">
-                            <property name="name">
-                                <cstring>Spacer8</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>80</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>LineEdit3</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="3" column="0">
-                            <property name="name">
-                                <cstring>TextLabel4</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL4</string>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL2</string>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/MeasureGUI/UIFiles/MeasureGUI_1Sel6LineEdit_QTD.ui b/src/MeasureGUI/UIFiles/MeasureGUI_1Sel6LineEdit_QTD.ui
deleted file mode 100644 (file)
index b439a76..0000000
+++ /dev/null
@@ -1,254 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>MeasureGUI_1Sel6LineEdit_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>MeasureGUI_1Sel6LineEdit_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>129</width>
-            <height>163</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>MeasureGUI_1Sel6LineEdit_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>7</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <spacer row="2" column="2">
-                            <property name="name">
-                                <cstring>Spacer8</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>50</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string>TL1</string>
-                            </property>
-                        </widget>
-                        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLineEdit" row="2" column="2">
-                                    <property name="name">
-                                        <cstring>LineEdit22</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="3" column="2">
-                                    <property name="name">
-                                        <cstring>LineEdit32</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="3" column="1">
-                                    <property name="name">
-                                        <cstring>LineEdit31</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="2" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel5</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL5</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>LineEdit11</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="3" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel6</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL6</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="1" column="2">
-                                    <property name="name">
-                                        <cstring>LineEdit12</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="2" column="1">
-                                    <property name="name">
-                                        <cstring>LineEdit21</cstring>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="2">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/MeasureGUI/UIFiles/MeasureGUI_2Sel1LineEdit_QTD.ui b/src/MeasureGUI/UIFiles/MeasureGUI_2Sel1LineEdit_QTD.ui
deleted file mode 100644 (file)
index 0cb6274..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>MeasureGUI_2Sel1LineEdit_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>MeasureGUI_2Sel1LineEdit_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>129</width>
-            <height>115</height>
-        </rect>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>7</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="1" column="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="2" column="0">
-                            <property name="name">
-                                <cstring>TextLabel3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>LineEdit3</cstring>
-                            </property>
-                        </widget>
-                        <spacer row="3" column="2">
-                            <property name="name">
-                                <cstring>Spacer8</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>60</height>
-                                </size>
-                            </property>
-                        </spacer>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/MeasureGUI/UIFiles/MeasureGUI_2Sel4LineEdit_QTD.ui b/src/MeasureGUI/UIFiles/MeasureGUI_2Sel4LineEdit_QTD.ui
deleted file mode 100644 (file)
index 8fb9b31..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>MeasureGUI_2Sel4LineEdit_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>MeasureGUI_2Sel4LineEdit_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>129</width>
-            <height>163</height>
-        </rect>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>7</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>PushButton1</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="0" column="2">
-                            <property name="name">
-                                <cstring>LineEdit1</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="1" column="0">
-                            <property name="name">
-                                <cstring>TextLabel2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QPushButton" row="1" column="1">
-                            <property name="name">
-                                <cstring>PushButton2</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="1" column="2">
-                            <property name="name">
-                                <cstring>LineEdit2</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="2" column="0">
-                            <property name="name">
-                                <cstring>TextLabel3</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>LineEdit3</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="3" column="0">
-                            <property name="name">
-                                <cstring>TextLabel4</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>LineEdit4</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="4" column="0">
-                            <property name="name">
-                                <cstring>TextLabel5</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>LineEdit5</cstring>
-                            </property>
-                        </widget>
-                        <widget class="QLabel" row="5" column="0">
-                            <property name="name">
-                                <cstring>TextLabel6</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <widget class="QLineEdit" row="5" column="1" rowspan="1" colspan="2">
-                            <property name="name">
-                                <cstring>LineEdit6</cstring>
-                            </property>
-                        </widget>
-                        <spacer row="6" column="2">
-                            <property name="name">
-                                <cstring>Spacer8</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>60</height>
-                                </size>
-                            </property>
-                        </spacer>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/MeasureGUI/UIFiles/MeasureGUI_Skeleton_QTD.ui b/src/MeasureGUI/UIFiles/MeasureGUI_Skeleton_QTD.ui
deleted file mode 100644 (file)
index fa012c2..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>MeasureGUI_Skeleton_QTD</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>MeasureGUI_Skeleton_QTD</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>228</width>
-            <height>266</height>
-        </rect>
-    </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>7</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </property>
-    <property name="sizeGripEnabled">
-        <bool>true</bool>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>11</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QLayoutWidget" row="0" column="0">
-            <property name="name">
-                <cstring>Layout1</cstring>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>0</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QGroupBox" row="2" column="0">
-                    <property name="name">
-                        <cstring>GroupButtons</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>11</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <spacer row="0" column="1">
-                                    <property name="name">
-                                        <cstring>Spacer1</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Horizontal</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>120</width>
-                                            <height>0</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QPushButton" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>buttonClose</cstring>
-                                    </property>
-                                </widget>
-                               <widget class="QPushButton" row="0" column="2">
-                                    <property name="name">
-                                        <cstring>buttonHelp</cstring>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-                <widget class="QButtonGroup" row="0" column="0">
-                    <property name="name">
-                        <cstring>GroupConstructors</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>5</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>11</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <hbox>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QRadioButton">
-                                    <property name="name">
-                                        <cstring>RadioButton1</cstring>
-                                    </property>
-                                </widget>
-                            </hbox>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/MeasureGUI/UIFiles/ui_to_cxx b/src/MeasureGUI/UIFiles/ui_to_cxx
deleted file mode 100755 (executable)
index eea9301..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
-#uic -o MeasureGUI_Skeleton_QTD.cxx -impl MeasureGUI_Skeleton_QTD.h MeasureGUI_Skeleton_QTD.ui
-
-uic -o MeasureGUI_1Sel3LineEdit_QTD.h MeasureGUI_1Sel3LineEdit_QTD.ui
-uic -o MeasureGUI_1Sel3LineEdit_QTD.cxx -impl MeasureGUI_1Sel3LineEdit_QTD.h MeasureGUI_1Sel3LineEdit_QTD.ui
-
-uic -o MeasureGUI_1Sel6LineEdit_QTD.h MeasureGUI_1Sel6LineEdit_QTD.ui
-uic -o MeasureGUI_1Sel6LineEdit_QTD.cxx -impl MeasureGUI_1Sel6LineEdit_QTD.h MeasureGUI_1Sel6LineEdit_QTD.ui
-
-uic -o MeasureGUI_1Sel12LineEdit_QTD.h MeasureGUI_1Sel12LineEdit_QTD.ui
-uic -o MeasureGUI_1Sel12LineEdit_QTD.cxx -impl MeasureGUI_1Sel12LineEdit_QTD.h MeasureGUI_1Sel12LineEdit_QTD.ui
-
-uic -o MeasureGUI_2Sel1LineEdit_QTD.h MeasureGUI_2Sel1LineEdit_QTD.ui
-uic -o MeasureGUI_2Sel1LineEdit_QTD.cxx -impl MeasureGUI_2Sel1LineEdit_QTD.h MeasureGUI_2Sel1LineEdit_QTD.ui
-
-uic -o MeasureGUI_2Sel4LineEdit_QTD.h MeasureGUI_2Sel4LineEdit_QTD.ui
-uic -o MeasureGUI_2Sel4LineEdit_QTD.cxx -impl MeasureGUI_2Sel4LineEdit_QTD.h MeasureGUI_2Sel4LineEdit_QTD.ui
-
-#uic -o MeasureGUI_1Sel1TextView_QTD.h MeasureGUI_1Sel1TextView_QTD.ui
-#uic -o MeasureGUI_1Sel1TextView_QTD.cxx -impl MeasureGUI_1Sel1TextView_QTD.h MeasureGUI_1Sel1TextView_QTD.ui
index 9968f3522c0d8bdf8357938df6fd8dd9f2a84731..407b7510b4d3e665267598ad50711486f5675b59 100644 (file)
@@ -1,63 +1,77 @@
-#  GEOM NMTAlgo : partition algorithm
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 #
-#  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
+#  This library is free software; you can redistribute it and/or
+#  modify it 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
+#
+#  GEOM NMTAlgo : partition algorithm
 #  File   : Makefile.in
 #  Author : Julia DOROVSKIKH
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS = \
-       NMTAlgo_Splitter1.hxx \
-       NMTAlgo_Splitter.hxx \
-       NMTAlgo_Builder.hxx \
-       NMTAlgo_Algo.hxx
+salomeinclude_HEADERS =                \
+       NMTAlgo_Splitter1.hxx   \
+       NMTAlgo_Splitter1.ixx   \
+       NMTAlgo_Splitter1.jxx   \
+       NMTAlgo_Splitter.hxx    \
+       NMTAlgo_Splitter.ixx    \
+       NMTAlgo_Splitter.jxx    \
+       NMTAlgo_Builder.hxx     \
+       NMTAlgo_Builder.ixx     \
+       NMTAlgo_Builder.jxx     \
+       NMTAlgo_Algo.hxx        \
+       NMTAlgo_Algo.ixx        \
+       NMTAlgo_Algo.jxx        \
+       NMTAlgo_Loop3d.hxx      \
+       NMTAlgo_Loop3d.ixx      \
+       NMTAlgo_Loop3d.jxx      \
+       NMTAlgo_Tools.hxx       \
+       NMTAlgo_Tools.ixx       \
+       NMTAlgo_Tools.jxx
 
 # Libraries targets
 lib_LTLIBRARIES = libNMTAlgo.la
 
-dist_libNMTAlgo_la_SOURCES = \
-       NMTAlgo_Algo.cxx \
-       NMTAlgo_Builder.cxx \
-       NMTAlgo_Loop3d.cxx \
-       NMTAlgo_Splitter.cxx \
-       NMTAlgo_Splitter1.cxx \
-       NMTAlgo_Splitter_1.cxx \
-       NMTAlgo_Splitter_2.cxx \
+dist_libNMTAlgo_la_SOURCES =   \
+       NMTAlgo_Algo.cxx        \
+       NMTAlgo_Builder.cxx     \
+       NMTAlgo_Loop3d.cxx      \
+       NMTAlgo_Splitter.cxx    \
+       NMTAlgo_Splitter1.cxx   \
+       NMTAlgo_Splitter_1.cxx  \
+       NMTAlgo_Splitter_2.cxx  \
        NMTAlgo_Tools.cxx
 
-# additionnal information to compil and link file
-libNMTAlgo_la_CPPFLAGS = \
-       $(CAS_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       -I$(srcdir)/../NMTDS \
+# additional information to compile and link file
+
+libNMTAlgo_la_CPPFLAGS =       \
+       $(CAS_CPPFLAGS)         \
+       $(KERNEL_CXXFLAGS)      \
+       -I$(srcdir)/../NMTDS    \
        -I$(srcdir)/../NMTTools
 
-libNMTAlgo_la_LDFLAGS  = \
-       $(STDLIB) \
-       $(CAS_LDPATH) -lTKBool -lTKBO \
-       $(KERNEL_LDFLAGS) \
+libNMTAlgo_la_LDFLAGS  =               \
+       $(STDLIB)                       \
+       $(CAS_LDPATH) -lTKBool -lTKBO   \
+       $(KERNEL_LDFLAGS)               \
        ../NMTTools/libNMTTools.la
index 46ae4c50bf35934d813484dec2cda5b4a0a71564..1af7ea7e23b3b795fd505af4f11b20055bc1d477 100644 (file)
@@ -1,27 +1,27 @@
-// 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:       NMTAlgo.cdl
--- Created:    Tue Jan 27 14:39:05 2004
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2004
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:      NMTAlgo.cdl
+--  Created:   Tue Jan 27 14:39:05 2004
+--  Author:    Peter KURNEV
 
 
 package NMTAlgo 
diff --git a/src/NMTAlgo/NMTAlgo.pro b/src/NMTAlgo/NMTAlgo.pro
new file mode 100644 (file)
index 0000000..213e5be
--- /dev/null
@@ -0,0 +1,66 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = NMTAlgo
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+STDLIB = -lstdc++
+
+CAS_LDPATH = -L$$(CASROOT)/Linux/lib 
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS} ../NMTDS ../NMTTools
+
+LIBS += $${STDLIB} $${CAS_LDPATH} -lTKBool -lTKBO $${KERNEL_LDFLAGS} -L$$(GEOM_ROOT_DIR)/lib -lNMTTools 
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+HEADERS  = NMTAlgo_Splitter1.hxx
+HEADERS += NMTAlgo_Splitter.hxx
+HEADERS += NMTAlgo_Builder.hxx
+HEADERS += NMTAlgo_Algo.hxx
+
+SOURCES  = NMTAlgo_Algo.cxx
+SOURCES += NMTAlgo_Builder.cxx
+SOURCES += NMTAlgo_Loop3d.cxx
+SOURCES += NMTAlgo_Splitter.cxx
+SOURCES += NMTAlgo_Splitter1.cxx
+SOURCES += NMTAlgo_Splitter_1.cxx
+SOURCES += NMTAlgo_Splitter_2.cxx
+SOURCES += NMTAlgo_Tools.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index e7d031398a3b7ec34000fdd3499d2ddf43dcc3ad..546ab20e81d9e1e8d80d1a85859215bb1b4dd329 100644 (file)
@@ -1,27 +1,27 @@
-// 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:       NMTAlgo_Algo.cdl
--- Created:    Tue Jan 27 14:41:04 2004
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2004
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:      NMTAlgo_Algo.cdl
+--  Created:   Tue Jan 27 14:41:04 2004
+--  Author:    Peter KURNEV
 
 
 deferred class Algo from NMTAlgo 
index 7e21d48c94dd75ef620584d62782e2aa3977cbcd..3beffd3db60e5122686df98e02ab057c66f79633 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTAlgo_Algo.cxx
 // Created:    Tue Jan 27 14:58:21 2004
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTAlgo_Algo.ixx>
 #include <stdlib.h>
 //=======================================================================
index b7012d17a1e3de1a571018c79489929051139b7f..dc73c10880d247773e1135b53ff09816dec64de3 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTAlgo_Algo_HeaderFile
 #define _NMTAlgo_Algo_HeaderFile
 
index d27ea63287e8f849a154e3ea6bebfba356b7ce20..cb4c135df761df69a5dec14faa593eb120b1c697 100644 (file)
@@ -1,20 +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.
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTAlgo_Algo.jxx>
index 9704d760ec518e671eab903aed51cdc93c861a9c..fc8787025b5844263b09d302d110f96c59def774 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 #include <NMTTools_DSFiller.hxx>
index 8a09824286f4c745194bda58a1e4086bfa73abcb..9527e0a212bbf27b3e4f295c6cf75271915f0584 100644 (file)
@@ -1,27 +1,27 @@
-// 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:       NMTAlgo_Builder.cdl
--- Created:    Tue Jan 27 15:09:45 2004
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2004
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:      NMTAlgo_Builder.cdl
+--  Created:   Tue Jan 27 15:09:45 2004
+--  Author:    Peter KURNEV
 
 
 class Builder from NMTAlgo  
index cd422a419a9ddb7b98edde60b15f76e7830b0f9a..b5a1fceb90926fe4695ed893ff37a30459456264 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTAlgo_Inter3d.cxx
 // Created:    Tue Jan 27 15:14:13 2004
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTAlgo_Builder.ixx>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
index e4ac3fc35de24b093a4d23e13bf941efac660102..a5df73c8ea9e658dab10c33e89fc68e7f6e1b04b 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTAlgo_Builder_HeaderFile
 #define _NMTAlgo_Builder_HeaderFile
 
index 8b48a26b73ad008ae8a476776f8a37bdf13e7422..283ec7648f0d3591a846f472c36676f8acb6b964 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTAlgo_Builder.jxx>
 
  
index 874fa7fc2d85b1060a4fdc6b16f4fb9ee19a6b9d..f3e4dbe5aa26b08e28e65b70615220d38c80d719 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 #include <NMTTools_DSFiller.hxx>
index 0ed4be963c6d50668c1693bd8f29f2a4a1a638f7..190825523dcc1eb17e4e91994f96c1951ba4a6f0 100644 (file)
@@ -1,22 +1,24 @@
-// 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
-//
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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
+--
 
 class Loop3d from NMTAlgo
 
index bdf053b2af531959044fd15ade9605990590edef..5517e95c72c626bf4a468bcf6ba60f90f00c1984 100644 (file)
@@ -1,25 +1,26 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
 //
-
 //using namespace std;
-
+//
 #include <NMTAlgo_Loop3d.ixx>
 
 #include <TopExp_Explorer.hxx>
index 8285773d11514d8c9d2dfc41c0b1e58e501787a5..b0dfb5adb900be3cfd153db9838779288fc6fc22 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTAlgo_Loop3d_HeaderFile
 #define _NMTAlgo_Loop3d_HeaderFile
 
index 98aaa0570ba4bfc50b69c8e460d3a2d0decd401d..97c229d65a46e992e98b4d09bdf3d47fc612c856 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTAlgo_Loop3d.jxx>
 
  
index 0c62ad93322de3e50aa21af503357143fbb68c48..02c10b8dd79b7f39f57f96b1013dbe9a1cd8b8ed 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
index 7d0f5ac8596f26f8c08c32e58020144e4ffcd350..48f5dbd6ecb783cca11e09bef1b74d9d9668bf85 100644 (file)
@@ -1,27 +1,27 @@
-// 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
-//
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:       NMTAlgo_Splitter.cdl
 -- Created:    Tue Jan 27 15:09:45 2004
 -- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2004
 
 
 class Splitter from NMTAlgo  
index a922453462424076a201a51c19a574b0e8972418..56a5de31054d5547bb6a2f30f5dda3d586f70547 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTAlgo_Splitter.cxx
 // Created:    Thu Jan 29 17:13:03 2004
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTAlgo_Splitter.ixx>
 
 #include <Precision.hxx>
index cad4113f600996c3daa2ece8caeef39c740c613a..64aa244e44d66ae4d6333a9292087621d23c3310 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTAlgo_Splitter_HeaderFile
 #define _NMTAlgo_Splitter_HeaderFile
 
index 7631ad17cbed62c346f1b51d6100863dc5251c41..53377eb6e40f60949766b780d8ec143c6da9bd5c 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTAlgo_Splitter.jxx>
 
  
index ec30120cdd156e43b7b5451ce0899bf72708f1f5..f76213b0492cac872c940856e5f8353937d42b54 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
index 0bbdc648467cc8aab0b36ec17bd959086d6dbef4..8449ca3404efaf7c86f766dc4e03248c7f1a7432 100644 (file)
@@ -1,27 +1,27 @@
-// 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:       NMTAlgo_Splitter1.cdl
--- Created:    Wed Feb 11 14:23:25 2004
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2004
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:      NMTAlgo_Splitter1.cdl
+--  Created:   Wed Feb 11 14:23:25 2004
+--  Author:    Peter KURNEV
 
 
 class Splitter1 from NMTAlgo  
index b4f21b09d987bf873c26e3549938416c59dc172b..911e7a8f939958c870e76962dcd5c0ae65848e12 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTAlgo_Splitter1.cxx
 // Created:    Wed Feb 11 14:26:27 2004
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTAlgo_Splitter1.ixx>
 #include <NMTAlgo_Splitter.hxx>
 #include <TopAbs_ShapeEnum.hxx>
index d0c25b76dcf9599ffe1010aa04d6d858f11e5e90..c9e733d3ec53d7c71c3dd19e728331257e3a3c26 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTAlgo_Splitter1_HeaderFile
 #define _NMTAlgo_Splitter1_HeaderFile
 
index 99a4b81d3d026839102f87edcc0fd3c6a2cf90ec..479cf4180eef9ceeb7eb8328be5bec52fffb39a2 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTAlgo_Splitter1.jxx>
 
  
index 4505b535f4d4ec866a0fe3fba1b717e995ff0a29..c804ba376b6cdc2894402e8316daba0f8ea4034b 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
index 4b0c771db1715fcc44de40453371e078d704bb47..b2135883fbc281881aa13529431661c7656f371b 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTAlgo_Splitter_1.cxx
 // Created:    Mon Feb  2 14:58:54 2004
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTAlgo_Splitter.ixx>
 
 #include <Precision.hxx>
index 0748d0d912068fc896d91ae417687a29e5589fb7..3262ee8ba1b5e3dbc2e31d8111ef6c8d3f9fa5bc 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTAlgo_Splitter_2.cxx
 // Created:    Mon Feb  9 15:07:51 2004
 // Author:     Igor FEOKTISTOV
 //             <ifv@philipox.nnov.matra-dtv.fr>
-
-
+//
 #include <NMTAlgo_Splitter.ixx>
 
 #include <TopoDS_Shape.hxx>
index 3ce389525cc5076dfa5a686033057e21e4f30b77..b27b601a1151846588d7e212b7db1f8172b3d99d 100644 (file)
@@ -1,27 +1,27 @@
-// 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:       NMTAlgo_Tools.cdl
--- Created:    Fri Jan 30 16:29:14 2004
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2004
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+--
+--  Copyright (C) 2003-2007  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:      NMTAlgo_Tools.cdl
+--  Created:   Fri Jan 30 16:29:14 2004
+--  Author:    Peter KURNEV
 
 
 class Tools from NMTAlgo 
index 290f5e0b1e81ca27351ddf53efc0b38edfb94848..35ea5e2f5501c67c213be2c01618504c2e056021 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTAlgo_Tools.cxx
 // Created:    Fri Jan 30 16:30:45 2004
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTAlgo_Tools.ixx>
 
 #include <gp_Dir.hxx>
index f4c8369069f82ffc7c7cb69cd455bafb2ba17f37..d804a886e7a7a9cffffe642d83ec8d4cf8e25292 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTAlgo_Tools_HeaderFile
 #define _NMTAlgo_Tools_HeaderFile
 
index 849811e1f36b8e4b1d94d2e06602466d10a64780..90f39ea0d94c0f2cd32e85161b8969a4228379a1 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTAlgo_Tools.jxx>
 
  
index fc418d6077f21d9108d81fabcd19e55852649ff0..080737905371deb639b5b0f5e61b96f73b4e9fd0 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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 _TopoDS_Shell_HeaderFile
 #include <TopoDS_Shell.hxx>
index a48a632d014703e57e5b46c713d5f74dc9bd02ab..f3b700b7c4dee129780ee41789f8b48e1ace2286 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger_HeaderFile
 #define _Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger_HeaderFile
 
index 3499864cc52d288203a9251630da82a6b9e08ac3..ae1c3f8072ac5673bf54280cc53fe8d9aea505fc 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
 #define _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
 
index 50dd456cbf2c7d7623c8865e62e569e04a5df57e..947e3c130019d5ad6e77cd7b54eef2521c17db01 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile
 #define _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile
 
index a1bb5bc11a137d16b793b3342c86420c04c6a9ee..de064dc6f64a641f711e56954fdc464027582c91 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile
 #define _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile
 
index 48ce73f8a49221ce3d39c9aaed7da8ae2aa33aff..0e68f8ec10814913892d3fc43f0c92ec257cce03 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
 #define _Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
 
index eca4f179e13b4bfd659a78ba97bcac8661c988aa..6a3d44c1b5fd357ce3ec5a998e3c5ac1bf87278a 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTDS_ListNodeOfListOfPassKey_HeaderFile
 #define _Handle_NMTDS_ListNodeOfListOfPassKey_HeaderFile
 
index 202965e9d9b15b0ef8b69308a8239829516627c3..39679e0020eadf9e7f1fa2afb2ab311bf51b01e8 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTDS_ListNodeOfListOfPassKeyBoolean_HeaderFile
 #define _Handle_NMTDS_ListNodeOfListOfPassKeyBoolean_HeaderFile
 
index fbea2a6fe58583f7053b7d68cdf9b9b36aef9441..0aa36f7e2f9e3fea55bd5dd758c7a7f8541f8ae7 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTDS_StdMapNodeOfMapOfPassKey_HeaderFile
 #define _Handle_NMTDS_StdMapNodeOfMapOfPassKey_HeaderFile
 
index 4cf3235592e52330e79eae4fc2c3e55f45437b36..05e4c09124bbbba5f6273f335fb62de0f07c885f 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean_HeaderFile
 #define _Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean_HeaderFile
 
index edc19fc6586c3d0b24158085928b75f50baaf781..f2dcd7560924a23d96d1917f2523078e5bef14a8 100644 (file)
@@ -1,32 +1,31 @@
-#  GEOM NMTAlgo : partition algorithm
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 #
-#  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
+#  This library is free software; you can redistribute it and/or
+#  modify it 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
+#
+#  GEOM NMTAlgo : partition algorithm
 #  File   : Makefile.in
 #  Author : Julia DOROVSKIKH
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
@@ -51,10 +50,18 @@ salomeinclude_HEADERS = \
        NMTDS_IndexedDataMapOfIntegerShape.hxx \
        NMTDS_IndexedDataMapOfShapeBox.hxx \
        NMTDS_IndexRange.hxx \
+       NMTDS_IndexRange.ixx \
+       NMTDS_IndexRange.jxx \
        NMTDS_InterfPool.hxx \
+       NMTDS_InterfPool.ixx \
+       NMTDS_InterfPool.jxx \
        NMTDS_InterfType.hxx \
        NMTDS_Iterator.hxx \
+       NMTDS_Iterator.ixx \
+       NMTDS_Iterator.jxx \
        NMTDS_IteratorCheckerSI.hxx \
+       NMTDS_IteratorCheckerSI.ixx \
+       NMTDS_IteratorCheckerSI.jxx \
        NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx \
        NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx \
        NMTDS_ListIteratorOfListOfPassKey.hxx \
@@ -69,17 +76,31 @@ salomeinclude_HEADERS = \
        NMTDS_MapOfPassKeyBoolean.hxx  \
        NMTDS_MapOfPassKey.hxx \
        NMTDS_PassKeyBoolean.hxx \
+       NMTDS_PassKeyBoolean.ixx \
+       NMTDS_PassKeyBoolean.jxx \
        NMTDS_PInterfPool.hxx \
        NMTDS_PIterator.hxx \
        NMTDS_PassKey.hxx \
+       NMTDS_PassKey.ixx \
+       NMTDS_PassKey.jxx \
        NMTDS_PassKeyMapHasher.hxx \
+       NMTDS_PassKeyMapHasher.ixx \
+       NMTDS_PassKeyMapHasher.jxx \
        NMTDS_PassKeyShape.hxx \
+       NMTDS_PassKeyShape.ixx \
+       NMTDS_PassKeyShape.jxx \
        NMTDS_PassKeyShapeMapHasher.hxx \
+       NMTDS_PassKeyShapeMapHasher.ixx \
+       NMTDS_PassKeyShapeMapHasher.jxx \
        NMTDS_PShapesDataStructure.hxx \
        NMTDS_ShapesDataStructure.hxx \
+       NMTDS_ShapesDataStructure.ixx \
+       NMTDS_ShapesDataStructure.jxx \
        NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx \
        NMTDS_StdMapNodeOfMapOfPassKey.hxx \
        NMTDS_Tools.hxx \
+       NMTDS_Tools.ixx \
+       NMTDS_Tools.jxx \
        NMTDS_BoxBndTree.hxx
 
 # Libraries targets
@@ -124,12 +145,29 @@ dist_libNMTDS_la_SOURCES = \
        NMTDS_Tools.cxx \
        NMTDS_BoxBndTree.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libNMTDS_la_CPPFLAGS = \
-       $(CAS_CPPFLAGS) \
+libNMTDS_la_CPPFLAGS =         \
+       $(CAS_CPPFLAGS)         \
        $(KERNEL_CXXFLAGS)
 
-libNMTDS_la_LDFLAGS  = \
-       $(STDLIB) \
+libNMTDS_la_LDFLAGS  =         \
+       $(STDLIB)               \
        $(CAS_LDPATH) -lTKBool -lTKBO
+
+# extra dist files
+CDL_FILES =                            \
+       NMTDS.cdl                       \
+       NMTDS_IndexRange.cdl            \
+       NMTDS_InterfPool.cdl            \
+       NMTDS_Iterator.cdl              \
+       NMTDS_IteratorCheckerSI.cdl     \
+       NMTDS_PassKey.cdl               \
+       NMTDS_PassKeyBoolean.cdl        \
+       NMTDS_PassKeyMapHasher.cdl      \
+       NMTDS_PassKeyShape.cdl          \
+       NMTDS_PassKeyShapeMapHasher.cdl \
+       NMTDS_ShapesDataStructure.cdl   \
+       NMTDS_Tools.cdl
+
+EXTRA_DIST += $(CDL_FILES)
index cabb10f4bf016cf7f4af84cc49693984ef297602..bcee78278273f815ede3276c89e7f01cbf5e0c5e 100644 (file)
@@ -1,28 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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:      NMTDS.cdl
+--  Created:   Fri Nov 28 10:13:19 2003
+--  Author:    Peter KURNEV
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
--- File:       NMTDS.cdl
--- Created:    Fri Nov 28 10:13:19 2003
--- Author:     Peter KURNEV
---             <pkv@irinox>
-
-
 package NMTDS 
 
        ---Purpose: 
diff --git a/src/NMTDS/NMTDS.pro b/src/NMTDS/NMTDS.pro
new file mode 100644 (file)
index 0000000..7b489ee
--- /dev/null
@@ -0,0 +1,119 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = NMTDS
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+STDLIB = -lstdc++
+
+CAS_LDPATH = -L$$(CASROOT)/Linux/lib 
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS}
+
+LIBS += $${STDLIB} $${CAS_LDPATH} -lTKBool -lTKBO
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+HEADERS  = Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
+HEADERS += Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
+HEADERS += Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
+HEADERS += Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+HEADERS += Handle_NMTDS_ListNodeOfListOfPassKeyBoolean.hxx
+HEADERS += Handle_NMTDS_ListNodeOfListOfPassKey.hxx
+HEADERS += Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
+HEADERS += Handle_NMTDS_StdMapNodeOfMapOfPassKey.hxx
+HEADERS += NMTDS_CArray1OfIndexRange.hxx
+HEADERS += NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
+HEADERS += NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
+HEADERS += NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
+HEADERS += NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
+HEADERS += NMTDS_IndexedDataMapOfIntegerShape.hxx
+HEADERS += NMTDS_IndexedDataMapOfShapeBox.hxx
+HEADERS += NMTDS_IndexRange.hxx
+HEADERS += NMTDS_Iterator.hxx
+HEADERS += NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+HEADERS += NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
+HEADERS += NMTDS_ListIteratorOfListOfPassKey.hxx
+HEADERS += NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+HEADERS += NMTDS_ListNodeOfListOfPassKeyBoolean.hxx
+HEADERS += NMTDS_ListNodeOfListOfPassKey.hxx
+HEADERS += NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+HEADERS += NMTDS_ListOfPassKeyBoolean.hxx
+HEADERS += NMTDS_ListOfPassKey.hxx
+HEADERS += NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx
+HEADERS += NMTDS_MapIteratorOfMapOfPassKey.hxx
+HEADERS += NMTDS_MapOfPassKeyBoolean.hxx
+HEADERS += NMTDS_MapOfPassKey.hxx
+HEADERS += NMTDS_PassKeyBoolean.hxx
+HEADERS += NMTDS_PassKey.hxx
+HEADERS += NMTDS_PassKeyMapHasher.hxx
+HEADERS += NMTDS_PShapesDataStructure.hxx
+HEADERS += NMTDS_ShapesDataStructure.hxx
+HEADERS += NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
+HEADERS += NMTDS_StdMapNodeOfMapOfPassKey.hxx
+HEADERS += NMTDS_BoxBndTree.hxx
+
+SOURCES  = NMTDS_CArray1OfIndexRange_0.cxx
+SOURCES += NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx
+SOURCES += NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx
+SOURCES += NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx
+SOURCES += NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx
+SOURCES += NMTDS_IndexedDataMapOfIntegerShape_0.cxx
+SOURCES += NMTDS_IndexedDataMapOfShapeBox_0.cxx
+SOURCES += NMTDS_IndexRange.cxx
+SOURCES += NMTDS_Iterator.cxx
+SOURCES += NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
+SOURCES += NMTDS_ListIteratorOfListOfPassKey_0.cxx
+SOURCES += NMTDS_ListIteratorOfListOfPassKeyBoolean_0.cxx
+SOURCES += NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
+SOURCES += NMTDS_ListNodeOfListOfPassKey_0.cxx
+SOURCES += NMTDS_ListNodeOfListOfPassKeyBoolean_0.cxx
+SOURCES += NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx
+SOURCES += NMTDS_ListOfPassKey_0.cxx
+SOURCES += NMTDS_ListOfPassKeyBoolean_0.cxx
+SOURCES += NMTDS_MapIteratorOfMapOfPassKey_0.cxx
+SOURCES += NMTDS_MapIteratorOfMapOfPassKeyBoolean_0.cxx
+SOURCES += NMTDS_MapOfPassKey_0.cxx
+SOURCES += NMTDS_MapOfPassKeyBoolean_0.cxx
+SOURCES += NMTDS_PassKeyBoolean.cxx
+SOURCES += NMTDS_PassKey.cxx
+SOURCES += NMTDS_PassKeyMapHasher.cxx
+SOURCES += NMTDS_ShapesDataStructure.cxx
+SOURCES += NMTDS_StdMapNodeOfMapOfPassKey_0.cxx
+SOURCES += NMTDS_StdMapNodeOfMapOfPassKeyBoolean_0.cxx
+SOURCES += NMTDS_BoxBndTree.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index 79bc0b5e154c29da36bbca26f83ff6da3be95a7e..88c4e31eb3bddb100a9bcea0b82d1b565cff7d91 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTDS_BoxBndTree.cxx
 // Created:    Tue Oct 17 13:04:11 2006
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTDS_BoxBndTree.hxx>
 //=======================================================================
 //function : 
index 9aeb58d41595ed9aa8a55c0e4f584d05c9c024f5..5ff1fe74e8ac3b466798c4493ada455e9158be9d 100755 (executable)
@@ -1,26 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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:       NMTDS_BoxBndTree.hxx
 // Created:    Tue Oct 17 12:50:31 2006
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #ifndef NMTDS_BoxBndTree_HeaderFile
 #define NMTDS_BoxBndTree_HeaderFile
 
index 120e3030cc186992a17d97414f652c06eb1339ee..27d922022fbc2154bbb8384a7fd594f29e675770 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_CArray1OfIndexRange_HeaderFile
 #define _NMTDS_CArray1OfIndexRange_HeaderFile
 
index 6bd7e3df2a305dba07e5c4b1ff5fa34859abb7d2..ec98e74751298213b6c105a02ea15e8b770de453 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_CArray1OfIndexRange.hxx>
 
 #ifndef _Standard_OutOfRange_HeaderFile
index 5c782f2d4db09979e675a7fc84c5773e8759bd37..7456aa64c84aa598d6822190cebb55f7d010f6d0 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger_HeaderFile
 #define _NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger_HeaderFile
 
index 52c8d53349dba3914f0cf699033d9a2cd1d95e90..b6d62d957051ac961913a73916c14c31ce1944c1 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index 89989c7a3abf243727502e10b6338173bd682645..0bfd4cdf38c3cfab7de71b39cc0269ae2ca0a56b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger_HeaderFile
 #define _NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger_HeaderFile
 
index 81d4ca5adcde62177bae5b8c877c21c869eca21e..8c8b273b7545eedc1ba51b798d84ce8fce4cd47f 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 2e7c5b402c105040a0c4631850a2b816607c5d4a..09e17e834ff0e10da67ff3cae1bebf4ea989fb74 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
 #define _NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
 
index ca6e0ffea765e08e7774be62df272a88dec3d663..f2bfe7c1cb8578daeaa35034a8961a351d8046a8 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_DataMapOfIntegerMapOfInteger.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index 70458ed5d09a5330c4187cd29fc7f794927bc69e..7591eb00f142eeb9e5acf10b8f32a99f93a0ab53 100644 (file)
@@ -1,27 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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:      NMTDS_IndexRange.cdl
+--  Created:   Fri Nov 28 10:31:05 2003
+--  Author:    Peter KURNEV
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
---  
--- File:       NMTDS_IndexRange.cdl
--- Created:    Fri Nov 28 10:31:05 2003
--- Author:     Peter KURNEV
---             <pkv@irinox>
-
 class IndexRange from NMTDS 
 
        ---Purpose: 
index 138d77f8f0a4fb1f96b269f55d5306da90d0629c..55c488ae46851599dec4d4aa20ded402d52e4167 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTDS_IndexRange.cxx
 // Created:    Fri Nov 28 10:34:59 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTDS_IndexRange.ixx>
 //=======================================================================
 //function :NMTDS_IndexRange::NMTDS_IndexRange
index 1e9f76065263b006b8d2fb69a3554c1a911cafc4..4dad2f6ae825ed27c05f738526165a8809e1805b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_IndexRange_HeaderFile
 #define _NMTDS_IndexRange_HeaderFile
 
index 44ea38a5a69bd37e6e572b9d947e843f1c421c91..5c9a8d46fe988bf2a5f47d01a0112963cf42570d 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_IndexRange.jxx>
 
  
index 936832bdca42c0181d2fa2da23a7c4aec871ddce..a936884110bc6898e4c800036369d209b6d0989e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_IndexRange_HeaderFile
 #include <NMTDS_IndexRange.hxx>
 #endif
index 1798951101f3acabd2adb450b0b24e0b59a7a788..189c2495dce99719d36f091c44ca06cab5028738 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
 #define _NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
 
index 4467ed2dbfcd8d605d4b965cc651f3a1286c63fe..14ba8e5954f9356c0236025ccc727f024079c702 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 6cc5bacc18409cfda90092f16f33b78f61fdeb7a..4b10b9e871203e00b7836dc72349bb0348e2ef47 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile
 #define _NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile
 
index 3293ddec19bc60f3eba44757e884501fc6c791e9..15a8485f4029527b0f0e606a080e79c8920bdc59 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 698204818d0d75de658e049335e1125fc5981835..04ee903daf191134a5ef1dd8d609c36c86edb1b9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile
 #define _NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile
 
index 75117613bd479ba5c5286cc61a64d7b8999718b0..a63d890cfb3cac79e101a9a256daf8d7ee7724c3 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 0b1fef8e9e3373ef009f9798bd94b84ecb36699b..7bfc49cca4417d6291a1ede34df5341d4059dac2 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
 #define _NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
 
index 95760dc497adc347e636993f50ab45b2d62bceaa..887e0a2f25beac8fb5631991456f36aa1e064bff 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index e9b04d0e54bd4fd965ae4b996b68a270b44d68c3..a97123c77a747db5df54d5b2aab20a5bcb15fede 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_IndexedDataMapOfIntegerShape_HeaderFile
 #define _NMTDS_IndexedDataMapOfIntegerShape_HeaderFile
 
index 144b6a844d3893945982ae102f651a7aede0a7dd..a1bf5c5be02c1b6d402509db32ca615223f03c4b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_IndexedDataMapOfIntegerShape.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index 98752296f626712fb9009bd296e988e437ff4bac..1be9929215a089c1e2230f3856c3c8afdc5789fd 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_IndexedDataMapOfShapeBox_HeaderFile
 #define _NMTDS_IndexedDataMapOfShapeBox_HeaderFile
 
index 53b8ed30605709cd9c70a4ef9fe4eeb5eed06683..1d753c44de00326fcbcbc7172d3a25d49ad47592 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_IndexedDataMapOfShapeBox.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index 8b74d08c48166fde059a013797288d0353444188..9b763286ab61cac5007050b977ecc13fc733a0c9 100644 (file)
@@ -1,29 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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:      NMTDS_InterfPool.cdl
+--  Created:   Wed Feb 21 10:10:58 2007
+--  Author:    Peter KURNEV
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
---   
--- File:       NMTDS_InterfPool.cdl
--- Created:    Wed Feb 21 10:10:58 2007
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2007
-
-
 class InterfPool from NMTDS 
 
        ---Purpose: 
index 95774e9f7168146e58f38ea0c48b24e2664986b2..d601d5cd8adbae3c4cb46e8bbfbd65ce6eb95fba 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTDS_.InterfPoolcxx
 // Created:    Wed Feb 21 10:35:35 2007
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTDS_InterfPool.ixx>
 #include <NMTDS_PassKeyBoolean.hxx>
 #include <NMTDS_ListOfPassKeyBoolean.hxx>
index f0bfd2111ae8a8f76517dd1a52ea9168d8dec440..3722c0046f17e45fcf3dc42e307c615af3cf94c9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_InterfPool_HeaderFile
 #define _NMTDS_InterfPool_HeaderFile
 
index c608b68855daf8f0a7e8facde93404f748255831..a26acd90d0ea6942145a1a5da4f0167b9c7a541b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_InterfPool.jxx>
 
  
index f12d5295167bb6739ac59eeb1aad4f5a77e998c5..5ec012a71771eb132a135187b50212c57c03193a 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_PassKeyBoolean_HeaderFile
 #include <NMTDS_PassKeyBoolean.hxx>
 #endif
index d32f9835b7d45e8c417bde8136660cb156b00c43..16631334185c09fd443918ce624bf938477e13e7 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_InterfType_HeaderFile
 #define _NMTDS_InterfType_HeaderFile
 
index d73a1d5d31a581f20e8e2e01b75355812ebd85e6..0bb5a13a1657e8583f840134eeedb5fa8dfee61b 100755 (executable)
@@ -1,28 +1,28 @@
--- Copyright (C) 2006 SAMTECH
--- 
--- This library is free software; you can redistribute it and/or
--- modify it 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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:      NMTDS_Iterator.cdl
+--  Created:   Sun May 07 14:58:16 2006
+--  Author:    Peter KURNEV
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
---  
--- File:       NMTDS_Iterator.cdl
--- Created:    Sun May 07 14:58:16 2006
--- Author:     Peter KURNEV
---             <peter@PREFEX>
-
-
-
 class Iterator from NMTDS 
      
        ---Purpose: 
index 8e894d6d4121542f1381c4d3e8f183d03f624b3f..a4069a59574926736ca481759920537d732606c2 100755 (executable)
@@ -1,27 +1,28 @@
-// Copyright (C) 2006 SAMTECH
-// 
-// This library is free software; you can redistribute it and/or
-// modify it 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTDS_Iterator.cxx
 // Created:    Sun May 07 15:04:41 2006
 // Author:     Peter KURNEV
-//             <peter@PREFEX>
-
-
+//
 #include <NMTDS_Iterator.ixx>
 //
 #include <Bnd_Box.hxx>
index 25ae15ec0fd2313c313483daa05dd622bd77f0b1..095eb283cbea4d289442a9583d1988c162bcc55a 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_Iterator_HeaderFile
 #define _NMTDS_Iterator_HeaderFile
 
index adb6c909f30abebdfdbeffde18ff08929e799e20..641e325220d72f874998f499ba7d17c676080cd0 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_Iterator.jxx>
 
  
index 4a0e4fb7cc07750716cafef25e7df22383b70f2f..ead7afaf6c420dc76fe093340429e4337a38dce6 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_ShapesDataStructure_HeaderFile
 #include <NMTDS_ShapesDataStructure.hxx>
 #endif
index c7f765003503cb2dacd2b835cf1a01facd02e31d..1c15c39c6930b249ed4d85d6ede8210444e7d664 100644 (file)
@@ -1,26 +1,28 @@
--- Copyright (C) 2007 SAMTECH
--- 
--- This library is free software; you can redistribute it and/or
--- modify it 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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:      NMTDS_IteratorCheckerSI.cdl
+--  Created:   Tue Feb  6 10:18:27 2007
+--  Author:    Peter KURNEV
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
---  
--- File:       NMTDS_IteratorCheckerSI.cdl
--- Created:    Tue Feb  6 10:18:27 2007
--- Author:     Peter KURNEV
-
-
 class IteratorCheckerSI from NMTDS  
     inherits Iterator from NMTDS
 
index da2290b935980d0efed80ea7fe4f18e4675c8657..310827edd91d49457a4d87947edc106fcb0bc302 100644 (file)
@@ -1,26 +1,28 @@
-// Copyright (C) 2007 SAMTECH
-// 
-// This library is free software; you can redistribute it and/or
-// modify it 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTDS_IteratorChecker.cxx
 // Created:    Tue Feb  6 10:37:59 2007
 // Author:     Peter KURNEV
-
-
+//
 #include <NMTDS_IteratorCheckerSI.ixx>
 
 #include <TopAbs_ShapeEnum.hxx>
index f11a9c1c2372ce04b22cf6507d0cb98834a216a4..e083f88e4613c7f5a9eb4d36e47efdc51b3e3ffe 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_IteratorCheckerSI_HeaderFile
 #define _NMTDS_IteratorCheckerSI_HeaderFile
 
index 6346ab51917afbfe38bc096c48e71101e387fd7b..b9fc4a7d93d690b17bf1331b73f1a4f1686936ff 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_IteratorCheckerSI.jxx>
 
  
index dc6afc1b7085c7a8dab552f92d66dea05c7fdf8e..569dce04a977bed29986b54c09c4dcd686851460 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_IteratorCheckerSI_HeaderFile
 #include <NMTDS_IteratorCheckerSI.hxx>
 #endif
index 3316ee82c0c3311626739c7781b9aaa3bb421544..dd32df2abcab472a160438cec46e0dc01b6a5b24 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
 #define _NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
 
index e3884deaa763b547ca4b78a8f5c84d16250065b1..b2866f1e1159626c8e506169b78aa9ffafe754ec 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx>
 
 #ifndef _Standard_NoMoreObject_HeaderFile
index bf3646a40053c2e8e1de0ffdcaf1667119a2e11d..ae3b3990ead7687f0800f10b82f7e881658b7a76 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_ListIteratorOfListOfPassKey_HeaderFile
 #define _NMTDS_ListIteratorOfListOfPassKey_HeaderFile
 
index bd2e0e03be0798aa730b0dacd88bebbb12f4ed60..efb4d8be9605dc9486afcee7b7182b5e005d820a 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_ListIteratorOfListOfPassKeyBoolean_HeaderFile
 #define _NMTDS_ListIteratorOfListOfPassKeyBoolean_HeaderFile
 
index a0daa155d1e804197ed08f8db31a0f671afd516b..161054c206f90f490e52aca9e13c5c5910db90fe 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx>
 
 #ifndef _Standard_NoMoreObject_HeaderFile
index de084cc1944cdece499f2e1940020442b9ccd7c5..017140d0f875febba75716b91c28645b0cc417b0 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_ListIteratorOfListOfPassKey.hxx>
 
 #ifndef _Standard_NoMoreObject_HeaderFile
index 05fe687bb8a2b4bd48e0566977d79c5e81f91f83..24a28af7ef9055c2e9ef0455fe5b53575901db07 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
 #define _NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
 
index f354af53106de9aa87ef968f1fcb61c1ea136e72..875b786e439972d16a9f818b1243ff88759572a6 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 160d2fbd32b9008ef4f1fc28ac30ee62cc887c77..c67b7845d363718e004f8e7a63400a2467aa94af 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_ListNodeOfListOfPassKey_HeaderFile
 #define _NMTDS_ListNodeOfListOfPassKey_HeaderFile
 
index a6e96e655751d428a9cc3300737081a93d0ee19b..c2f7431184cfc0721340f6c1efa7e30fa56adc16 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_ListNodeOfListOfPassKeyBoolean_HeaderFile
 #define _NMTDS_ListNodeOfListOfPassKeyBoolean_HeaderFile
 
index e84d51f5bb694755fa0781bb2ae60d2341d8d4f0..7145c153231e15d253782a5727f8d33c77db3c93 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_ListNodeOfListOfPassKeyBoolean.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index a85b03bc1a86cb2dcd3295689be06ed580ee68fa..dcca753f725b3f25d38906ec5a338c7cd3ed42b9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_ListNodeOfListOfPassKey.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 7664fc4ea60ace29efbb4f02a02dcbdac77d8918..bc3715363de116debf295387c24e03913104c158 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
 #define _NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
 
index f85f6d9d5089015781e29ee27c46b8c85c1af672..66eede0c1e47d759cbbb9d664379748db80aa2e7 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index 207251094ef6def0957dc7a7f7e4744280521f1f..390a3a5d11132e452ec9aa82b1e294744d7ec476 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_ListOfPassKey_HeaderFile
 #define _NMTDS_ListOfPassKey_HeaderFile
 
index 3ca9a39ab73ad2f5b16a0022e692fa80edd6158a..d4dec7dede4e8f06365ddb8483b90cbd447a85a7 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_ListOfPassKeyBoolean_HeaderFile
 #define _NMTDS_ListOfPassKeyBoolean_HeaderFile
 
index 846661e5f99976ff8815fe32a7b67602b2cfff22..5b289b5532b23615cc9da24ec42336db9f50cf3c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_ListOfPassKeyBoolean.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index f87d96c3b0d151155f0b55d3cac4f44f58d2d13c..a68d4c892595af82a059bce7da303f28d73bd6ca 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_ListOfPassKey.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index 71b372604af3f0f8a8ebd276eafc108db430b6e4..bdb843bfe790318227b01928ef91d6d55ee2d976 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_MapIteratorOfMapOfPassKey_HeaderFile
 #define _NMTDS_MapIteratorOfMapOfPassKey_HeaderFile
 
index dbff06524a4a3f7d21e77c93927ef5bea7dcf8c1..52f2bc1dfde103ae197bcd3d5d1f8cbd4b6e90e1 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_MapIteratorOfMapOfPassKeyBoolean_HeaderFile
 #define _NMTDS_MapIteratorOfMapOfPassKeyBoolean_HeaderFile
 
index 68c88970ede5ffa1e9ff34b8db444f816d727a0c..e601bd0a315070e946e55017a6fda09f187047f7 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index c96965f879cc9678eedb85044dbd12ca6b1cdeb2..611ca70927025360da1fc28224b937557ce93405 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_MapIteratorOfMapOfPassKey.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index b9360dd20be7d9dda14ef100f50eb98763464ab4..e20be33a2a0dfdf5b2f7eda50bea2397f022ca4e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_MapOfPassKey_HeaderFile
 #define _NMTDS_MapOfPassKey_HeaderFile
 
index 8f0312b63a6c83d4e2e87f7764f3bc871986fa9d..d3fcfd8ed20a4f174b2243a9ddeb2372929f7de8 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_MapOfPassKeyBoolean_HeaderFile
 #define _NMTDS_MapOfPassKeyBoolean_HeaderFile
 
index 4c9ac2a3f92bb103349e7f71245de961dad42aef..4eb82501e6466a6bfa7ddc38d516c39e58fb00d4 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_MapOfPassKeyBoolean.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index 12f3a2289195b0e25bbbddfa398def0c71f6ff19..2a2a23e9696687ee95cfb5e7b31fe49a4cab6e56 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_MapOfPassKey.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index 7084ba33345e3312865fc814ffb2522f73ff3746..0e7f04d8f53bcad70459c69cacf3409d51b720bf 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_PInterfPool_HeaderFile
 #define _NMTDS_PInterfPool_HeaderFile
 
index 8cefa5bb5b36d8886ed79984c2f4551e7113752b..0cc2973f43c655726e3eef90175c3d8072ee2d1d 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_PIterator_HeaderFile
 #define _NMTDS_PIterator_HeaderFile
 
index 128b4586233483869604fd4807f558ba8ef33607..0bebcb823af35e8588c47b0be94bb272fea2f8b9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_PShapesDataStructure_HeaderFile
 #define _NMTDS_PShapesDataStructure_HeaderFile
 
index 905a8d62af018cfee7fede43578abf4b2d29bbb0..62284b52055614c27bc70234a28a0f7fbd803825 100755 (executable)
@@ -1,28 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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:      NMTDS_PassKey.cdl
+--  Created:   Mon Nov 20 12:16:13 2006
+--  Author:    Peter KURNEV
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
--- File:       NMTDS_PassKey.cdl
--- Created:    Mon Nov 20 12:16:13 2006
--- Author:     Peter KURNEV
---             <pkv@irinox>
-
-
 class PassKey from NMTDS 
 
        ---Purpose: 
index 2d2d52ea0a5386292a7eefe810383791173d3eed..91e1da95640754e632f824850eea9c8bca680548 100755 (executable)
@@ -1,29 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTDS_Algo.cxx
 // Created:    Sat Dec 04 12:39:47 2004
 // Author:     Peter KURNEV
 //             <peter@PREFEX>
-
-
+//
 #include <NMTDS_PassKey.ixx>
 
 #include <stdio.h>
index 379b72f79d2e5de73b5703f17114c22ecdcbbc66..b75f6302926eebf49dc319c85fb1ee6fc3fbda73 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_PassKey_HeaderFile
 #define _NMTDS_PassKey_HeaderFile
 
index 906d159d02fa76824c6495b83f7d5796aeff7754..fee442621e45c05ee944ac7eec15bc0ed195c94a 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_PassKey.jxx>
 
  
index ba0d04dd17ed07bdbc4dc1403387efb9e7e78a85..65bb207de5413b2f16463855f297695ac576a8d9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TColStd_ListOfInteger_HeaderFile
 #include <TColStd_ListOfInteger.hxx>
 #endif
index c34a3244a6b5d46627ec0c191175bcae2ce7db7d..73b93b2344f54f305f418045626cf08e8763915f 100755 (executable)
@@ -1,27 +1,28 @@
--- Copyright (C) 2006 SAMTECH 
--- 
--- This library is free software; you can redistribute it and/or
--- modify it 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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:      NMTDS_PassKeyBoolean.cdl
+--  Created:   
+--  Author:    Peter KURNEV
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
--- File:       NMTDS_PassKeyBoolean.cdl
--- Created:    
--- Author:     Peter KURNEV
---             <pkv@irinox>
-
-
 class PassKeyBoolean from NMTDS 
     inherits  PassKey from NMTDS 
 
index 059751fe2e180ebe2e29f2e6f81209cf5d4a7032..d2636052cadd9dfbe6c7272d28b759339e4da69f 100755 (executable)
@@ -1,27 +1,29 @@
-// Copyright (C) 2006 SAMTECH
-// 
-// This library is free software; you can redistribute it and/or
-// modify it 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTDS_PassKeyBoolean.cxx
 // Created:    Mon May 15 14:31:05 2006
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTDS_PassKeyBoolean.ixx>
 
 //=======================================================================
index 604cfa30b368c4c1216748e83afcb38c1ac1eebf..aa0cc5b50c57a326d0fb42407079facc4ab03e0b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_PassKeyBoolean_HeaderFile
 #define _NMTDS_PassKeyBoolean_HeaderFile
 
index 88cae8df233c14574c4dc1aeddace9f3bb7b9035..f879f4ff7d6f0ed639e06a6d478bb224d09d5b0b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_PassKeyBoolean.jxx>
 
  
index 4291273e93041d081a8b0f9a87440bb6b0d4edda..b4559ce9b40b2e0b4495d1be154efdddccfe5337 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_PassKeyBoolean_HeaderFile
 #include <NMTDS_PassKeyBoolean.hxx>
 #endif
index de75ce8f9de1a32bd78fe3cf1f5cc07a9e56a78d..052e9aa97dd74b8cd7af39b1d00ca0f5375b7afa 100755 (executable)
@@ -1,28 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:      NMTDS_PassKeyMapHasher.cdl
+--  Created:   
+--  Author:    Peter KURNEV
 --
--- File:       NMTDS_PassKeyMapHasher.cdl
--- Created:    
--- Author:     Peter KURNEV
---             <pkv@irinox>
-
-
 class PassKeyMapHasher from NMTDS 
 
        ---Purpose: 
index ac7910947f683d906b4c3a45e42e33bb8164999b..2afd292d03f6779f10447f2dae1989dfd82d686e 100755 (executable)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTDS_PassKeyMapHasher.cxx
 // Created:    
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTDS_PassKeyMapHasher.ixx>
 
 //=======================================================================
index b22d6e8f76a5d24c2d1001bdae48432f1ea7ee5b..372e21411dd8eb6395186d19e2b585ef5ad37143 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_PassKeyMapHasher_HeaderFile
 #define _NMTDS_PassKeyMapHasher_HeaderFile
 
index 177c4e352238675ec82c0d1de8571943a7c6a21d..8c37b4e0c7f0e222b150bbda3799d554fdcfa7f9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_PassKeyMapHasher.jxx>
 
  
index ab0e61052e9fea8af9d789038e90ff04bd3305a4..7487e5b187099ee8efdffc82246e868534afa01b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_PassKey_HeaderFile
 #include <NMTDS_PassKey.hxx>
 #endif
index 081226594b0141cf3446512e0b5b32b5772d977d..8721823bee53c309730f4fc1aa36b1aaf9b4a863 100644 (file)
@@ -1,28 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:      NMTDS_PassKeyShape.cdl
+--  Created:   
+--  Author:    Peter KURNEV
 --
--- File:       NMTDS_PassKeyShape.cdl
--- Created:    
--- Author:     Peter KURNEV
---             <pkv@irinox>
-
-
 class PassKeyShape from NMTDS 
    
        ---Purpose: 
index c4af3a480ee4f08671b2b6cd72ab303dfc21f484..804acd5c5fed8845eab5594b5d4f6c6bb31b3d1d 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTDS_PassKeyShape.cxx
 // Created:    
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTDS_PassKeyShape.ixx>
 
 #include <TopTools_ListOfShape.hxx>
index 81eaa8096317eb1f8a3f4fa43c02baf75a235771..4f9583ecf059f001caead00966ddb059b51f11d2 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_PassKeyShape_HeaderFile
 #define _NMTDS_PassKeyShape_HeaderFile
 
index 90c37bd34e4bf62d3ab51685948c9c36143f5813..c98d335424310c29de876b3be9902010dcb2073c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_PassKeyShape.jxx>
 
  
index 9d79955e4a830063f224dae1734189ed50208150..7b7553bcf5647234810b8f25060e5f82870c6b33 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index 77c066755a818f410cd0a3d6144cfd890d20c55d..6fc92b1e5d753127c59a2f2e41ea31a57dfd2cd9 100644 (file)
@@ -1,28 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http:--www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:      NMTDS_PassKeyMapHasher.cdl
+--  Created:   
+--  Author:    Peter KURNEV
 --
--- File:       NMTDS_PassKeyMapHasher.cdl
--- Created:    
--- Author:     Peter KURNEV
---             <pkv@irinox>
-
-
 class PassKeyShapeMapHasher from NMTDS 
 
        ---Purpose: 
index e637e3380777d5bb0ee60b61f326ba0c98acc124..b8fa382301b6b0781dcdeb3e01f0020293f503af 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTDS_PassKeyMapHasher.cxx
 // Created:    
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTDS_PassKeyShapeMapHasher.ixx>
 
 //=======================================================================
index e4843673746c3256591abec39eca8cc7f40b7e4f..909ebb5cdba695601ee926b97f914c4c763bccf0 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_PassKeyShapeMapHasher_HeaderFile
 #define _NMTDS_PassKeyShapeMapHasher_HeaderFile
 
index c7148fd5d54c486557751363ec5ea69eb4baf737..32be52eaf9057cc2ce3bb2f4285daa2e830296d9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_PassKeyShapeMapHasher.jxx>
 
  
index f0e81fc339a6302fdb77c4fb372f163b66c0a6f2..34fa8cc5e30c91b06e76c0c0fa429d3a7e22b3bb 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_PassKeyShape_HeaderFile
 #include <NMTDS_PassKeyShape.hxx>
 #endif
index 5a2f93f72ce08f2eb8f8d62f9f15f0a8a699e754..ba1f59f48d9b9ae839fa6b86f3cbe3423cf89bd0 100644 (file)
@@ -1,27 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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:      NMTDS_ShapesDataStructure.cdl
+--  Created:   Mon Dec  1 10:17:05 2003
+--  Author:    Peter KURNEV
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
---  
--- File:       NMTDS_ShapesDataStructure.cdl
--- Created:    Mon Dec  1 10:17:05 2003
--- Author:     Peter KURNEV
---             <pkv@irinox>
-
 class ShapesDataStructure from NMTDS  
     inherits ShapesDataStructure from BooleanOperations  
 
index a9a0e7370c65e3b5b0201ec41e137b1cab3cd2b6..c10daf2360a346e9e729c3cfa598a4e8b25e7af0 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTDS_ShapesDataStructure.cxx
 // Created:    Mon Dec  1 10:21:04 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTDS_ShapesDataStructure.ixx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
index 9d149f5a716193fbbe630634b059634643430b47..2dede1f6569a35dbaba070d412a479a3cd753896 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_ShapesDataStructure_HeaderFile
 #define _NMTDS_ShapesDataStructure_HeaderFile
 
index 587761e251664a9dde1db07e4c0d72d403248f0f..2eb57d133f4b91dae0e74472d477e3e10046cad8 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_ShapesDataStructure.jxx>
 
  
index 41897c6155a228076677b1cea8c684a07c6ee55b..f14232fd41e6142c4041923c947504d98b834b98 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index 0028623859d8a23ca0f956bf3bc15a5df7cebfae..196074ff45fc2dc65ce3aa2d177adf3147c36fce 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_StdMapNodeOfMapOfPassKey_HeaderFile
 #define _NMTDS_StdMapNodeOfMapOfPassKey_HeaderFile
 
index 0392838d1568b475bbca79ebdf0b511e0dbccb6c..61cba228bf0a90fabd406b5acea91aa53322052e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_StdMapNodeOfMapOfPassKeyBoolean_HeaderFile
 #define _NMTDS_StdMapNodeOfMapOfPassKeyBoolean_HeaderFile
 
index 9728d1014ef54961ace3e3825d6f727e902d6094..154519c8e4d3168e30f87a799d48643bb90b5e8e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 08659bb9b12643c42de6a215a972fbc602e6c269..27fa652b38a2d455649650c532f0ca97fe97d13a 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_StdMapNodeOfMapOfPassKey.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 1465d4d16e16bced03c8b8b160077eda60aa996c..1506fa7b6d43aef02e39b5814a3b908ec6f52ca8 100644 (file)
@@ -1,29 +1,28 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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:      NMTDS_Tools.cdl
+--  Created:   Tue Feb 20 14:56:14 2007
+--  Author:    Peter KURNEV
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
---  
--- File:       NMTDS_Tools.cdl
--- Created:    Tue Feb 20 14:56:14 2007
--- Author:     Peter KURNEV
---             <pkv@irinox>
----Copyright:   Matra Datavision 2007
-
-
 class Tools from NMTDS 
 
        ---Purpose: 
index 8944fe5014cfaacae0aabb96fb5c33147d565ce2..b49af9da35dd17c1761174b6cd317f26971fe415 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTDS_Tools.cxx
 // Created:    Tue Feb 20 14:57:28 2007
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTDS_Tools.ixx>
 #include <TopoDS_Vertex.hxx>
 #include <gp_Pnt.hxx>
index c7eb8fdc9deb8369624c0b4efa47540d349aabbe..ca5f8984f419b9c773434039f70cb2a33adf3a70 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTDS_Tools_HeaderFile
 #define _NMTDS_Tools_HeaderFile
 
index 8e5877b34ea20edf9504b73e33e0c4cbae86243b..da643aa19496d0474e433f449ad75a8563577a90 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTDS_Tools.jxx>
 
  
index 4359a18a76de09a4d1c75de18b6ab55fc5f7a027..5fdfd4c5df14b384e72eb1358e59bd2733572755 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Vertex_HeaderFile
 #include <TopoDS_Vertex.hxx>
 #endif
index 3499864cc52d288203a9251630da82a6b9e08ac3..ae1c3f8072ac5673bf54280cc53fe8d9aea505fc 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
 #define _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
 
index 48ce73f8a49221ce3d39c9aaed7da8ae2aa33aff..0e68f8ec10814913892d3fc43f0c92ec257cce03 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
 #define _Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
 
index a1d7b3076efa84f15035340b2994356db6fe6fd7..37052ceedb0330fa4e47677bc4392ce0d03ec939 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_HeaderFile
 #define _Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_HeaderFile
 
index ddf434f3fd2420a5c26053bfa921c5ad18bc5fb8..9be2a7b5359187455bcfe8affae4ac0194546174 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_HeaderFile
 #define _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_HeaderFile
 
index 2ae11665b7f9745bfd5dc4f27352c370a2762ceb..4bde10714420e617808af75da669618878fb0310 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
 #define _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
 
index bd78cab85ff2e612090dc76216bbb9d38f83fdca..26f899d6a07b09371ff00610d4f3ed86fedf60a0 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_HeaderFile
 #define _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_HeaderFile
 
index 68c12bec0d6a80b749d0d4806c3a2b566e20ccfb..fb7fd9bbc672da8f318443eeecc60343df9b3b69 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTTools_ListNodeOfListOfCommonBlock_HeaderFile
 #define _Handle_NMTTools_ListNodeOfListOfCommonBlock_HeaderFile
 
index 10c82d0404f45f7cdc41c27963602958bd71bdbb..6464781051fb20262cf500c128b45581d2fcd5c7 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTTools_ListNodeOfListOfCoupleOfShape_HeaderFile
 #define _Handle_NMTTools_ListNodeOfListOfCoupleOfShape_HeaderFile
 
index 93a4a7634e0d5801cf7de9c0e615bf91e6f0ad2e..47559616e4871b0e993e682c54d0c639060b699f 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Handle_NMTTools_StdMapNodeOfMapOfPaveBlock_HeaderFile
 #define _Handle_NMTTools_StdMapNodeOfMapOfPaveBlock_HeaderFile
 
index ecd125530e2bbce5685e8ca7e2db95b3cc5abd9a..59c6b1f8d014fc90b80f619d32813bfb65fc4645 100644 (file)
@@ -1,32 +1,31 @@
-#  GEOM NMTTools : partition algorithm
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY 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 NMTTools : partition algorithm
 #  File   : Makefile.in
 #  Author : Julia DOROVSKIKH
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
@@ -39,11 +38,21 @@ salomeinclude_HEADERS = \
        Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx \
        Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx \
        NMTTools_CheckerSI.hxx \
+       NMTTools_CheckerSI.ixx \
+       NMTTools_CheckerSI.jxx \
        NMTTools_CommonBlockAPI.hxx \
+       NMTTools_CommonBlockAPI.ixx \
+       NMTTools_CommonBlockAPI.jxx \
        NMTTools_CommonBlock.hxx \
+       NMTTools_CommonBlock.ixx \
+       NMTTools_CommonBlock.jxx \
        NMTTools_CommonBlockPool.hxx \
        NMTTools_CoupleOfShape.hxx \
+       NMTTools_CoupleOfShape.ixx \
+       NMTTools_CoupleOfShape.jxx \
        NMTTools_DEProcessor.hxx \
+       NMTTools_DEProcessor.ixx \
+       NMTTools_DEProcessor.jxx \
        NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx \
        NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx \
        NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx \
@@ -51,6 +60,8 @@ salomeinclude_HEADERS = \
        NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx \
        NMTTools_IndexedDataMapOfShapePaveBlock.hxx \
        NMTTools_IteratorOfCoupleOfShape.hxx \
+       NMTTools_IteratorOfCoupleOfShape.ixx \
+       NMTTools_IteratorOfCoupleOfShape.jxx \
        NMTTools_ListIteratorOfListOfCommonBlock.hxx \
        NMTTools_ListIteratorOfListOfCoupleOfShape.hxx \
        NMTTools_ListNodeOfListOfCommonBlock.hxx \
@@ -58,8 +69,12 @@ salomeinclude_HEADERS = \
        NMTTools_ListOfCommonBlock.hxx \
        NMTTools_ListOfCoupleOfShape.hxx \
        NMTTools_PaveFiller.hxx \
+       NMTTools_PaveFiller.ixx \
+       NMTTools_PaveFiller.jxx \
        NMTTools_PPaveFiller.hxx \
        NMTTools_Tools.hxx \
+       NMTTools_Tools.ixx \
+       NMTTools_Tools.jxx \
        Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx \
        Handle_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx \
        NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx \
@@ -112,15 +127,43 @@ dist_libNMTTools_la_SOURCES = \
        NMTTools_MapOfPaveBlock_0.cxx \
        NMTTools_StdMapNodeOfMapOfPaveBlock_0.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libNMTTools_la_CPPFLAGS = \
-       $(CAS_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
+libNMTTools_la_CPPFLAGS =      \
+       $(CAS_CPPFLAGS)         \
+       $(KERNEL_CXXFLAGS)      \
        -I$(srcdir)/../NMTDS
 
-libNMTTools_la_LDFLAGS  = \
-       ../NMTDS/libNMTDS.la \
-       $(STDLIB) \
-       $(CAS_LDPATH) -lTKBool -lTKBO \
+libNMTTools_la_LDFLAGS  =              \
+       ../NMTDS/libNMTDS.la            \
+       $(STDLIB)                       \
+       $(CAS_LDPATH) -lTKBool -lTKBO   \
        $(KERNEL_LDFLAGS)
+
+CDL_FILES =                                    \
+       NMTTools.cdl                            \
+       NMTTools_CheckerSI.cdl                  \
+       NMTTools_CommonBlock.cdl                \
+       NMTTools_CommonBlockAPI.cdl             \
+       NMTTools_CoupleOfShape.cdl              \
+       NMTTools_DEProcessor.cdl                \
+       NMTTools_IteratorOfCoupleOfShape.cdl    \
+       NMTTools_PaveFiller.cdl                 \
+       NMTTools_Tools.cdl
+
+EXTRA_DIST += $(CDL_FILES)
+
+########################################
+# Non-used (obsolete?) files
+########################################
+# NMTTools_PCurveMaker.cdl
+# NMTTools_PCurveMaker.cxx
+# NMTTools_PCurveMaker.hxx
+# NMTTools_PCurveMaker.ixx
+# NMTTools_PCurveMaker.jxx
+# NMTTools_PDSFiller.hxx
+# NMTTools_DSFiller.cdl
+# NMTTools_DSFiller.cxx
+# NMTTools_DSFiller.hxx
+# NMTTools_DSFiller.ixx
+# NMTTools_DSFiller.jxx
index 14ce83e18de44cb5602624cf88063d0d2bde7593..727b8331edf201a0a1fd8c22cecef0dd8fa32ce5 100644 (file)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
---  
 -- File:       NMTTools.cdl
 -- Created:    Thu Dec  4 16:55:49 2003
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 package NMTTools 
 
        ---Purpose: 
diff --git a/src/NMTTools/NMTTools.pro b/src/NMTTools/NMTTools.pro
new file mode 100644 (file)
index 0000000..109a949
--- /dev/null
@@ -0,0 +1,131 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = NMTTools
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+STDLIB = -lstdc++
+
+CAS_LDPATH = -L$$(CASROOT)/Linux/lib 
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS} ../NMTDS
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lNMTDS $${STDLIB} $${CAS_LDPATH} -lTKBool -lTKBO $${KERNEL_LDFLAGS}
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+HEADERS  = Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
+HEADERS += Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+HEADERS += Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx
+HEADERS += Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx
+HEADERS += Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx
+HEADERS += Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx
+HEADERS += Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx
+HEADERS += NMTTools_CommonBlockAPI.hxx
+HEADERS += NMTTools_CommonBlock.hxx
+HEADERS += NMTTools_CommonBlockPool.hxx
+HEADERS += NMTTools_CoupleOfShape.hxx
+HEADERS += NMTTools_DEProcessor.hxx
+HEADERS += NMTTools_DSFiller.hxx
+HEADERS += NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx
+HEADERS += NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx
+HEADERS += NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx
+HEADERS += NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
+HEADERS += NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
+HEADERS += NMTTools_IndexedDataMapOfShapePaveBlock.hxx
+HEADERS += NMTTools_IteratorOfCoupleOfShape.hxx
+HEADERS += NMTTools_ListIteratorOfListOfCommonBlock.hxx
+HEADERS += NMTTools_ListIteratorOfListOfCoupleOfShape.hxx
+HEADERS += NMTTools_ListNodeOfListOfCommonBlock.hxx
+HEADERS += NMTTools_ListNodeOfListOfCoupleOfShape.hxx
+HEADERS += NMTTools_ListOfCommonBlock.hxx
+HEADERS += NMTTools_ListOfCoupleOfShape.hxx
+HEADERS += NMTTools_PaveFiller.hxx
+HEADERS += NMTTools_PCurveMaker.hxx
+HEADERS += NMTTools_PDSFiller.hxx
+HEADERS += NMTTools_PPaveFiller.hxx
+HEADERS += NMTTools_Tools.hxx
+HEADERS += Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx
+HEADERS += Handle_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx
+HEADERS += NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx
+HEADERS += NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx
+HEADERS += NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
+HEADERS += NMTTools_MapIteratorOfMapOfPaveBlock.hxx
+HEADERS += NMTTools_MapOfPaveBlock.hxx
+HEADERS += NMTTools_StdMapNodeOfMapOfPaveBlock.hxx
+
+SOURCES  = NMTTools_CommonBlockAPI.cxx
+SOURCES += NMTTools_CommonBlock.cxx
+SOURCES += NMTTools_CommonBlockPool_0.cxx
+SOURCES += NMTTools_CoupleOfShape.cxx
+SOURCES += NMTTools_DEProcessor.cxx
+SOURCES += NMTTools_DSFiller.cxx
+SOURCES += NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_0.cxx
+SOURCES += NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_0.cxx
+SOURCES += NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_0.cxx
+SOURCES += NMTTools_IndexedDataMapOfIndexedMapOfInteger_0.cxx
+SOURCES += NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_0.cxx
+SOURCES += NMTTools_IndexedDataMapOfShapePaveBlock_0.cxx
+SOURCES += NMTTools_IteratorOfCoupleOfShape.cxx
+SOURCES += NMTTools_ListIteratorOfListOfCommonBlock_0.cxx
+SOURCES += NMTTools_ListIteratorOfListOfCoupleOfShape_0.cxx
+SOURCES += NMTTools_ListNodeOfListOfCommonBlock_0.cxx
+SOURCES += NMTTools_ListNodeOfListOfCoupleOfShape_0.cxx
+SOURCES += NMTTools_ListOfCommonBlock_0.cxx
+SOURCES += NMTTools_ListOfCoupleOfShape_0.cxx
+SOURCES += NMTTools_PaveFiller_0.cxx
+SOURCES += NMTTools_PaveFiller_1.cxx
+SOURCES += NMTTools_PaveFiller_2.cxx
+SOURCES += NMTTools_PaveFiller_3.cxx
+SOURCES += NMTTools_PaveFiller_4.cxx
+SOURCES += NMTTools_PaveFiller_5.cxx
+SOURCES += NMTTools_PaveFiller_6.cxx
+SOURCES += NMTTools_PaveFiller_7.cxx
+SOURCES += NMTTools_PaveFiller_8.cxx
+SOURCES += NMTTools_PaveFiller_9.cxx
+SOURCES += NMTTools_PaveFiller.cxx
+SOURCES += NMTTools_PCurveMaker.cxx
+SOURCES += NMTTools_Tools.cxx
+SOURCES += NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_0.cxx
+SOURCES += NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_0.cxx
+SOURCES += NMTTools_DataMapOfIntegerListOfPaveBlock_0.cxx
+SOURCES += NMTTools_MapIteratorOfMapOfPaveBlock_0.cxx
+SOURCES += NMTTools_MapOfPaveBlock_0.cxx
+SOURCES += NMTTools_StdMapNodeOfMapOfPaveBlock_0.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index 50518ecd0bd1bff6346fcd027f678e0350c541db..9267d8272bb4ef2594aa82db8dff22345ec5b1ea 100644 (file)
@@ -1,26 +1,28 @@
--- Copyright (C) 2006 SAMTECH 
--- 
--- This library is free software; you can redistribute it and/or
--- modify it 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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:      NMTTools_CheckerSI.cdl
+--  Created:   Mon Feb 19 11:23:55 2007
+--  Author:    Peter KURNEV
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
---   
--- File:       NMTTools_CheckerSI.cdl
--- Created:    Mon Feb 19 11:23:55 2007
--- Author:     Peter KURNEV
-
-
 class CheckerSI from NMTTools 
        inherits PaveFiller from NMTTools 
        ---Purpose: 
index f3158795f3bc8ed756ccd3b65684e3364cd44603..fd7cd2c2b9534dd6858be509eb9c59a5d26036cd 100644 (file)
@@ -1,27 +1,28 @@
-// Copyright (C) 2006 SAMTECH
-// 
-// This library is free software; you can redistribute it and/or
-// modify it 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      NMTTools_CheckerSI.cxx
+//  Created:   Mon Feb 19 11:32:08 2007
+//  Author:    Peter KURNEV
 //
-// File:       NMTTools_CheckerSI.cxx
-// Created:    Mon Feb 19 11:32:08 2007
-// Author:     Peter KURNEV
-//             <pkv@irinox>
-
-
 #include <NMTTools_CheckerSI.ixx>
 
 #include <NMTDS_ShapesDataStructure.hxx>
index 4aacb49d25e46ce2bf81505a0c88f667d6c52eca..2bd804de4f3fd14588f6cf96b07ff7fc8c6acb7e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_CheckerSI_HeaderFile
 #define _NMTTools_CheckerSI_HeaderFile
 
index 5d3e0201dad8d267db4bb645cd76c9eb8b7056e8..ebd56f247e66526a8e56ce2a21d88e69b81cd310 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_CheckerSI.jxx>
 
  
index 68bdc3096115331260fd5639c7894ba4ad7e0db3..774127cac30104cd05d068bb89bacf56e615aa1e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_CheckerSI_HeaderFile
 #include <NMTTools_CheckerSI.hxx>
 #endif
index 36ab867df44e345ba255f7aaedbf32dd39f9a1ad..a0c9f978b320dd249dd1b1d6509422ae7f07e2ca 100755 (executable)
@@ -1,27 +1,28 @@
-// Copyright (C) 2006 SAMTECH
-// 
-// This library is free software; you can redistribute it and/or
-// modify it 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_CheckerSI.cxx
 // Created:    Mon Feb 19 11:32:08 2007
 // Author:     Peter KURNEV
-//             <pkv@irinox>
-
-
+//
 #include <NMTTools_CheckerSI.ixx>
 #include <NMTDS_ShapesDataStructure.hxx>
 #include <NMTDS_IteratorCheckerSI.hxx>
index 7c4fd74091e18cf6ac76718dd0d008c4a4cd5965..406208a05c0738fc82c8d635c7657b0442010d2b 100644 (file)
@@ -1,29 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
---  
 -- File:       NMTTools_CommonBlock.cdl
 -- Created:    Tue Dec  9 12:11:48 2003
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
-
+--
 class CommonBlock from NMTTools 
 
        ---Purpose: 
index 5924d0e16e3fbc15526923ba67d5e74d31038ef4..94ff2e98c2e01efdff4c9e776b1a43fd69c57e12 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_CommonBlock.cxx
 // Created:    Tue Dec  9 12:23:29 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTTools_CommonBlock.ixx>
 
 #include <BOPTools_ListIteratorOfListOfPaveBlock.hxx>
index 38d036f8d9382ff93834e34d7dbeff642cb3fd7f..d13b2c496f20ba05d1683150dfc2a72f5eebd865 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_CommonBlock_HeaderFile
 #define _NMTTools_CommonBlock_HeaderFile
 
index 91d08c8c876e1404eadb4a115315201742f51ab5..f335f898106443cdd75e434ea574788a2ed74b7b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_CommonBlock.jxx>
 
  
index 1373207f31b621db08fb7372354f8abf84c3725f..be3140a9c552b8569fe9518093f0ac25b30caeef 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _BOPTools_PaveBlock_HeaderFile
 #include <BOPTools_PaveBlock.hxx>
 #endif
index 8743ee8eef12d46c1109e477c5bd7290bf4f22e2..601f6535fa896a16af9207b6ebb9acfd4fc86743 100644 (file)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       NMTTools_CommonBlockAPI.cdl
 -- Created:    Mon Dec 15 11:35:46 2003
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class CommonBlockAPI from NMTTools 
 
        ---Purpose: 
index b92e983072801851f733704ad9079196b4e687c6..817f328cbcf0c448ac12f913e489dcc82e9dcc77 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_CommonBlockAPI.cxx
 // Created:    Mon Dec 15 11:38:04 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTTools_CommonBlockAPI.ixx>
 
 #include <BOPTools_PaveBlock.hxx>
index a3c437330fda9374667f547eda1c8a11fb4be415..7b717d706733538cd3a1945ab64a4d4931471286 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_CommonBlockAPI_HeaderFile
 #define _NMTTools_CommonBlockAPI_HeaderFile
 
index 49edac89495f97a80fba92446ca8edec1cf5a6e8..fdca4ca4a959b0c7dd1d17d84d6517db5b91d81b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_CommonBlockAPI.jxx>
 
  
index f6599af59b89c79941e3398b3fc3b03e1b3f8aa1..68ffe0ae9bbec1db5813dcb8b222c1bc1327a38e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_ListOfCommonBlock_HeaderFile
 #include <NMTTools_ListOfCommonBlock.hxx>
 #endif
index 92f849c57690fa6229275899fefbe13fab89f209..4c131de93f277cd355317eceb4c25f1de0b7f18b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_CommonBlockPool_HeaderFile
 #define _NMTTools_CommonBlockPool_HeaderFile
 
index 09fe06543238c6d28256cc15c6a84c658b5ae927..72b005821a25f25311bba908eb40e1cc51173bf1 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_CommonBlockPool.hxx>
 
 #ifndef _Standard_OutOfRange_HeaderFile
index 7e8d2ed63ad2f273fc2d51e6c963d58ea2707c96..e9cc2d30ebbffe9b22920fdd618082a89db34042 100644 (file)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
---  
 -- File:       NMTTools_CoupleOfShape.cdl
 -- Created:    Wed Jan 28 15:03:39 2004
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class CoupleOfShape from NMTTools 
 
        ---Purpose: 
index cbb721df1758ff468167d2f316de11a7b7f8f493..5736b977c3fa49a8e5d595058bc6bd9bb4499ac6 100644 (file)
@@ -1,27 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_CoupleOfShape.cxx
 // Created:    Wed Jan 28 15:06:11 2004
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
+//
 #include <NMTTools_CoupleOfShape.ixx>
 
 //=======================================================================
index 17ccbd0af7227faa17536a37ba9698c70ee618a5..870b5261d6f442c28dd316038386c5ad7c91c8e9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_CoupleOfShape_HeaderFile
 #define _NMTTools_CoupleOfShape_HeaderFile
 
index 9711b73adbb6831054450c18304a364d3ba03efa..65ba2898a8c4e1c3f24c57f97301a82deafb4b2d 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_CoupleOfShape.jxx>
 
  
index fe94c884971ef71029e97569001b6b4804d0714c..64230757cf252ad214e69468a53937b804e0abeb 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index d58f06dbf1a93db18ebcfa57438c6e2667da5929..d4e279c42a03c8b004bc42ca2563cc2e468d7162 100644 (file)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+--  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+--  This library is free software; you can redistribute it and/or
+--  modify it 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:       NMTTools_DEProcessor.cdl
 -- Created:    Wed Sep 12 12:08:37 2001
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class DEProcessor from NMTTools 
 
        ---Purpose:  
index 0933b0104516cb8ef58776ecc00a8dba94345d70..538c998b4528adbb30ea8170707471dfb2cbf698 100644 (file)
@@ -1,27 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_DEProcessor.cxx
 // Created:    Wed Sep 12 12:10:52 2001
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
+//
 #include <NMTTools_DEProcessor.ixx>
 
 #include <Precision.hxx>
 
 #include <gp_Pnt2d.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Sphere.hxx>
+#include <gp_Lin2d.hxx>
+
+#include <ElCLib.hxx>
 
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_Line.hxx>
+#include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
 #include <Geom2dInt_GInter.hxx>
 
 #include <BOPTools_PavePool.hxx>
 #include <BOPTools_PaveSet.hxx>
 #include <BOPTools_Tools3D.hxx>
-
+#include <BOPTools_SequenceOfCurves.hxx>
+#include <BOPTools_Curve.hxx>
 #include <BOPTools_CArray1OfSSInterference.hxx>
 #include <BOPTools_SplitShapesPool.hxx>
 
 #include <NMTDS_ShapesDataStructure.hxx>
+#include <NMTDS_InterfPool.hxx>
 
 #include <NMTTools_PaveFiller.hxx>
-//
-#include <BOPTools_SequenceOfCurves.hxx>
-#include <BOPTools_Curve.hxx>
-//
-#include <Geom2d_TrimmedCurve.hxx>
-
-#include <ElCLib.hxx>
-#include <gp_Lin2d.hxx>
-
-#include <NMTDS_InterfPool.hxx>
 
 //=======================================================================
-// function: NMTTools_DEProcessor::NMTTools_DEProcessor
+// function: 
 // purpose: 
 //=======================================================================
   NMTTools_DEProcessor::NMTTools_DEProcessor(NMTTools_PaveFiller& aPaveFiller)
   void NMTTools_DEProcessor::Do()
 {
   Standard_Integer aNbE;
+  //
   myIsDone=Standard_False;
-
+  //
   FindDegeneratedEdges();
+  //
   aNbE=myDEMap.Extent();
-  
   if (!aNbE) {
-    myIsDone=Standard_True;
+    myIsDone=!myIsDone;
     return;
   }
+  //
   DoPaves();
 }
 //=======================================================================
   void NMTTools_DEProcessor::FindDegeneratedEdges()
 {
   Standard_Integer i, aNb, nV, nF, nVx, ip, iRankE;
+  TopoDS_Vertex aV;
   TopTools_IndexedDataMapOfShapeListOfShape aMEF;
   //
   aNb=myDS->NumberOfShapesOfTheObject();
-  //
-  for (i=1; i<=aNb; i++) {
-    const TopoDS_Shape aF=myDS->Shape(i);//mpv
+  for (i=1; i<=aNb; ++i) {
+    const TopoDS_Shape aF=myDS->Shape(i);
     if (aF.ShapeType()==TopAbs_FACE) {
       TopExp::MapShapesAndAncestors (aF, TopAbs_EDGE, TopAbs_FACE, aMEF);
     }
   }
   //
-  for (i=1; i<=aNb; i++) {
-    const TopoDS_Shape aS=myDS->Shape(i);//mpv
+  for (i=1; i<=aNb; ++i) {
+    const TopoDS_Shape aS=myDS->Shape(i);
     if (aS.ShapeType()==TopAbs_EDGE) {
       const TopoDS_Edge& aE=TopoDS::Edge(aS);
       
       if (BRep_Tool::Degenerated(aE)) {
        iRankE=myDS->Rank(i);
-
-       TopoDS_Vertex aV=TopExp::FirstVertex(aE);
-
+       aV=TopExp::FirstVertex(aE);
        nVx=myDS->ShapeIndex(aV, iRankE);
        //
        nV=nVx;
   //
   nFD=0;
   aNbE=myDEMap.Extent();
-  for (i=1; i<=aNbE; i++) {
+  for (i=1; i<=aNbE; ++i) {
     nED=myDEMap.FindKey(i);
-    
+    //
     const BOPTools_DEInfo& aDEInfo=myDEMap(i);
     nVD=aDEInfo.Vertex();
+    //
     // Fill PaveSet for the edge nED
     const TColStd_ListOfInteger& nLF=aDEInfo.Faces();
     TColStd_ListIteratorOfListOfInteger anIt(nLF);
       
       BOPTools_ListOfPaveBlock aLPB;
       FindPaveBlocks(nED, nVD, nFD, aLPB);
-      // xxf
+      //
       aNbLPB=aLPB.Extent();
       if (!aNbLPB) {
        continue;
       }
-      //xxt
+      //
       FillPaveSet (nED, nVD, nFD, aLPB);
     }
     // 
   BOPTools_ListIteratorOfListOfPaveBlock anIt;
   Standard_Integer i, aNb, nF2, nV;
   //
-  //BOPTools_CArray1OfSSInterference& aFFs=(myFiller->InterfPool())->SSInterferences();
   BOPTools_CArray1OfSSInterference& aFFs=(myFiller->IP())->SSInterferences();
   //
   aNb=aFFs.Extent();
     //
     // Section Parts
     Standard_Integer j, aNbCurves;   
+    //
     BOPTools_SequenceOfCurves& aSC=aFF.Curves();
     aNbCurves=aSC.Length();
-    
-    for (j=1; j<=aNbCurves; j++) {
+    for (j=1; j<=aNbCurves; ++j) {
       const BOPTools_Curve& aBC=aSC(j);
       const BOPTools_ListOfPaveBlock& aLPBSe=aBC.NewPaveBlocks();
-
+      //
       anIt.Initialize(aLPBSe);
       for (; anIt.More(); anIt.Next()) {
        const BOPTools_PaveBlock& aPBSe=anIt.Value();
-       
+       //
        const BOPTools_Pave& aPv1=aPBSe.Pave1();
        nV=aPv1.Index();
        if (nV==nVD) {
          aLPBOut.Append(aPBSe);
          continue;
        }
-       
+       //
        const BOPTools_Pave& aPv2=aPBSe.Pave2();
        nV=aPv2.Index();
        if (nV==nVD) {
 {
   Standard_Boolean bIsDone, bXDir, bRejectFlag;
   Standard_Integer nE, aNbPoints, j;
-  Standard_Real aTD1, aTD2, aT1, aT2, aTolInter, aX, aDT;
+  Standard_Real aTD1, aTD2, aT1, aT2, aTolInter, aX, aDT, aXx;
+  gp_Pnt2d aP2d1, aP2d2, aP2D;
+  gp_Lin2d aLDE;
   //
   aDT=Precision::PConfusion();
   //
-  BOPTools_PaveSet& aPaveSet= (myFiller->ChangePavePool()).ChangeValue(myDS->RefEdge(nED));
+  BOPTools_PaveSet& aPaveSet= 
+    (myFiller->ChangePavePool()).ChangeValue(myDS->RefEdge(nED));
   //
   // Clear aPaveSet, aSplitEdges
   aPaveSet.ChangeSet().Clear();
   //
-  const TopoDS_Edge aDE=TopoDS::Edge(myDS->Shape(nED));//mpv
-  const TopoDS_Face aDF=TopoDS::Face(myDS->Shape(nFD));//mpv
+  const TopoDS_Edge aDE=TopoDS::Edge(myDS->Shape(nED));
+  const TopoDS_Face aDF=TopoDS::Face(myDS->Shape(nFD));
   //
   // 2D Curve of degenerated edge on the face aDF
-  // Modified  Thu Sep 14 14:35:18 2006 
-  // Contribution of Samtech www.samcef.com BEGIN
-  //Handle(Geom2d_Curve) aC2DDE=BRep_Tool::CurveOnSurface(aDE, aDF, aTD1, aTD2);
   Handle(Geom2d_Curve) aC2DDE1=BRep_Tool::CurveOnSurface(aDE, aDF, aTD1, aTD2);
   Handle(Geom2d_TrimmedCurve)aC2DDE=new Geom2d_TrimmedCurve(aC2DDE1, aTD1, aTD2);
-  // Contribution of Samtech www.samcef.com END 
   //
-  // Choose direction for Degenerated Edge
-  gp_Pnt2d aP2d1, aP2d2;
+  // Choose direction for degenerated edge
   aC2DDE->D0(aTD1, aP2d1);
   aC2DDE->D0(aTD2, aP2d2);
 
   for (; anIt.More(); anIt.Next()) {
     const BOPTools_PaveBlock& aPB=anIt.Value();
     nE=aPB.Edge();
-    const TopoDS_Edge aE=TopoDS::Edge(myDS->Shape(nE));//mpv
+    const TopoDS_Edge aE=TopoDS::Edge(myDS->Shape(nE));
     
     Handle(Geom2d_Curve) aC2D=BRep_Tool::CurveOnSurface(aE, aDF, aT1, aT2);
     //
     // Intersection
-    aTolInter=0.001;
-        
     Geom2dAdaptor_Curve aGAC1, aGAC2;
-    
+    //
     aGAC1.Load(aC2DDE, aTD1, aTD2);
     Handle(Geom2d_Line) aL2D= Handle(Geom2d_Line)::DownCast(aC2D);
     if (!aL2D.IsNull()) {
     else {
       aGAC2.Load(aC2D, aT1, aT2);
     }
-    
+    //
+    aTolInter=0.001;
     Geom2dInt_GInter aGInter(aGAC1, aGAC2, aTolInter, aTolInter);
-    
     bIsDone=aGInter.IsDone();
     if(bIsDone) {
       aNbPoints=aGInter.NbPoints();
       if (aNbPoints) { 
        for (j=1; j<=aNbPoints; ++j) {
-         gp_Pnt2d aP2D=aGInter.Point(j).Value();
+         aP2D=aGInter.Point(j).Value();
+         Handle(Geom2d_Line) aCLDE;
          //
-         // Modified to obtain exact parameter Thu Sep 14 14:35:18 2006 
-         // Contribution of Samtech www.samcef.com BEGIN
-         Handle(Geom2d_Line) aCLDE=Handle(Geom2d_Line)::DownCast(aC2DDE1);
+         //modified by NIZNHY-PKV Thu Mar 20 17:37:32 2008f
+         Handle(Geom2d_TrimmedCurve) aCLDET1=
+           Handle(Geom2d_TrimmedCurve)::DownCast(aC2DDE1);
+         if (aCLDET1.IsNull()) {
+           aCLDE=Handle(Geom2d_Line)::DownCast(aC2DDE1);
+         }
+         else {
+           Handle(Geom2d_Curve) aBasisCurve=aCLDET1->BasisCurve();
+           aCLDE=Handle(Geom2d_Line)::DownCast(aBasisCurve);
+         }
+         //aCLDE=Handle(Geom2d_Line)::DownCast(aC2DDE1);
+         //modified by NIZNHY-PKV Thu Mar 20 17:37:37 2008t
+         
          if (aCLDE.IsNull()) {
            continue;
          }
-         gp_Lin2d aLDE=aCLDE->Lin2d();
+
+         aLDE=aCLDE->Lin2d();
          aX=ElCLib::Parameter(aLDE, aP2D);
          //
-         //aX=(bXDir) ? aP2D.X(): aP2D.Y();
-         // Contribution of Samtech www.samcef.com END 
-         //
          if (fabs (aX-aTD1) < aDT || fabs (aX-aTD2) < aDT) {
            continue; 
          }
          BOPTools_ListIteratorOfListOfPave aPaveIt(aListOfPave);
          for (; aPaveIt.More(); aPaveIt.Next()) {
            const BOPTools_Pave& aPavex=aPaveIt.Value();
-           Standard_Real aXx=aPavex.Param();
+           aXx=aPavex.Param();
            if (fabs (aX-aXx) < aDT) {
              bRejectFlag=Standard_True;
              break;
 //=======================================================================
   void NMTTools_DEProcessor::FillSplitEdgesPool (const Standard_Integer nED)
 {
-  BOPTools_SplitShapesPool& aSplitShapesPool=myFiller->ChangeSplitShapesPool();
-  BOPTools_ListOfPaveBlock& aSplitEdges=aSplitShapesPool.ChangeValue(myDS->RefEdge(nED));
+  BOPTools_SplitShapesPool& aSplitShapesPool=
+    myFiller->ChangeSplitShapesPool();
+  BOPTools_ListOfPaveBlock& aSplitEdges=
+    aSplitShapesPool.ChangeValue(myDS->RefEdge(nED));
   //
   aSplitEdges.Clear();
   //
   TopoDS_Edge aE, aESplit;
   TopoDS_Vertex aV1, aV2;
 
-  const TopoDS_Edge aDE=TopoDS::Edge(myDS->Shape(nED));//mpv
-  const TopoDS_Face aDF=TopoDS::Face(myDS->Shape(nFD));//mpv
+  const TopoDS_Edge aDE=TopoDS::Edge(myDS->Shape(nED));
+  const TopoDS_Face aDF=TopoDS::Face(myDS->Shape(nFD));
 
   BOPTools_ListIteratorOfListOfPaveBlock aPBIt(aSplitEdges);
 
   BB.UpdateEdge(E, aTol);
   aNewEdge=E;
 }
-/*
-//=======================================================================
-// function: NMTTools_DEProcessor::NMTTools_DEProcessor
-// purpose: 
-//=======================================================================
-  NMTTools_DEProcessor::NMTTools_DEProcessor(NMTTools_PDSFiller& pDSFiller)
-:
-  myIsDone(Standard_False)
-{
-  myDSFiller=pDSFiller;
-  myFiller=(NMTTools_PaveFiller*) &(myDSFiller->PaveFiller());
-  myDS=myFiller->DS();
-}
-*/
+
index dfd14933593aca38c6f1a9dc8fc3a916bd66b9bd..c3587312fbc380eea48880a365802aa0689715bb 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_DEProcessor_HeaderFile
 #define _NMTTools_DEProcessor_HeaderFile
 
index 941caff8c4118d0d6c7de209f9fa0c2a836cb6e5..e7f2e54f87e4c3f9af3ef47053b9e42cbd0e517a 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_DEProcessor.jxx>
 
  
index b039537bcb77585255d0a1be914f6a1b7a735a88..9b5931f0e837f969539cb1c2eeda04dab9dc504c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_PaveFiller_HeaderFile
 #include <NMTTools_PaveFiller.hxx>
 #endif
index 1876b25fe2ad4d2da1f1da37eed6eef1c0d7693d..bf9522076f3101fe9574509edfb3a37a243d27dc 100644 (file)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       NMTTools_DSFiller.cdl
 -- Created:    Fri Dec  5 13:57:03 2003
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class DSFiller from NMTTools 
 
        ---Purpose: 
index b46b41c9c9f3a91a27ef0c8e431931d5156ac334..861a72c823b3db8cd99283bfef5246245a06e655 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_DSFiller.cxx
 // Created:    Fri Dec  5 14:06:34 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTTools_DSFiller.ixx>
 #include <NMTTools_PaveFiller.hxx>
 
index 82c9b40c41990fde3a100a0ea81a7ff34bf9f16c..2f00644123c44ff85c40b83f4cfe4f78ffe891b7 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_DSFiller_HeaderFile
 #define _NMTTools_DSFiller_HeaderFile
 
index c9b80740a4c399b7f0dd774a8b83d4d71127b539..798cc4a140f66e8397b7357a0168e3e0599bf384 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_DSFiller.jxx>
 
  
index 3ff0ae84f7565f03816e30acc701bfaeca8e84a3..b9e272ee0925f07e83e94780b8fe3d306b09411a 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index df15c1128a7e627610f13b49e70af176dc2c5b4e..cafca05eaeacc10b4edf6750e6155a86cd08c1f9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_HeaderFile
 #define _NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_HeaderFile
 
index 58c33e1b7a48002e44c4555d13336625e143e99f..dddb915440ed892af55d5e31b95e303502921726 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index 4c4104183e353618c1e6da4f63aeea5eb0b34d16..bd3a90005cc7b36ac060ef0f15c1e141cd7b7758 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_HeaderFile
 #define _NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_HeaderFile
 
index c863a91b7aa9d28dd569424831e1ae211c9c3c90..3b091cdfc4f5186a684737b01f8c7536c5f03265 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 39dddc5be7a7107246cf450bde96c327d8e542f4..4ee635d04eb15f7f5b729d875addb9bf6a5f917b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile
 #define _NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile
 
index a785ad2ee79c8006d231a9a12a6d5c4981ddb38e..ba1f46649a544293902975b7036b647ad04c639f 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_DataMapOfIntegerListOfPaveBlock.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index 3823f0edfb8a3c5334119a917ada29870d7f3cbb..3774d3411db49b6a84dcbd7c949c87c8a6f63974 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_HeaderFile
 #define _NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_HeaderFile
 
index bddc64d48b0f6c639161f7b941ee2f6156cb671d..7989209e2f4ad1951ffefa558afc342688980b89 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 0caba086be1c8b3471ade9410e1b874917bbc1a6..9b24aa885df7be54e2b7f1a0bed311c98845244f 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
 #define _NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
 
index 40833f09d003ae8fcf295ca72df438c50c971b35..628f0b740afac94bd97871143629b80fc22912f0 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 7a0a361ee189444a76f4b065d890af409f60f015..b89241660cd27121caaa30a78be4cc98887c5d64 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_HeaderFile
 #define _NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_HeaderFile
 
index f16382ff4d0276f265e76ebc0868ad83e366b6f6..311306e41ac9eef264db4b08c2466cd344c7df09 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index b9f696fe26e0ed1bcf405c666f4af038f9e419bf..98cf95b4a5c7b187f2507be107574cacacf55a2e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile
 #define _NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile
 
index 38e7ef10b45c43266308e989738f132e94549cc3..4b7aaac9080a48cca6d228a2e15dece60301f07e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index 2c55162c350b9bca1b47f3e9cda8862f6fc40161..02fbc923c2aee06ae5e496cb1942d751fbe61d48 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
 #define _NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
 
index c41bc1e2a47fe02187acae1fa00b54eba76c3e69..f349c91a79648a74411d38c09929d8747406b569 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index a13f75903bf6ffe2d9e7bdd54ca953558209be04..78ad92772bf728e39624640d46f484bc286b9add 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile
 #define _NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile
 
index 8e25be569faed3aa9ce6d47f506703fa3c7d0da7..7266c017e7ea9fe8bd961877197f9a4c9f7a4634 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_IndexedDataMapOfShapePaveBlock.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index cc8e02bfe2f57ec9c92934a76300a5c857ba0f44..9be78d98bff14f807f1227526e162be67ff13224 100644 (file)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       NMTTools_IteratorOfCoupleOfShape.cdl
 -- Created:    Thu Dec  4 16:57:48 2003
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class IteratorOfCoupleOfShape from NMTTools  
     inherits IteratorOfCoupleOfShape from BOPTools
 
index 181703608a424dc443a07ec1a875d04d2ee2f41a..8cf489a9bd54a452fa5840192b97226336f1fc73 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_IteratorOfCoupleOfShape.cxx
 // Created:    Thu Dec  4 17:00:03 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTTools_IteratorOfCoupleOfShape.ixx>
 #include <Standard_NoSuchObject.hxx>
 #include <NMTDS_ShapesDataStructure.hxx>
index 81dabc0545b9bd9266820e509be7eb641d413898..67128fb0c2023207ee223d2f82bc22425e89c457 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_IteratorOfCoupleOfShape_HeaderFile
 #define _NMTTools_IteratorOfCoupleOfShape_HeaderFile
 
index 5a5cd42bdcebb8fc0cb661d08a7d2af15cf868f6..35f563b1384d976ce7706ec91828424e6f0d87ac 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_IteratorOfCoupleOfShape.jxx>
 
  
index e09e5e92e1af5ca5ef798aeb2e1c8de6e1a1083b..b2c3333a3cc5dd9b82463ba897dae0bb3f129d0c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _Standard_NoSuchObject_HeaderFile
 #include <Standard_NoSuchObject.hxx>
 #endif
index 25a3784c0db4ccc3b3de7424803d5cdc37d4a636..e4d4eb1fd0b0eed2171af6ef7d785614824b2f08 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_ListIteratorOfListOfCommonBlock_HeaderFile
 #define _NMTTools_ListIteratorOfListOfCommonBlock_HeaderFile
 
index 82d54ddd82b6753a039f39ad2fa54773a929b177..8c92815c19c0fcb4c29852964fc3d477ad13ea9e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_ListIteratorOfListOfCommonBlock.hxx>
 
 #ifndef _Standard_NoMoreObject_HeaderFile
index 7e6224c4fcbe8a1e4f9c68f58978f9aefdb423b3..dad1e219bc862bb755c1e0ecb05493b15d0338da 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_ListIteratorOfListOfCoupleOfShape_HeaderFile
 #define _NMTTools_ListIteratorOfListOfCoupleOfShape_HeaderFile
 
index 6e5da2628a8a52576f3e2db470cf76a6dff99565..246c8f0e16bef7cad8ae5425531a3fe6467758d0 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_ListIteratorOfListOfCoupleOfShape.hxx>
 
 #ifndef _Standard_NoMoreObject_HeaderFile
index 8dbc0e6854d42c02a1b1c6e3bbfda9b00e36b680..ce0b0608e7c8472aae3ba5ed2679f54f50c6c8a2 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_ListNodeOfListOfCommonBlock_HeaderFile
 #define _NMTTools_ListNodeOfListOfCommonBlock_HeaderFile
 
index ab8a57f3b8ff8c0189d4c342a7002c5fcaa7534c..793bcf9ed789ead5f3c35cadb81b973e6b397a2e 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_ListNodeOfListOfCommonBlock.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 9aa25f86d7c36ee5518089f668477830ee3f85af..6b54795d2ced19f3cddc8d11a1de3e3e53737761 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_ListNodeOfListOfCoupleOfShape_HeaderFile
 #define _NMTTools_ListNodeOfListOfCoupleOfShape_HeaderFile
 
index 430f82c5fe949682cbaec0712555fce93d5f1fac..912f0a39cfd25602cebd006af38955ec94833395 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_ListNodeOfListOfCoupleOfShape.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index a3c33aaaaa00e2013fe836eec54c2eb6541c4ce2..7e664fd9a01b307f27e5e111375b0cf6eadd4e9f 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_ListOfCommonBlock_HeaderFile
 #define _NMTTools_ListOfCommonBlock_HeaderFile
 
index 68839bedd18b0a49d8c84a9d574fc4942a7c97c4..160550ecbdd3dc6d9ee1bc914b0d255b2076f663 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_ListOfCommonBlock.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index 2ba0b324c990f45cad64e258c012ab777cb32bed..27a971107bd247e0b9b5ea29d1276c93da2465e8 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_ListOfCoupleOfShape_HeaderFile
 #define _NMTTools_ListOfCoupleOfShape_HeaderFile
 
index 3251491ef299d567bda9b4938d1a0bab7c6e7162..3861f4069da4f6c8bccbf6e7387b1ca1e7046b2b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_ListOfCoupleOfShape.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index d53253da913d9b33ab468dc3f69a041a2bde7d3c..c002745627f279fe0a00a948cc3a2ee2d62285f9 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_MapIteratorOfMapOfPaveBlock_HeaderFile
 #define _NMTTools_MapIteratorOfMapOfPaveBlock_HeaderFile
 
index c3dd9b3306288c4ed68221f431fddb5126f0df35..d22f3ace7fefc346b492f20ee05cac545509db65 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_MapIteratorOfMapOfPaveBlock.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
index f7db910f2dc8af8260346d216c742f3975855052..6dc17138f0fa73487bd22281e2da8cc45399632c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_MapOfPaveBlock_HeaderFile
 #define _NMTTools_MapOfPaveBlock_HeaderFile
 
index 5b8574f39438348d009f6efeeb8b48977f58caff..c2efd4b3bc1d7fc5d4f5c3fa8a00d0fb76eef8d2 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_MapOfPaveBlock.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
index b4babb82fc7b77568321db739cdb82aba959f4d1..a322117788a73e6099c3dfe98cd487417b3227d3 100644 (file)
@@ -1,27 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       NMTTools_PCurveMaker.cdl
 -- Created:     
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
+--
 class PCurveMaker from NMTTools 
 
        ---Purpose:  
index e39b05bf6f5863c492d1d171baf892b83e155193..91a8bc14c09e0aa63b1cc9177804de8d789242b5 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_PCurveMaker.cxx
 // Created:    
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTTools_PCurveMaker.ixx>
 
 #include <gp_Pnt2d.hxx>
index ca0b3f24806098c1ab2ef3333952d61fd6d28f96..25e94667a8055c763c43092cb913fe5e21fbee02 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_PCurveMaker_HeaderFile
 #define _NMTTools_PCurveMaker_HeaderFile
 
index 3a2ac54d66a030efae30619c209f8efd9c6dcb0d..2b0b74625bcca96dafc4a272fc50cda12812036c 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_PCurveMaker.jxx>
 
  
index 46c9c270ff6c6ccdb098c8290116afb76f8a9ca4..edf46c82dcb1753c76b392bc12bf5871fbc476d7 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_PCurveMaker_HeaderFile
 #include <NMTTools_PCurveMaker.hxx>
 #endif
index cfc95a0faba351c02ae888899973320b0242d3f8..abffc2acd3526dad7327f891e01d09900cffbe07 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_PDSFiller_HeaderFile
 #define _NMTTools_PDSFiller_HeaderFile
 
index 116c108efe34a8630e6f4374da88c6954a2762ea..0d373a0a4ff66288264b060af3827cf02a0dd318 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_PPaveFiller_HeaderFile
 #define _NMTTools_PPaveFiller_HeaderFile
 
index ca5202204ad707a37599291cf6a27ccf114833aa..0a79bf1df4814ab68ecf6a267b8bff384a8b8ae4 100644 (file)
@@ -1,28 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
 -- File:       NMTTools_PaveFiller.cdl
 -- Created:    Fri Dec  5 14:35:00 2003
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class PaveFiller from NMTTools 
 
        ---Purpose: 
index 236a077dcc04ffb74213b12b852a20c02c23f412..cbac88266c250f3845f0e8eecb07e0d15653f7f6 100644 (file)
@@ -1,21 +1,23 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_PaveFiller.cxx
 // Created:    Fri Dec  5 14:58:54 2003
index 35b23a61da0dad8eacf1681a1dbec535c9901375..6269aa77dccb91559a6415eadefcdc58afbed920 100644 (file)
@@ -1,24 +1,24 @@
-// File generated by CPPExt (Value)
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//                     Copyright (C) 1991 - 2000 by  
-//                      Matra Datavision SA.  All rights reserved.
-//  
-//                     Copyright (C) 2001 - 2004 by
-//                     Open CASCADE SA.  All rights reserved.
-// 
-// This file is part of the Open CASCADE Technology software.
+//  Copyright (C) 2003-2007  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 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.
-
 #ifndef _NMTTools_PaveFiller_HeaderFile
 #define _NMTTools_PaveFiller_HeaderFile
 
index a07e7b69a242cbab65463353b28e6975480b0cd9..210065e010c1466c446d1465b0c8321da3104b63 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_PaveFiller.jxx>
 
  
index 1c7e98a59ac4ee6869c377404e9bcc2cee9b7cf0..ec28fecacd5dab3be3be71c1cc6284f597865e35 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index 6a355d3df5941f0bf7b39139b0f722df8ff41435..7a787ebac38c2d525fb6ed0277b677ac735b04fa 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_PaveFiller_0.cxx
 // Created:    Mon Dec  8 11:45:51 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTTools_PaveFiller.ixx>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
index d4cca964a85ebc0394ca9af5e4aa3e80aff7d60d..8685855c00e58fce5ffa541f6f4a760e0f6312d1 100644 (file)
@@ -1,27 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_PaveFiller_1.cxx
 // Created:    Mon Dec  8 11:47:55 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
+//
 #include <NMTTools_PaveFiller.ixx>
 
 #include <TColStd_DataMapOfIntegerListOfInteger.hxx>
index 4c3c9ed33f0360fed3ab019a5ac993936a4c3f01..e400245ca1bd4c9d689e3d41e07000d5582d7f73 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_PaveFiller_2.cxx
 // Created:    Mon Dec  8 12:02:56 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTTools_PaveFiller.ixx>
 
 #include <Precision.hxx>
index ca458c3292f7e8918ef25abad89ede80a32b0f91..039cbbc1b594137fd7dc6a4247ee50717a8c85dc 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_PaveFiller_3.cxx
 // Created:    Mon Dec  8 16:06:56 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTTools_PaveFiller.ixx>
 
 #include <TopoDS.hxx>
index 2c1d50e26251bb01820c5f7ea09065b805e1bf2e..f16ced3abc60b74a19d31993c93bfd7b25c27b48 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_PaveFiller_4.cxx
 // Created:    Mon Dec  8 17:08:58 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTTools_PaveFiller.ixx>
 //
 #include <stdio.h>
index 01ec5e0bb346676c244a86f119f49fba88549ffc..abcace89315bff5b516572c152571c1bc2a94c95 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_PaveFiller_5.cxx
 // Created:    Mon Dec 15 11:28:33 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTTools_PaveFiller.ixx>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
@@ -98,16 +99,18 @@ static
 //=======================================================================
   void NMTTools_PaveFiller::PerformEF() 
 {
-  myIsDone=Standard_False;
-  
-  Standard_Integer n1, n2, anIndexIn=0, nE, nF, aNbEFs, aBlockLength;
   Standard_Boolean bJustAdd;
-  Standard_Real aTolE, aTolF, aDeflection=0.01;
-  Standard_Integer aDiscretize=35;
+  Standard_Integer n1, n2, anIndexIn, nE, nF, aNbEFs, aBlockLength;
+  Standard_Integer aDiscretize;
+  Standard_Real aTolE, aTolF, aDeflection;
   BooleanOperations_IndexedDataMapOfShapeInteger aMapVI;
   BOPTools_IDMapOfPaveBlockIMapOfInteger aMapCB;
   BOPTools_IMapOfPaveBlock aIMPBx;
   //
+  myIsDone=Standard_False;
+  aDeflection=0.01;
+  aDiscretize=35;
+  //
   BOPTools_CArray1OfESInterference& aEFs=myIP->ESInterferences();
   //
   myDSIt->Initialize(TopAbs_EDGE, TopAbs_FACE);
@@ -121,11 +124,12 @@ static
   //
   for (; myDSIt->More(); myDSIt->Next()) {
     myDSIt->Current(n1, n2, bJustAdd);
-    anIndexIn = 0;
     //
-    //if (myIntrPool->IsComputed(n1, n2)) {
-    //  continue;
-    //}
+    if(bJustAdd) {
+      continue;
+    }
+    //
+    anIndexIn = 0;
     //
     nE=n1; 
     nF=n2;
@@ -133,44 +137,29 @@ static
       nE=n2; 
       nF=n1;
     }
-    //SortTypes(nE, nF);
     //
     // all Common Blocks for face nF
-    //XXX
     NMTTools_ListOfCommonBlock aLCBF;
     CommonBlocksFace(nF, aLCBF);
     NMTTools_CommonBlockAPI aCBAPIF(aLCBF);
-    //XXX
-    if(bJustAdd) {
-      //myIntrPool->AddInterference (nE, nF, BooleanOperations_EdgeSurface, anIndexIn);
-      continue;
-    }
+    //
     // Edge
-    const TopoDS_Edge aE=TopoDS::Edge(myDS->GetShape(nE));//mpv
+    const TopoDS_Edge aE=TopoDS::Edge(myDS->Shape(nE));
     if (BRep_Tool::Degenerated(aE)){
       continue;
     }
+    //
     // Face
-    const TopoDS_Face aF=TopoDS::Face(myDS->GetShape(nF));//mpv
+    const TopoDS_Face aF=TopoDS::Face(myDS->Shape(nF));
     //
-    // Modified 
-    // to avoid intersection between face and edge from that face
-    // Thu Sep 14 14:35:18 2006 
-    // Contribution of Samtech www.samcef.com BEGIN
     TopTools_IndexedMapOfShape aME;
-    //
     TopExp::MapShapes(aF, TopAbs_EDGE, aME);
     if (aME.Contains(aE)) {
       continue;
     }
-    // Contribution of Samtech www.samcef.com END
     //
     aTolF=BRep_Tool::Tolerance(aF);
-    
-    // Modified  Thu Sep 14 14:35:18 2006 
-    // Contribution of Samtech www.samcef.com BEGIN
     aTolE=BRep_Tool::Tolerance(aE);
-    // Contribution of Samtech www.samcef.com END
     
     const Bnd_Box& aBBF=myDS->GetBoundingBox(nF); 
     //
@@ -180,14 +169,13 @@ static
     BOPTools_ListIteratorOfListOfPaveBlock anIt(aLPB);
     for (; anIt.More(); anIt.Next()) {
       BOPTools_PaveBlock& aPB=anIt.Value();
-      //XXX
       if (aCBAPIF.IsCommonBlock(aPB)) {
        continue;
       }
-      //XXX
+      //
       const IntTools_ShrunkRange& aShrunkRange=aPB.ShrunkRange();
       const IntTools_Range& aSR =aShrunkRange.ShrunkRange();
-      const Bnd_Box&        aBBE=aShrunkRange.BndBox();
+      const Bnd_Box& aBBE=aShrunkRange.BndBox();
       //
       if (aBBF.IsOut (aBBE)) {
        continue;
@@ -213,17 +201,21 @@ static
       aEF.Perform();
       //
       if (aEF.IsDone()) {
-       const IntTools_SequenceOfCommonPrts& aCPrts=aEF.CommonParts();
+       Standard_Boolean bCoinsideFlag;
        Standard_Integer i, aNbCPrts;
+       TopAbs_ShapeEnum aType;
+       //
+       const IntTools_SequenceOfCommonPrts& aCPrts=aEF.CommonParts();
+       //
        aNbCPrts=aCPrts.Length();
-       for (i=1; i<=aNbCPrts; i++) {
-         //
+       for (i=1; i<=aNbCPrts; ++i) {
          anIndexIn=0;
          //
          const IntTools_CommonPrt& aCPart=aCPrts(i);
-         TopAbs_ShapeEnum aType=aCPart.Type();
+         aType=aCPart.Type();
+         //
          switch (aType) {
-
+           //
            case TopAbs_VERTEX:  {
              Standard_Boolean bIsOnPave1, bIsOnPave2;
              Standard_Integer nVF;
@@ -238,7 +230,6 @@ static
              //
              //decide to add pave or not
              aTolToDecide=5.e-8;
-             //
              bIsOnPave1=IsOnPave(anewSR.First(), aR, aTolToDecide); 
              bIsOnPave2=IsOnPave(anewSR.Last() , aR, aTolToDecide); 
              //
@@ -253,24 +244,27 @@ static
                  //
                  aMapVI.Add(aNewVertex, anIndexIn);
                  aIMPBx.Add(aPB);
-                 // qqf
-                 {
-                   myIP->Add(nE, nF, Standard_True, NMTDS_TI_EF);
-                 }
-                 // qqt
+                 //
+                 myIP->Add(nE, nF, Standard_True, NMTDS_TI_EF);
                  //
                }// if (!nVF)
              }// if (!bIsOnPave1 && !bIsOnPave2) 
-             //myIntrPool->AddInterference (nE, nF, BooleanOperations_EdgeSurface, anIndexIn);
+             //
+             //modified by NIZNHY-PKV Fri Apr 18 10:55:38 2008f
+             else {
+               const BOPTools_Pave& aPave=(bIsOnPave1)? aPB.Pave1() : aPB.Pave2();
+               nVF=aPave.Index();
+               const TopoDS_Vertex& aVF=TopoDS::Vertex(myDS->Shape(nVF));
+               BOPTools_Tools::UpdateVertex (aVF, aNewVertex);
+             }
+             //modified by NIZNHY-PKV Fri Apr 18 10:55:40 2008t
+             //
            }// case TopAbs_VERTEX:
              break;
            //
            case TopAbs_EDGE: {
-             Standard_Boolean aCoinsideFlag;
-             //
-             aCoinsideFlag=BOPTools_Tools::IsBlockInOnFace(aPB, aF, myContext);
-             if (!aCoinsideFlag) {
-               //myIntrPool->AddInterference (nE, nF, BooleanOperations_EdgeSurface, anIndexIn);
+             bCoinsideFlag=BOPTools_Tools::IsBlockInOnFace(aPB, aF, myContext);
+             if (!bCoinsideFlag) {
                break;
              }
              //
@@ -284,12 +278,9 @@ static
                aMapF.Add(nF);
                aMapCB.Add(aPB, aMapF);
              }
+             //
              aIMPBx.Add(aPB);
-             // qqf
-             {
-               myIP->Add(nE, nF, Standard_True, NMTDS_TI_EF);
-             }
-             // qqt
+             myIP->Add(nE, nF, Standard_True, NMTDS_TI_EF);
            }// case TopAbs_EDGE:
              break;
 
@@ -343,12 +334,12 @@ static
 // function:EFCommonBlocks
 // purpose: 
 //=======================================================================
-  void NMTTools_PaveFiller::EFCommonBlocks(const BOPTools_IDMapOfPaveBlockIMapOfInteger& aMapCB)
+  void NMTTools_PaveFiller::EFCommonBlocks
+    (const BOPTools_IDMapOfPaveBlockIMapOfInteger& aMapCB)
 {
   Standard_Integer i, aNbPB, nE, j, aNbF, nF;
   //
   aNbPB=aMapCB.Extent();
-  //
   for (i=1; i<=aNbPB; ++i) {
     const BOPTools_PaveBlock& aPB=aMapCB.FindKey(i);
     const TColStd_IndexedMapOfInteger& aMapF=aMapCB.FindFromIndex(i);
@@ -382,7 +373,8 @@ static
 // function:EFNewVertices
 // purpose: 
 //=======================================================================
-  void NMTTools_PaveFiller::EFNewVertices (const BooleanOperations_IndexedDataMapOfShapeInteger& aMapVI) 
+  void NMTTools_PaveFiller::EFNewVertices 
+    (const BooleanOperations_IndexedDataMapOfShapeInteger& aMapVI) 
 {
   Standard_Integer i, j, aNb, aNewShape, aFlag, iX, aNbVV, aNbSimple;
   Standard_Integer aWhat, aWith, nE, nF, nV, aNbIEF, aNbEdges, iTmp;
@@ -395,14 +387,13 @@ static
   BooleanOperations_AncestorsSeqAndSuccessorsSeq anASSeq;
   TopTools_IndexedMapOfShape aMNVComplex, aMNVSimple;
   //
-  BOPTools_CArray1OfESInterference& aEFs=myIP->ESInterferences();
-  //
   aNb=aMapVI.Extent();
-  //
   if (!aNb) { // no new vertices, no new problems 
     return;
   }
   //
+  BOPTools_CArray1OfESInterference& aEFs=myIP->ESInterferences();
+  //
   // 0.
   if (aNb==1) {
     aNewVertex=TopoDS::Vertex(aMapVI.FindKey(1));
@@ -425,12 +416,9 @@ static
   //
   tPF.Init();
   tPF.PerformVV();
-  //tPF.PerformNewVertices(); qq
   //
   NMTDS_ShapesDataStructure& tDS=*(tPF.DS());
-  //const BOPTools_InterferencePool& tInterfPool=*(tPF.InterfPool());
   NMTDS_InterfPool& tInterfPool=*(tPF.IP());
-  //const BOPTools_CArray1OfVVInterference& aVVInterfs=tInterfPool.VVInterfs();
   BOPTools_CArray1OfVVInterference& aVVInterfs=tInterfPool.VVInterferences();
   //
   // 3. Separate Comlex and Simple new vertices
@@ -486,7 +474,7 @@ static
     iX=aMapVI.FindFromKey(aV1);
     const BOPTools_ESInterference& aEF1=aEFs(iX);
     aEF1.Indices(nE, nF);
-    //SortTypes(nE, nF);
+    //
     if (myDS->GetShapeType(nF)==TopAbs_EDGE) {
       iTmp=nE;
       nE=nF;
@@ -499,7 +487,7 @@ static
     iX=aMapVI.FindFromKey(aV2);
     const BOPTools_ESInterference& aEF2=aEFs(iX);
     aEF2.Indices(nE, nF);
-    //SortTypes(nE, nF);
+    //
     if (myDS->GetShapeType(nF)==TopAbs_EDGE) {
       iTmp=nE;
       nE=nF;
@@ -507,7 +495,8 @@ static
     }
     aME.Add(nE);
     aMIEF.Add(iX);
-  }
+  }// for (i=1; i<=aNb; ++i) {
+  //
   // 4. Process new vertices
   aNb=aMNVE.Extent();
   for (i=1; i<=aNb; ++i) { // xx
@@ -555,8 +544,9 @@ static
 // function:EFNewVertices
 // purpose: 
 //=======================================================================
-  void NMTTools_PaveFiller::EFNewVertices (const TopoDS_Vertex& aNewVertex,
-                                          const BooleanOperations_IndexedDataMapOfShapeInteger& aMapVI) 
+  void NMTTools_PaveFiller::EFNewVertices 
+    (const TopoDS_Vertex& aNewVertex,
+     const BooleanOperations_IndexedDataMapOfShapeInteger& aMapVI) 
 {
   Standard_Integer i, aNewShape, nE, nF;
   Standard_Real aT;
@@ -569,13 +559,13 @@ static
   myDS->InsertShapeAndAncestorsSuccessors(aNewVertex, anASSeq);
   aNewShape=myDS->NumberOfInsertedShapes();
   myDS->SetState (aNewShape, BooleanOperations_ON);
+  //
   // Insert New Vertex in EFInterference
   i=aMapVI.FindFromKey(aNewVertex);
   BOPTools_ESInterference& aEFInterf= aEFs(i);
   aEFInterf.SetNewShape(aNewShape);
   // Extract interference info
   aEFInterf.Indices(nE, nF);
-  //SortTypes(nE, nF);
   if (myDS->GetShapeType(nF)==TopAbs_EDGE) {
     nE=nF;
   }
@@ -596,15 +586,17 @@ static
 // function: CheckFacePaves
 // purpose: 
 //=======================================================================
-  Standard_Integer NMTTools_PaveFiller::CheckFacePaves (const TopoDS_Vertex& aNewVertex,
-                                                       const Standard_Integer nF)
+  Standard_Integer NMTTools_PaveFiller::CheckFacePaves 
+    (const TopoDS_Vertex& aNewVertex,
+     const Standard_Integer nF)
 {
-  Standard_Integer nEF, nVF, iFlag, i, aNbV;
+  Standard_Integer nEF, nVF, iFlag, i, aNbV, iRet;
   BOPTools_ListIteratorOfListOfPave anIt;
   TColStd_IndexedMapOfInteger aMVF;
-  // 
-  BooleanOperations_OnceExplorer aExp(*myDS);
   //
+  iRet=0; 
+  //
+  BooleanOperations_OnceExplorer aExp(*myDS);
   aExp.Init(nF, TopAbs_EDGE);
   for (; aExp.More(); aExp.Next()) {
     nEF=aExp.Current();
@@ -621,15 +613,14 @@ static
   aNbV=aMVF.Extent();
   for (i=1; i<=aNbV; ++i) {
     nVF=aMVF(i);
-    const TopoDS_Vertex aVF=TopoDS::Vertex(myDS->Shape(nVF));//mpv
+    const TopoDS_Vertex aVF=TopoDS::Vertex(myDS->Shape(nVF));
     iFlag=IntTools_Tools::ComputeVV(aNewVertex, aVF);
     if (!iFlag) {
       return nVF;
     }
   }
-  return 0;
+  return iRet;
 }
-
 //
 //=======================================================================
 // function: VertexParameter
@@ -640,7 +631,6 @@ void VertexParameter(const IntTools_CommonPrt& aCPart,
 {
   const IntTools_Range& aR=aCPart.Range1();
   aT=0.5*(aR.First()+aR.Last());
-  //
   if((aCPart.VertexParameter1() >= aR.First()) &&
      (aCPart.VertexParameter1() <= aR.Last())) {
     aT = aCPart.VertexParameter1();
@@ -663,6 +653,7 @@ Standard_Boolean IsOnPave(const Standard_Real& aTR,
   if (bIsOnPave) {
     return bIsOnPave;
   }
+  //
   dT1=Abs(aTR-aT1);  
   dT2=Abs(aTR-aT2);
   bIsOnPave=(dT1<=aTolerance || dT2<=aTolerance);
index 90b631205ef0d6783a4fdd8d53c666afe7073424..e55e4dff46d29301e20f008acea0d38a5390734e 100644 (file)
@@ -1,30 +1,30 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// IMPROVED by NIZNHY-PKV Thu Oct 12 16:03:33 2006
+//  Copyright (C) 2003-2007  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) 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 distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// IMPROVED by NIZNHY-PKV Thu Oct 12 16:03:33 2006
 // File:       NMTTools_PaveFiller_6.cxx
 // Created:    Fri Dec 19 10:27:31 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
+//
 #include <NMTTools_PaveFiller.ixx>
 
 #include <Precision.hxx>
 #include <IntTools_ShrunkRange.hxx>
 
 #include <BOPTools_CArray1OfSSInterference.hxx>
-//#include <BOPTools_ListIteratorOfListOfInterference.hxx>
-//#include <BOPTools_CArray1OfInterferenceLine.hxx>
-//#include <BOPTools_InterferenceLine.hxx>
-//#include <BOPTools_ListOfInterference.hxx>
-//#include <BOPTools_Interference.hxx>
 
 #include <BOPTools_SSInterference.hxx>
 #include <BOPTools_ListOfPaveBlock.hxx>
 #include <NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx>
 #include <NMTTools_MapOfPaveBlock.hxx>
 
-// Modified  Thu Sep 14 14:35:18 2006 
-// Contribution of Samtech www.samcef.com BEGIN
 static
   void SharedEdges1(const TopoDS_Face& aF1,
                    const TopoDS_Face& aF2,
                    TopTools_ListOfShape& aLS);
-// Contribution of Samtech www.samcef.com END
-
-//modified by NIZNHY-PKV Mon Dec  4 12:56:04 2006f
 static
   Standard_Boolean IsMicroEdge(const TopoDS_Edge& aE, 
                               IntTools_Context& aCtx);
-//modified by NIZNHY-PKV Mon Dec  4 12:56:08 2006t
 
 //=======================================================================
 // function: PerformFF
@@ -152,11 +141,6 @@ static
   for (; myDSIt->More(); myDSIt->Next()) {
     myDSIt->Current(n1, n2, bJustAdd);
     //
-    //bIsComputed=myIntrPool->IsComputed(n1, n2);
-    //if (bIsComputed) {
-    //  continue;
-    //}
-    //
     nF1 = n2;
     nF2 = n1;
     if(n1 < n2) {
@@ -167,21 +151,6 @@ static
     aPnts.Clear();
     aCvs.Clear();
     //
-    /*
-    bIsFound=IsPairFound(nF1, nF2, myIntrPool, aMapWhat, aMapWith);
-    if (bJustAdd) {
-      if (!bIsFound) {
-       myIntrPool->AddInterference (nF1, nF2, aTypeFF, anIndexIn);
-      }
-      else{
-       BOPTools_SSInterference anInterf (nF1, nF2, 1.e-07, 1.e-07, aCvs, aPnts);
-       anIndexIn=aFFs.Append(anInterf);
-       myIntrPool->AddInterference (nF1, nF2, aTypeFF, anIndexIn);
-      }
-      continue;
-    }
-    */
-    //
     const TopoDS_Face aF1=TopoDS::Face(myDS->Shape(nF1));//mpv
     const TopoDS_Face aF2=TopoDS::Face(myDS->Shape(nF2));//mpv
     //
@@ -233,14 +202,12 @@ static
     if (!aNbCurves && !aNbPoints) {
       BOPTools_SSInterference anInterf (nF1, nF2, 1.e-07, 1.e-07, aCvs, aPnts);
       anIndexIn=aFFs.Append(anInterf);
-      //myIntrPool->AddInterference (nF1, nF2, aTypeFF, anIndexIn);
       continue;
     }
     //
     {
       BOPTools_SSInterference anInterf (nF1, nF2, aTolR3D, aTolR2D, aCvsX, aPntsX);
       anIndexIn=aFFs.Append(anInterf);
-      //myIntrPool->AddInterference (nF1, nF2, aTypeFF, anIndexIn);
     }
     //
   }// for (; myDSIt.More(); myDSIt.Next()) 
@@ -255,11 +222,7 @@ static
 {
   myIsDone=Standard_False;
   //
-  // Modified  Thu Sep 14 14:35:18 2006 
-  // Contribution of Samtech www.samcef.com BEGIN
   Standard_Boolean bIsExistingPaveBlock, bIsValidIn2D, bIsCoincided;
-  // Contribution of Samtech www.samcef.com END
-  //
   Standard_Boolean bIsMicroEdge, bHasES;
   Standard_Integer i, aNbFFs, nF1, nF2, aBid=0;
   Standard_Integer nV1, nV2, j, aNbCurves;
@@ -826,8 +789,6 @@ static
       BOPTools_Tools2D::BuildPCurveForEdgeOnFace(aE, aF2FWD);
     }
   } 
-  //
-  //modified by NIZNHY-PKV Fri Mar 23 10:35:02 2007f
   // Check common blocks between edges and faces
   // Build P-Curves if they were not built in previos block.
   //
@@ -878,7 +839,6 @@ static
       } // for (; aItCB.More(); aItCB.Next()) {
     }//if (aS.ShapeType()==TopAbs_EDGE) {
   }    
-  //modified by NIZNHY-PKV Fri Mar 23 10:35:13 2007t
 }
 //=======================================================================
 // function: IsExistingPaveBlock
@@ -921,6 +881,7 @@ static
 {
   Standard_Boolean bFlag;
   Standard_Integer aNbSE, iC;
+  Standard_Real aTolE, aTol;
   TopTools_ListIteratorOfListOfShape anIt;
   //
   bFlag=Standard_False;
@@ -933,7 +894,15 @@ static
   anIt.Initialize(aLSE);
   for (; anIt.More(); anIt.Next()) {
     const TopoDS_Edge& aE=TopoDS::Edge(anIt.Value());
-    iC=CheckIntermediatePoint(aPBNew, aE, aTolR3D);
+    //modified by NIZNHY-PKV Mon Nov 17 09:54:43 2008f //0019974
+    aTolE=BRep_Tool::Tolerance(aE);
+    aTol=aTolR3D;
+    if (aTolE>aTol) {
+      aTol=aTolE;
+    }
+    iC=CheckIntermediatePoint(aPBNew, aE, aTol);
+    //iC=CheckIntermediatePoint(aPBNew, aE, aTolR3D);
+    //modified by NIZNHY-PKV Mon Nov 17 09:54:45 2008t
     if (!iC) {
       return !bFlag;
     }
@@ -1189,8 +1158,6 @@ static
 /////////////
 
 
-// Modified  Thu Sep 14 14:35:18 2006 
-// Contribution of Samtech www.samcef.com BEGIN
 //=======================================================================
 //function : SharedEdges1
 //purpose  : 
@@ -1334,10 +1301,7 @@ void SharedEdges1(const TopoDS_Face& aF1,
   bRet=(Standard_Boolean)(iCount>iCountExt);
   return bRet;
 }
-//
-// Contribution of Samtech www.samcef.com END
 
-//modified by NIZNHY-PKV Mon Dec  4 12:30:38 2006f use_01
 //=======================================================================
 //function : IsMicroEdge
 //purpose  : 
@@ -1376,139 +1340,3 @@ Standard_Boolean IsMicroEdge(const TopoDS_Edge& aE,
   //
   return bRet;
 }
-//modified by NIZNHY-PKV Mon Dec  4 12:55:50 2006t
-/*
-static 
-  Standard_Boolean IsPairFound(const Standard_Integer nF1,
-                              const Standard_Integer nF2,
-                              BOPTools_InterferencePool* myIntrPool,
-                              BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMapWhat,
-                              BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMapWith);
-
-static
-  void FMapWhat(const Standard_Integer nF,
-               BOPTools_InterferencePool* myIntrPool,
-               TColStd_IndexedMapOfInteger& aMapWhat);
-static
-  void FMapWith(const Standard_Integer nF,
-               BOPTools_InterferencePool* myIntrPool,
-               TColStd_IndexedMapOfInteger& aMapWith);
-static
-  Standard_Boolean IsFound(const TColStd_IndexedMapOfInteger& aMapWhat,
-                          const TColStd_IndexedMapOfInteger& aMapWith);
-
-//=======================================================================
-// function: IsPairFound
-// purpose: 
-//=======================================================================
-Standard_Boolean IsPairFound(const Standard_Integer nF1,
-                            const Standard_Integer nF2,
-                            BOPTools_InterferencePool* myIntrPool,
-                            BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMapWhat,
-                            BOPTColStd_IndexedDataMapOfIntegerIndexedMapOfInteger& aMapWith)
-{
-  Standard_Boolean bIsFound;
-  //
-  if (!aMapWhat.Contains(nF1)) {
-    TColStd_IndexedMapOfInteger aMWhat;
-    FMapWhat(nF1, myIntrPool, aMWhat);
-    aMapWhat.Add(nF1, aMWhat);
-  }
-  //
-  if (!aMapWith.Contains(nF2)) {
-    TColStd_IndexedMapOfInteger aMWith;
-    FMapWith(nF2, myIntrPool, aMWith);
-    aMapWith.Add(nF2, aMWith);
-  }
-  //
-  const TColStd_IndexedMapOfInteger& aMWht=aMapWhat.FindFromKey(nF1);
-  const TColStd_IndexedMapOfInteger& aMWit=aMapWith.FindFromKey(nF2);
-  //
-  bIsFound=IsFound(aMWht, aMWit);
-  //
-  return bIsFound;
-}
-//=======================================================================
-// function: FMapWhat
-// purpose: 
-//=======================================================================
-void FMapWhat(const Standard_Integer nF,
-             BOPTools_InterferencePool* myIntrPool,
-             TColStd_IndexedMapOfInteger& aMapWhat)
-                   
-{
-  Standard_Integer nE, nV;
-  //
-  BooleanOperations_ShapesDataStructure* myDS=myIntrPool->DS();
-  BooleanOperations_OnceExplorer aExp(*myDS);
-  //
-  //  What
-  aMapWhat.Add(nF);
-  aExp.Init(nF, TopAbs_VERTEX);
-  for (; aExp.More(); aExp.Next()) {
-    nV=aExp.Current();
-    aMapWhat.Add(nV);
-  }
-  //
-  aExp.Init(nF, TopAbs_EDGE);
-  for (; aExp.More(); aExp.Next()) {
-    nE=aExp.Current();
-    aMapWhat.Add(nE);
-  }
-}
-//=======================================================================
-// function: FMapWith
-// purpose: 
-//=======================================================================
-void FMapWith(const Standard_Integer nF,
-             BOPTools_InterferencePool* myIntrPool,
-             TColStd_IndexedMapOfInteger& aMapWith)
-{
-  TColStd_IndexedMapOfInteger aMapWhat;
-  
-  FMapWhat(nF, myIntrPool, aMapWhat);
-  //
-  // With
-  Standard_Integer i, aNb, anIndex, aWhat, aWith;
-  BOPTools_ListIteratorOfListOfInterference anIt;
-  
-  const BOPTools_CArray1OfInterferenceLine& anArrIL= myIntrPool->InterferenceTable();
-
-  aNb=aMapWhat.Extent();
-  for (i=1; i<=aNb; i++) {
-    aWhat=aMapWhat(i);
-    
-    const BOPTools_InterferenceLine& aWithLine=anArrIL(aWhat);
-  
-    const BOPTools_ListOfInterference& aLI=aWithLine.List();
-    anIt.Initialize(aLI);
-    for (; anIt.More(); anIt.Next()) {
-      const BOPTools_Interference& anIntf=anIt.Value();
-      anIndex=anIntf.Index();
-      if (anIndex) {
-       aWith=anIntf.With();
-       aMapWith.Add(aWith);
-      }
-    }
-  }
-}
-//=======================================================================
-// function: IsFound
-// purpose: 
-//=======================================================================
-Standard_Boolean IsFound(const TColStd_IndexedMapOfInteger& aMapWhat,
-                        const TColStd_IndexedMapOfInteger& aMapWith)
-{
-  Standard_Boolean bFlag=Standard_False;
-  Standard_Integer i, aNb, aWhat;
-
-  aNb=aMapWhat.Extent();
-  for (i=1; i<=aNb; i++) {
-    aWhat=aMapWhat(i);
-    if (aMapWith.Contains(aWhat)) {
-      return !bFlag;
-    }
-  }
-  return bFlag;
-}
-*/
index ef23a7e29b74b506cb1f636e75789390bf98ea37..86f232ad30e787396b6080d2bbf09f9c05b637ac 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_PaveFiller_7.cxx
 // Created:    Thu Dec 18 15:14:55 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTTools_PaveFiller.ixx>
 
 #include <Bnd_HArray1OfBox.hxx>
index 6d7a77c1ba85b3ccaae235807b276364286be0fc..734d415e55decefcd52a9161b992fba13810d4cb 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_PaveFiller_8.cxx
 // Created:    Fri Dec 19 11:15:53 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTTools_PaveFiller.ixx>
 
 #include <TColStd_MapOfInteger.hxx>
index 090e6f2da218fe637e5d4f6180d350be95ec3aad..e0b2a3fc70674692a0e1f78f048471a3db60eabe 100644 (file)
@@ -1,27 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_PaveFiller_9.cxx
 // Created:    Fri Dec 19 11:15:53 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
+//
 #include <NMTTools_PaveFiller.ixx>
 
 #include <Geom_Surface.hxx>
index 12bf8f2f575675c2537c347c9c24442f7a73d3b6..af49cafff9c93f357447434e9c0bcc8b7f89946b 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_StdMapNodeOfMapOfPaveBlock_HeaderFile
 #define _NMTTools_StdMapNodeOfMapOfPaveBlock_HeaderFile
 
index 0b6dba8f45a9922f11d6a82f77de53f5ddd26fea..6d479e8135530413f4f11eb54e688b02a7309645 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_StdMapNodeOfMapOfPaveBlock.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index cab93959a1b882dfe571e2c0eadadaf4e1fc5bff..9341d837be7242e9a34dc89c121ef9c48e66d945 100644 (file)
@@ -1,29 +1,29 @@
--- 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
--- You should have received a copy of the GNU Lesser General Public  
--- License along with this library; if not, write to the Free Software 
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--  Copyright (C) 2003-2007  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
 --
--- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--- 
-
 -- File:       NMTTools_Tools.cdl
 -- Created:    Mon Dec  8 10:32:34 2003
 -- Author:     Peter KURNEV
 --             <pkv@irinox>
-
-
+--
 class Tools from NMTTools 
 
        ---Purpose: 
index 3f986765ec772cb1ea1533603942cb23684802fb..da3da38a599a2b3a1b782bd1a7ac1e5f4b67fef8 100644 (file)
@@ -1,28 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       NMTTools_Tools.cxx
 // Created:    Mon Dec  8 10:35:15 2003
 // Author:     Peter KURNEV
 //             <pkv@irinox>
-
-
+//
 #include <NMTTools_Tools.ixx>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
index 96913473b69cea523f034d8afee0e928f6fb3f78..89b91404e645cbc9024cf10c6711093a87a000bd 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _NMTTools_Tools_HeaderFile
 #define _NMTTools_Tools_HeaderFile
 
index 78e1147294716d3e0e46b0423c019ad1c9c62a3c..5b825b3fc2d015bb89c3abc8fc4b7f3a83c01f09 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include <NMTTools_Tools.jxx>
 
  
index 8f3817efad4f1fff7342e1e98566990a09d386e7..7b6f648a2e3fa83307396bd7854fa2b1694dd0e5 100644 (file)
@@ -1,22 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY 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.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopTools_ListOfShape_HeaderFile
 #include <TopTools_ListOfShape.hxx>
 #endif
index 4a3f6e0e9ab23d9af89a4499838e6d189a33bf2d..a40b492e4fa4ec5bf1f3fd94a593962924d913c8 100644 (file)
@@ -1,31 +1,30 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
+//
+//  GEOM OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_AISShape.cxx
 //  Author : Nicolas REJNERI
 //  Module : GEOM
 //  $Header$
-
+//
 /*!
   \class GEOM_AISShape GEOM_AISShape.hxx
   \brief ....
 #include "GEOM_AISShape.ixx"
 #include "SALOME_InteractiveObject.hxx"
 
-#include "utilities.h"
-
 // Open CASCADE Includes
 #include <AIS_Drawer.hxx>
 #include <AIS_InteractiveContext.hxx>
 #include <Graphic3d_AspectFillArea3d.hxx>
-#include <Prs3d_Drawer.hxx>
-#include <Prs3d_IsoAspect.hxx>
-#include <Prs3d_LineAspect.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <SelectBasics_SensitiveEntity.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -51,7 +45,6 @@
 #include <SelectMgr_Selection.hxx>
 #include <StdSelect_DisplayMode.hxx>
 #include <StdPrs_WFShape.hxx>
-#include <StdPrs_ShadedShape.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 #include <TColStd_ListOfInteger.hxx>
index a90919622be38904b721470da245030145f2b914..643d51019f5dbeb1f142b63cf2e400aea755ce9f 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_AISShape.hxx
 //  Module : GEOM
-
+//
 #ifndef _GEOM_AISShape_HeaderFile
 #define _GEOM_AISShape_HeaderFile
 
index d50ba8db5fdca6dd88db0fbeb0bf6b71461e2bf6..b72aa5a84a799849a88ab81343c868a0f66ca196 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_AISShape.ixx
 //  Module : GEOM
-
+//
 #include "GEOM_AISShape.jxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 9575226d7619b3d062246a44df824a1a6cd8a7d6..b02bfe1e368332d19e01014fec0d09029e23365e 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_AISShape.jxx
 //  Module : GEOM
-
+//
 #ifndef _GEOM_InteractiveObject_HeaderFile
 #include "GEOM_InteractiveObject.hxx"
 #endif
index acf93656d4b2cb625801255bdd43b18819862c0c..661a1a84a67a72ee22153bee652b7894caf29446 100755 (executable)
@@ -1,6 +1,6 @@
-//  GEOM_AISTrihedron : Filter for VTK viewer
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
-//
-//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+//  GEOM_AISTrihedron : Filter for VTK viewer
 //  File   : GEOM_AISTrihedron.cxx
 //  Author : Sergey LITONIN
 //  Module : SALOME
-
+//
 #include "GEOM_AISTrihedron.hxx"
 #include <Geom_Axis2Placement.hxx>
 
index 60071c842f0486d9e40e83805b9c754c2775bc8c..b70bea8b4e57785dd3221d74a2abcb45bb0022f2 100755 (executable)
@@ -1,6 +1,6 @@
-//  GEOM_AISTrihedron : Filter for VTK viewer
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
-//
-//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+//  GEOM_AISTrihedron : Filter for VTK viewer
 //  File   : GEOM_AISTrihedron.hxx
 //  Author : Sergey LITONIN
 //  Module : SALOME
-
+//
 #ifndef GEOM_AISTrihedron_HeaderFile
 #define GEOM_AISTrihedron_HeaderFile
 
index 66e968da871b4632fabdade59f0c7f25bbfd5c7c..44262f14945a2876295b83cdf45787b52fde0622 100644 (file)
@@ -1,31 +1,29 @@
-// GEOM OBJECT : interactive object for Geometry entities visualization
-//
-// Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is free software; you can redistribute it and/or
-// modify it 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 // File   : GEOM_AISVector.cxx
 // Author : Julia DOROVSKIKH
 // $Header$
-
-
+//
 #include <GEOM_AISVector.hxx>
 
 // OCCT Includes
index 993e17c33920fdfdd7858a13858d70d63abcffcc..2ffbf3a4f2d2cb3eb856facb0346c6322232d6bd 100644 (file)
@@ -1,30 +1,29 @@
-// GEOM OBJECT : interactive object for Geometry entities visualization
-//
-// 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.
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// You should have received a copy of the GNU Lesser General Public
-// 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 free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 // File   : GEOM_AISVector.hxx
 // Author : Julia DOROVSKIKH
 // Module : GEOM
-
+//
 #ifndef GEOM_AISVector_HeaderFile
 #define GEOM_AISVector_HeaderFile
 
index 6771efaa98b2f5b0204e744a13ce48c505e138e6..e9e047146491b26b9387d9ef779adcce49e7c66d 100644 (file)
@@ -1,31 +1,30 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
+//
+//  GEOM OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_Actor.cxx
 //  Author : Christophe ATTANASIO
 //  Module : GEOM
 //  $Header$
-
+//
 /*!
   \class GEOM_Actor GEOM_Actor.h
   \brief This class allows to display an OpenCASCADE CAD model in a VTK viewer.
@@ -67,6 +66,8 @@
 #include <vtkMath.h>
 #include <vtkCamera.h>
 
+#include "utilities.h"
+
 //vtkStandardNewMacro(GEOM_Actor);
 
 #ifndef MYDEBUG
@@ -105,7 +106,7 @@ GEOM_Actor::GEOM_Actor():
   
 { 
 #ifdef MYDEBUG
-  cout <<this<< " GEOM_Actor::GEOM_Actor"<<endl;
+  MESSAGE (this<< " GEOM_Actor::GEOM_Actor");
 #endif
 
   myPolyDataMapper->SetInput(myAppendFilter->GetOutput()); 
@@ -180,7 +181,7 @@ GEOM_Actor::GEOM_Actor():
 GEOM_Actor::~GEOM_Actor() 
 { 
 #ifdef MYDEBUG
-  cout <<this<< " ~GEOM_Actor::GEOM_Actor"<<endl;
+  MESSAGE (this<< " ~GEOM_Actor::GEOM_Actor");
 #endif
   myHighlightProp->Delete();
   myPreHighlightProp->Delete();
@@ -199,7 +200,7 @@ New()
  
 void Write(vtkPolyData* theDataSet, const char* theFileName){ 
   vtkPolyDataWriter* aWriter = vtkPolyDataWriter::New(); 
-  cout<<"Write - "<<theFileName<<"' : "<<theDataSet->GetNumberOfPoints()<<"; "<<theDataSet->GetNumberOfCells()<<endl
+  MESSAGE ("Write - "<<theFileName<<"' : "<<theDataSet->GetNumberOfPoints()<<"; "<<theDataSet->GetNumberOfCells())
   aWriter->SetInput(theDataSet); 
   aWriter->SetFileName(theFileName); 
   //aWriter->Write(); 
@@ -275,7 +276,7 @@ GEOM_Actor::
 setDisplayMode(int theMode) 
 { 
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::SetDisplayMode = "<<theMode  <<endl;
+  MESSAGE ( "GEOM_Actor::SetDisplayMode = "<<theMode );
 #endif
   VTKViewer_Actor::setDisplayMode(theMode);
   SetVisibility(GetVisibility()); 
@@ -286,7 +287,7 @@ GEOM_Actor::
 SetSelected(bool theIsSelected) 
 { 
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::SetSelected = "<<theIsSelected  <<endl;
+  MESSAGE ( "GEOM_Actor::SetSelected = "<<theIsSelected  );
 #endif
 
   myIsSelected = theIsSelected; 
@@ -298,8 +299,8 @@ GEOM_Actor::
 SetVisibility(int theVisibility) 
 { 
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::SetVisibility = "<<theVisibility <<"  myIsSelected="<< myIsSelected
-       << " theVisibility="<<theVisibility<<" myIsPreselected="<<myIsPreselected<<endl;
+  MESSAGE ( "GEOM_Actor::SetVisibility = "<<theVisibility <<"  myIsSelected="<< myIsSelected
+           << " theVisibility="<<theVisibility<<" myIsPreselected="<<myIsPreselected );
 #endif
 
   SALOME_Actor::SetVisibility(theVisibility);
@@ -313,7 +314,8 @@ SetVisibility(int theVisibility)
   myOneFaceEdgeActor->SetVisibility(theVisibility && myDisplayMode == (int)eWireframe && !myIsSelected);
   myIsolatedEdgeActor->SetVisibility(theVisibility && !myIsSelected);
 
-  myVertexActor->SetVisibility(false);// must be added new mode points 
+//  myVertexActor->SetVisibility(false);// must be added new mode points 
+  myVertexActor->SetVisibility(theVisibility);
 }
  
 
@@ -321,16 +323,14 @@ void
 GEOM_Actor
 ::SetNbIsos(const int theNb[2])
 {
-  myNbIsos[0] = theNb[0];
-  myNbIsos[1] = theNb[1];
+  myWireframeFaceSource->SetNbIso(theNb);
 }
 
 void
 GEOM_Actor
 ::GetNbIsos(int &theNbU,int &theNbV)
 {
-  theNbU = myNbIsos[0];
-  theNbV = myNbIsos[1];
+  myWireframeFaceSource->GetNbIso(theNbU, theNbV);
 }
 
 static 
@@ -465,7 +465,7 @@ void GEOM_Actor::SetShape (const TopoDS_Shape& theShape,
 // OLD METHODS
 void GEOM_Actor::setDeflection(double adef) {
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::setDeflection"<<endl;
+  MESSAGE ( "GEOM_Actor::setDeflection" );
 #endif
   SetDeflection((float)adef,GetIsRelative());
 }
@@ -479,7 +479,7 @@ void GEOM_Actor::setDeflection(double adef) {
 void GEOM_Actor::SetHighlightProperty(vtkProperty* Prop)
 {
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::SetHighlightProperty"<<endl;
+  MESSAGE ( "GEOM_Actor::SetHighlightProperty" );
 #endif
   this->myHighlightActor->GetProperty()->DeepCopy(Prop);
   
@@ -488,7 +488,7 @@ void GEOM_Actor::SetHighlightProperty(vtkProperty* Prop)
 void GEOM_Actor::SetWireframeProperty(vtkProperty* Prop)
 {
 #ifdef MYDEBUG
-  cout << this << " GEOM_Actor::SetWireframeProperty"<<endl;
+  MESSAGE ( this << " GEOM_Actor::SetWireframeProperty" );
 #endif
   // must be filled
   myWireframeFaceActor->SetProperty(Prop);
@@ -497,7 +497,7 @@ void GEOM_Actor::SetWireframeProperty(vtkProperty* Prop)
 void GEOM_Actor::SetShadingProperty(vtkProperty* Prop)
 {
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::SetShadingProperty"<<endl;
+  MESSAGE ( "GEOM_Actor::SetShadingProperty" );
 #endif
   myShadingFaceProp->DeepCopy(Prop);
 }
@@ -506,7 +506,7 @@ void GEOM_Actor::SetShadingProperty(vtkProperty* Prop)
 void GEOM_Actor::Render(vtkRenderer *ren, vtkMapper *theMapper)
 {
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::Render"<<endl;
+  MESSAGE ( "GEOM_Actor::Render" );
 #endif
 
   if(!GetVisibility())
@@ -573,13 +573,12 @@ void GEOM_Actor::Render(vtkRenderer *ren, vtkMapper *theMapper)
     aMatrix->Delete();    
   } else
     this->Device->Render(ren, theMapper);
-
 }
 
 void GEOM_Actor::ReleaseGraphicsResources(vtkWindow *)
 {
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::ReleaseGraphicsResources"<<endl;
+  MESSAGE ( "GEOM_Actor::ReleaseGraphicsResources" );
 #endif  
 }
 
@@ -588,7 +587,7 @@ void GEOM_Actor::ReleaseGraphicsResources(vtkWindow *)
 void GEOM_Actor::ShallowCopy(vtkProp *prop)
 {
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::ShallowCopy"<<endl;
+  MESSAGE ( "GEOM_Actor::ShallowCopy" );
 #endif
   GEOM_Actor *f = GEOM_Actor::SafeDownCast(prop);
   if ( f != NULL )
@@ -602,7 +601,7 @@ void GEOM_Actor::ShallowCopy(vtkProp *prop)
 
 const TopoDS_Shape& GEOM_Actor::getTopo() {
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::getTopo"<<endl;
+  MESSAGE ( "GEOM_Actor::getTopo" );
 #endif
   return myShape;
 }
@@ -611,14 +610,14 @@ void GEOM_Actor::setInputShape(const TopoDS_Shape& ashape, double adef1,
                                int imode, bool isVector)
 {
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::setInputShape"<<endl;
+  MESSAGE ( "GEOM_Actor::setInputShape" );
 #endif
 }
 
 double GEOM_Actor::getDeflection()
 {
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::getDeflection"<<endl;
+  MESSAGE ( "GEOM_Actor::getDeflection" );
 #endif
   return (double) GetDeflection();
 }
@@ -627,7 +626,7 @@ double GEOM_Actor::getDeflection()
 double GEOM_Actor::isVector()
 {
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::isVector"<<endl;
+  MESSAGE ( "GEOM_Actor::isVector" );
 #endif  
   return 0;
 }
@@ -635,21 +634,21 @@ double GEOM_Actor::isVector()
 void GEOM_Actor::SubShapeOn()
 {
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::SubShapeOn"<<endl;
+  MESSAGE ( "GEOM_Actor::SubShapeOn" );
 #endif  
 }
 
 void GEOM_Actor::SubShapeOff()
 {
 #ifdef MYDEBUG
-  cout << "GEOM_Actor::SubShapeOff"<<endl;
+  MESSAGE ( "GEOM_Actor::SubShapeOff" );
 #endif
 }
 
 void GEOM_Actor::highlight(bool highlight)
 {
 #ifdef MYDEBUG
-  cout << this << " GEOM_Actor::highlight highlight="<<highlight<<endl;
+  MESSAGE ( this << " GEOM_Actor::highlight highlight="<<highlight );
 #endif
   SALOME_Actor::highlight(highlight);
 }
@@ -671,7 +670,11 @@ vtkFloatingPointType GEOM_Actor::GetOpacity()
 void GEOM_Actor::SetColor(vtkFloatingPointType r,vtkFloatingPointType g,vtkFloatingPointType b)
 {
   // enk:tested OK
-  myShadingFaceProp->SetColor(r,g,b);
+  myShadingFaceProp->SetColor(r,g,b);                          // shading color (Shading)
+  myIsolatedEdgeActor->GetProperty()->SetColor(r,g,b);         // standalone edge color (Wireframe)
+  myVertexActor->GetProperty()->SetColor(r,g,b);               // vertex actor (Shading/Wireframe)
+  myOneFaceEdgeActor->GetProperty()->SetColor(r,g,b);          // standalone face edge color (Wireframe)
+  mySharedEdgeActor->GetProperty()->SetColor(r,g,b);           // share edge color (Wireframe)
 }
 
 void GEOM_Actor::GetColor(vtkFloatingPointType& r,vtkFloatingPointType& g,vtkFloatingPointType& b)
@@ -684,7 +687,7 @@ void GEOM_Actor::GetColor(vtkFloatingPointType& r,vtkFloatingPointType& g,vtkFlo
   b = aRGB[2];
 }
 
-bool GEOM_Actor::IsInfinite()
+bool GEOM_Actor::IsInfinitive()
 {
   return (bool)(myShape.Infinite());
 }
@@ -698,7 +701,7 @@ GEOM_Actor
 {
   myIsSelected = theIsHighlight;
 #ifdef MYDEBUG
-  cout << this << " GEOM_Actor::Highlight myIsSelected="<<myIsSelected<<endl;
+  MESSAGE ( this << " GEOM_Actor::Highlight myIsSelected="<<myIsSelected );
 #endif
   
   SALOME_Actor::Highlight(theIsHighlight); // this method call ::highlight(theIsHighlight) in the end
@@ -715,7 +718,7 @@ GEOM_Actor
               bool theIsHighlight)
 {
 #ifdef MYDEBUG
-  cout << this<<" GEOM_Actor::PreHighlight (3) theIsHighlight="<<theIsHighlight<<endl;
+  MESSAGE ( this<<" GEOM_Actor::PreHighlight (3) theIsHighlight="<<theIsHighlight );
 #endif
 
   if ( !GetPickable() )
@@ -760,7 +763,7 @@ GEOM_Actor
 {
   // define the selection of object
 #ifdef MYDEBUG
-  cout << endl << this << " GEOM_Actor::Highlight (3) myIsSelected="<<myIsSelected<<endl;
+  MESSAGE ( std::endl << this << " GEOM_Actor::Highlight (3) myIsSelected="<<myIsSelected );
 #endif
   bool aRet = SALOME_Actor::Highlight(theInteractorStyle,theSelectionEvent,theIsHighlight);
   SetSelected(theIsHighlight);
index 3ecdce2b6ce227d1528d457f482d03f033822c60..af1b9b7e239db9bcdac2772def08fe58fcf46bcf 100644 (file)
@@ -1,43 +1,43 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_Actor.h
 //  Author : Christophe ATTANASIO
 //  Module : GEOM
 //  $Header$
-
+//
 #ifndef GEOM_ACTOR_H
 #define GEOM_ACTOR_H
 
 #include "GEOM_OBJECT_defs.hxx"
+#include "GEOM_SmartPtr.h"
 
-#include "SALOME_Actor.h"
+#include <SALOME_Actor.h>
 
 #include <TopoDS_Shape.hxx>
-
-#include "GEOM_SmartPtr.h"
 #include <vtkSmartPointer.h>
 
+class vtkCamera;
+
 class GEOM_VertexSource;
 typedef GEOM_SmartPtr<GEOM_VertexSource> PVertexSource;
 
@@ -124,7 +124,7 @@ public:
   void SetColor(vtkFloatingPointType r,vtkFloatingPointType g,vtkFloatingPointType b);
   void GetColor(vtkFloatingPointType& r,vtkFloatingPointType& g,vtkFloatingPointType& b);
 
-  virtual bool IsInfinite();
+  virtual bool IsInfinitive();
 
   // overloaded functions
   //! To map current selection to VTK representation
index 5a0fa17a3ed867e088cd044744959f4356e00845..69d7fa9f5ceee0a3c72b5155803f02b7d859e98f 100644 (file)
@@ -1,31 +1,30 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
+//
+//  GEOM OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_AssemblyBuilder.cxx
 //  Author : Christophe ATTANASIO
 //  Module : GEOM
 //  $Header$
-
+//
 /*!
   \class GEOM_AssemblyBuilder GEOM_AssemblyBuilder.h
   \brief ....
 #include "GEOM_Actor.h"
 
 #include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
 
 #include <vtkProperty.h>
+#include <vtkAssembly.h>
+#include <vtkActorCollection.h>
 
 // Open CASCADE Includes
 #include <TopExp_Explorer.hxx>
@@ -50,6 +52,9 @@
 #include <TopTools_ListOfShape.hxx>
 #include <TopoDS_Iterator.hxx>
 
+// Qt includes
+#include <QColor>
+
 #include "utilities.h"
 
 using namespace std;
index c74cc11d5d6d4b71ff86d5c2f942a436a8f48b83..da50e5e923a8c1e248e80e148b0c027913292422 100644 (file)
@@ -1,36 +1,35 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_AssemblyBuilder.h
 //  Author : Christophe ATTANASIO
 //  Module : GEOM
 //  $Header$
-
+//
 #include "GEOM_OBJECT_defs.hxx"
 
-#include <vtkAssembly.h>
-#include <vtkPropAssembly.h>
-#include <vtkActorCollection.h>
+class vtkProperty;
+class vtkAssembly;
+class vtkActorCollection;
 
 // Open CASCADE Inlcudes
 #include <TopoDS.hxx>
index 167010b9189d279e11be539fcf8f10eeb01e0072..445ab14709e0f70392fdff63ab1d449a7cfcafa2 100755 (executable)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 "GEOM_DeviceActor.h" 
 
 #include <vtkObjectFactory.h> 
@@ -80,4 +101,4 @@ GEOM_DeviceActor::
 RemoveFromRender(vtkRenderer* theRenderer)
 {
   theRenderer->RemoveActor(myActor.GetPointer());
-}
\ No newline at end of file
+}
index 85809daf54dad48e6bbdd94290d01c14124e52c5..84bbbe912d5fc5d9bc680c27add0cb1a9c9d53cd 100755 (executable)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 GEOM_DEVICEACTOR_H 
 #define GEOM_DEVICEACTOR_H 
  
index 23cb30dfa9b7b16049481bec80c5671644d95727..12b467de992b3220a5f5eba730d5d65f18509c76 100755 (executable)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 "GEOM_EdgeSource.h" 
  
 #include <vtkObjectFactory.h> 
index 56813e0fb454df61c5c714be05828b93488991c5..8cb2e514d13693c05bdfb393a4c2a059e8bce655 100755 (executable)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 GEOM_EDGESOURCE_H 
 #define GEOM_EDGESOURCE_H 
  
index 4f0d9145e6dd96763f1c9c7c3bec12cdb801b403..0600ee1d97e88460d7bde7f4682c5895c72b2cfd 100755 (executable)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 "GEOM_FaceSource.h" 
  
 #include <vtkObjectFactory.h> 
index 8c03167af65c4007184ae356f4e84edb9a13c833..6378a8edaed9f4d14589ccfa4387ba520d400cf0 100755 (executable)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 GEOM_FACESOURCE_H 
 #define GEOM_FACESOURCE_H 
  
index 628df2d2483d46d59e5d7f7d0faf61876ad2a59e..1f82d31bfd70dbc4b0a2e7e85111b20c2d12a5a3 100644 (file)
@@ -1,31 +1,30 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_InteractiveObject.cxx
 //  Author : Christophe ATTANASIO
 //  Module : GEOM
 //  $Header$
-
+//
 /*!
   \class GEOM_InteractiveObject GEOM_InteractiveObject.hxx
   \brief ....
index cc405f407409494f335763a195a44159cf120c73..1acd05421312b6a25ae87cbc08797652f0b2851e 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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
+//  This library is free software; you can redistribute it and/or
+//  modify it 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
+//
+//  GEOM OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_InteractiveObject.hxx
 //  Module : GEOM
-
+//
 #ifndef _GEOM_InteractiveObject_HeaderFile
 #define _GEOM_InteractiveObject_HeaderFile
 
@@ -46,8 +45,6 @@
 #ifndef _Handle_SALOME_InteractiveObject_HeaderFile
 #include "Handle_SALOME_InteractiveObject.hxx"
 #endif
-class SALOME_InteractiveObject;
-
 
 class GEOM_InteractiveObject : public SALOME_InteractiveObject {
 
index 20d58cbb23e1e61f1b610ec448f73f62ef4c4a75..56d8f268d16bccd3c8a248e732483de3d51b32da 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_InteractiveObject.ixx
 //  Module : GEOM
-
+//
 #include "GEOM_InteractiveObject.jxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
index 94666cbf484679005e7fe00c99d2de93b9dd4e72..7455669f911c03f00160591390bd82e29ba90a22 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_InteractiveObject.jxx
 //  Module : GEOM
-
+//
 #ifndef _SALOME_InteractiveObject_HeaderFile
 #include "SALOME_InteractiveObject.hxx"
 #endif
index 3377ce908a68b4195c6b8c0c91b73d075a5d3e00..c7d239347f10be10bed66c02d06a15144623a6fe 100755 (executable)
@@ -1,47 +1,39 @@
-//  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 
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
+//  Copyright (C) 2003-2007  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_OBJECT_defs.hxx
 //  Author : Alexander A. BORODIN
 //  Module : GEOM
-
+//
 #ifndef _GEOM_OBJECT_defs_HXX_
 #define _GEOM_OBJECT_defs_HXX_
 
-#ifdef WNT
- #if defined OBJECT_EXPORTS
-  #if defined WIN32
-   #define GEOM_OBJECT_EXPORT __declspec( dllexport )
-  #else
-   #define GEOM_OBJECT_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define GEOM_OBJECT_EXPORT __declspec( dllimport )
-  #else
-   #define GEOM_OBJECT_EXPORT
-  #endif
- #endif
+#ifdef WIN32
+# if defined GEOM_OBJECT_EXPORTS
+#  define GEOM_OBJECT_EXPORT __declspec( dllexport )
+# else
+#  define GEOM_OBJECT_EXPORT __declspec( dllimport )
+# endif
 #else
- #define GEOM_OBJECT_EXPORT
+define GEOM_OBJECT_EXPORT
 #endif
 
 #endif
index 01400b67f43bca1890e1b3084fc0a39d7ddf9df5..95a4c33b7d9db9acbaa5f6238c38fb07f24c48ec 100644 (file)
@@ -1,31 +1,30 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_OCCReader.h
 //  Author : Christophe ATTANASIO
 //  Module : GEOM
 //  $Header$
-
+//
 #include "GEOM_OCCReader.h"
 
 // VTK Includes
 
 #include <vtkObjectFactory.h>
 #include <vtkPolyData.h>
-#include <vtkPolyDataMapper.h>
-#include <vtkMergePoints.h>
-
-#include <vtkTransform.h>
-#include <vtkMatrix4x4.h>
 
 // OpenCASCADE Includes
-#include <BRepAdaptor_Surface.hxx>
 #include <TopExp_Explorer.hxx>
-#include <BRepMesh_IncrementalMesh.hxx>
 #include <Poly_Triangulation.hxx>
 #include <Poly_Polygon3D.hxx>
-#include <BRep_Tool.hxx>
+#include <Poly_PolygonOnTriangulation.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Wire.hxx>
-#include <BRepBndLib.hxx>
-#include <TopoDS.hxx>
 #include <TopAbs.hxx>
 #include <Precision.hxx>
 #include <BRepTools.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <HatchGen_Domain.hxx>
-#include <GeomAbs_IsoType.hxx>
-#include <Precision.hxx>
 #include <TopAbs_ShapeEnum.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
 #include <gp_Dir2d.hxx>
 #include <gp_Pnt2d.hxx>
 #include <TColStd_Array1OfInteger.hxx>
@@ -485,7 +469,7 @@ void GEOM_OCCReader::DrawTo(gp_Pnt P,
   coord[0] = P.X(); coord[1] = P.Y(); coord[2] = P.Z();
   Standard_Integer NewVTKpoint =  Pts->InsertNextPoint(coord);
 
-  int pts[2];
+  vtkIdType pts[2];
   pts[0] = lastVTKpoint;
   pts[1] = NewVTKpoint;
 
@@ -751,7 +735,7 @@ void GEOM_OCCReader::TransferEdgeWData(const TopoDS_Edge& aEdge,
     aP2 = theNodesP(nbnodes);
 
     float coord[3];
-    int pts[2];
+    vtkIdType pts[2];
 
     for(int j=1;j<nbnodes;j++) {
       gp_Pnt pt1 = theNodesP(j);
@@ -783,7 +767,7 @@ void GEOM_OCCReader::TransferEdgeWData(const TopoDS_Edge& aEdge,
     aP2 = theNodesPoly(nbnodes);
 
     float coord[3];
-    int pts[2];
+    vtkIdType pts[2];
     
     for(int j=1;j<nbnodes;j++) {
       Standard_Integer id1 = Nodesidx(j);
@@ -859,7 +843,7 @@ void GEOM_OCCReader::TransferEdgeWData(const TopoDS_Edge& aEdge,
     int ptPrev = 0;
     int ptCur = 0;
 
-    int pts[2];
+    vtkIdType pts[2];
 
     int NbPoints = 15;
     for (int i = 1; i <= NbPoints; i++, ptPrev = ptCur)
@@ -902,7 +886,7 @@ void GEOM_OCCReader::TransferEdgeWData(const TopoDS_Edge& aEdge,
   const TColgp_Array1OfPnt& theNodes = T->Nodes();
     
   float coord[3];
-  int pts[2];
+  vtkIdType pts[2];
     
 
   // PUSH NODES
@@ -925,7 +909,7 @@ void GEOM_OCCReader::TransferEdgeWData(const TopoDS_Edge& aEdge,
     Standard_Integer id1 = Nodesidx(i);
     Standard_Integer id2 = Nodesidx(i+1);
     
-    int pts[2];
+    vtkIdType pts[2];
     pts[0] = id1-1; pts[1] = id2-1;
 
     // insert line (pt1,pt2)
@@ -947,7 +931,7 @@ void GEOM_OCCReader::TransferVertexWData(const TopoDS_Vertex& aVertex,
   
   gp_Pnt P = BRep_Tool::Pnt( aVertex );
   float delta = 1, coord[3];
-  int pts[2];
+  vtkIdType pts[2];
   // insert pt
   ZERO_COORD; coord[0] = +delta;
   pts[0] = Pts->InsertNextPoint(coord);
@@ -1026,7 +1010,7 @@ void GEOM_OCCReader::TransferFaceSData(const TopoDS_Face& aFace,
       Standard_Integer N1,N2,N3;
       Triangles(i).Get(N1,N2,N3);
        
-      int pts[3];
+      vtkIdType pts[3];
       pts[0] = N1-1; pts[1] = N2-1; pts[2] = N3-1;
       Cells->InsertNextCell(3,pts);
 
index 5c0288a75c66191e3cebe72da96fef9930b4f235..869ec4f29effc935c7075c784af016a9d325b691 100644 (file)
@@ -1,31 +1,30 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_OCCReader.h
 //  Author : Christophe ATTANASIO
 //  Module : GEOM
 //  $Header$
-
+//
 /*!
   \class GEOM_OCCReader GEOM_OCCReader.h
   \brief This class allow to display a OpenCASCADE CAD model in a VTK viewer.
@@ -44,8 +43,6 @@ class vtkCellArray;
 // OpenCASCADE
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
-#include <Poly_Polygon3D.hxx>
-#include <Poly_PolygonOnTriangulation.hxx>
 #include <GeomAbs_IsoType.hxx>
 #include <BRepAdaptor_Surface.hxx>
 
index 1795bf0c2476d2c279570eacc89dc125cfc7bed6..755b329257182bc6b594f8f9987375a173a44ed4 100755 (executable)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 "GEOM_ShadingFace.h" 
  
 #include <vtkObjectFactory.h> 
@@ -81,4 +102,4 @@ OCC2VTK(const TopoDS_Face& theFace,
       thePolyData->InsertNextCell(VTK_TRIANGLE,3,anIds);
     }
   } 
-}
\ No newline at end of file
+}
index 4414f9f2944639b089e1022e722a9f67e8a5ea0c..097c1340cd6515a1f4a1b67b815d413a35560c0e 100755 (executable)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 GEOM_SHADINGFACE_H 
 #define GEOM_SHADINGFACE_H 
  
index 886a085b8245cc603012a9133858caec47fc55bd..eedaf8200a28795e2c8b60701bae0171d7aa60e2 100755 (executable)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 GEOM_SMARTPTR_H 
 #define GEOM_SMARTPTR_H 
  
index 847077d5588f35cb1d06481639603ec492885be5..113d7a931bf39a5d561c70f888158cdb726bfbcd 100644 (file)
@@ -1,56 +1,44 @@
-//  SALOME GEOM : 
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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
 //
+//  SALOME GEOM : 
 //  File   : GEOM_VTKTrihedron.cxx
 //  Author : Sergey LITONIN
 //  Module : SALOME
 //  $Header:
-
+//
 #include "GEOM_VTKTrihedron.hxx"
-#include "utilities.h"
-#include "GEOM_OCCReader.h"
 
 #include <Geom_Axis2Placement.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Pnt.hxx>
-#include <BRep_Builder.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Compound.hxx>
 
-#include <vtkMath.h>
 #include <vtkMapper.h>
-#include <vtkDataSet.h>
 #include <vtkRenderer.h>
-#include <vtkFollower.h>
-#include <vtkRenderWindow.h>
 #include <vtkObjectFactory.h>
-#include <vtkPolyData.h>
 #include <vtkActor.h>
+#include <vtkActorCollection.h>
 #include <vtkProperty.h>
 #include <vtkLineSource.h>
-#include <vtkConeSource.h>
 #include <vtkPolyDataMapper.h>
 #include <vtkAppendPolyData.h>
 #include <vtkMatrix4x4.h>
index 1d9e85347ac8daf975d388e566b4f4e31508cc01..9dde2edd4a829ae32db1622743c674f9abc8937c 100644 (file)
@@ -1,31 +1,30 @@
-//  SALOME GEOM : 
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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
 //
+//  SALOME GEOM : 
 //  File   : GEOM_VTKTrihedron.h
 //  Author : Sergey LITONIN
 //  Module : SALOME
 //  $Header: 
-
+//
 #ifndef GEOM_VTKTrihedron_H
 #define GEOM_VTKTrihedron_H
 
@@ -35,7 +34,6 @@
 #include "SALOME_Actor.h"
 #include "VTKViewer_Trihedron.h"
 
-class vtkActorCollection;
 class vtkRenderer;
 class vtkPolyDataMapper;
 
index 50277626b09379077cdb44ef47e9e1e5d5d747d0..4fdf79092723c734c97bea809cd8cbb94a995402 100755 (executable)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 "GEOM_VertexSource.h" 
  
 #include <vtkObjectFactory.h> 
index 46a64f0dea9b51927a49427bca71d81e77a4fb5c..00ac63f85f9eb4b3a76672f04cdb311956ee7ccb 100755 (executable)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 GEOM_VERTEXSOURCE_H 
 #define GEOM_VERTEXSOURCE_H 
  
index 8d49a177caee338e08cc1678817ed7b79a4d61fd..08430275f90b25173bba25cd76fa11ab2c3b6913 100755 (executable)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 "GEOM_WireframeFace.h" 
  
 #include <vtkObjectFactory.h> 
 vtkStandardNewMacro(GEOM_WireframeFace);
  
 GEOM_WireframeFace::GEOM_WireframeFace(): 
-  NbIso(1), 
-  Discret(15) 
+  Discret(15)
 { 
+  NbIso[0] = 1;
+  NbIso[1] = 1;
 } 
  
 GEOM_WireframeFace::~GEOM_WireframeFace() 
@@ -58,12 +80,29 @@ Execute()
   }
 }
 
+void GEOM_WireframeFace::SetNbIso(const int theNb[2])
+{
+  if ( theNb[0] == NbIso[0] && theNb[1] == NbIso[1])
+    return;
+
+  NbIso[0] = theNb[0];
+  NbIso[1] = theNb[1];
+
+  Modified();
+}
+
+void GEOM_WireframeFace::GetNbIso(int &theNbU,int &theNbV)
+{
+  theNbU = NbIso[0];
+  theNbV = NbIso[1];
+}
+
 void  
 GEOM_WireframeFace:: 
 OCC2VTK(const TopoDS_Face& theFace,
         vtkPolyData* thePolyData,
                    vtkPoints* thePts,  
-        const int theNbIso, 
+        const int theNbIso[2]
         const int theDiscret) 
 { 
   TopoDS_Face aFace = theFace; 
@@ -74,7 +113,7 @@ OCC2VTK(const TopoDS_Face& theFace,
 void 
 GEOM_WireframeFace:: 
 CreateIso(const TopoDS_Face& theFace,
-               const int theNbIso
+         const int theNbIso[2]
           const int theDiscret, 
           vtkPolyData* thePolyData,
           vtkPoints* thePts)
@@ -95,8 +134,8 @@ CreateIso(const TopoDS_Face& theFace,
                                     Standard_False);
   
   Standard_Real anUMin, anUMax, aVMin, aVMax;
-  TColStd_Array1OfReal anUPrm(1, theNbIso), aVPrm(1, theNbIso);
-  TColStd_Array1OfInteger anUInd(1, theNbIso), aVInd(1, theNbIso);
+  TColStd_Array1OfReal anUPrm(1, theNbIso[0]), aVPrm(1, theNbIso[1]);
+  TColStd_Array1OfInteger anUInd(1, theNbIso[0]), aVInd(1, theNbIso[1]);
 
   anUInd.Init(0);
   aVInd.Init(0);
@@ -185,11 +224,11 @@ CreateIso(const TopoDS_Face& theFace,
   Standard_Real confusion = Min(DeltaU, DeltaV) * HATHCER_CONFUSION_3D ;
   aHatcher.Confusion3d (confusion) ;
 
-  Standard_Real StepU = DeltaU / (Standard_Real)theNbIso;
+  Standard_Real StepU = DeltaU / (Standard_Real)theNbIso[0];
   if(StepU > confusion){
     Standard_Real UPrm = anUMin + StepU / 2.;
     gp_Dir2d Dir(0., 1.) ;
-    for(IIso = 1 ; IIso <= theNbIso ; IIso++) {
+    for(IIso = 1 ; IIso <= theNbIso[0] ; IIso++) {
       anUPrm(IIso) = UPrm ;
       gp_Pnt2d Ori (UPrm, 0.) ;
       Geom2dAdaptor_Curve HCur (new Geom2d_Line (Ori, Dir)) ;
@@ -198,11 +237,11 @@ CreateIso(const TopoDS_Face& theFace,
     }
   }
 
-  Standard_Real StepV = DeltaV / (Standard_Real) theNbIso ;
+  Standard_Real StepV = DeltaV / (Standard_Real) theNbIso[1] ;
   if(StepV > confusion){
     Standard_Real VPrm = aVMin + StepV / 2.;
     gp_Dir2d Dir(1., 0.);
-    for(IIso = 1 ; IIso <= theNbIso ; IIso++){
+    for(IIso = 1 ; IIso <= theNbIso[1] ; IIso++){
       aVPrm(IIso) = VPrm;
       gp_Pnt2d Ori (0., VPrm);
       Geom2dAdaptor_Curve HCur(new Geom2d_Line (Ori, Dir));
@@ -217,9 +256,9 @@ CreateIso(const TopoDS_Face& theFace,
   aHatcher.Trim() ;
 
   Standard_Integer aNbDom = 0 ; // for debug purpose
-  for(IIso = 1 ; IIso <= theNbIso ; IIso++){
-    Standard_Integer Index ;
+  Standard_Integer Index ;
 
+  for(IIso = 1 ; IIso <= theNbIso[0] ; IIso++){
     Index = anUInd(IIso) ;
     if(Index != 0){
       if(aHatcher.TrimDone(Index) && !aHatcher.TrimFailed(Index)){
@@ -228,7 +267,9 @@ CreateIso(const TopoDS_Face& theFace,
           aNbDom = aHatcher.NbDomains (Index);
       }
     }
+  }
 
+  for(IIso = 1 ; IIso <= theNbIso[1] ; IIso++){
     Index = aVInd(IIso);
     if(Index != 0){
       if(aHatcher.TrimDone (Index) && !aHatcher.TrimFailed(Index)){
@@ -463,4 +504,4 @@ CreateIso__(const BRepAdaptor_Surface& theSurface,
       CreateIso__(theSurface, theIsoType, aLocalU , theV, theStep/2, thePolyData, thePts);
     }
   }
-}
\ No newline at end of file
+}
index cdbe122b3a895f50da2d1840a43ecfaf2179675c..2958694dfcf0d8a55d3d9f5273e38556bd344f04 100755 (executable)
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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 GEOM_WIREFRAME_FACE_H 
 #define GEOM_WIREFRAME_FACE_H 
  
@@ -15,8 +36,8 @@ public:
   vtkTypeMacro(GEOM_WireframeFace,GEOM_FaceSource); 
   static GEOM_WireframeFace* New(); 
  
-  vtkSetMacro(NbIso,int); 
-  vtkGetMacro(NbIso,int); 
+  /*  vtkSetMacro(NbIso,int); 
+      vtkGetMacro(NbIso,int);*/
  
   vtkSetMacro(Discret,int); 
   vtkGetMacro(Discret,int); 
@@ -25,16 +46,22 @@ public:
   void OCC2VTK(const TopoDS_Face& theFace,  
                vtkPolyData* thePolyData, 
                vtkPoints* thePts, 
-               int theNbIso = 1, 
-               int theDiscret = 15); 
+               const int theNbIso[2], 
+               const int theDiscret = 15);
+
+  //! IsoLines management
+  // theNb[0] - number of U lines
+  // theNb[1] - number of V lines
+  virtual void SetNbIso(const int theNb[2]);
+  virtual void GetNbIso(int &theNbU,int &theNbV);
+
 protected: 
-  int NbIso, Discret; 
+  int NbIso[2], Discret; 
  
   static  
   void 
   CreateIso(const TopoDS_Face& theFace,
-                 const int theNbIso
+           const int theNbIso[2]
             const int theDiscret, 
             vtkPolyData* thePolyData,
             vtkPoints* thePts);
index 4c7d4c7d1378f9c84dba67fb41eb7b7c0da71d59..4556c271237a55f4896f75de9e5366de25aed819 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 //  File   : Handle_GEOM_AISShape.hxx
 //  Module : GEOM
-
+//
 #ifndef _Handle_GEOM_AISShape_HeaderFile
 #define _Handle_GEOM_AISShape_HeaderFile
 
index 70c1c92c01401edc91499bb3c41e8e8e60475199..822359cb7af603adbc79decb1ad490f4dcac3245 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM OBJECT : interactive object for Geometry entities visualization
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 //  File   : Handle_GEOM_InteractiveObject.hxx
 //  Module : GEOM
-
+//
 #ifndef _Handle_GEOM_InteractiveObject_HeaderFile
 #define _Handle_GEOM_InteractiveObject_HeaderFile
 
index 638ff6ac4973c4dfb30ae314be612919ed8d74ea..671ab5c4c182155e3f77aa0362073ec8760c6bc2 100644 (file)
@@ -1,86 +1,89 @@
-#  GEOM OBJECT : interactive object for Geometry entities visualization
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY 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 OBJECT : interactive object for Geometry entities visualization
 #  File   : Makefile.in
 #  Author : Damien COQUERET (OCC)
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS = \
-       GEOM_Actor.h \
-       GEOM_AssemblyBuilder.h \
-       GEOM_AISShape.hxx \
-       Handle_GEOM_AISShape.hxx \
-       GEOM_InteractiveObject.hxx \
-       Handle_GEOM_InteractiveObject.hxx \
-       GEOM_AISTrihedron.hxx \
-       GEOM_VTKTrihedron.hxx \
-       GEOM_AISVector.hxx \
-       GEOM_OBJECT_defs.hxx \
-       GEOM_SmartPtr.h \
-       GEOM_DeviceActor.h \
-       GEOM_EdgeSource.h \
-       GEOM_FaceSource.h \
-       GEOM_ShadingFace.h \
-       GEOM_VertexSource.h \
+salomeinclude_HEADERS =                                \
+       GEOM_Actor.h                            \
+       GEOM_AssemblyBuilder.h                  \
+       GEOM_AISShape.hxx                       \
+       GEOM_AISShape.ixx                       \
+       GEOM_AISShape.jxx                       \
+       Handle_GEOM_AISShape.hxx                \
+       GEOM_InteractiveObject.hxx              \
+       GEOM_InteractiveObject.ixx              \
+       GEOM_InteractiveObject.jxx              \
+       Handle_GEOM_InteractiveObject.hxx       \
+       GEOM_AISTrihedron.hxx                   \
+       GEOM_VTKTrihedron.hxx                   \
+       GEOM_AISVector.hxx                      \
+       GEOM_OBJECT_defs.hxx                    \
+       GEOM_OCCReader.h                        \
+       GEOM_SmartPtr.h                         \
+       GEOM_DeviceActor.h                      \
+       GEOM_EdgeSource.h                       \
+       GEOM_FaceSource.h                       \
+       GEOM_ShadingFace.h                      \
+       GEOM_VertexSource.h                     \
        GEOM_WireframeFace.h
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOMObject.la
 
-dist_libGEOMObject_la_SOURCES = \
-       GEOM_Actor.cxx \
-       GEOM_OCCReader.cxx \
-       GEOM_AssemblyBuilder.cxx \
-       GEOM_AISShape.cxx \
-       GEOM_InteractiveObject.cxx \
-       GEOM_AISTrihedron.cxx \
-       GEOM_VTKTrihedron.cxx \
-       GEOM_AISVector.cxx \
-       GEOM_DeviceActor.cxx \
-       GEOM_EdgeSource.cxx \
-       GEOM_FaceSource.cxx \
-       GEOM_ShadingFace.cxx \
-       GEOM_VertexSource.cxx \
+dist_libGEOMObject_la_SOURCES =                \
+       GEOM_Actor.cxx                  \
+       GEOM_OCCReader.cxx              \
+       GEOM_AssemblyBuilder.cxx        \
+       GEOM_AISShape.cxx               \
+       GEOM_InteractiveObject.cxx      \
+       GEOM_AISTrihedron.cxx           \
+       GEOM_VTKTrihedron.cxx           \
+       GEOM_AISVector.cxx              \
+       GEOM_DeviceActor.cxx            \
+       GEOM_EdgeSource.cxx             \
+       GEOM_FaceSource.cxx             \
+       GEOM_ShadingFace.cxx            \
+       GEOM_VertexSource.cxx           \
        GEOM_WireframeFace.cxx
 
 
-libGEOMObject_la_CPPFLAGS = \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       $(QT_INCLUDES) \
-       $(PYTHON_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(VTK_INCLUDES) \
-       $(OGL_INCLUDES) \
-       $(KERNEL_CXXFLAGS) \
+libGEOMObject_la_CPPFLAGS =    \
+       $(CORBA_CXXFLAGS)       \
+       $(CORBA_INCLUDES)       \
+       $(QT_INCLUDES)          \
+       $(PYTHON_INCLUDES)      \
+       $(CAS_CPPFLAGS)         \
+       $(VTK_INCLUDES)         \
+       $(KERNEL_CXXFLAGS)      \
        $(GUI_CXXFLAGS) 
        
-libGEOMObject_la_LDFLAGS  = \
-       $(KERNEL_LDFLAGS)  -lSALOMELocalTrace \
+libGEOMObject_la_LDFLAGS  =                    \
+       $(KERNEL_LDFLAGS)  -lSALOMELocalTrace   \
        $(GUI_LDFLAGS) -lqtx -lVTKViewer -lSVTK -lSalomeObject
 #      $(CORBA_LIBS) \
 #      $(STDLIB) \
diff --git a/src/OBJECT/OBJECT.pro b/src/OBJECT/OBJECT.pro
new file mode 100644 (file)
index 0000000..0c8330f
--- /dev/null
@@ -0,0 +1,80 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = GEOMObject
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+GUI_LDFLAGS = -L$$(GUI_ROOT_DIR)/lib/salome
+
+INCLUDEPATH += $${CORBA_INCLUDES} $${QT_INCLUDES} $${PYTHON_INCLUDES} $${CAS_CPPFLAGS} $${VTK_INCLUDES} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS}
+
+LIBS += $${KERNEL_LDFLAGS} -lSALOMELocalTrace $${GUI_LDFLAGS} -lqtx -lVTKViewer -lSVTK -lSalomeObject
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += OBJECT_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+HEADERS  = GEOM_Actor.h
+HEADERS += GEOM_AssemblyBuilder.h
+HEADERS += GEOM_AISShape.hxx
+HEADERS += Handle_GEOM_AISShape.hxx
+HEADERS += GEOM_InteractiveObject.hxx
+HEADERS += Handle_GEOM_InteractiveObject.hxx
+HEADERS += GEOM_AISTrihedron.hxx
+HEADERS += GEOM_VTKTrihedron.hxx
+HEADERS += GEOM_AISVector.hxx
+HEADERS += GEOM_OBJECT_defs.hxx
+
+SOURCES  = GEOM_Actor.cxx
+SOURCES += GEOM_OCCReader.cxx
+SOURCES += GEOM_AssemblyBuilder.cxx
+SOURCES += GEOM_AISShape.cxx
+SOURCES += GEOM_InteractiveObject.cxx
+SOURCES += GEOM_AISTrihedron.cxx
+SOURCES += GEOM_VTKTrihedron.cxx
+SOURCES += GEOM_AISVector.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index e25d13348c9239a6c4832857b25e23f4eefb958b..3afc0501389191653da1f9b8b02e96943e4a1bcd 100644 (file)
@@ -1,83 +1,96 @@
-#  GEOM OPERATIONGUI : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM OPERATIONGUI : 
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : OperationGUI
 #
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =                                \
+       OperationGUI.h                          \
+       OperationGUI_ArchimedeDlg.h             \
+       OperationGUI_PartitionDlg.h             \
+       OperationGUI_FilletDlg.h                \
+       OperationGUI_Fillet2dDlg.h              \
+       OperationGUI_ChamferDlg.h               \
+       OperationGUI_GetShapesOnShapeDlg.h      \
+       OperationGUI_ClippingDlg.h
 
 # Libraries targets
 lib_LTLIBRARIES = libOperationGUI.la
 
-dist_libOperationGUI_la_SOURCES = \
-       OperationGUI.cxx \
-       OperationGUI_ArchimedeDlg.cxx \
-       OperationGUI_PartitionDlg.cxx \
-       OperationGUI_FilletDlg.cxx \
-       OperationGUI_ChamferDlg.cxx \
+dist_libOperationGUI_la_SOURCES =              \
+       OperationGUI.cxx                        \
+       OperationGUI_ArchimedeDlg.cxx           \
+       OperationGUI_PartitionDlg.cxx           \
+       OperationGUI_GetShapesOnShapeDlg.cxx    \
+       OperationGUI_FilletDlg.cxx              \
+       OperationGUI_Fillet2dDlg.cxx            \
+       OperationGUI_ChamferDlg.cxx             \
        OperationGUI_ClippingDlg.cxx
 
-MOC_FILES = \
-       OperationGUI_ArchimedeDlg_moc.cxx \
-       OperationGUI_PartitionDlg_moc.cxx \
-       OperationGUI_FilletDlg_moc.cxx \
-       OperationGUI_ChamferDlg_moc.cxx \
+MOC_FILES =                                    \
+       OperationGUI_ArchimedeDlg_moc.cxx       \
+       OperationGUI_PartitionDlg_moc.cxx       \
+       OperationGUI_GetShapesOnShapeDlg_moc.cxx\
+       OperationGUI_FilletDlg_moc.cxx          \
+       OperationGUI_Fillet2dDlg_moc.cxx        \
+       OperationGUI_ChamferDlg_moc.cxx         \
        OperationGUI_ClippingDlg_moc.cxx
 
-nodist_libOperationGUI_la_SOURCES= \
+nodist_libOperationGUI_la_SOURCES =            \
        $(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl
+# additional information to compile and link file
 
-#LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
-
-libOperationGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../DlgRef \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(top_builddir)/idl \
+libOperationGUI_la_CPPFLAGS =          \
+       $(QT_INCLUDES)                  \
+       $(VTK_INCLUDES)                 \
+       $(CAS_CPPFLAGS)                 \
+       $(PYTHON_INCLUDES)              \
+       $(BOOST_CPPFLAGS)               \
+       $(KERNEL_CXXFLAGS)              \
+       $(GUI_CXXFLAGS)                 \
+       $(CORBA_CXXFLAGS)               \
+       $(CORBA_INCLUDES)               \
+       -I$(srcdir)/../GEOMGUI          \
+       -I$(srcdir)/../DlgRef           \
+       -I$(srcdir)/../GEOMBase         \
+       -I$(srcdir)/../OBJECT           \
+       -I$(srcdir)/../GEOMClient       \
+       -I$(srcdir)/../GEOMImpl         \
+       -I$(srcdir)/../GEOMAlgo         \
+       -I$(top_builddir)/src/DlgRef    \
+       -I$(top_builddir)/idl           \
        -I$(top_builddir)/salome_adm/unix
 
-libOperationGUI_la_LDFLAGS  = \
-       ../GEOMBase/libGEOMBase.la \
+libOperationGUI_la_LDFLAGS =           \
+       ../GEOMBase/libGEOMBase.la      \
        $(CAS_LDPATH) -lTKFillet
+
+###############################
+# Obsolete files ?
+###############################
+# OperationGUI_MaterialDlg.h
+# OperationGUI_MaterialDlg.cxx
index 1372e926da4b94ce304d5d497441cbbbff76a6cb..ebc81748d1d95d6ee4e579d75f4efa450218dd47 100644 (file)
@@ -1,36 +1,35 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : OperationGUI.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : OperationGUI.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "OperationGUI.h"
 
-#include "SUIT_Session.h"
-#include "SUIT_Desktop.h"
-#include "SalomeApp_Application.h"
+#include <GeometryGUI.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
+#include <SalomeApp_Application.h>
 
 #include <TopTools_MapOfShape.hxx>
 #include <TopExp_Explorer.hxx>
 #include "OperationGUI_PartitionDlg.h"   // Method PARTITION
 #include "OperationGUI_ArchimedeDlg.h"   // Method ARCHIMEDE
 #include "OperationGUI_FilletDlg.h"      // Method FILLET
+#include "OperationGUI_Fillet2dDlg.h"    // Method FILLET 2D
 #include "OperationGUI_ChamferDlg.h"     // Method CHAMFER
-
-#include "OperationGUI_ClippingDlg.h"
-
-using namespace std;
+#include "OperationGUI_ClippingDlg.h"    // Clipping dialog box
+#include "OperationGUI_GetShapesOnShapeDlg.h"
 
 //=======================================================================
 // function : OperationGUI()
 // purpose  : Constructor
 //=======================================================================
-OperationGUI::OperationGUI(GeometryGUI* parent) : GEOMGUI(parent)
+OperationGUI::OperationGUI( GeometryGUI* parent ) :
+  GEOMGUI( parent )
 {
 }
 
@@ -69,19 +68,20 @@ OperationGUI::~OperationGUI()
 bool OperationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 {
   SalomeApp_Application* app = getGeometryGUI()->getApp();
-  if (!app) return false;
+  if ( !app ) return false;
 
   getGeometryGUI()->EmitSignalDeactivateDialog();
 
-  switch (theCommandID)
-  {
-  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;
+  switch ( theCommandID ) {
+  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;
+  case 508: ( new OperationGUI_GetShapesOnShapeDlg( getGeometryGUI(), parent ) )->show(); break;
+  case 509: ( new OperationGUI_Fillet2dDlg        ( getGeometryGUI(), parent ) )->show(); break;
   default:
-    app->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
+    app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
   }
 
   return true;
@@ -93,10 +93,10 @@ bool OperationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 extern "C"
 {
 #ifdef WNT
-       __declspec( dllexport )
+  __declspec( dllexport )
 #endif
-  GEOMGUI* GetLibGUI(GeometryGUI* parent)
+  GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
-    return new OperationGUI(parent);
+    return new OperationGUI( parent );
   }
 }
index d2bd5662b73ae7698de19de3e08ae9a174aae506..760150bacb6961d7dc8f2e605c266c2e5015bd07 100644 (file)
@@ -1,35 +1,32 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : OperationGUI.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : OperationGUI.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
 #ifndef OPERATIONGUI_H
 #define OPERATIONGUI_H
 
-#include "GEOMGUI.h"
-#include "GEOMBase.h"
+#include <GEOMGUI.h>
 
 //=================================================================================
 // class    : OperationGUI
 class OperationGUI : public GEOMGUI
 {
 public :
-  OperationGUI( GeometryGUI* parent );
+  OperationGUI( GeometryGUI* );
   ~OperationGUI();
 
-  bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent);
+  bool OnGUIEvent( int, SUIT_Desktop* );
 };
 
-#endif
+#endif // OPERATIONGUI_H
index 9102c527377835877a9203f44a41d5b2616dfe60..fdf1778e3e1ea4b340f01fa12eb3f5d029cf59cd 100644 (file)
@@ -1,40 +1,39 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : OperationGUI_ArchimedeDlg.cxx
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
 //
-//  File   : OperationGUI_ArchimedeDlg.cxx
-//  Author : Nicolas REJNERI 
-//  Module : GEOM
-//  $Header$
-
 #include "OperationGUI_ArchimedeDlg.h"
-#include "DlgRef_1Sel3Spin.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include <qlabel.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : OperationGUI_ArchimedeDlg()
 //            TRUE to construct a modal dialog.
 //=================================================================================
 OperationGUI_ArchimedeDlg::OperationGUI_ArchimedeDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
-  : GEOMBase_Skeleton(theGeometryGUI, parent, "ArchimedeDlg", false,
-                      WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+  : GEOMBase_Skeleton( theGeometryGUI, parent, false )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_ARCHIMEDE")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_ARCHIMEDE" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
   
-  setCaption(tr("GEOM_ARCHIMEDE_TITLE"));
+  setWindowTitle( tr( "GEOM_ARCHIMEDE_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_ARCHIMEDE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel3Spin(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS"));
-  GroupPoints->TextLabel2->setText(tr("GEOM_WEIGHT"));
-  GroupPoints->TextLabel3->setText(tr("GEOM_WATER_DENSITY"));
-  GroupPoints->TextLabel4->setText(tr("GEOM_MESHING_DEFLECTION"));
-  GroupPoints->PushButton1->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_ARCHIMEDE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_1Sel3Spin( centralWidget() );
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_OBJECTS" ) );
+  GroupPoints->TextLabel2->setText( tr( "GEOM_WEIGHT" ) );
+  GroupPoints->TextLabel3->setText( tr( "GEOM_WATER_DENSITY" ) );
+  GroupPoints->TextLabel4->setText( tr( "GEOM_MESHING_DEFLECTION" ) );
+  GroupPoints->PushButton1->setIcon( image1 );
   GroupPoints->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget(GroupPoints, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
+
   /***************************************************************/
 
-  setHelpFileName("archimede_page.html");
+  setHelpFileName( "archimede_page.html" );
 
   /* Initialisations */
   Init();
@@ -98,31 +101,29 @@ void OperationGUI_ArchimedeDlg::Init()
 
   /* Get setting of myStep value from file configuration */
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double myStep = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
+  double myStep = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100 );
 
   double SpecificStep1 = 0.1;
   double SpecificStep2 = 0.01;
   /* min, max, myStep and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, myStep, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox_DY->RangeStepAndValidator(0.001, COORD_MAX, SpecificStep1, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox_DZ->RangeStepAndValidator(0.001, COORD_MAX, SpecificStep2, DBL_DIGITS_DISPLAY);
+  initSpinBox( GroupPoints->SpinBox_DX, 0.001, COORD_MAX, myStep, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( GroupPoints->SpinBox_DY, 0.001, COORD_MAX, SpecificStep1, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( GroupPoints->SpinBox_DZ, 0.001, COORD_MAX, SpecificStep2, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
 
-  GroupPoints->SpinBox_DX->SetValue( 100.0 );
-  GroupPoints->SpinBox_DY->SetValue( 1.0 );
-  GroupPoints->SpinBox_DZ->SetValue( 0.01 );
+  GroupPoints->SpinBox_DX->setValue( 100.0 );
+  GroupPoints->SpinBox_DY->setValue( 1.0 );
+  GroupPoints->SpinBox_DZ->setValue( 0.01 );
 
   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPoints->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
-  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 ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
   
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-         this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
   
   initName( tr( "GEOM_ARCHIMEDE" ) );
   
@@ -132,6 +133,17 @@ void OperationGUI_ArchimedeDlg::Init()
 }
 
 
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void OperationGUI_ArchimedeDlg::SetDoubleSpinBoxStep( double step )
+{
+  GroupPoints->SpinBox_DX->setSingleStep(step);
+  GroupPoints->SpinBox_DY->setSingleStep(step);
+  GroupPoints->SpinBox_DZ->setSingleStep(step);
+}
+
 //=================================================================================
 // function : ClickOnOk()
 // purpose  :
@@ -156,32 +168,33 @@ bool OperationGUI_ArchimedeDlg::ClickOnApply()
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection as changed or other case
 //=================================================================================
 void OperationGUI_ArchimedeDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText( "" );
+  myEditCurrentArgument->setText("");
   myShape = GEOM::GEOM_Object::_nil();
-  
-  if ( IObjectCount() != 1 )
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1)
     return;
 
   Standard_Boolean testResult = Standard_False;
-  myShape = GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
+  myShape = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
-  if ( !testResult || myShape->_is_nil() || !GEOMBase::IsShape( myShape ) )
-  {
+  if (!testResult || myShape->_is_nil() || !GEOMBase::IsShape(myShape)) {
     myShape = GEOM::GEOM_Object::_nil();
     return;
   }
 
-  myEditCurrentArgument->setText( GEOMBase::GetName( myShape ) );
+  myEditCurrentArgument->setText(GEOMBase::GetName(myShape));
 }
 
-
 //=================================================================================
 // function : LineEditReturnPressed()
 // purpose  :
@@ -189,13 +202,12 @@ void OperationGUI_ArchimedeDlg::SelectionIntoArgument()
 void OperationGUI_ArchimedeDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1)
+  if ( send == GroupPoints->LineEdit1 )
     myEditCurrentArgument = GroupPoints->LineEdit1;
   else
     return;
 
   GEOMBase_Skeleton::LineEditReturnPressed();
-  return;
 }
 
 //=================================================================================
@@ -206,9 +218,8 @@ void OperationGUI_ArchimedeDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
   globalSelection( GEOM_ALLSHAPES );
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-  return;
+  connect( myGeomGUI->getApp()->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 }
 
 
@@ -216,12 +227,11 @@ void OperationGUI_ArchimedeDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void OperationGUI_ArchimedeDlg::enterEvent(QEvent* e)
+void OperationGUI_ArchimedeDlg::enterEvent( QEvent* )
 {
-  if(GroupConstructors->isEnabled())
+  if ( mainFrame()->GroupConstructors->isEnabled() )
     return;
   this->ActivateThisDialog();
-  return;
 }
 
 
@@ -238,9 +248,13 @@ GEOM::GEOM_IOperations_ptr OperationGUI_ArchimedeDlg::createOperation()
 // function : isValid
 // purpose  :
 //=================================================================================
-bool OperationGUI_ArchimedeDlg::isValid( QString& )
+bool OperationGUI_ArchimedeDlg::isValid( QString& msg )
 {
-  return !myShape->_is_nil();
+  bool ok = true;
+  ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+  ok = GroupPoints->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+  ok = GroupPoints->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok;
+  return !myShape->_is_nil() && ok;
 }
 
 //=================================================================================
@@ -251,15 +265,25 @@ bool OperationGUI_ArchimedeDlg::execute( ObjectList& objects )
 {
   GEOM::GEOM_Object_var anObj;
 
-  double aWeight         = GroupPoints->SpinBox_DX->GetValue();
-  double aWaterDensity   = GroupPoints->SpinBox_DY->GetValue();
-  double aMeshDeflection = GroupPoints->SpinBox_DZ->GetValue();
+  double aWeight         = GroupPoints->SpinBox_DX->value();
+  double aWaterDensity   = GroupPoints->SpinBox_DY->value();
+  double aMeshDeflection = GroupPoints->SpinBox_DZ->value();
   
   anObj = GEOM::GEOM_ILocalOperations::_narrow(
     getOperation() )->MakeArchimede( myShape, aWeight, aWaterDensity, aMeshDeflection );
 
   if ( !anObj->_is_nil() )
+  {
+    if ( !IsPreview() )
+    {
+      QStringList aParameters;
+      aParameters << GroupPoints->SpinBox_DX->text();
+      aParameters << GroupPoints->SpinBox_DY->text();
+      aParameters << GroupPoints->SpinBox_DZ->text();
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    }
     objects.push_back( anObj._retn() );
+  }
 
   return true;
 }
index f848d5e265c7d3ce0cdcab3b929b63845d02032b..640e06f77dd17dd70f39024cb62c4c44c868f85d 100644 (file)
@@ -1,34 +1,32 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : OperationGUI_ArchimedeDlg.h
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_ARCHIMEDE_H
-#define DIALOGBOX_ARCHIMEDE_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : OperationGUI_ArchimedeDlg.h
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
+//
+#ifndef OPERATIONGUI_ARCHIMEDEDLG_H
+#define OPERATIONGUI_ARCHIMEDEDLG_H
 
-#include "GEOMBase_Skeleton.h"
+#include <GEOMBase_Skeleton.h>
 
 class DlgRef_1Sel3Spin;
 
@@ -38,33 +36,34 @@ class DlgRef_1Sel3Spin;
 //=================================================================================
 class OperationGUI_ArchimedeDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    OperationGUI_ArchimedeDlg(GeometryGUI* theGeometryGUI, QWidget* parent);
-    ~OperationGUI_ArchimedeDlg();
-
+  OperationGUI_ArchimedeDlg( GeometryGUI* , QWidget* );
+  ~OperationGUI_ArchimedeDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr  createOperation();
-    virtual bool                        isValid( QString& msg );
-    virtual bool                        execute( ObjectList& objects );    
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr  createOperation();
+  virtual bool                        isValid( QString& );
+  virtual bool                        execute( ObjectList& );    
 
 private:
-    void                                Init();
-    void                                enterEvent(QEvent* e);
+  void                                Init();
+  void                                enterEvent( QEvent* );
 
 private:    
-    GEOM::GEOM_Object_var               myShape;
-    DlgRef_1Sel3Spin*                   GroupPoints;
-    double                              myStep;
+  GEOM::GEOM_Object_var               myShape;
+  DlgRef_1Sel3Spin*                   GroupPoints;
+  double                              myStep;
 
 private slots:
-    void                                ClickOnOk();
-    bool                                ClickOnApply();
-    void                                ActivateThisDialog();
-    void                                LineEditReturnPressed();
-    void                                SelectionIntoArgument();
+  void                                ClickOnOk();
+  bool                                ClickOnApply();
+  void                                ActivateThisDialog();
+  void                                LineEditReturnPressed();
+  void                                SelectionIntoArgument();
+  void                                SetDoubleSpinBoxStep( double );
 };
 
-#endif // DIALOGBOX_ARCHIMEDE_H
+#endif // OPERATIONGUI_ARCHIMEDEDLG_H
index e5914d23d5ff22145f12e11b142f0e2fa3b3773a..af89feddd4a931f2eaf9580910c50170708ef756 100644 (file)
@@ -1,8 +1,8 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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 along with this library; if 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
-//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : OperationGUI_ChamferDlg.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : OperationGUI_ChamferDlg.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "OperationGUI_ChamferDlg.h"
-#include "DlgRef_SpinBox.h"
-
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "OCCViewer_ViewModel.h"
-
+#include <QtxDoubleSpinBox.h>
+
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Desktop.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_ViewManager.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <OCCViewer_ViewModel.h>
+
+// OCCT Includes
 #include <TColStd_MapOfInteger.hxx>
 
-#include <qlabel.h>
-#include "qpixmap.h"
-#include <list>
-
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : OperationGUI_ChamferDlg()
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-OperationGUI_ChamferDlg::OperationGUI_ChamferDlg(GeometryGUI* theGeometryGUI, QWidget* parent)
-  : GEOMBase_Skeleton(theGeometryGUI, parent, "ChamferDlg", false,
-                      WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+OperationGUI_ChamferDlg::OperationGUI_ChamferDlg (GeometryGUI* theGeometryGUI, QWidget* parent)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, false),
+    myInitial(true)
 {
-  myConstructorId = -1;
+  SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+  QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_CHAMFER_ALL")));
+  QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_CHAMFER_EDGE_FROM_FACE")));
+  QPixmap image3 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_CHAMFER_FACE")));
+  QPixmap image4 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_CHAMFER_EDGE")));
 
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CHAMFER_ALL")));
-  QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CHAMFER_EDGE_FROM_FACE")));
-  QPixmap image3(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CHAMFER_FACE")));
-  QPixmap image4(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CHAMFER_EDGE")));
-  QPixmap iconSelect(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap iconSelect (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption( tr( "GEOM_CHAMFER_TITLE" ) );
+  setWindowTitle(tr("GEOM_CHAMFER_TITLE"));
 
-  GroupConstructors->setTitle( tr( "GEOM_CHAMFER" ) );
+  /***************************************************************/
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_CHAMFER"));
 
-  RadioButton1->setPixmap( image1 );
-  RadioButton2->setPixmap( image2 );
-  RadioButton3->setPixmap( image3 );
-  RadioButton4->show();
-  RadioButton4->setPixmap( image4 );
+  mainFrame()->RadioButton1->setIcon(image1);
+  mainFrame()->RadioButton2->setIcon(image2);
+  mainFrame()->RadioButton3->setIcon(image3);
+  mainFrame()->RadioButton4->show();
+  mainFrame()->RadioButton4->setIcon(image4);
 
   // Create first group
 
-  myGrp1 = new QGroupBox( 1, Qt::Horizontal, tr( "GEOM_CHAMFER_ALL" ), this );
+  myGrp1 = new QGroupBox(tr("GEOM_CHAMFER_ALL"), centralWidget());
 
-  QGroupBox* aSelGrp1 = new QGroupBox( 3, Qt::Horizontal, myGrp1 );
-  aSelGrp1->setFrameStyle( QFrame::NoFrame );
-  aSelGrp1->setInsideMargin( 0 );
+  QGridLayout* aLayout = new QGridLayout(myGrp1);
+  aLayout->setMargin(9); aLayout->setSpacing(6);
 
-  createSelWg( tr( "GEOM_MAIN_OBJECT" ), iconSelect, aSelGrp1, MainObj1 );
+  createSelWg(tr("GEOM_MAIN_OBJECT"), iconSelect, myGrp1, aLayout, MainObj1);
 
-  QGroupBox* aSpinGrp = new QGroupBox( 1, Qt::Vertical, myGrp1 );
-  aSpinGrp->setFrameStyle( QFrame::NoFrame );
-  aSpinGrp->setInsideMargin( 0 );
-  
-  new QLabel( tr( "D" ), aSpinGrp );
-  mySpinBox[ SpinBox1 ] = new DlgRef_SpinBox( aSpinGrp );
-
-  ( new QFrame( myGrp1 ) )->setSizePolicy(
-    QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
+  int row = aLayout->rowCount();
+  aLayout->addWidget(new QLabel(tr("D"), myGrp1), row, 0);
+  aLayout->addWidget((mySpinBox[ SpinBox1 ] = new SalomeApp_DoubleSpinBox(myGrp1)), row++, 2);
+  aLayout->setRowStretch(row, 10);
 
   // Create second group
 
-  myGrp2 = new QGroupBox( 1, Qt::Horizontal, tr( "GEOM_CHAMFER_EDGES" ), this );
-
-  QGroupBox* aSelGrp2 = new QGroupBox( 3, Qt::Horizontal, myGrp2 );
-  aSelGrp2->setFrameStyle( QFrame::NoFrame );
-  aSelGrp2->setInsideMargin( 0 );
-
-  createSelWg( tr( "GEOM_MAIN_OBJECT" ), iconSelect, aSelGrp2, MainObj2 );
-  createSelWg( tr( "FACE_1" ), iconSelect, aSelGrp2, Face1 );
-  createSelWg( tr( "FACE_2" ), iconSelect, aSelGrp2, Face2 );
-
-  QGroupBox* aSpinGrp1 = new QGroupBox( 1, Qt::Vertical, myGrp2 );
-  aSpinGrp1->setFrameStyle( QFrame::NoFrame );
-  aSpinGrp1->setInsideMargin( 0 );
-  
-  myRadioButton[ RadioButton21] = new QRadioButton( aSpinGrp1 );
-
-  new QLabel( tr( "GEOM_D1" ), aSpinGrp1 );
-  mySpinBox[ SpinBox21 ] = new DlgRef_SpinBox( aSpinGrp1 );
-
-  new QLabel( tr( "GEOM_D2" ), aSpinGrp1 );
-  mySpinBox[ SpinBox22 ] = new DlgRef_SpinBox( aSpinGrp1 );
-
-  QGroupBox* aSpinGrp2 = new QGroupBox( 1, Qt::Vertical, myGrp2 );
-  aSpinGrp2->setFrameStyle( QFrame::NoFrame );
-  aSpinGrp2->setInsideMargin( 0 );
+  myGrp2 = new QGroupBox(tr("GEOM_CHAMFER_EDGES"), centralWidget());
 
-  myRadioButton[ RadioButton22] = new QRadioButton( aSpinGrp2 );
+  aLayout = new QGridLayout(myGrp2);
+  aLayout->setMargin(9); aLayout->setSpacing(6);
 
-  new QLabel( tr( "GEOM_D" ), aSpinGrp2 );
-  mySpinBox[ SpinBox23 ] = new DlgRef_SpinBox( aSpinGrp2 );
+  createSelWg(tr("GEOM_MAIN_OBJECT"), iconSelect, myGrp2, aLayout, MainObj2);
+  createSelWg(tr("FACE_1"),           iconSelect, myGrp2, aLayout, Face1);
+  createSelWg(tr("FACE_2"),           iconSelect, myGrp2, aLayout, Face2);
 
-  new QLabel( tr( "GEOM_ANGLE" ), aSpinGrp2 );
-  mySpinBox[ SpinBox24 ] = new DlgRef_SpinBox( aSpinGrp2 );
+  createRadioWg(tr("GEOM_D1"), tr("GEOM_D2"),    myGrp2, aLayout, RadioButton21, SpinBox21, SpinBox22);
+  createRadioWg(tr("GEOM_D"),  tr("GEOM_ANGLE"), myGrp2, aLayout, RadioButton22, SpinBox23, SpinBox24);
 
- ( new QLabel( myGrp2 ) )->setSizePolicy(
-       QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
+  aLayout->setRowStretch(aLayout->rowCount(), 10);
 
   // Create third group
 
-  myGrp3 = new QGroupBox( 1, Qt::Horizontal, tr( "GEOM_CHAMFER_FACES" ), this );
+  myGrp3 = new QGroupBox(tr("GEOM_CHAMFER_FACES"), centralWidget());
 
-  QGroupBox* aSelGrp3 = new QGroupBox( 3, Qt::Horizontal, myGrp3 );
-  aSelGrp3->setFrameStyle( QFrame::NoFrame );
-  aSelGrp3->setInsideMargin( 0 );
+  aLayout = new QGridLayout(myGrp3);
+  aLayout->setMargin(9); aLayout->setSpacing(6);
 
-  createSelWg( tr( "GEOM_MAIN_OBJECT" ), iconSelect, aSelGrp3, MainObj3 );
-  createSelWg( tr( "SELECTED_FACES" ), iconSelect, aSelGrp3, Faces );
+  createSelWg(tr("GEOM_MAIN_OBJECT"), iconSelect, myGrp3, aLayout, MainObj3);
+  createSelWg(tr("SELECTED_FACES"),   iconSelect, myGrp3, aLayout, Faces);
 
-  aSpinGrp1 = new QGroupBox( 1, Qt::Vertical, myGrp3 );
-  aSpinGrp1->setFrameStyle( QFrame::NoFrame );
-  aSpinGrp1->setInsideMargin( 0 );
+  createRadioWg(tr("GEOM_D1"), tr("GEOM_D2"),    myGrp3, aLayout, RadioButton31, SpinBox31, SpinBox32);
+  createRadioWg(tr("GEOM_D"),  tr("GEOM_ANGLE"), myGrp3, aLayout, RadioButton32, SpinBox33, SpinBox34);
 
-  myRadioButton[ RadioButton31] = new QRadioButton( aSpinGrp1 );
-
-  new QLabel( tr( "GEOM_D1" ), aSpinGrp1 );
-  mySpinBox[ SpinBox31 ] = new DlgRef_SpinBox( aSpinGrp1 );
-
-  new QLabel( tr( "GEOM_D2" ), aSpinGrp1 );
-  mySpinBox[ SpinBox32 ] = new DlgRef_SpinBox( aSpinGrp1 );
-
-  aSpinGrp2 = new QGroupBox( 1, Qt::Vertical, myGrp3 );
-  aSpinGrp2->setFrameStyle( QFrame::NoFrame );
-  aSpinGrp2->setInsideMargin( 0 );
-
-  myRadioButton[ RadioButton32] = new QRadioButton( aSpinGrp2 );
-
-  new QLabel( tr( "GEOM_D" ), aSpinGrp2 );
-  mySpinBox[ SpinBox33 ] = new DlgRef_SpinBox( aSpinGrp2 );
-
-  new QLabel( tr( "GEOM_ANGLE" ), aSpinGrp2 );
-  mySpinBox[ SpinBox34 ] = new DlgRef_SpinBox( aSpinGrp2 );
-
-  ( new QLabel( myGrp3 ) )->setSizePolicy(
-       QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
+  aLayout->setRowStretch(aLayout->rowCount(), 10);
 
   // Create fourth group
 
-  myGrp4 = new QGroupBox( 1, Qt::Horizontal, tr( "GEOM_CHAMFER_EDGE" ), this );
-
-  QGroupBox* aSelGrp4 = new QGroupBox( 3, Qt::Horizontal, myGrp4 );
-  aSelGrp4->setFrameStyle( QFrame::NoFrame );
-  aSelGrp4->setInsideMargin( 0 );
-
-  createSelWg( tr( "GEOM_MAIN_OBJECT" ), iconSelect, aSelGrp4, MainObj4 );
-  createSelWg( tr( "SELECTED_EDGE" ), iconSelect, aSelGrp4, Edges );
-
-  aSpinGrp1 = new QGroupBox( 1, Qt::Vertical, myGrp4 );
-  aSpinGrp1->setFrameStyle( QFrame::NoFrame );
-  aSpinGrp1->setInsideMargin( 0 );
-
-  myRadioButton[ RadioButton41] = new QRadioButton( aSpinGrp1 );
-
-  new QLabel( tr( "GEOM_D1" ), aSpinGrp1 );
-  mySpinBox[ SpinBox41 ] = new DlgRef_SpinBox( aSpinGrp1 );
-
-  new QLabel( tr( "GEOM_D2" ), aSpinGrp1 );
-  mySpinBox[ SpinBox42 ] = new DlgRef_SpinBox( aSpinGrp1 );
-
-  aSpinGrp2 = new QGroupBox( 1, Qt::Vertical, myGrp4 );
-  aSpinGrp2->setFrameStyle( QFrame::NoFrame );
-  aSpinGrp2->setInsideMargin( 0 );
+  myGrp4 = new QGroupBox(tr("GEOM_CHAMFER_EDGE"), centralWidget());
 
-  myRadioButton[ RadioButton42] = new QRadioButton( aSpinGrp2 );
+  aLayout = new QGridLayout(myGrp4);
+  aLayout->setMargin(9); aLayout->setSpacing(6);
 
-  new QLabel( tr( "GEOM_D" ), aSpinGrp2 );
-  mySpinBox[ SpinBox43 ] = new DlgRef_SpinBox( aSpinGrp2 );
+  createSelWg(tr("GEOM_MAIN_OBJECT"), iconSelect, myGrp4, aLayout, MainObj4);
+  createSelWg(tr("SELECTED_EDGE"),    iconSelect, myGrp4, aLayout, Edges);
 
-  new QLabel( tr( "GEOM_ANGLE" ), aSpinGrp2 );
-  mySpinBox[ SpinBox44 ] = new DlgRef_SpinBox( aSpinGrp2 );
+  createRadioWg(tr("GEOM_D1"), tr("GEOM_D2"),    myGrp4, aLayout, RadioButton41, SpinBox41, SpinBox42);
+  createRadioWg(tr("GEOM_D"),  tr("GEOM_ANGLE"), myGrp4, aLayout, RadioButton42, SpinBox43, SpinBox44);
 
-  ( new QLabel( myGrp4 ) )->setSizePolicy(
-    QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
+  aLayout->setRowStretch(aLayout->rowCount(), 10);
 
   // Add groups to layout
 
-  Layout1->addWidget( myGrp1, 2, 0 );
-  Layout1->addWidget( myGrp2, 2, 0 );
-  Layout1->addWidget( myGrp3, 2, 0 );
-  Layout1->addWidget( myGrp4, 2, 0 );
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(myGrp1);
+  layout->addWidget(myGrp2);
+  layout->addWidget(myGrp3);
+  layout->addWidget(myGrp4);
+  /***************************************************************/
 
   // Set range of spinboxes
-  
   double SpecificStep = 10.0;
-  QMap< int, DlgRef_SpinBox* >::iterator anIter;
-  for ( anIter = mySpinBox.begin(); anIter != mySpinBox.end(); ++anIter )
-    {
-      anIter.data()->RangeStepAndValidator( 0.001, COORD_MAX, SpecificStep, 3 );
-      if ( anIter.key() == SpinBox44 || anIter.key() == SpinBox34 || anIter.key() == SpinBox24 )
-           anIter.data()->RangeStepAndValidator( 0.001, 89.999, 5, 0 );
-    }
+  QMap< int, SalomeApp_DoubleSpinBox* >::iterator anIter;
+  for (anIter = mySpinBox.begin(); anIter != mySpinBox.end(); ++anIter) {
+    if (anIter.key() == SpinBox44 || anIter.key() == SpinBox34 || anIter.key() == SpinBox24)
+      initSpinBox(anIter.value(), 0.001, 89.999, 5, 0);
+    else
+      initSpinBox(anIter.value(), 0.001, COORD_MAX, SpecificStep, 3);
+  }
 
   setHelpFileName("chamfer_operation_page.html");
 
-  /* Initialisations */
-  RadioButtonPressed();
+  // Initialisation
   Init();
+  myRadioButton[ RadioButton21 ]->click();
 }
 
-
 //=================================================================================
 // function : ~OperationGUI_ChamferDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -241,172 +169,197 @@ OperationGUI_ChamferDlg::~OperationGUI_ChamferDlg()
 {
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void OperationGUI_ChamferDlg::Init()
 {
-  myConstructorId = -1;
-  reset();
-  RadioButton1->setChecked( true );
-  myEditCurrentArgument = mySelName[ MainObj1 ];
+  // Set Initial values of spinboxes
+  QMap< int, SalomeApp_DoubleSpinBox* >::iterator anIter;
+  for (anIter = mySpinBox.begin(); anIter != mySpinBox.end(); ++anIter)
+    anIter.value()->setValue(5);
+
+  // Clear line edits
+  QMap< int, QLineEdit* >::iterator anIterLE;
+  for (anIterLE = mySelName.begin(); anIterLE != mySelName.end(); ++anIterLE)
+    anIterLE.value()->setText("");
+
+  myShape = GEOM::GEOM_Object::_nil();
+
+  myFaces.Clear();
+  myEdges.Clear();
+  myFace[ Face1 ] = -1;
+  myFace[ Face2 ] = -1;
 
-  /* signals and slots connections */
+  // signals and slots connections
 
   // main buttons
-  connect( buttonOk   , SIGNAL( clicked() ), this, SLOT( ClickOnOk()    ) );
-  connect( buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()   ));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
 
   // group box
-  connect( GroupConstructors, SIGNAL( clicked( int ) ),
-           this, SLOT( ConstructorsClicked( int ) ) );
+  connect(this,          SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
 
   // push buttons
   QMap< int, QPushButton* >::iterator anIterBtn;
-  for ( anIterBtn = mySelBtn.begin(); anIterBtn != mySelBtn.end(); ++anIterBtn )
-    connect( anIterBtn.data(), SIGNAL( clicked() ),
-             this, SLOT( SetEditCurrentArgument() ) );
+  for (anIterBtn = mySelBtn.begin(); anIterBtn != mySelBtn.end(); ++anIterBtn)
+    connect(anIterBtn.value(), SIGNAL(clicked()),
+            this, SLOT(SetEditCurrentArgument()));
 
   // line edits
   QMap< int, QLineEdit* >::iterator anIterLE2;
-  for ( anIterLE2 = mySelName.begin(); anIterLE2 != mySelName.end(); ++anIterLE2 )
-    connect( anIterLE2.data(), SIGNAL( returnPressed() ),
-             this, SLOT( LineEditReturnPressed() ) );
+  for (anIterLE2 = mySelName.begin(); anIterLE2 != mySelName.end(); ++anIterLE2)
+    connect(anIterLE2.value(), SIGNAL(returnPressed()),
+            this, SLOT(LineEditReturnPressed()));
 
   // spin boxes
-  QMap< int, DlgRef_SpinBox* >::iterator anIterSpin;
-  for ( anIterSpin = mySpinBox.begin(); anIterSpin != mySpinBox.end(); ++anIterSpin )
-    connect( anIterSpin.data(), SIGNAL( valueChanged( double ) ),
-             this, SLOT( ValueChangedInSpinBox( double ) ) );
+  QMap< int, SalomeApp_DoubleSpinBox* >::iterator anIterSpin;
+  for (anIterSpin = mySpinBox.begin(); anIterSpin != mySpinBox.end(); ++anIterSpin)
+    connect(anIterSpin.value(), SIGNAL(valueChanged(double)),
+            this, SLOT(ValueChangedInSpinBox(double)));
 
   // radio buttons
   QMap< int, QRadioButton* >::iterator anIterRadio;
-  for ( anIterRadio = myRadioButton.begin(); anIterRadio != myRadioButton.end(); ++anIterRadio )
-    connect( anIterRadio.data(), SIGNAL( clicked() ),
-            this, SLOT( RadioButtonPressed() ) );
+  for (anIterRadio = myRadioButton.begin(); anIterRadio != myRadioButton.end(); ++anIterRadio)
+    connect(anIterRadio.value(), SIGNAL(clicked()),
+            this, SLOT(RadioButtonPressed()));
 
-  // selection
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-          SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  initName(tr("GEOM_CHAMFER"));
 
-  initName( tr( "GEOM_CHAMFER" ) );
-
-  myGrp4->hide();
-  myGrp3->hide();
-  myGrp2->hide();
-  myGrp1->show();
+  myConstructorId = -1;
+  ConstructorsClicked(0);
 }
 
-
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void OperationGUI_ChamferDlg::ConstructorsClicked( int constructorId )
+void OperationGUI_ChamferDlg::ConstructorsClicked (int constructorId)
 {
    // Activate next widget
-  if (myGeomGUI->getApp()->desktop()->activeWindow()->getViewManager()->getType() 
-      != OCCViewer_Viewer::Type())
-  {
-    RadioButton1->setChecked( true );
+  if (myGeomGUI->getApp()->desktop()->activeWindow()->getViewManager()->getType()
+      != OCCViewer_Viewer::Type()) {
+    mainFrame()->RadioButton1->setChecked(true);
     return;
   }
 
   if (myConstructorId == constructorId)
     return;
 
+  //disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+
   // Get values from previous widget
-  double D1 = 5, D2 = 5, D = 5, Angle = 5;
-  if ( myConstructorId == 0 )
-    D1 = D2 = mySpinBox[ SpinBox1 ]->GetValue();
-  else if ( myConstructorId == 1 )
-  {
-    D1 = mySpinBox[ SpinBox21 ]->GetValue();
-    D2 = mySpinBox[ SpinBox22 ]->GetValue();
-    D =  mySpinBox[ SpinBox23 ]->GetValue();
-    Angle = mySpinBox[ SpinBox24 ]->GetValue();
+  QString D1 = "5", D2 = "5", D = "5", Angle = "5";
+  if (myConstructorId == 0)
+    D1 = D2 = mySpinBox[ SpinBox1 ]->text();
+  else if (myConstructorId == 1) {
+    D1 = mySpinBox[ SpinBox21 ]->text();
+    D2 = mySpinBox[ SpinBox22 ]->text();
+    D =  mySpinBox[ SpinBox23 ]->text();
+    Angle = mySpinBox[ SpinBox24 ]->text();
   }
-  else if ( myConstructorId == 2 )
-  {
-    D1 = mySpinBox[ SpinBox31 ]->GetValue();
-    D2 = mySpinBox[ SpinBox32 ]->GetValue();
-    D =  mySpinBox[ SpinBox33 ]->GetValue();
-    Angle = mySpinBox[ SpinBox34 ]->GetValue();
+  else if (myConstructorId == 2) {
+    D1 = mySpinBox[ SpinBox31 ]->text();
+    D2 = mySpinBox[ SpinBox32 ]->text();
+    D =  mySpinBox[ SpinBox33 ]->text();
+    Angle = mySpinBox[ SpinBox34 ]->text();
   }
-  else if ( myConstructorId == 3 )
-  {
-    D1 = mySpinBox[ SpinBox41 ]->GetValue();
-    D2 = mySpinBox[ SpinBox42 ]->GetValue();
-    D =  mySpinBox[ SpinBox43 ]->GetValue();
-    Angle = mySpinBox[ SpinBox44 ]->GetValue();
+  else if (myConstructorId == 3) {
+    D1 = mySpinBox[ SpinBox41 ]->text();
+    D2 = mySpinBox[ SpinBox42 ]->text();
+    D =  mySpinBox[ SpinBox43 ]->text();
+    Angle = mySpinBox[ SpinBox44 ]->text();
   }
 
   myConstructorId = constructorId;
 
-   switch ( constructorId )
-  {
-    case 0:
-        myGrp1->show();
-        myGrp2->hide();
-        myGrp3->hide();
-       myGrp4->hide();
-        mySpinBox[ SpinBox1 ]->SetValue( D1 );
+  switch (constructorId) {
+  case 0:
+    myGrp2->hide();
+    myGrp3->hide();
+    myGrp4->hide();
+    myGrp1->show();
+    mySpinBox[ SpinBox1 ]->setText(D1);
     break;
-    case 1:
-        myGrp1->hide();
-        myGrp2->show();
-        myGrp3->hide();
-       myGrp4->hide();
-        mySpinBox[ SpinBox21 ]->SetValue( D1 );
-        mySpinBox[ SpinBox22 ]->SetValue( D2 );
-        mySpinBox[ SpinBox23 ]->SetValue( D );
-        mySpinBox[ SpinBox24 ]->SetValue( Angle );
+  case 1:
+    myGrp1->hide();
+    myGrp3->hide();
+    myGrp4->hide();
+    myGrp2->show();
+    mySpinBox[ SpinBox21 ]->setText(D1);
+    mySpinBox[ SpinBox22 ]->setText(D2);
+    mySpinBox[ SpinBox23 ]->setText(D);
+    mySpinBox[ SpinBox24 ]->setText(Angle);
     break;
-    case 2:
-        myGrp1->hide();
-        myGrp2->hide();
-        myGrp3->show();
-       myGrp4->hide();
-        mySpinBox[ SpinBox31 ]->SetValue( D1 );
-        mySpinBox[ SpinBox32 ]->SetValue( D2 );
-        mySpinBox[ SpinBox33 ]->SetValue( D );
-        mySpinBox[ SpinBox34 ]->SetValue( Angle );
+  case 2:
+    myGrp1->hide();
+    myGrp2->hide();
+    myGrp4->hide();
+    myGrp3->show();
+    mySpinBox[ SpinBox31 ]->setText(D1);
+    mySpinBox[ SpinBox32 ]->setText(D2);
+    mySpinBox[ SpinBox32 ]->setText(D2);
+    mySpinBox[ SpinBox33 ]->setText(D);
+    mySpinBox[ SpinBox34 ]->setText(Angle);
     break;
-       case 3:
-        myGrp1->hide();
-        myGrp2->hide();
-        myGrp3->hide();
-       myGrp4->show();
-        mySpinBox[ SpinBox41 ]->SetValue( D1 );
-        mySpinBox[ SpinBox42 ]->SetValue( D2 );        
-        mySpinBox[ SpinBox43 ]->SetValue( D );
-        mySpinBox[ SpinBox44 ]->SetValue( Angle );
+  case 3:
+    myGrp1->hide();
+    myGrp2->hide();
+    myGrp3->hide();
+    myGrp4->show();
+    mySpinBox[ SpinBox41 ]->setText(D1);
+    mySpinBox[ SpinBox42 ]->setText(D2);
+    mySpinBox[ SpinBox43 ]->setText(D);
+    mySpinBox[ SpinBox44 ]->setText(Angle);
     break;
-    default:
+  default:
     break;
   }
 
-  if      ( constructorId == 0 ) myEditCurrentArgument = mySelName[ MainObj1 ];
-  else if ( constructorId == 1 ) myEditCurrentArgument = mySelName[ MainObj2 ];
-  else if ( constructorId == 2 ) myEditCurrentArgument = mySelName[ MainObj3 ];
-  else                           myEditCurrentArgument = mySelName[ MainObj4 ];
+  if      (constructorId == 0) mySelBtn[ MainObj1 ]->click();
+  else if (constructorId == 1) mySelBtn[ MainObj2 ]->click();
+  else if (constructorId == 2) mySelBtn[ MainObj3 ]->click();
+  else                         mySelBtn[ MainObj4 ]->click();
 
-  activateSelection(); 
   enableWidgets();
-  
-  if ( !myShape->_is_nil() )
-  {
-    myEditCurrentArgument->setText( GEOMBase::GetName( myShape ) );
-    GEOMBase_Skeleton::LineEditReturnPressed();
+
+  if (myInitial) {
+    myInitial = false;
+    SelectionIntoArgument();
   }
-  else
-    myEditCurrentArgument->setText( "" );
+  else {
+    if (!myShape->_is_nil()) {
+      myEditCurrentArgument->setText(GEOMBase::GetName(myShape));
+      GEOMBase_Skeleton::LineEditReturnPressed();
+      switch (getConstructorId()) {
+      case 1:
+        if (myFace[ Face1 ] == -1)
+          mySelBtn[ Face1 ]->click();
+        break;
+      case 2:
+        if (myFaces.Extent() == 0)
+          mySelBtn[ Faces ]->click();
+        break;
+      case 3:
+        if (myEdges.Extent() == 0)
+          mySelBtn[ Edges ]->click();
+        break;
+      default:
+        break;
+      }
+    }
+    else {
+      myEditCurrentArgument->setText("");
+    }
 
-  displayPreview();
-}
+    displayPreview();
+  }
 
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -414,7 +367,7 @@ void OperationGUI_ChamferDlg::ConstructorsClicked( int constructorId )
 //=================================================================================
 void OperationGUI_ChamferDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
@@ -424,194 +377,203 @@ void OperationGUI_ChamferDlg::ClickOnOk()
 //=================================================================================
 bool OperationGUI_ChamferDlg::ClickOnApply()
 {
-  if ( !onAccept() )
+  if (!onAccept())
     return false;
 
   initName();
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection has changed
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void OperationGUI_ChamferDlg::SelectionIntoArgument()
 {
   erasePreview();
-  myEditCurrentArgument->setText( "" );
+  myEditCurrentArgument->setText("");
 
   // Get index of current selection focus
   int aCurrFocus = -1;
   QMap< int, QLineEdit* >::iterator anIter;
-  for ( anIter = mySelName.begin(); anIter != mySelName.end(); ++anIter )
-    if ( myEditCurrentArgument == anIter.data() )
-    {
+  for (anIter = mySelName.begin(); anIter != mySelName.end(); ++anIter) {
+    if (myEditCurrentArgument == anIter.value()) {
       aCurrFocus = anIter.key();
       break;
     }
+  }
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
 
   // If selection of main object is activated
-  if ( aCurrFocus == MainObj1 || aCurrFocus == MainObj2 || aCurrFocus == MainObj3 || aCurrFocus == MainObj4)
+  if (aCurrFocus == MainObj1 || aCurrFocus == MainObj2 || aCurrFocus == MainObj3 || aCurrFocus == MainObj4)
   {
-    if ( IObjectCount() == 1 )
-    {
+    myShape = GEOM::GEOM_Object::_nil();
+    if (aSelList.Extent() == 1) {
       Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject( firstIObject(), aResult );
+        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
 
-      if ( aResult && !anObj->_is_nil() )
-      {
+      if (aResult && !anObj->_is_nil()) {
         myShape = anObj;
-        mySelName[ aCurrFocus ]->setText( GEOMBase::GetName( anObj ) );
+        myEditCurrentArgument->setText(GEOMBase::GetName(anObj));
         displayPreview();
-        enableWidgets();
-        return;
       }
     }
 
-    myShape = GEOM::GEOM_Object::_nil();
     enableWidgets();
   }
   // If face selection of second tab is activated
-  else if ( aCurrFocus == Face1 || aCurrFocus == Face2 )
+  else if (aCurrFocus == Face1 || aCurrFocus == Face2)
   {
-    if ( IObjectCount() == 1 )
-    {
+    myFace[ aCurrFocus ] = -1;
+    if (aSelList.Extent() == 1) {
       Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject( firstIObject(), aResult );
+        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
 
-      if ( aResult && !anObj->_is_nil() )
-      {
+      if (aResult && !anObj->_is_nil()) {
          TColStd_IndexedMapOfInteger anIndexes;
-        ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->GetIndexes( firstIObject(), anIndexes );
+         aSelMgr->GetIndexes(aSelList.First(), anIndexes);
 
-         if ( anIndexes.Extent() == 1 )
-         {
-            int anIndex = anIndexes( 1 );
-            QString aFaceName = QString( GEOMBase::GetName( anObj ) ) + ":%1";
-            myEditCurrentArgument->setText( aFaceName.arg( anIndex ) );
+         if (anIndexes.Extent() == 1) {
+            int anIndex = anIndexes(1);
+            QString aFaceName = QString(GEOMBase::GetName(anObj)) + ":%1";
+            myEditCurrentArgument->setText(aFaceName.arg(anIndex));
             myFace[ aCurrFocus ] = anIndex;
-           displayPreview();
-            return;
+            displayPreview();
          }
       }
     }
-
-    myFace[ aCurrFocus ] = -1;
   }
   // If face selection of third or fourth tab is activated
-  else if ( aCurrFocus == Faces  || aCurrFocus == Edges )
-  {
-    if ( IObjectCount() == 1 )
-    {
+  else if (aCurrFocus == Faces || aCurrFocus == Edges) {
+    if (aCurrFocus == Faces) myFaces.Clear();
+    else myEdges.Clear();
+    if (aSelList.Extent() == 1) {
       Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject( firstIObject(), aResult );
-
-      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 );
-          int aConstructorId = getConstructorId();
-          if ( aConstructorId == 2)
-            myFaces = anIndexes;
-          else if (aConstructorId == 3)
-            myEdges = anIndexes;
-            
-           displayPreview();
-           return;
-         }
+        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+
+      if (aResult && !anObj->_is_nil()) {
+        TColStd_IndexedMapOfInteger anIndexes;
+        aSelMgr->GetIndexes(aSelList.First(), 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);
+          int aConstructorId = getConstructorId();
+          if (aConstructorId == 2)
+            myFaces = anIndexes;
+          else if (aConstructorId == 3)
+            myEdges = anIndexes;
+
+          displayPreview();
+        }
       }
     }
-    myFaces.Clear();
-    myEdges.Clear();
   }
-}
 
+  // clear selection
+  if (aCurrFocus != Faces && aCurrFocus != Edges) {
+    disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+    myGeomGUI->getApp()->selectionMgr()->clearSelected();
+    connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+            this, SLOT(SelectionIntoArgument()));
+  }
 
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose  :
-//=================================================================================
-void OperationGUI_ChamferDlg::LineEditReturnPressed()
-{
-  QLineEdit* aSender = ( QLineEdit* )sender();
-
-  QMap< int, QLineEdit* >::iterator anIterLE;
-  for ( anIterLE = mySelName.begin(); anIterLE != mySelName.end(); ++anIterLE )
-    if ( anIterLE.data() == aSender )
-      myEditCurrentArgument = anIterLE.data();
-
-  GEOMBase_Skeleton::LineEditReturnPressed();
-}
-
-//=================================================================================
-// function : RadioButtonPressed()
-// purpose  :
-//=================================================================================
-void OperationGUI_ChamferDlg::RadioButtonPressed()
-{
-  bool flag;
-  flag = ( myRadioButton[ RadioButton21 ]->isChecked() &&
-          myRadioButton[ RadioButton31 ]->isChecked() &&
-          myRadioButton[ RadioButton41 ]->isChecked() );
-    
-  myRadioButton[ RadioButton21 ]->setChecked(!flag);
-  myRadioButton[ RadioButton31 ]->setChecked(!flag);
-  myRadioButton[ RadioButton41 ]->setChecked(!flag);
-  myRadioButton[ RadioButton22 ]->setChecked(flag);
-  myRadioButton[ RadioButton32 ]->setChecked(flag);
-  myRadioButton[ RadioButton42 ]->setChecked(flag);
-  mySpinBox[ SpinBox21 ]->setDisabled(flag);
-  mySpinBox[ SpinBox22 ]->setDisabled(flag); 
-  mySpinBox[ SpinBox31 ]->setDisabled(flag); 
-  mySpinBox[ SpinBox32 ]->setDisabled(flag); 
-  mySpinBox[ SpinBox41 ]->setDisabled(flag); 
-  mySpinBox[ SpinBox42 ]->setDisabled(flag);
-  mySpinBox[ SpinBox23 ]->setDisabled(!flag);
-  mySpinBox[ SpinBox24 ]->setDisabled(!flag); 
-  mySpinBox[ SpinBox33 ]->setDisabled(!flag); 
-  mySpinBox[ SpinBox34 ]->setDisabled(!flag); 
-  mySpinBox[ SpinBox43 ]->setDisabled(!flag); 
-  mySpinBox[ SpinBox44 ]->setDisabled(!flag);
-  displayPreview();
+  switch (getConstructorId()) {
+  case 1:
+    if (aCurrFocus == MainObj2) {
+      if (!myShape->_is_nil() && myFace[ Face1 ] == -1)
+        mySelBtn[ Face1 ]->click();
+    }
+    else if (aCurrFocus == Face1) {
+      if (myFace[ Face1 ] != -1 && myFace[ Face2 ] == -1)
+        mySelBtn[ Face2 ]->click();
+    }
+    else if (aCurrFocus == Face2) {
+      if (myFace[ Face2 ] != -1 && myShape->_is_nil())
+        mySelBtn[ MainObj2 ]->click();
+    }
+    break;
+  case 2:
+    if (aCurrFocus == MainObj3) {
+      if (!myShape->_is_nil() && myFaces.Extent() == 0)
+        mySelBtn[ Faces ]->click();
+    }
+    break;
+  case 3:
+    if (aCurrFocus == MainObj4) {
+      if (!myShape->_is_nil() && myEdges.Extent() == 0)
+        mySelBtn[ Edges ]->click();
+    }
+    break;
+  default:
+    break;
+  }
 }
 
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
 //=================================================================================
 void OperationGUI_ChamferDlg::SetEditCurrentArgument()
 {
QPushButton* aSender = ( QPushButton* )sender();
 QPushButton* send = (QPushButton*)sender();
 
   QMap< int, QPushButton* >::iterator anIter;
-  for ( anIter = mySelBtn.begin(); anIter != mySelBtn.end(); ++anIter )
-    if ( anIter.data() == aSender )
-    {
+  for (anIter = mySelBtn.begin(); anIter != mySelBtn.end(); ++anIter) {
+    if (anIter.value() == send) {
       mySelName[ anIter.key() ]->setFocus();
       myEditCurrentArgument = mySelName[ anIter.key() ];
     }
+    else {
+      anIter.value()->setDown(false);
+      mySelName[ anIter.key() ]->setEnabled(false);
+    }
+  }
+
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
+  myEditCurrentArgument->setFocus();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
 
   activateSelection();
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
 }
 
+//=================================================================================
+// function : LineEditReturnPressed()
+// purpose  :
+//=================================================================================
+void OperationGUI_ChamferDlg::LineEditReturnPressed()
+{
+  QLineEdit* send = (QLineEdit*)sender();
+
+  QMap< int, QLineEdit* >::iterator anIterLE;
+  for (anIterLE = mySelName.begin(); anIterLE != mySelName.end(); ++anIterLE)
+    if (anIterLE.value() == send)
+      myEditCurrentArgument = anIterLE.value();
+
+  GEOMBase_Skeleton::LineEditReturnPressed();
+}
 
 //=================================================================================
 // function : ActivateThisDialog()
@@ -620,97 +582,75 @@ void OperationGUI_ChamferDlg::SetEditCurrentArgument()
 void OperationGUI_ChamferDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  connect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-          SIGNAL(currentSelectionChanged()), this, SLOT( SelectionIntoArgument() ) );
-
-  activateSelection();
-  displayPreview();
+  ConstructorsClicked( getConstructorId() );
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void OperationGUI_ChamferDlg::enterEvent(QEvent* e)
+void OperationGUI_ChamferDlg::enterEvent (QEvent*)
 {
-  if ( !GroupConstructors->isEnabled() )
+  if (!mainFrame()->GroupConstructors->isEnabled())
     this->ActivateThisDialog();
 }
 
-
 //=================================================================================
 // function : ValueChangedInSpinBox()
 // purpose  :
 //=================================================================================
-void OperationGUI_ChamferDlg::ValueChangedInSpinBox( double newValue )
+void OperationGUI_ChamferDlg::ValueChangedInSpinBox (double)
 {
   displayPreview();
 }
 
-
 //=================================================================================
 // function : createSelWg()
 // purpose  :
 //=================================================================================
-void OperationGUI_ChamferDlg::createSelWgconst QString& theLbl,
+void OperationGUI_ChamferDlg::createSelWg (const QString& theLbl,
                                            QPixmap&       thePix,
                                            QWidget*       theParent,
-                                           const int      theId )
-{
-  new QLabel( theLbl, theParent );
-  mySelBtn[ theId ] = new QPushButton( theParent );
-  mySelBtn[ theId ]->setPixmap( thePix );
-  mySelName[ theId ] = new QLineEdit( theParent );
-  mySelName[ theId ]->setReadOnly( true );
-}
-
-//=================================================================================
-// function : reset()
-// purpose  :
-//=================================================================================
-void OperationGUI_ChamferDlg::reset()
+                                           QGridLayout*   theLayout,
+                                           const int      theId)
 {
- // Set Initial values of spinboxes
-  QMap< int, DlgRef_SpinBox* >::iterator anIter;
-  for ( anIter = mySpinBox.begin(); anIter != mySpinBox.end(); ++anIter )
-    anIter.data()->SetValue( 5 );
-
-  // clear line edits
-  QMap< int, QLineEdit* >::iterator anIterLE;
-  for ( anIterLE = mySelName.begin(); anIterLE != mySelName.end(); ++anIterLE )
-    anIterLE.data()->setText( "" );
-
-  // constructor id
-  int aConstructorId = getConstructorId();
-
-  if      ( aConstructorId == 0 ) myEditCurrentArgument = mySelName[ MainObj1 ];
-  else if ( aConstructorId == 1 ) myEditCurrentArgument = mySelName[ MainObj2 ];
-  else if ( aConstructorId == 2 ) myEditCurrentArgument = mySelName[ MainObj3 ];
-  else                            myEditCurrentArgument = mySelName[ MainObj4 ];
-
-  myShape = GEOM::GEOM_Object::_nil();
-
-  myFaces.Clear();
-  myEdges.Clear();
-  myFace[ Face1 ] = -1;
-  myFace[ Face2 ] = -1;
-
-  erasePreview( true );
-
-  activateSelection();
-
-  enableWidgets();
+  QLabel* lab = new QLabel(theLbl, theParent);
+  mySelBtn[ theId ] = new QPushButton(theParent);
+  mySelBtn[ theId ]->setIcon(thePix);
+  mySelName[ theId ] = new QLineEdit(theParent);
+  mySelName[ theId ]->setReadOnly(true);
+  int row = theLayout->rowCount();
+  theLayout->addWidget(lab,                row, 0);
+  theLayout->addWidget(mySelBtn[ theId ],  row, 1);
+  theLayout->addWidget(mySelName[ theId ], row, 2, 1, 4); // take into account createRadioWg()
 }
 
 //=================================================================================
-// function : getConstructorId()
+// function : createRadioWg()
 // purpose  :
 //=================================================================================
-int OperationGUI_ChamferDlg::getConstructorId() const
+void OperationGUI_ChamferDlg::createRadioWg(const QString& theLbl1,
+                                             const QString& theLbl2,
+                                             QWidget*       theParent,
+                                             QGridLayout*   theLayout,
+                                             const int      theRbId,
+                                             const int      theSpin1Id,
+                                             const int      theSpin2Id)
 {
-  return GroupConstructors->id( GroupConstructors->selected() );
+  myRadioButton[ theRbId ] = new QRadioButton(theParent);
+  QLabel* lab1 = new QLabel(theLbl1, theParent);
+  QLabel* lab2 = new QLabel(theLbl2, theParent);
+  mySpinBox[ theSpin1Id ]  = new SalomeApp_DoubleSpinBox(theParent);
+  mySpinBox[ theSpin2Id ]  = new SalomeApp_DoubleSpinBox(theParent);
+  int row = theLayout->rowCount();
+  theLayout->addWidget(myRadioButton[ theRbId ], row, 0);
+  theLayout->addWidget(lab1,                     row, 2);
+  theLayout->addWidget(mySpinBox[ theSpin1Id ],  row, 3);
+  theLayout->addWidget(lab2,                     row, 4);
+  theLayout->addWidget(mySpinBox[ theSpin2Id ],  row, 5);
 }
 
 //=================================================================================
@@ -719,23 +659,27 @@ int OperationGUI_ChamferDlg::getConstructorId() const
 //=================================================================================
 void OperationGUI_ChamferDlg::activateSelection()
 {
-  if (  !myShape->_is_nil() &&
-       ( myEditCurrentArgument == mySelName[ Face1 ] ||
-         myEditCurrentArgument == mySelName[ Face2 ] ||
-                myEditCurrentArgument == mySelName[ Faces ] ) )
-    localSelection( myShape, TopAbs_FACE );
-  else if (!myShape->_is_nil() && myEditCurrentArgument == mySelName[ Edges ] )
-    localSelection( myShape, TopAbs_EDGE );
-  else
-  {
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+
+  if (!myShape->_is_nil() &&
+      (myEditCurrentArgument == mySelName[ Face1 ] ||
+       myEditCurrentArgument == mySelName[ Face2 ] ||
+       myEditCurrentArgument == mySelName[ Faces ])) {
+    localSelection(myShape, TopAbs_FACE);
+  }
+  else if (!myShape->_is_nil() && myEditCurrentArgument == mySelName[ Edges ]) {
+    localSelection(myShape, TopAbs_EDGE);
+  }
+  else {
     TColStd_MapOfInteger aMap;
-    aMap.Add( GEOM_SHELL );
-    aMap.Add( GEOM_SOLID );
-    aMap.Add( GEOM_COMPOUND );
-    globalSelection( aMap );
+    aMap.Add(GEOM_SHELL);
+    aMap.Add(GEOM_SOLID);
+    aMap.Add(GEOM_COMPOUND);
+    globalSelection(aMap);
   }
 
-  SelectionIntoArgument();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 }
 
 //=================================================================================
@@ -747,40 +691,39 @@ void OperationGUI_ChamferDlg::enableWidgets()
   int anId = getConstructorId();
 
   bool toEnable = !myShape->_is_nil();
-  
-  if ( anId == 1 )
+
+  if (anId == 1)
   {
-    mySelName[ Face1 ]->setEnabled( toEnable );
-    mySelName[ Face2 ]->setEnabled( toEnable );
-    mySelBtn[ Face1 ]->setEnabled( toEnable );
-    mySelBtn[ Face2 ]->setEnabled( toEnable );
+    //mySelName[ Face1 ]->setEnabled(toEnable);
+    //mySelName[ Face2 ]->setEnabled(toEnable);
+    mySelBtn[ Face1 ]->setEnabled(toEnable);
+    mySelBtn[ Face2 ]->setEnabled(toEnable);
 
-    if ( !toEnable )
+    if (!toEnable)
     {
-      mySelName[ Face1 ]->setText( "" );
-      mySelName[ Face2 ]->setText( "" );
+      mySelName[ Face1 ]->setText("");
+      mySelName[ Face2 ]->setText("");
       myFace[ Face1 ] = -1;
       myFace[ Face2 ] = -1;
     }
   }
-  else if ( anId == 2 )
+  else if (anId == 2)
   {
-    mySelName[ Faces ]->setEnabled( toEnable );
-    if ( !toEnable )
-       {
-         mySelName[ Faces ]->setText( "" );
-         myFaces = -1;
-       }
+    //mySelName[ Faces ]->setEnabled(toEnable);
+    mySelBtn[ Faces ]->setEnabled(toEnable);
+    if (!toEnable) {
+      mySelName[ Faces ]->setText("");
+      myFaces.Clear();
+    }
   }
-  else if ( anId == 3 )
-  {
-    mySelName[ Edges ]->setEnabled( toEnable );
+  else if (anId == 3) {
+    //mySelName[ Edges ]->setEnabled(toEnable);
+    mySelBtn[ Edges ]->setEnabled(toEnable);
 
-    if ( !toEnable )
-       {
-         mySelName[ Edges ]->setText( "" );
-         myEdges = -1;
-       }
+    if (!toEnable) {
+      mySelName[ Edges ]->setText("");
+      myEdges.Clear();
+    }
   }
 }
 
@@ -790,20 +733,57 @@ void OperationGUI_ChamferDlg::enableWidgets()
 //=================================================================================
 GEOM::GEOM_IOperations_ptr OperationGUI_ChamferDlg::createOperation()
 {
-  return getGeomEngine()->GetILocalOperations( getStudyId() );
+  return getGeomEngine()->GetILocalOperations(getStudyId());
 }
+
 //=================================================================================
-// function : ClickOnApply()
+// function : isValid()
 // purpose  : Verify validity of input data
 //=================================================================================
-bool OperationGUI_ChamferDlg::isValid( QString& )
+bool OperationGUI_ChamferDlg::isValid (QString& msg)
 {
-  switch ( getConstructorId() )
+  bool ok = true;
+  switch (getConstructorId())
   {
-    case 0: return !myShape->_is_nil();
-    case 1: return !myShape->_is_nil() && myFace[ Face1 ] > 0 && myFace[ Face2 ] > 0;
-    case 2: return !myShape->_is_nil() && myFaces.Extent() > 0;
-    case 3: return !myShape->_is_nil() && myEdges.Extent() > 0;
+    case 0:
+      ok = mySpinBox[ SpinBox1 ]->isValid( msg, !IsPreview() );
+      return !myShape->_is_nil() && ok;
+    case 1:
+      if (myRadioButton[ RadioButton21 ]->isChecked())
+      {
+       ok = mySpinBox[ SpinBox21 ]->isValid( msg, !IsPreview() ) && ok;
+       ok = mySpinBox[ SpinBox22 ]->isValid( msg, !IsPreview() ) && ok;
+      }
+      else
+      {
+       ok = mySpinBox[ SpinBox23 ]->isValid( msg, !IsPreview() ) && ok;
+       ok = mySpinBox[ SpinBox24 ]->isValid( msg, !IsPreview() ) && ok;
+      }
+      return !myShape->_is_nil() && myFace[ Face1 ] > 0 && myFace[ Face2 ] > 0 && ok;
+    case 2:
+      if (myRadioButton[ RadioButton31 ]->isChecked())
+      {
+       ok = mySpinBox[ SpinBox31 ]->isValid( msg, !IsPreview() ) && ok;
+       ok = mySpinBox[ SpinBox32 ]->isValid( msg, !IsPreview() ) && ok;
+      }
+      else
+      {
+       ok = mySpinBox[ SpinBox33 ]->isValid( msg, !IsPreview() ) && ok;
+       ok = mySpinBox[ SpinBox34 ]->isValid( msg, !IsPreview() ) && ok;
+      }
+      return !myShape->_is_nil() && myFaces.Extent() > 0 && ok;
+    case 3:
+      if (myRadioButton[ RadioButton41 ]->isChecked())
+      {
+       ok = mySpinBox[ SpinBox41 ]->isValid( msg, !IsPreview() ) && ok;
+       ok = mySpinBox[ SpinBox42 ]->isValid( msg, !IsPreview() ) && ok;
+      }
+      else
+      {
+       ok = mySpinBox[ SpinBox43 ]->isValid( msg, !IsPreview() ) && ok;
+       ok = mySpinBox[ SpinBox44 ]->isValid( msg, !IsPreview() ) && ok;
+      }
+      return !myShape->_is_nil() && myEdges.Extent() > 0 && ok;
     default: return false;
   }
 }
@@ -812,72 +792,166 @@ bool OperationGUI_ChamferDlg::isValid( QString& )
 // function : execute
 // purpose  :
 //=================================================================================
-bool OperationGUI_ChamferDlg::execute( ObjectList& objects )
+bool OperationGUI_ChamferDlg::execute (ObjectList& objects)
 {
+  QStringList aParameters;
   GEOM::GEOM_Object_var anObj;
-  bool flag = ( myRadioButton[ RadioButton21 ]->isChecked() &&
-                myRadioButton[ RadioButton31 ]->isChecked() &&
-                myRadioButton[ RadioButton41 ]->isChecked() );
+  bool flag = (myRadioButton[ RadioButton21 ]->isChecked() &&
+               myRadioButton[ RadioButton31 ]->isChecked() &&
+               myRadioButton[ RadioButton41 ]->isChecked());
 
   int anId = getConstructorId();
-  if ( anId == 0 )
-    anObj = GEOM::GEOM_ILocalOperations::_narrow(
-      getOperation() )->MakeChamferAll( myShape,
-                                        mySpinBox[ SpinBox1 ]->GetValue() );
-  else if ( anId == 1 )
-    {
-      if ( flag )
-         anObj = GEOM::GEOM_ILocalOperations::_narrow(
-                 getOperation() )->MakeChamferEdge( myShape,
-                                                    mySpinBox[ SpinBox21 ]->GetValue(),
-                                                    mySpinBox[ SpinBox22 ]->GetValue(),
-                                                    myFace[ Face1 ],
-                                                    myFace[ Face2 ] );
-      else
-         anObj = GEOM::GEOM_ILocalOperations::_narrow(
-                 getOperation() )->MakeChamferEdgeAD( myShape,
-                                                      mySpinBox[ SpinBox23 ]->GetValue(),
-                                                      mySpinBox[ SpinBox24 ]->GetValue() * PI180,
-                                                      myFace[ Face1 ],
-                                                      myFace[ Face2 ]);
+  if (anId == 0) {
+    anObj = GEOM::GEOM_ILocalOperations::_narrow(getOperation())->
+      MakeChamferAll(myShape, mySpinBox[ SpinBox1 ]->value());
+    if (!anObj->_is_nil())
+      aParameters << mySpinBox[ SpinBox1 ]->text();
+  }
+  else if (anId == 1) {
+    if (flag) {
+      anObj = GEOM::GEOM_ILocalOperations::_narrow(getOperation())->
+        MakeChamferEdge(myShape,
+                        mySpinBox[ SpinBox21 ]->value(),
+                        mySpinBox[ SpinBox22 ]->value(),
+                        myFace[ Face1 ],
+                        myFace[ Face2 ]);
+      if (!anObj->_is_nil())
+      {
+       aParameters << mySpinBox[ SpinBox21 ]->text();
+       aParameters << mySpinBox[ SpinBox22 ]->text();
+      }
+    }
+    else {
+      anObj = GEOM::GEOM_ILocalOperations::_narrow(getOperation())->
+        MakeChamferEdgeAD(myShape,
+                          mySpinBox[ SpinBox23 ]->value(),
+                          mySpinBox[ SpinBox24 ]->value() * PI180,
+                          myFace[ Face1 ],
+                          myFace[ Face2 ]);
+      if (!anObj->_is_nil())
+      {
+       aParameters << mySpinBox[ SpinBox23 ]->text();
+       aParameters << mySpinBox[ SpinBox24 ]->text();
+      }
     }
-  else if ( anId == 2 )
+  }
+  else if (anId == 2)
   {
     GEOM::ListOfLong_var anArray = new GEOM::ListOfLong;
-    anArray->length( myFaces.Extent() );
-    for ( int i = 1, n = myFaces.Extent(); i <= n; i++ )
-      anArray[ i - 1 ] = myFaces( i );
-    if ( flag )
-    anObj = GEOM::GEOM_ILocalOperations::_narrow(
-      getOperation() )->MakeChamferFaces( myShape,
-                                          mySpinBox[ SpinBox31 ]->GetValue(),
-                                          mySpinBox[ SpinBox32 ]->GetValue(),
-                                          anArray );
-    else
-    anObj = GEOM::GEOM_ILocalOperations::_narrow(
-      getOperation() )->MakeChamferFacesAD( myShape,
-                                            mySpinBox[ SpinBox33 ]->GetValue(),
-                                            mySpinBox[ SpinBox34 ]->GetValue() * PI180,
-                                            anArray );
+    anArray->length(myFaces.Extent());
+
+    for (int i = 1, n = myFaces.Extent(); i <= n; i++)
+      anArray[ i - 1 ] = myFaces(i);
+
+    if (flag) {
+      anObj = GEOM::GEOM_ILocalOperations::_narrow(getOperation())->
+       MakeChamferFaces(myShape,
+                        mySpinBox[ SpinBox31 ]->value(),
+                        mySpinBox[ SpinBox32 ]->value(),
+                        anArray);
+      if (!anObj->_is_nil())
+      {
+       aParameters << mySpinBox[ SpinBox31 ]->text();
+       aParameters << mySpinBox[ SpinBox32 ]->text();
+      }
+    }
+    else {
+      anObj = GEOM::GEOM_ILocalOperations::_narrow(getOperation())->
+       MakeChamferFacesAD(myShape,
+                          mySpinBox[ SpinBox33 ]->value(),
+                          mySpinBox[ SpinBox34 ]->value() * PI180,
+                          anArray);
+      if (!anObj->_is_nil())
+      {
+       aParameters << mySpinBox[ SpinBox33 ]->text();
+       aParameters << mySpinBox[ SpinBox34 ]->text();
+      }
+    }
   }
-  else if ( anId == 3 )
-  {
+  else if (anId == 3) {
     GEOM::ListOfLong_var anArray = new GEOM::ListOfLong;
-    anArray->length( myEdges.Extent() );
-    for ( int i = 1, n = myEdges.Extent(); i <= n; i++ )
-      anArray[ i - 1 ] = myEdges( i );             
-    if ( flag )
-      anObj = GEOM::GEOM_ILocalOperations::_narrow(
-      getOperation() )->MakeChamferEdges( myShape, mySpinBox[ SpinBox41 ]->GetValue(),
-                                          mySpinBox[ SpinBox42 ]->GetValue(), anArray );
-    else
-      anObj = GEOM::GEOM_ILocalOperations::_narrow(
-      getOperation() )->MakeChamferEdgesAD( myShape, mySpinBox[ SpinBox43 ]->GetValue(),
-                                            mySpinBox[ SpinBox44 ]->GetValue() * PI180, anArray );
+    anArray->length(myEdges.Extent());
+    for (int i = 1, n = myEdges.Extent(); i <= n; i++)
+      anArray[ i - 1 ] = myEdges(i);
+    if (flag) {
+      anObj = GEOM::GEOM_ILocalOperations::_narrow(getOperation())->
+        MakeChamferEdges(myShape,
+                         mySpinBox[ SpinBox41 ]->value(),
+                         mySpinBox[ SpinBox42 ]->value(),
+                         anArray);
+      if (!anObj->_is_nil())
+      {
+       aParameters << mySpinBox[ SpinBox41 ]->text();
+       aParameters << mySpinBox[ SpinBox42 ]->text();
+      }
+    }
+    else {
+      anObj = GEOM::GEOM_ILocalOperations::_narrow(getOperation())->
+        MakeChamferEdgesAD(myShape,
+                           mySpinBox[ SpinBox43 ]->value(),
+                           mySpinBox[ SpinBox44 ]->value() * PI180,
+                           anArray);
+      if (!anObj->_is_nil())
+      {
+       aParameters << mySpinBox[ SpinBox43 ]->text();
+       aParameters << mySpinBox[ SpinBox44 ]->text();
+      }
+    }
   }
 
-  if ( !anObj->_is_nil() )
-    objects.push_back( anObj._retn() );
+  if (!anObj->_is_nil())
+  {
+    if (!IsPreview())
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    objects.push_back(anObj._retn());
+  }
 
   return true;
 }
+
+//=================================================================================
+// function : RadioButtonPressed()
+// purpose  :
+//=================================================================================
+void OperationGUI_ChamferDlg::RadioButtonPressed()
+{
+  const QObject* s = sender();
+  bool flag = s == myRadioButton[ RadioButton21 ] ||
+              s == myRadioButton[ RadioButton31 ] ||
+              s == myRadioButton[ RadioButton41 ];
+
+  myRadioButton[ RadioButton21 ]->blockSignals(true);
+  myRadioButton[ RadioButton22 ]->blockSignals(true);
+  myRadioButton[ RadioButton31 ]->blockSignals(true);
+  myRadioButton[ RadioButton32 ]->blockSignals(true);
+  myRadioButton[ RadioButton41 ]->blockSignals(true);
+  myRadioButton[ RadioButton42 ]->blockSignals(true);
+
+  myRadioButton[ RadioButton21 ]->setChecked(flag);
+  myRadioButton[ RadioButton31 ]->setChecked(flag);
+  myRadioButton[ RadioButton41 ]->setChecked(flag);
+  myRadioButton[ RadioButton22 ]->setChecked(!flag);
+  myRadioButton[ RadioButton32 ]->setChecked(!flag);
+  myRadioButton[ RadioButton42 ]->setChecked(!flag);
+  mySpinBox[ SpinBox21 ]->setEnabled(flag);
+  mySpinBox[ SpinBox22 ]->setEnabled(flag);
+  mySpinBox[ SpinBox31 ]->setEnabled(flag);
+  mySpinBox[ SpinBox32 ]->setEnabled(flag);
+  mySpinBox[ SpinBox41 ]->setEnabled(flag);
+  mySpinBox[ SpinBox42 ]->setEnabled(flag);
+  mySpinBox[ SpinBox23 ]->setEnabled(!flag);
+  mySpinBox[ SpinBox24 ]->setEnabled(!flag);
+  mySpinBox[ SpinBox33 ]->setEnabled(!flag);
+  mySpinBox[ SpinBox34 ]->setEnabled(!flag);
+  mySpinBox[ SpinBox43 ]->setEnabled(!flag);
+  mySpinBox[ SpinBox44 ]->setEnabled(!flag);
+
+  myRadioButton[ RadioButton21 ]->blockSignals(false);
+  myRadioButton[ RadioButton22 ]->blockSignals(false);
+  myRadioButton[ RadioButton31 ]->blockSignals(false);
+  myRadioButton[ RadioButton32 ]->blockSignals(false);
+  myRadioButton[ RadioButton41 ]->blockSignals(false);
+  myRadioButton[ RadioButton42 ]->blockSignals(false);
+
+  displayPreview();
+}
index 41669752a3b6aeac61bd3aa128bea355fcfc594c..dfbe25d922f48e2560074e527bac46d6df197903 100644 (file)
@@ -1,37 +1,43 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : OperationGUI_ChamferDlg.h
-//  Author : Damien COQUERET
-//  Module : GEOM
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : OperationGUI_ChamferDlg.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
+//
+#ifndef OPERATIONGUI_CHAMFERDLG_H
+#define OPERATIONGUI_CHAMFERDLG_H
 
-#ifndef DIALOGBOX_CHAMFER_H
-#define DIALOGBOX_CHAMFER_H
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
 #include <TColStd_IndexedMapOfInteger.hxx>
 
-class DlgRef_SpinBox;
+#include <QMap>
+
+class SalomeApp_DoubleSpinBox;
+class QGroupBox;
+class QPushButton;
+class QLineEdit;
+class QGridLayout;
+class QRadioButton;
 
 //=================================================================================
 // class    : OperationGUI_ChamferDlg
@@ -39,7 +45,7 @@ class DlgRef_SpinBox;
 //=================================================================================
 class OperationGUI_ChamferDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
   enum { MainObj1, MainObj2, Face1, Face2, MainObj3, Faces, MainObj4, Edges};
   enum { SpinBox1,
@@ -49,53 +55,58 @@ class OperationGUI_ChamferDlg : public GEOMBase_Skeleton
   enum { RadioButton21, RadioButton22,
          RadioButton31, RadioButton32,
          RadioButton41, RadioButton42 };
+
 public:
-  OperationGUI_ChamferDlg(GeometryGUI* theGeometryGUI, QWidget* parent);
+  OperationGUI_ChamferDlg( GeometryGUI*, QWidget* );
   virtual ~OperationGUI_ChamferDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual                             GEOM::GEOM_IOperations_ptr createOperation();
-    virtual                             bool isValid( QString& msg );
-    virtual                             bool execute( ObjectList& objects );    
+  // redefined from GEOMBase_Helper
+  virtual                             GEOM::GEOM_IOperations_ptr createOperation();
+  virtual                             bool isValid( QString& );
+  virtual                             bool execute( ObjectList& );    
 
 private slots:
-    void                                ClickOnOk();
-    bool                                ClickOnApply();
-    void                                ActivateThisDialog();
-    void                                LineEditReturnPressed();
-    void                                RadioButtonPressed();
-    void                                SelectionIntoArgument();
-    void                                SetEditCurrentArgument();
-    void                                ValueChangedInSpinBox( double newValue );
-    void                                ConstructorsClicked( int constructorId );
+  void                                ClickOnOk();
+  bool                                ClickOnApply();
+  void                                ActivateThisDialog();
+  void                                LineEditReturnPressed();
+  void                                RadioButtonPressed();
+  void                                SelectionIntoArgument();
+  void                                SetEditCurrentArgument();
+  void                                ValueChangedInSpinBox( double );
+  void                                ConstructorsClicked( int );
 
 private:
-    void                                Init();
-    void                                enterEvent( QEvent* e );
-    void                                reset();
-    void                                createSelWg( const QString&, QPixmap&, QWidget*, const int );
-    int                                 getConstructorId() const;
-    void                                activateSelection();
-    void                                enableWidgets();
-
+  void                                Init();
+  void                                enterEvent( QEvent* );
+  void                                createSelWg( const QString&, QPixmap&, QWidget*, 
+                                                  QGridLayout*, const int );
+  void                                createRadioWg( const QString&, const QString&, QWidget*, 
+                                                    QGridLayout*, const int, const int, const int );
+  void                                activateSelection();
+  void                                enableWidgets();
+  
 private:
-    int                                 myConstructorId;
-
-    GEOM::GEOM_Object_var               myShape; 
-    QMap< int, int >                    myFace;  // indexes of faces from second tab ( Face1,2 )
-    TColStd_IndexedMapOfInteger         myFaces; // indexes of faces from first tab ( Faces )
-    TColStd_IndexedMapOfInteger         myEdges; // indexes of edges from fourth tab (Edges)
-    
-    QFrame*                             myGrp1;
-    QFrame*                             myGrp2;
-    QFrame*                             myGrp3;
-    QFrame*                             myGrp4;
+  int                                 myConstructorId;
+  
+  GEOM::GEOM_Object_var               myShape; 
+  QMap< int, int >                    myFace;  // indexes of faces from second tab ( Face1,2 )
+  TColStd_IndexedMapOfInteger         myFaces; // indexes of faces from first tab ( Faces )
+  TColStd_IndexedMapOfInteger         myEdges; // indexes of edges from fourth tab (Edges)
 
-    QMap< int, QPushButton* >           mySelBtn;
-    QMap< int, QLineEdit* >             mySelName;
-    QMap< int, DlgRef_SpinBox* >        mySpinBox;
-    QMap< int, QRadioButton* >          myRadioButton;
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
+  
+  QGroupBox*                          myGrp1;
+  QGroupBox*                          myGrp2;
+  QGroupBox*                          myGrp3;
+  QGroupBox*                          myGrp4;
+  
+  QMap< int, QPushButton* >           mySelBtn;
+  QMap< int, QLineEdit* >             mySelName;
+  QMap< int, SalomeApp_DoubleSpinBox* > mySpinBox;
+  QMap< int, QRadioButton* >          myRadioButton;
 };
 
-#endif // DIALOGBOX_CHAMFER_H
+#endif // OPERATIONGUI_CHAMFERDLG_H
index 7f4d49762c09cd80dad1246a282abb93fa9e724f..b24298447ba6957013f283e4dfdba933e80436aa 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : OperationGUI_ClippingDlg.cxx
+// Author : Michael Zorin, Open CASCADE S.A.S. (mikhail.zorin@opencascade.com)
 //
-//  File   : OperationGUI_ClippingDlg.cxx
-//  Author : Michael Zorin
-//  Module : GEOM
-//  $Header$
-
 #include "OperationGUI_ClippingDlg.h"
-#include "DlgRef_SpinBox.h"
 
-#include "SUIT_Session.h"
-#include "SUIT_ViewWindow.h"
-#include "SVTK_ViewWindow.h"
-#include "SVTK_ViewModel.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+#include <QtxDoubleSpinBox.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ViewManager.h>
+#include <SVTK_ViewWindow.h>
+#include <SVTK_ViewModel.h>
 
-#include "OCCViewer_ViewWindow.h"
-#include "OCCViewer_ViewPort3d.h"
+#include <OCCViewer_ViewModel.h>
+#include <OCCViewer_ViewWindow.h>
+#include <OCCViewer_ViewPort3d.h>
 
-#include "utilities.h"
+#include <VTKViewer.h>
+
+// OCC Includes
 #include <V3d_View.hxx>
 #include <V3d.hxx>
 
-// QT Includes
-#include <qapplication.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qcombobox.h>
-
 // VTK Includes
-#include "VTKViewer.h"
 #include <vtkCamera.h>
 #include <vtkRenderer.h>
 
 //=================================================================================
 // class    : OperationGUI_ClippingDlg()
-// purpose  : 
+// purpose  :
 //=================================================================================
-OperationGUI_ClippingDlg::OperationGUI_ClippingDlg(GeometryGUI* theGeometryGUI, QWidget* parent)
-  : GEOMBase_Skeleton(theGeometryGUI, parent, "OperationGUI_ClippingDlg", false,
-                      WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+OperationGUI_ClippingDlg::OperationGUI_ClippingDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, false )
 {
-  setCaption( tr( "Change clipping range" ) );
+  setWindowTitle( tr( "Change clipping range" ) );
 
-  GroupConstructors->close();
-  GroupBoxName->close();
+  mainFrame()->GroupConstructors->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->GroupConstructors->close();
+  mainFrame()->GroupBoxName->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->GroupBoxName->close();
 
   /***************************************************************/
-  GroupArguments = new QGroupBox( this, "GroupArguments" );
-  GroupArguments->setColumnLayout(0, Qt::Vertical );
-  GroupArguments->layout()->setSpacing( 0 );
-  GroupArguments->layout()->setMargin( 0 );
-  QGridLayout* GroupArgumentsLayout = new QGridLayout( GroupArguments->layout() );
-  GroupArgumentsLayout->setAlignment( Qt::AlignTop );
+  GroupArguments = new QGroupBox( centralWidget() );
+  QGridLayout* GroupArgumentsLayout = new QGridLayout( GroupArguments );
   GroupArgumentsLayout->setSpacing( 6 );
-  GroupArgumentsLayout->setMargin( 11 );
+  GroupArgumentsLayout->setMargin( 9 );
 
   // Controls
-  TextLabelNear = new QLabel( GroupArguments, "TextLabelNear" );
-  TextLabelNear->setText( tr( "Near"  ) );
-  TextLabelNear->setFixedWidth(74);
+  TextLabelNear = new QLabel( tr( "Near" ), GroupArguments );
   GroupArgumentsLayout->addWidget( TextLabelNear, 0, 0 );
 
-  SpinBox_Near = new DlgRef_SpinBox( GroupArguments, "SpinBox_Near");
+  SpinBox_Near = new SalomeApp_DoubleSpinBox( COORD_MIN, COORD_MAX, 10.0, 3, 10, GroupArguments );
   GroupArgumentsLayout->addWidget( SpinBox_Near, 0, 1 );
 
-  TextLabelFar = new QLabel( GroupArguments, "TextLabelFar" );
-  TextLabelFar->setText( tr( "Far"  ) );
-  TextLabelFar->setFixedWidth(74);
+  TextLabelFar = new QLabel( tr( "Far" ), GroupArguments );
   GroupArgumentsLayout->addWidget( TextLabelFar, 0, 2 );
 
-  SpinBox_Far = new DlgRef_SpinBox( GroupArguments, "SpinBox_Far");
+  SpinBox_Far = new SalomeApp_DoubleSpinBox( COORD_MIN, COORD_MAX, 10.0, 3, 10, GroupArguments );
   GroupArgumentsLayout->addWidget( SpinBox_Far, 0, 3 );
 
-  resetButton  = new QPushButton( GroupArguments, "resetButton" );
-  resetButton->setText( tr( "Reset"  ) );
+  resetButton  = new QPushButton( tr( "Reset" ), GroupArguments );
   GroupArgumentsLayout->addWidget( resetButton, 0, 4 );
 
-  TypeCB = new QComboBox( GroupArguments, "TypeCB" );
-  TypeCB->insertItem(tr("OFF"));
-  TypeCB->insertItem(tr("BACK"));
-  TypeCB->insertItem(tr("FRONT"));
-  TypeCB->insertItem(tr("SLICE"));
-  GroupArgumentsLayout->addMultiCellWidget( TypeCB, 1, 1, 0, 4 );
-
-  Layout1->addWidget( GroupArguments, 2, 0 );
+  TypeCB = new QComboBox( GroupArguments );
+  TypeCB->addItem( tr( "OFF" ) );
+  TypeCB->addItem( tr( "BACK" ) );
+  TypeCB->addItem( tr( "FRONT" ) );
+  TypeCB->addItem( tr( "SLICE" ) );
+  GroupArgumentsLayout->addWidget( TypeCB, 1, 0, 1, 5 );
 
-  /* Initialisations */
-  SpinBox_Near->RangeStepAndValidator( COORD_MIN, COORD_MAX, 10.0, DBL_DIGITS_DISPLAY );
-  SpinBox_Far->RangeStepAndValidator( COORD_MIN, COORD_MAX, 10.0, DBL_DIGITS_DISPLAY );
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupArguments );
 
   /* signals and slots connections */
-  connect( buttonOk   , SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
-  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( resetButton,   SIGNAL( clicked() ), this, SLOT( onReset() ) ) ;
 
-  setHelpFileName("none.htm");
+  setHelpFileName( "none.htm" );
 
   Init();
 }
@@ -136,77 +123,74 @@ OperationGUI_ClippingDlg::~ OperationGUI_ClippingDlg()
 //=================================================================================
 void OperationGUI_ClippingDlg::Init()
 {
-  SUIT_ViewWindow* anActiveWindow =  SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
-  if (!anActiveWindow)
+  SUIT_ViewWindow* anActiveWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
+  if ( !anActiveWindow )
     return;
 
-  if ( anActiveWindow->getViewManager()->getType() == SVTK_Viewer::Type() )
-    {
-      SVTK_ViewWindow* aVTKFrame = dynamic_cast<SVTK_ViewWindow*>( anActiveWindow );
-      if( !aVTKFrame )
-       return;
+  if ( anActiveWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) {
+    SVTK_ViewWindow* aVTKFrame = dynamic_cast<SVTK_ViewWindow*>( anActiveWindow );
+    if ( !aVTKFrame )
+      return;
 
-      TextLabelNear->setText( tr( "Near"  ) );
-      TextLabelFar->setText( tr( "Far"  ) );
+    TextLabelNear->setText( tr( "Near" ) );
+    TextLabelFar->setText( tr( "Far" ) );
 
-      TypeCB->hide();
+    TypeCB->hide();
 
-      vtkRenderer* aRenderer = aVTKFrame->getRenderer();
-      if(!aRenderer) return;
+    vtkRenderer* aRenderer = aVTKFrame->getRenderer();
+    if ( !aRenderer ) return;
 
-      vtkCamera* anActiveCamera = aRenderer->GetActiveCamera();
-      if( anActiveCamera == NULL ){
-       MESSAGE("Trying to reset clipping range of non-existant camera");
-       return;
-      }
+    vtkCamera* anActiveCamera = aRenderer->GetActiveCamera();
+    if ( anActiveCamera == NULL ) {
+      return;
+    }
 
       // Find the plane equation for the camera view plane
-      double vn[3];
-      anActiveCamera->GetViewPlaneNormal(vn);
-      double  position[3];
-      anActiveCamera->GetPosition(position);
+    double vn[3];
+    anActiveCamera->GetViewPlaneNormal( vn );
+    double  position[3];
+    anActiveCamera->GetPosition( position );
 
-      vtkFloatingPointType bounds[6];
-      aRenderer->ComputeVisiblePropBounds(bounds);
+    vtkFloatingPointType bounds[6];
+    aRenderer->ComputeVisiblePropBounds( bounds );
 
-      double center[3];
-      center[0] = (bounds[0] + bounds[1])/2.0;
-      center[1] = (bounds[2] + bounds[3])/2.0;
-      center[2] = (bounds[4] + bounds[5])/2.0;
+    double center[3];
+    center[0] = ( bounds[0] + bounds[1] ) / 2.0;
+    center[1] = ( bounds[2] + bounds[3] ) / 2.0;
+    center[2] = ( bounds[4] + bounds[5] ) / 2.0;
 
-      double width = sqrt((bounds[1]-bounds[0])*(bounds[1]-bounds[0]) +
-                         (bounds[3]-bounds[2])*(bounds[3]-bounds[2]) +
-                         (bounds[5]-bounds[4])*(bounds[5]-bounds[4]));
+    double width = sqrt( ( bounds[1]-bounds[0] ) * ( bounds[1]-bounds[0] ) +
+                        ( bounds[3]-bounds[2] ) * ( bounds[3]-bounds[2] ) +
+                        ( bounds[5]-bounds[4] ) * ( bounds[5]-bounds[4] ) );
 
-      double distance = sqrt((position[0]-center[0])*(position[0]-center[0]) +
-                            (position[1]-center[1])*(position[1]-center[1]) +
-                            (position[2]-center[2])*(position[2]-center[2]));
+    double distance = sqrt( ( position[0]-center[0] ) * ( position[0]-center[0] ) +
+                           ( position[1]-center[1] ) * ( position[1]-center[1] ) +
+                           ( position[2]-center[2] ) * ( position[2]-center[2] ) );
 
-      vtkFloatingPointType 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]);
+    SpinBox_Near->setValue( range[0] );
+    SpinBox_Far->setValue( range[1] );
 
-      return;
-    }
-  else if ( anActiveWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() )
-    {
-      OCCViewer_ViewWindow* aOCCFrame = dynamic_cast<OCCViewer_ViewWindow*>( anActiveWindow );
+    return;
+  }
+  else if ( anActiveWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) {
+    OCCViewer_ViewWindow* aOCCFrame = dynamic_cast<OCCViewer_ViewWindow*>( anActiveWindow );
 
-      TextLabelNear->setText( tr( "Depth"  ) );
-      TextLabelFar->setText( tr( "Thickness"  ) );
+    TextLabelNear->setText( tr( "Depth" ) );
+    TextLabelFar->setText( tr( "Thickness" ) );
 
-      Handle(V3d_View) view3d = ((OCCViewer_ViewPort3d*)aOCCFrame->getViewPort())->getView();
+    Handle(V3d_View) view3d = ( (OCCViewer_ViewPort3d*)aOCCFrame->getViewPort() )->getView();
 
-      double depth, thickness;
-      int ztype= view3d->ZClipping(depth, thickness);
-      SpinBox_Near->SetValue(depth);
-      SpinBox_Far->SetValue(thickness);
-      TypeCB->setCurrentItem(ztype);
+    double depth, thickness;
+    int ztype = view3d->ZClipping( depth, thickness );
+    SpinBox_Near->setValue( depth );
+    SpinBox_Far->setValue( thickness );
+    TypeCB->setCurrentIndex( ztype );
 
-      //Handle(V3d_Plane) aPlane = new V3d_Plane( aOCCFrame->getViewer()->getViewer3d() ,0, 0, 1, -100);
-      //aPlane->Display(view3d);
-    }
+    //Handle(V3d_Plane) aPlane = new V3d_Plane( aOCCFrame->getViewer()->getViewer3d() ,0, 0, 1, -100);
+    //aPlane->Display(view3d);
+  }
 }
 
 
@@ -216,45 +200,42 @@ void OperationGUI_ClippingDlg::Init()
 //=================================================================================
 bool OperationGUI_ClippingDlg::ClickOnApply()
 {
-  SUIT_ViewWindow* anActiveWindow =  SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
-  if (!anActiveWindow)
+  SUIT_ViewWindow* anActiveWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
+  if ( !anActiveWindow )
     return false;
 
-  if ( anActiveWindow->getViewManager()->getType() == SVTK_Viewer::Type() )
-    {
-      SVTK_ViewWindow* aVTKFrame = dynamic_cast<SVTK_ViewWindow*>( anActiveWindow );
-      if( !aVTKFrame )
-       return false;
+  if ( anActiveWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) {
+    SVTK_ViewWindow* aVTKFrame = dynamic_cast<SVTK_ViewWindow*>( anActiveWindow );
+    if ( !aVTKFrame )
+      return false;
 
-      vtkRenderer* aRenderer = aVTKFrame->getRenderer();
-      if(!aRenderer) return false;
+    vtkRenderer* aRenderer = aVTKFrame->getRenderer();
+    if ( !aRenderer ) return false;
 
-      vtkCamera* anActiveCamera = aRenderer->GetActiveCamera();
-      if( anActiveCamera == NULL ){
-       MESSAGE("Trying to reset clipping range of non-existant camera");
-       return false;
-      }
+    vtkCamera* anActiveCamera = aRenderer->GetActiveCamera();
+    if ( anActiveCamera == NULL ) {
+      return false;
+    }
 
-      vtkFloatingPointType range[2] = { SpinBox_Near->GetValue(), SpinBox_Far->GetValue() };
-      if (range[0] < 0.0) range[0] = 0.0;
-      anActiveCamera->SetClippingRange( range );
+    vtkFloatingPointType range[2] = { SpinBox_Near->value(), SpinBox_Far->value() };
+    if ( range[0] < 0.0 ) range[0] = 0.0;
+    anActiveCamera->SetClippingRange( range );
 
-      return true;
-    }
-  else if ( anActiveWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() )
-    {
-      OCCViewer_ViewWindow* aOCCFrame = dynamic_cast<OCCViewer_ViewWindow*>( anActiveWindow );
+    return true;
+  }
+  else if ( anActiveWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) {
+    OCCViewer_ViewWindow* aOCCFrame = dynamic_cast<OCCViewer_ViewWindow*>( anActiveWindow );
 
-      Handle(V3d_View) view3d = ((OCCViewer_ViewPort3d*)aOCCFrame->getViewPort())->getView();
+    Handle(V3d_View) view3d = ( (OCCViewer_ViewPort3d*)aOCCFrame->getViewPort() )->getView();
 
-      double depth = SpinBox_Near->GetValue();
-      double thickness = SpinBox_Far->GetValue();
-      int aType = TypeCB->currentItem();
+    double depth = SpinBox_Near->value();
+    double thickness = SpinBox_Far->value();
+    int aType = TypeCB->currentIndex();
 
-      view3d->SetZClippingType(V3d_TypeOfZclipping(aType));
-      view3d->SetZClippingDepth(depth);
-      view3d->SetZClippingWidth(thickness);
-    }
+    view3d->SetZClippingType( V3d_TypeOfZclipping( aType ) );
+    view3d->SetZClippingDepth( depth );
+    view3d->SetZClippingWidth( thickness );
+  }
 
   return true;
 }
@@ -265,8 +246,8 @@ bool OperationGUI_ClippingDlg::ClickOnApply()
 //=================================================================================
 void OperationGUI_ClippingDlg::ClickOnOk()
 {
-  ClickOnApply();
-  ClickOnCancel();
+  if ( ClickOnApply() )
+    ClickOnCancel();
 }
 
 //=================================================================================
@@ -282,19 +263,9 @@ void OperationGUI_ClippingDlg::onActivate()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void OperationGUI_ClippingDlg::enterEvent(QEvent*)
-{
-  this->setEnabled(true);
-  return;
-}
-
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void OperationGUI_ClippingDlg::closeEvent( QCloseEvent* e )
+void OperationGUI_ClippingDlg::enterEvent( QEvent* )
 {
-  QDialog::closeEvent( e );
+  this->setEnabled( true );
 }
 
 //=================================================================================
@@ -305,70 +276,65 @@ void OperationGUI_ClippingDlg::onReset()
 {
   SUIT_ViewWindow* anActiveWindow =
     SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
-  if (!anActiveWindow)
+  if ( !anActiveWindow )
     return;
 
-  if ( anActiveWindow->getViewManager()->getType() == SVTK_Viewer::Type() )
-    {
-      SVTK_ViewWindow* aVTKFrame = dynamic_cast<SVTK_ViewWindow*>( anActiveWindow );
-      if( !aVTKFrame )
-       return;
+  if ( anActiveWindow->getViewManager()->getType() == SVTK_Viewer::Type() ) {
+    SVTK_ViewWindow* aVTKFrame = dynamic_cast<SVTK_ViewWindow*>( anActiveWindow );
+    if ( !aVTKFrame )
+      return;
 
-      vtkRenderer* aRenderer = aVTKFrame->getRenderer();
-      if(!aRenderer) return;
+    vtkRenderer* aRenderer = aVTKFrame->getRenderer();
+    if ( !aRenderer ) return;
 
-      vtkCamera* anActiveCamera = aRenderer->GetActiveCamera();
-      if( anActiveCamera == NULL ){
-       MESSAGE("Trying to reset clipping range of non-existant camera");
-       return;
-      }
+    vtkCamera* anActiveCamera = aRenderer->GetActiveCamera();
+    if ( anActiveCamera == NULL ) {
+      return;
+    }
 
       // Find the plane equation for the camera view plane
-      double vn[3];
-      anActiveCamera->GetViewPlaneNormal(vn);
-      double  position[3];
-      anActiveCamera->GetPosition(position);
-
-      vtkFloatingPointType bounds[6];
-      aRenderer->ComputeVisiblePropBounds(bounds);
+    double vn[3];
+    anActiveCamera->GetViewPlaneNormal( vn );
+    double  position[3];
+    anActiveCamera->GetPosition( position );
 
-      double center[3];
-      center[0] = (bounds[0] + bounds[1])/2.0;
-      center[1] = (bounds[2] + bounds[3])/2.0;
-      center[2] = (bounds[4] + bounds[5])/2.0;
+    vtkFloatingPointType bounds[6];
+    aRenderer->ComputeVisiblePropBounds( bounds );
 
-      double width = sqrt((bounds[1]-bounds[0])*(bounds[1]-bounds[0]) +
-                         (bounds[3]-bounds[2])*(bounds[3]-bounds[2]) +
-                         (bounds[5]-bounds[4])*(bounds[5]-bounds[4]));
+    double center[3];
+    center[0] = ( bounds[0] + bounds[1] ) / 2.0;
+    center[1] = ( bounds[2] + bounds[3] ) / 2.0;
+    center[2] = ( bounds[4] + bounds[5] ) / 2.0;
 
-      double distance = sqrt((position[0]-center[0])*(position[0]-center[0]) +
-                            (position[1]-center[1])*(position[1]-center[1]) +
-                            (position[2]-center[2])*(position[2]-center[2]));
+    double width = sqrt( ( bounds[1]-bounds[0] ) * ( bounds[1]-bounds[0] ) +
+                        ( bounds[3]-bounds[2] ) * ( bounds[3]-bounds[2] ) +
+                        ( bounds[5]-bounds[4] ) * ( bounds[5]-bounds[4] ) );
 
-      vtkFloatingPointType range[2] = {distance - width/2.0, distance + width/2.0};
+    double distance = sqrt( ( position[0]-center[0] ) * ( position[0]-center[0] ) +
+                           ( position[1]-center[1] ) * ( position[1]-center[1] ) +
+                           ( position[2]-center[2] ) * ( position[2]-center[2] ) );
 
-      SpinBox_Near->SetValue(range[0]);
-      SpinBox_Far->SetValue(range[1]);
+    vtkFloatingPointType range[2] = { distance - width/2.0, distance + width/2.0 };
 
-      return;
-    }
-  else if ( anActiveWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() )
-    {
-      OCCViewer_ViewWindow* aOCCFrame = dynamic_cast<OCCViewer_ViewWindow*>( anActiveWindow );
-
-      TextLabelNear->setText( tr( "Depth"  ) );
-      TextLabelFar->setText( tr( "Thickness"  ) );
-
-      Handle(V3d_View) view3d = ((OCCViewer_ViewPort3d*)aOCCFrame->getViewPort())->getView();
-
-      view3d->SetZClippingType(V3d_TypeOfZclipping(0));
-      view3d->ZFitAll();
-      double depth, thickness;
-      int ztype= view3d->ZClipping(depth, thickness);
-      SpinBox_Near->SetValue(0);
-      SpinBox_Far->SetValue(1000);
-      TypeCB->setCurrentItem(ztype);
-    }
+    SpinBox_Near->setValue( range[0] );
+    SpinBox_Far->setValue( range[1] );
 
-  return;
+    return;
+  }
+  else if ( anActiveWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() ) {
+    OCCViewer_ViewWindow* aOCCFrame = dynamic_cast<OCCViewer_ViewWindow*>( anActiveWindow );
+
+    TextLabelNear->setText( tr( "Depth"  ) );
+    TextLabelFar->setText( tr( "Thickness"  ) );
+
+    Handle(V3d_View) view3d = ( (OCCViewer_ViewPort3d*)aOCCFrame->getViewPort() )->getView();
+
+    view3d->SetZClippingType( V3d_TypeOfZclipping( 0 ) );
+    view3d->ZFitAll();
+    double depth, thickness;
+    int ztype= view3d->ZClipping( depth, thickness );
+    SpinBox_Near->setValue( 0 );
+    SpinBox_Far->setValue( 1000 );
+    TypeCB->setCurrentIndex( ztype );
+  }
 }
index 31215cfa6f330328e5f67770cb5903fd9a10d7d9..1e6cba6c6a76c48db3fe7cd4540c36c16f4f8948 100644 (file)
@@ -1,40 +1,38 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : OperationGUI_ClippingDlg.h
-//  Author : Michael Zorin
-//  Module : GEOM
-
-#ifndef DIALOGBOX_CLIPPINGRANGE_H
-#define DIALOGBOX_CLIPPING_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : OperationGUI_ClippingDlg.h
+// Author : Michael Zorin, Open CASCADE S.A.S. (mikhail.zorin@opencascade.com)
+//
+#ifndef OPERATIONGUI_CLIPPINGDLG_H
+#define OPERATIONGUI_CLIPPINGDLG_H
 
-#include "GEOMBase_Skeleton.h"
+#include <GEOMBase_Skeleton.h>
 
 class QGroupBox;
 class QLabel;
 class QPushButton;
 class QComboBox;
-class DlgRef_SpinBox;
+class SalomeApp_DoubleSpinBox;
 
 enum ViewerTypes { VTK, OCC, OTHER };
 
@@ -44,33 +42,33 @@ enum ViewerTypes { VTK, OCC, OTHER };
 //=================================================================================
 class OperationGUI_ClippingDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    OperationGUI_ClippingDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0);
-    ~OperationGUI_ClippingDlg();
-
+  OperationGUI_ClippingDlg( GeometryGUI*, QWidget* = 0 );
+  ~OperationGUI_ClippingDlg();
+  
 private:
-    void Init();
-
-    ViewerTypes myViewerType;
-
-    virtual void closeEvent( QCloseEvent* e );
-    void enterEvent(QEvent* e);
-
-    QGroupBox* GroupArguments;
-    QLabel* TextLabelNear;
-    DlgRef_SpinBox* SpinBox_Near;
-    QLabel* TextLabelFar;
-    DlgRef_SpinBox* SpinBox_Far;
-    QPushButton* resetButton;
-    QComboBox* TypeCB;
+  void              Init();
+  
+  void              enterEvent( QEvent* );
+  
+private:
+  ViewerTypes       myViewerType;
+  
+  QGroupBox*        GroupArguments;
+  QLabel*           TextLabelNear;
+  SalomeApp_DoubleSpinBox* SpinBox_Near;
+  QLabel*           TextLabelFar;
+  SalomeApp_DoubleSpinBox* SpinBox_Far;
+  QPushButton*      resetButton;
+  QComboBox*        TypeCB;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void onActivate();
-    void onReset();
+  void              ClickOnOk();
+  bool              ClickOnApply();
+  void              onActivate();
+  void              onReset();
 };
 
-#endif // DIALOGBOX_CLIPPINGRANGE_H
+#endif // OPERATIONGUI_CLIPPINGDLG_H
diff --git a/src/OperationGUI/OperationGUI_Fillet2dDlg.cxx b/src/OperationGUI/OperationGUI_Fillet2dDlg.cxx
new file mode 100755 (executable)
index 0000000..b33cfc3
--- /dev/null
@@ -0,0 +1,400 @@
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File   : OperationGUI_Fillet2dDlg.cxx
+// Author : DMV, OCN.
+//
+
+#include "OperationGUI_Fillet2dDlg.h"
+
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Desktop.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_ViewManager.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <OCCViewer_ViewModel.h>
+
+// OCCT Includes
+#include <TColStd_MapOfInteger.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+
+#include <GEOMImpl_Types.hxx>
+
+//=================================================================================
+// class    : OperationGUI_Fillet2dDlg()
+// purpose  : Constructs a OperationGUI_Fillet2dDlg which is 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.
+//=================================================================================
+OperationGUI_Fillet2dDlg::OperationGUI_Fillet2dDlg (GeometryGUI* theGeometryGUI, QWidget* parent)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, false)
+{
+  SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr();
+  QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_FILLET_2D")));
+  QPixmap iconSelect (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
+
+  setWindowTitle(tr("GEOM_FILLET_2D_TITLE"));
+
+  /***************************************************************/
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_FILLET_2D"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->close();
+
+  GroupVertexes = new DlgRef_2Sel1Spin(centralWidget());
+  GroupVertexes->GroupBox1->setTitle(tr("GEOM_FILLET_2D"));
+  GroupVertexes->TextLabel1->setText(tr("GEOM_PLANAR_FACE"));
+  GroupVertexes->TextLabel2->setText(tr("GEOM_VERTEXES"));
+  GroupVertexes->TextLabel3->setText(tr("GEOM_RADIUS"));
+  GroupVertexes->PushButton1->setIcon(iconSelect);
+  GroupVertexes->PushButton2->setIcon(iconSelect);
+  GroupVertexes->LineEdit1->setReadOnly(true);
+  GroupVertexes->LineEdit2->setReadOnly(true);
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupVertexes);
+
+  /***************************************************************/
+
+  // Set range of spinboxes
+  double SpecificStep = 10.0;
+  initSpinBox(GroupVertexes->SpinBox_DX, 0.00001, COORD_MAX, SpecificStep, 5); // VSR: TODO: DBL_DIGITS_DISPLAY
+
+  setHelpFileName("fillet2d_operation_page.html");
+
+  // Initialisation
+  Init();
+  resize(0,0);
+}
+
+//=================================================================================
+// function : ~OperationGUI_Fillet2dDlg()
+// purpose  : Destroys the object and frees any allocated resources
+//=================================================================================
+OperationGUI_Fillet2dDlg::~OperationGUI_Fillet2dDlg()
+{
+}
+
+//=================================================================================
+// function : Init()
+// purpose  :
+//=================================================================================
+void OperationGUI_Fillet2dDlg::Init()
+{
+  // Set Initial values of spinboxes
+  GroupVertexes->SpinBox_DX->setValue(5);
+
+  // Clear line edits
+  GroupVertexes->LineEdit1->setText("");
+  GroupVertexes->LineEdit2->setText("");
+
+  myShape = GEOM::GEOM_Object::_nil();
+
+  myVertexes.Clear();
+
+  // signals and slots connections
+
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()   ));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  //  connect(this,          SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
+
+  connect(GroupVertexes->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupVertexes->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+
+  connect(GroupVertexes->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupVertexes->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+
+  connect(GroupVertexes->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+
+  initName(tr("GEOM_FILLET_2D"));
+  GroupVertexes->PushButton1->click();
+}
+
+//=================================================================================
+// function : ClickOnOk()
+// purpose  :
+//=================================================================================
+void OperationGUI_Fillet2dDlg::ClickOnOk()
+{
+  if (ClickOnApply())
+    ClickOnCancel();
+}
+
+//=================================================================================
+// function : ClickOnApply()
+// purpose  :
+//=================================================================================
+bool OperationGUI_Fillet2dDlg::ClickOnApply()
+{
+  if (!onAccept())
+    return false;
+
+  initName();
+  // Reset dialog state
+  GroupVertexes->LineEdit1->setText("");
+  GroupVertexes->LineEdit2->setText("");
+  myShape = GEOM::GEOM_Object::_nil();
+  myVertexes.Clear();
+  GroupVertexes->PushButton1->click();
+
+  return true;
+}
+
+//=================================================================================
+// function : SelectionIntoArgument()
+// purpose  : Called when selection is changed or on dialog initialization or activation
+//=================================================================================
+void OperationGUI_Fillet2dDlg::SelectionIntoArgument()
+{
+  erasePreview();
+  myEditCurrentArgument->setText("");
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  // If selection of main object is activated
+  if (myEditCurrentArgument == GroupVertexes->LineEdit1) {
+    myShape = GEOM::GEOM_Object::_nil();
+    if (aSelList.Extent() == 1) {
+      Standard_Boolean aResult = Standard_False;
+      GEOM::GEOM_Object_var anObj =
+        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+      
+      if (aResult && !anObj->_is_nil()) {
+       QString aName = GEOMBase::GetName( anObj );
+       TopoDS_Shape aShape;
+       if ( GEOMBase::GetShape( anObj, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) {
+         TColStd_IndexedMapOfInteger aMap;
+         aSelMgr->GetIndexes(aSelList.First(), aMap);
+         if ( aMap.Extent() == 1 ) { // Local Selection
+           int anIndex = aMap( 1 );
+           aName += QString( ":face_%1" ).arg( anIndex );
+   
+           //Find SubShape Object in Father
+           GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather( anObj, aName );
+           
+           if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
+             GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
+             anObj = aShapesOp->GetSubShape( anObj, anIndex );
+           }
+           else
+             anObj = aFindedObject; // get Object from study
+         }
+         else { // Global Selection
+           if ( aShape.ShapeType() != TopAbs_FACE ) {
+             anObj = GEOM::GEOM_Object::_nil();
+             aName = "";
+           }
+         }
+       }
+       myShape = anObj;
+       myEditCurrentArgument->setText(aName
+);
+       displayPreview();
+      }
+    }
+  } else if (myEditCurrentArgument == GroupVertexes->LineEdit2) {
+    myVertexes.Clear();
+    if (aSelList.Extent() == 1) {
+      Standard_Boolean aResult = Standard_False;
+      GEOM::GEOM_Object_var anObj =
+        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+
+      if (aResult && !anObj->_is_nil()) {
+        TColStd_IndexedMapOfInteger anIndexes;
+        aSelMgr->GetIndexes(aSelList.First(), anIndexes);
+
+        if (anIndexes.Extent() > 0) {
+          QString aName;
+          if (anIndexes.Extent() == 1) {
+            int anIndex = anIndexes(1);
+            aName = QString(GEOMBase::GetName(anObj)) + QString(":vertex_%1").arg(anIndex);
+          }
+          else
+            aName = tr("GEOM_MEN_POPUP_NAME").arg(anIndexes.Extent());
+
+          myEditCurrentArgument->setText(aName);
+         myVertexes = anIndexes;
+          displayPreview();
+        }
+      }
+    }
+  }
+
+  if (myEditCurrentArgument == GroupVertexes->LineEdit1) {
+    if (!myShape->_is_nil() && myVertexes.Extent() == 0)
+      GroupVertexes->PushButton2->click();
+  }
+}
+
+//=================================================================================
+// function : SetEditCurrentArgument()
+// purpose  :
+//=================================================================================
+void OperationGUI_Fillet2dDlg::SetEditCurrentArgument()
+{
+  QPushButton* send = (QPushButton*)sender();
+
+  if (send == GroupVertexes->PushButton1) {
+    myEditCurrentArgument = GroupVertexes->LineEdit1;
+    GroupVertexes->PushButton2->setDown(false);
+    GroupVertexes->LineEdit2->setEnabled(false);
+  }
+  else if (send == GroupVertexes->PushButton2) {
+    myEditCurrentArgument = GroupVertexes->LineEdit2;
+    GroupVertexes->PushButton1->setDown(false);
+    GroupVertexes->LineEdit1->setEnabled(false);
+  }
+
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
+  myEditCurrentArgument->setFocus();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
+  activateSelection();
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
+}
+
+//=================================================================================
+// function : LineEditReturnPressed()
+// purpose  :
+//=================================================================================
+void OperationGUI_Fillet2dDlg::LineEditReturnPressed()
+{
+  QLineEdit* send = (QLineEdit*)sender();
+
+  if (send == GroupVertexes->LineEdit1)
+    myEditCurrentArgument = GroupVertexes->LineEdit1;
+  else if (send == GroupVertexes->LineEdit2)
+    myEditCurrentArgument = GroupVertexes->LineEdit2;
+  else
+    return;
+
+  GEOMBase_Skeleton::LineEditReturnPressed();
+}
+
+//=================================================================================
+// function : ActivateThisDialog()
+// purpose  :
+//=================================================================================
+void OperationGUI_Fillet2dDlg::ActivateThisDialog()
+{
+  GEOMBase_Skeleton::ActivateThisDialog();
+}
+
+//=================================================================================
+// function : enterEvent()
+// purpose  :
+//=================================================================================
+void OperationGUI_Fillet2dDlg::enterEvent (QEvent*)
+{
+  if (!mainFrame()->GroupConstructors->isEnabled())
+    this->ActivateThisDialog();
+}
+
+//=================================================================================
+// function : ValueChangedInSpinBox()
+// purpose  :
+//=================================================================================
+void OperationGUI_Fillet2dDlg::ValueChangedInSpinBox (double)
+{
+  displayPreview();
+}
+
+//=================================================================================
+// function : activateSelection
+// purpose  : Activate selection in accordance with myEditCurrentArgument
+//=================================================================================
+void OperationGUI_Fillet2dDlg::activateSelection()
+{
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  globalSelection();
+  if (myEditCurrentArgument == GroupVertexes->LineEdit1)
+    globalSelection( GEOM_FACE );  //    localSelection(myShape, TopAbs_FACE);
+  else if (!myShape->_is_nil() && myEditCurrentArgument == GroupVertexes->LineEdit2)
+    localSelection(myShape, TopAbs_VERTEX);
+
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+}
+
+//=================================================================================
+// function : createOperation
+// purpose  :
+//=================================================================================
+GEOM::GEOM_IOperations_ptr OperationGUI_Fillet2dDlg::createOperation()
+{
+  return getGeomEngine()->GetILocalOperations(getStudyId());
+}
+
+//=================================================================================
+// function : isValid()
+// purpose  : Verify validity of input data
+//=================================================================================
+bool OperationGUI_Fillet2dDlg::isValid (QString&)
+{
+  return !myShape->_is_nil() && myVertexes.Extent() > 0;
+}
+
+//=================================================================================
+// function : execute
+// purpose  :
+//=================================================================================
+bool OperationGUI_Fillet2dDlg::execute (ObjectList& objects)
+{
+  GEOM::GEOM_Object_var anObj;
+
+  GEOM::ListOfLong_var aListOfIndexes = new GEOM::ListOfLong;
+  aListOfIndexes->length(myVertexes.Extent());
+
+  for (int i = 1, n = myVertexes.Extent(); i <= n; i++)
+    aListOfIndexes[ i - 1 ] = myVertexes(i);
+
+  anObj = GEOM::GEOM_ILocalOperations::_narrow(getOperation())->
+          MakeFillet2D(myShape, getRadius(), aListOfIndexes);
+
+  if (!anObj->_is_nil())
+    objects.push_back(anObj._retn());
+
+  return true;
+}
+
+//=================================================================================
+// function : getRadius
+// purpose  : Get radius
+//=================================================================================
+double OperationGUI_Fillet2dDlg::getRadius() const
+{
+  return GroupVertexes ->SpinBox_DX->value();
+}
diff --git a/src/OperationGUI/OperationGUI_Fillet2dDlg.h b/src/OperationGUI/OperationGUI_Fillet2dDlg.h
new file mode 100755 (executable)
index 0000000..523dbad
--- /dev/null
@@ -0,0 +1,75 @@
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File   : OperationGUI_Fillet2dDlg.h
+// Author : DMV, OCN
+//
+
+#ifndef OPERATIONGUI_FILLET2DDLG_H
+#define OPERATIONGUI_FILLET2DDLG_H
+
+#include <GEOMBase_Skeleton.h>
+
+#include <TColStd_IndexedMapOfInteger.hxx>
+
+class DlgRef_2Sel1Spin;
+
+//=================================================================================
+// class    : OperationGUI_Fillet2dDlg
+// purpose  :
+//=================================================================================
+class OperationGUI_Fillet2dDlg : public GEOMBase_Skeleton
+{ 
+  Q_OBJECT
+      
+public:
+  OperationGUI_Fillet2dDlg( GeometryGUI*, QWidget* );
+  ~OperationGUI_Fillet2dDlg();
+  
+protected:
+  // redefined from GEOMBase_Helper
+  virtual                             GEOM::GEOM_IOperations_ptr createOperation();
+  virtual                             bool isValid( QString& );
+  virtual                             bool execute( ObjectList& );
+
+private slots:
+  void                                ClickOnOk();
+  bool                                ClickOnApply();
+  void                                ActivateThisDialog();
+  void                                LineEditReturnPressed();
+  void                                SelectionIntoArgument();
+  void                                SetEditCurrentArgument();
+  void                                ValueChangedInSpinBox( double );
+  
+private:
+  void                                Init();
+  void                                enterEvent( QEvent* );
+  void                                activateSelection();
+  double                              getRadius() const;
+
+private:
+  GEOM::GEOM_Object_var               myShape;
+  TColStd_IndexedMapOfInteger         myVertexes;
+
+  DlgRef_2Sel1Spin*                   GroupVertexes;
+};
+
+#endif // OPERATIONGUI_FILLET2DDLG_H
index 87fbbfd76465c091705ee3043a5c91c61b95b198..84a2f3134cdff391ba2d223c87b060e45811de0f 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : OperationGUI_FilletDlg.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : OperationGUI_FilletDlg.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "OperationGUI_FilletDlg.h"
-#include "DlgRef_1Sel1Spin.h"
-#include "DlgRef_2Sel3Spin2Rb.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "OCCViewer_ViewModel.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Desktop.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_ViewManager.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <OCCViewer_ViewModel.h>
 
-#include "qlabel.h"
-#include "qpixmap.h"
+// OCCT Includes
 #include <TColStd_MapOfInteger.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
-#include <list>
 
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : OperationGUI_FilletDlg()
-// purpose  : Constructs a OperationGUI_FilletDlg which is a child of 'parent', with the 
+// purpose  : Constructs a OperationGUI_FilletDlg which is 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.
 //=================================================================================
-OperationGUI_FilletDlg::OperationGUI_FilletDlg(GeometryGUI* theGeometryGUI, QWidget* parent)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, "OperationGUI_FilletDlg", false,
-                     WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+OperationGUI_FilletDlg::OperationGUI_FilletDlg (GeometryGUI* theGeometryGUI, QWidget* parent)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, false),
+    myInitial(true)
 {
-  myConstructorId = -1;
-
   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")));
+  QPixmap iconSelect (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_FILLET_TITLE"));
+  setWindowTitle(tr("GEOM_FILLET_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle( tr( "GEOM_FILLET" ) );
-  RadioButton1->setPixmap( image0 );
-  RadioButton2->setPixmap( image1 );
-  RadioButton3->setPixmap( image2 );
-
-  Group1 = new DlgRef_1Sel1Spin( this, "Group1" );
-  Group1->GroupBox1->setTitle( tr( "GEOM_FILLET_ALL" ) );
-  Group1->TextLabel1->setText( tr( "GEOM_MAIN_OBJECT" ) );
-  Group1->TextLabel2->setText( tr( "GEOM_RADIUS" ) );
-  Group1->PushButton1->setPixmap( iconSelect );
-  Group1->LineEdit1->setReadOnly( true );
-
-  Group2 = new DlgRef_2Sel3Spin2Rb( this, "Group2" );
-  Group2->GroupBox1->setTitle( tr( "GEOM_FILLET_EDGES" ) );
-  Group2->TextLabel1->setText( tr( "GEOM_MAIN_OBJECT" ) );
-  Group2->TextLabel2->setText( tr( "SELECTED_EDGES" ) );
-  Group2->TextLabel3->setText( tr( "GEOM_RADIUS" ) );
-  Group2->TextLabel4->setText( tr( "GEOM_R1" ) );
-  Group2->TextLabel5->setText( tr( "GEOM_R2" ) );
-  Group2->PushButton1->setPixmap( iconSelect );
-  Group2->PushButton2->setPixmap( iconSelect );
-  Group2->LineEdit1->setReadOnly( true );
-  Group2->LineEdit2->setReadOnly( true );
-
-  Group3 = new DlgRef_2Sel3Spin2Rb( this, "Group3" );
-  Group3->GroupBox1->setTitle(tr( "GEOM_FILLET_FACES" ) );
-  Group3->TextLabel1->setText(tr( "GEOM_MAIN_OBJECT" ) );
-  Group3->TextLabel2->setText(tr( "SELECTED_FACES" ) );
-  Group3->TextLabel3->setText(tr( "GEOM_RADIUS" ) );
-  Group3->TextLabel4->setText(tr( "GEOM_R1" ) );
-  Group3->TextLabel5->setText(tr( "GEOM_R2" ) );
-  Group3->PushButton1->setPixmap( iconSelect );
-  Group3->PushButton2->setPixmap( iconSelect );
-  Group3->LineEdit1->setReadOnly( true );
-  Group3->LineEdit2->setReadOnly( true );
-
-  Layout1->addWidget( Group1, 2, 0 );
-  Layout1->addWidget( Group2, 2, 0 );
-  Layout1->addWidget( Group3, 2, 0 );
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_FILLET"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image1);
+  mainFrame()->RadioButton3->setIcon(image2);
+
+  Group1 = new DlgRef_1Sel1Spin(centralWidget());
+  Group1->GroupBox1->setTitle(tr("GEOM_FILLET_ALL"));
+  Group1->TextLabel1->setText(tr("GEOM_MAIN_OBJECT"));
+  Group1->TextLabel2->setText(tr("GEOM_RADIUS"));
+  Group1->PushButton1->setIcon(iconSelect);
+  Group1->LineEdit1->setReadOnly(true);
+
+  Group2 = new DlgRef_2Sel3Spin2Rb(centralWidget());
+  Group2->GroupBox1->setTitle(tr("GEOM_FILLET_EDGES"));
+  Group2->TextLabel1->setText(tr("GEOM_MAIN_OBJECT"));
+  Group2->TextLabel2->setText(tr("SELECTED_EDGES"));
+  Group2->TextLabel3->setText(tr("GEOM_RADIUS"));
+  Group2->TextLabel4->setText(tr("GEOM_R1"));
+  Group2->TextLabel5->setText(tr("GEOM_R2"));
+  Group2->PushButton1->setIcon(iconSelect);
+  Group2->PushButton2->setIcon(iconSelect);
+  Group2->LineEdit1->setReadOnly(true);
+  Group2->LineEdit2->setReadOnly(true);
+
+  Group3 = new DlgRef_2Sel3Spin2Rb(centralWidget());
+  Group3->GroupBox1->setTitle(tr("GEOM_FILLET_FACES"));
+  Group3->TextLabel1->setText(tr("GEOM_MAIN_OBJECT"));
+  Group3->TextLabel2->setText(tr("SELECTED_FACES"));
+  Group3->TextLabel3->setText(tr("GEOM_RADIUS"));
+  Group3->TextLabel4->setText(tr("GEOM_R1"));
+  Group3->TextLabel5->setText(tr("GEOM_R2"));
+  Group3->PushButton1->setIcon(iconSelect);
+  Group3->PushButton2->setIcon(iconSelect);
+  Group3->LineEdit1->setReadOnly(true);
+  Group3->LineEdit2->setReadOnly(true);
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(Group1);
+  layout->addWidget(Group2);
+  layout->addWidget(Group3);
   /***************************************************************/
 
+  // Set range of spinboxes
   double SpecificStep = 10.0;
-  Group1->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, SpecificStep, DBL_DIGITS_DISPLAY);
-  Group2->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, SpecificStep, DBL_DIGITS_DISPLAY);
-  Group2->SpinBox_DY->RangeStepAndValidator(0.001, COORD_MAX, SpecificStep, DBL_DIGITS_DISPLAY);
-  Group2->SpinBox_DZ->RangeStepAndValidator(0.001, COORD_MAX, SpecificStep, DBL_DIGITS_DISPLAY);
-  Group3->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, SpecificStep, DBL_DIGITS_DISPLAY);
-  Group3->SpinBox_DY->RangeStepAndValidator(0.001, COORD_MAX, SpecificStep, DBL_DIGITS_DISPLAY);
-  Group3->SpinBox_DZ->RangeStepAndValidator(0.001, COORD_MAX, SpecificStep, DBL_DIGITS_DISPLAY);
+  initSpinBox(Group1->SpinBox_DX, 0.001, COORD_MAX, SpecificStep, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(Group2->SpinBox_DX, 0.001, COORD_MAX, SpecificStep, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(Group2->SpinBox_DY, 0.001, COORD_MAX, SpecificStep, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(Group2->SpinBox_DZ, 0.001, COORD_MAX, SpecificStep, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(Group3->SpinBox_DX, 0.001, COORD_MAX, SpecificStep, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(Group3->SpinBox_DY, 0.001, COORD_MAX, SpecificStep, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(Group3->SpinBox_DZ, 0.001, COORD_MAX, SpecificStep, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
 
   setHelpFileName("fillet_operation_page.html");
 
-  /* Initialisations */
+  // Initialisation
   Init();
 }
 
-
 //=================================================================================
 // function : ~OperationGUI_FilletDlg()
 // purpose  : Destroys the object and frees any allocated resources
 //=================================================================================
 OperationGUI_FilletDlg::~OperationGUI_FilletDlg()
-{  
+{
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void OperationGUI_FilletDlg::Init()
 {
-  myConstructorId = -1;
-  reset();
-  RadioButton1->setChecked( true );
-  myEditCurrentArgument = Group1->LineEdit1;
+  // Set Initial values of spinboxes
+  Group1->SpinBox_DX->setValue(5);
+  Group2->SpinBox_DX->setValue(5);
+  Group2->SpinBox_DY->setValue(5);
+  Group2->SpinBox_DZ->setValue(5);
+  Group3->SpinBox_DX->setValue(5);
+  Group3->SpinBox_DY->setValue(5);
+  Group3->SpinBox_DZ->setValue(5);
+
+  // Clear line edits
+  Group1->LineEdit1->setText("");
+  Group2->LineEdit1->setText("");
+  Group2->LineEdit2->setText("");
+  Group3->LineEdit1->setText("");
+  Group3->LineEdit2->setText("");
+
+  myShape = GEOM::GEOM_Object::_nil();
+
+  myFaces.Clear();
+  myEdges.Clear();
+
+  // signals and slots connections
 
   // main buttons
-  connect( buttonOk   , SIGNAL( clicked() ), this, SLOT( ClickOnOk()    ) );
-  connect( buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()   ));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
 
   // group box
-  connect( GroupConstructors, SIGNAL( clicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
+  connect(this,          SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
 
   // push buttons
   connect(Group1->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
@@ -163,7 +180,7 @@ void OperationGUI_FilletDlg::Init()
   connect(Group2->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
   connect(Group3->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
 
-  // spin boxes  
+  // spin boxes
   connect(Group1->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
   connect(Group2->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
   connect(Group2->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
@@ -172,102 +189,115 @@ void OperationGUI_FilletDlg::Init()
   connect(Group3->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
   connect(Group3->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
 
-  //RadioButtons
-  connect( Group2->RadioButton1, SIGNAL( clicked() ), this, SLOT( RadioButton_Clicked() ) );
-  connect( Group2->RadioButton2, SIGNAL( clicked() ), this, SLOT( RadioButton_Clicked() ) );
-  connect( Group3->RadioButton1, SIGNAL( clicked() ), this, SLOT( RadioButton_Clicked() ) );
-  connect( Group3->RadioButton2, SIGNAL( clicked() ), this, SLOT( RadioButton_Clicked() ) );
+  // radio buttons
+  connect(Group2->RadioButton1, SIGNAL(clicked()), this, SLOT(RadioButtonClicked()));
+  connect(Group2->RadioButton2, SIGNAL(clicked()), this, SLOT(RadioButtonClicked()));
+  connect(Group3->RadioButton1, SIGNAL(clicked()), this, SLOT(RadioButtonClicked()));
+  connect(Group3->RadioButton2, SIGNAL(clicked()), this, SLOT(RadioButtonClicked()));
 
-    // selection
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-          SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  initName(tr("GEOM_FILLET"));
 
-  initName( tr( "GEOM_FILLET" ) );
-
-  Group2->hide();
-  Group3->hide();
-  Group1->show();
+  myConstructorId = -1;
+  ConstructorsClicked(0);
 }
 
-
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void OperationGUI_FilletDlg::ConstructorsClicked( int constructorId )
+void OperationGUI_FilletDlg::ConstructorsClicked (int constructorId)
 {
-  if ( SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType() 
-       != OCCViewer_Viewer::Type() )
-  {
-    RadioButton1->setChecked( true );
+  if (myGeomGUI->getApp()->desktop()->activeWindow()->getViewManager()->getType()
+      != OCCViewer_Viewer::Type()) {
+    mainFrame()->RadioButton1->setChecked(true);
     return;
   }
 
-  if ( myConstructorId == constructorId )
+  if (myConstructorId == constructorId)
     return;
 
   // Get radius from previous widget
-  double R = 5, R1 = 5, R2 = 5;
-  if      ( myConstructorId == 0 ) R = Group1->SpinBox_DX->GetValue();
-  else if ( myConstructorId == 1 ) {
-    R = Group2->SpinBox_DX->GetValue();
-    R1 = Group2->SpinBox_DY->GetValue();
-    R2 = Group2->SpinBox_DZ->GetValue();
+  QString R = "5", R1 = "5", R2 = "5";
+  if      (myConstructorId == 0) {
+    R = Group1->SpinBox_DX->text();
+  }
+  else if (myConstructorId == 1) {
+    R = Group2->SpinBox_DX->text();
+    R1 = Group2->SpinBox_DY->text();
+    R2 = Group2->SpinBox_DZ->text();
   }
   else {
-    R = Group3->SpinBox_DX->GetValue();
-    R1 = Group3->SpinBox_DY->GetValue();
-    R2 = Group3->SpinBox_DZ->GetValue();
+    R = Group3->SpinBox_DX->text();
+    R1 = Group3->SpinBox_DY->text();
+    R2 = Group3->SpinBox_DZ->text();
   }
 
   myConstructorId = constructorId;
 
-  switch ( constructorId )
-  {
-    case 0:
-        Group1->show();
-        Group2->hide();
-        Group3->hide();
-        Group1->SpinBox_DX->SetValue( R );
+  switch (constructorId) {
+  case 0:
+    Group2->hide();
+    Group3->hide();
+    Group1->show();
+    Group1->SpinBox_DX->setText(R);
     break;
-    case 1:
-        Group1->hide();
-        Group2->show();
-        Group3->hide();
-        Group2->SpinBox_DX->SetValue( R );
-        Group2->SpinBox_DY->SetValue( R1 );
-        Group2->SpinBox_DZ->SetValue( R2 );
+  case 1:
+    Group1->hide();
+    Group3->hide();
+    Group2->show();
+    Group2->SpinBox_DX->setText(R);
+    Group2->SpinBox_DY->setText(R1);
+    Group2->SpinBox_DZ->setText(R2);
     break;
-    case 2:
-        Group1->hide();
-        Group2->hide();
-        Group3->show();
-        Group3->SpinBox_DX->SetValue( R );
-        Group3->SpinBox_DY->SetValue( R1 );
-        Group3->SpinBox_DZ->SetValue( R2 );
+  case 2:
+    Group1->hide();
+    Group2->hide();
+    Group3->show();
+    Group3->SpinBox_DX->setText(R);
+    Group3->SpinBox_DY->setText(R1);
+    Group3->SpinBox_DZ->setText(R2);
     break;
-    default:
+  default:
     break;
   }
 
-  if      ( constructorId == 0 ) myEditCurrentArgument = Group1->LineEdit1;
-  else if ( constructorId == 1 ) myEditCurrentArgument = Group2->LineEdit1;
-  else                           myEditCurrentArgument = Group3->LineEdit1;
+  if      (constructorId == 0) Group1->PushButton1->click();
+  else if (constructorId == 1) Group2->PushButton1->click();
+  else                         Group3->PushButton1->click();
 
-  activateSelection();
   enableWidgets();
 
-  if ( !myShape->_is_nil() )
-  {
-    myEditCurrentArgument->setText( GEOMBase::GetName( myShape ) );
-    GEOMBase_Skeleton::LineEditReturnPressed();
+  if (myInitial) {
+    myInitial = false;
+    SelectionIntoArgument();
   }
-  else
-    myEditCurrentArgument->setText( "" );
+  else {
+    if (!myShape->_is_nil()) {
+      myEditCurrentArgument->setText(GEOMBase::GetName(myShape));
+      GEOMBase_Skeleton::LineEditReturnPressed();
+      switch (getConstructorId()) {
+      case 1:
+        if (myEdges.Extent() == 0)
+          Group2->PushButton2->click();
+        break;
+      case 2:
+        if (myFaces.Extent() == 0)
+          Group3->PushButton2->click();
+        break;
+      default:
+        break;
+      }
+    }
+    else
+      myEditCurrentArgument->setText("");
 
-  displayPreview();  
-}
+    displayPreview();
+  }
 
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -275,123 +305,124 @@ void OperationGUI_FilletDlg::ConstructorsClicked( int constructorId )
 //=================================================================================
 void OperationGUI_FilletDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool OperationGUI_FilletDlg::ClickOnApply()
 {
-    if ( !onAccept() )
+  if (!onAccept())
     return false;
 
   initName();
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection has changed
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void OperationGUI_FilletDlg::SelectionIntoArgument()
 {
   erasePreview();
-  myEditCurrentArgument->setText( "" );
+  myEditCurrentArgument->setText("");
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
 
   // If selection of main object is activated
-  if ( myEditCurrentArgument == Group1->LineEdit1 ||
-       myEditCurrentArgument == Group2->LineEdit1 ||
-       myEditCurrentArgument == Group3->LineEdit1 )
+  if (myEditCurrentArgument == Group1->LineEdit1 ||
+      myEditCurrentArgument == Group2->LineEdit1 ||
+      myEditCurrentArgument == Group3->LineEdit1)
   {
-    if ( IObjectCount() == 1 )
-    {
+    myShape = GEOM::GEOM_Object::_nil();
+    if (aSelList.Extent() == 1) {
       Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject( firstIObject(), aResult );
+        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
 
-      if ( aResult && !anObj->_is_nil() )
-      {
+      if (aResult && !anObj->_is_nil()) {
         myShape = anObj;
-        myEditCurrentArgument->setText( GEOMBase::GetName( anObj ) );
+        myEditCurrentArgument->setText(GEOMBase::GetName(anObj));
         displayPreview();
-        enableWidgets();
-        return;
       }
     }
 
-    myShape = GEOM::GEOM_Object::_nil();
     enableWidgets();
   }
   // If face or edge selection is activated
-  else if ( myEditCurrentArgument == Group2->LineEdit2 ||
-            myEditCurrentArgument == Group3->LineEdit2 )
+  else if (myEditCurrentArgument == Group2->LineEdit2 ||
+           myEditCurrentArgument == Group3->LineEdit2)
   {
-    if ( IObjectCount() == 1 )
-    {
+    if (myEditCurrentArgument == Group2->LineEdit2) myEdges.Clear();
+    else myFaces.Clear();
+    if (aSelList.Extent() == 1) {
       Standard_Boolean aResult = Standard_False;
       GEOM::GEOM_Object_var anObj =
-        GEOMBase::ConvertIOinGEOMObject( firstIObject(), aResult );
+        GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
 
-      if ( aResult && !anObj->_is_nil() )
-      {
+      if (aResult && !anObj->_is_nil()) {
         TColStd_IndexedMapOfInteger anIndexes;
-        myGeomGUI->getApp()->selectionMgr()->GetIndexes( firstIObject(), anIndexes );
+        aSelMgr->GetIndexes(aSelList.First(), anIndexes);
 
-        if ( anIndexes.Extent() > 0 )
-        {
+        if (anIndexes.Extent() > 0) {
           QString aName;
-          if ( anIndexes.Extent() == 1 )
-          {
-            int anIndex = anIndexes( 1 );
+          if (anIndexes.Extent() == 1) {
+            int anIndex = anIndexes(1);
 
-            aName = QString( GEOMBase::GetName( anObj ) ) + QString( ":%1" ).arg( anIndex );
+            aName = QString(GEOMBase::GetName(anObj)) + QString(":%1").arg(anIndex);
+          }
+          else {
+            aName = tr("GEOM_MEN_POPUP_NAME").arg(anIndexes.Extent());
           }
-          else
-            aName = tr( "GEOM_MEN_POPUP_NAME" ).arg( anIndexes.Extent() );
 
-          myEditCurrentArgument->setText( aName );
+          myEditCurrentArgument->setText(aName);
 
-          if ( myConstructorId == 1 )
+          if (myConstructorId == 1)
             myEdges = anIndexes;
           else
             myFaces = anIndexes;
 
           displayPreview();
-          return;
         }
       }
     }
-    myFaces.Clear();
   }
-}
-
 
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose  :
-//=================================================================================
-void OperationGUI_FilletDlg::LineEditReturnPressed()
-{
-  QLineEdit* send = ( QLineEdit* )sender();
-  
-  if ( send == Group1->LineEdit1 )
-    myEditCurrentArgument = Group1->LineEdit1;
-  else if ( send == Group2->LineEdit1 )
-    myEditCurrentArgument = Group2->LineEdit1;
-  else if ( send == Group3->LineEdit1 )
-    myEditCurrentArgument = Group3->LineEdit1;
-  else
-    return;
+  // clear selection
+  if (!(myEditCurrentArgument == Group2->LineEdit2 ||
+        myEditCurrentArgument == Group3->LineEdit2)) {
+    disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+    myGeomGUI->getApp()->selectionMgr()->clearSelected();
+    connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+            this, SLOT(SelectionIntoArgument()));
+  }
 
-  GEOMBase_Skeleton::LineEditReturnPressed();
-  return;
+  switch (getConstructorId()) {
+  case 1:
+    if (myEditCurrentArgument == Group2->LineEdit1) {
+      if (!myShape->_is_nil() && myEdges.Extent() == 0)
+        Group2->PushButton2->click();
+    }
+    break;
+  case 2:
+    if (myEditCurrentArgument == Group3->LineEdit1) {
+      if (!myShape->_is_nil() && myFaces.Extent() == 0)
+        Group3->PushButton2->click();
+    }
+    break;
+  default:
+    break;
+  }
 }
 
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -400,118 +431,92 @@ void OperationGUI_FilletDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
 
-  if ( send == Group1->PushButton1 )
-  {
-    Group1->LineEdit1->setFocus();
+  if (send == Group1->PushButton1) {
     myEditCurrentArgument = Group1->LineEdit1;
   }
-  else if( send == Group2->PushButton1 )
-  {
-    Group2->LineEdit1->setFocus();
+  else if (send == Group2->PushButton1) {
     myEditCurrentArgument = Group2->LineEdit1;
+    Group2->PushButton2->setDown(false);
+    Group2->LineEdit2->setEnabled(false);
   }
-  else if( send == Group2->PushButton2 )
-  {
-    Group2->LineEdit2->setFocus();
+  else if (send == Group2->PushButton2) {
     myEditCurrentArgument = Group2->LineEdit2;
+    Group2->PushButton1->setDown(false);
+    Group2->LineEdit1->setEnabled(false);
   }
-  else if ( send == Group3->PushButton1 )
-  {
-    Group3->LineEdit1->setFocus();
+  else if (send == Group3->PushButton1) {
     myEditCurrentArgument = Group3->LineEdit1;
+    Group3->PushButton2->setDown(false);
+    Group3->LineEdit2->setEnabled(false);
   }
-  else if( send == Group3->PushButton2 )
-  {
-    Group3->LineEdit1->setFocus();
+  else if (send == Group3->PushButton2) {
     myEditCurrentArgument = Group3->LineEdit2;
+    Group3->PushButton1->setDown(false);
+    Group3->LineEdit1->setEnabled(false);
   }
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
+  myEditCurrentArgument->setFocus();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
   activateSelection();
-}
 
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
+}
 
 //=================================================================================
-// function : ActivateThisDialog()
+// function : LineEditReturnPressed()
 // purpose  :
 //=================================================================================
-void OperationGUI_FilletDlg::ActivateThisDialog()
+void OperationGUI_FilletDlg::LineEditReturnPressed()
 {
-  GEOMBase_Skeleton::ActivateThisDialog();
+  QLineEdit* send = (QLineEdit*)sender();
 
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-          SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  if (send == Group1->LineEdit1)
+    myEditCurrentArgument = Group1->LineEdit1;
+  else if (send == Group2->LineEdit1)
+    myEditCurrentArgument = Group2->LineEdit1;
+  else if (send == Group3->LineEdit1)
+    myEditCurrentArgument = Group3->LineEdit1;
+  else
+    return;
 
-  activateSelection();
-  displayPreview();
+  GEOMBase_Skeleton::LineEditReturnPressed();
 }
 
-
 //=================================================================================
-// function : enterEvent()
+// function : ActivateThisDialog()
 // purpose  :
 //=================================================================================
-void OperationGUI_FilletDlg::enterEvent( QEvent* e )
+void OperationGUI_FilletDlg::ActivateThisDialog()
 {
-  if ( !GroupConstructors->isEnabled() )
-    this->ActivateThisDialog();
-}
+  GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-//=================================================================================
-// function : ValueChangedInSpinBox()
-// purpose  :
-//=================================================================================
-void OperationGUI_FilletDlg::ValueChangedInSpinBox( double newValue )
-{
-  displayPreview();
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================
-// function : reset()
+// function : enterEvent()
 // purpose  :
 //=================================================================================
-void OperationGUI_FilletDlg::reset()
+void OperationGUI_FilletDlg::enterEvent (QEvent*)
 {
-  // Set Initial values of spinboxes
-  Group1->SpinBox_DX->SetValue( 5 );
-  Group2->SpinBox_DX->SetValue( 5 );
-  Group2->SpinBox_DY->SetValue( 5 );
-  Group2->SpinBox_DZ->SetValue( 5 );
-  Group3->SpinBox_DX->SetValue( 5 );
-  Group3->SpinBox_DY->SetValue( 5 );
-  Group3->SpinBox_DZ->SetValue( 5 );
-
-  Group1->LineEdit1->setText( "" );
-  Group2->LineEdit1->setText( "" );
-  Group2->LineEdit2->setText( "" );
-  Group3->LineEdit1->setText( "" );
-  Group3->LineEdit2->setText( "" );
-
-  // constructor id
-  int aConstructorId = getConstructorId();
-
-  if      ( aConstructorId == 0 ) myEditCurrentArgument = Group1->LineEdit1;
-  else if ( aConstructorId == 1 ) myEditCurrentArgument = Group2->LineEdit1;
-  else                            myEditCurrentArgument = Group3->LineEdit1;
-
-  myShape = GEOM::GEOM_Object::_nil();
-
-  myFaces.Clear();
-  myEdges.Clear();
-
-  erasePreview( true );
-
-  activateSelection();
-
-  enableWidgets();
+  if (!mainFrame()->GroupConstructors->isEnabled())
+    this->ActivateThisDialog();
 }
 
 //=================================================================================
-// function : getConstructorId()
+// function : ValueChangedInSpinBox()
 // purpose  :
 //=================================================================================
-int OperationGUI_FilletDlg::getConstructorId() const
+void OperationGUI_FilletDlg::ValueChangedInSpinBox (double)
 {
-  return GroupConstructors->id( GroupConstructors->selected() );
+  displayPreview();
 }
 
 //=================================================================================
@@ -520,21 +525,22 @@ int OperationGUI_FilletDlg::getConstructorId() const
 //=================================================================================
 void OperationGUI_FilletDlg::activateSelection()
 {
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
 
-  if ( !myShape->_is_nil() && myEditCurrentArgument == Group2->LineEdit2 )
-    localSelection( myShape, TopAbs_EDGE );
-  else if ( !myShape->_is_nil() && myEditCurrentArgument == Group3->LineEdit2 )
-    localSelection( myShape, TopAbs_FACE );
-  else
-  {
+  if (!myShape->_is_nil() && myEditCurrentArgument == Group2->LineEdit2)
+    localSelection(myShape, TopAbs_EDGE);
+  else if (!myShape->_is_nil() && myEditCurrentArgument == Group3->LineEdit2)
+    localSelection(myShape, TopAbs_FACE);
+  else {
     TColStd_MapOfInteger aMap;
-    aMap.Add( GEOM_SHELL );
-    aMap.Add( GEOM_SOLID );
-    aMap.Add( GEOM_COMPOUND );
-    globalSelection( aMap );
+    aMap.Add(GEOM_SHELL);
+    aMap.Add(GEOM_SOLID);
+    aMap.Add(GEOM_COMPOUND);
+    globalSelection(aMap);
   }
 
-  SelectionIntoArgument();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 }
 
 //=================================================================================
@@ -547,25 +553,21 @@ void OperationGUI_FilletDlg::enableWidgets()
 
   bool toEnable = !myShape->_is_nil();
 
-  if ( anId == 1 )
-  {
-    Group2->LineEdit2->setEnabled( toEnable );
-    Group2->PushButton2->setEnabled( toEnable );
-    
-    if ( !toEnable )
-    {
-      Group2->LineEdit2->setText( "" );
+  if (anId == 1) {
+    //Group2->LineEdit2->setEnabled(toEnable);
+    Group2->PushButton2->setEnabled(toEnable);
+
+    if (!toEnable) {
+      Group2->LineEdit2->setText("");
       myEdges.Clear();
     }
   }
-  else if ( anId == 2 )
-  {
-    Group3->LineEdit2->setEnabled( toEnable );
-    Group3->PushButton2->setEnabled( toEnable );
+  else if (anId == 2) {
+    //Group3->LineEdit2->setEnabled(toEnable);
+    Group3->PushButton2->setEnabled(toEnable);
 
-    if ( !toEnable )
-    {
-      Group3->LineEdit2->setText( "" );
+    if (!toEnable) {
+      Group3->LineEdit2->setText("");
       myFaces.Clear();
     }
   }
@@ -577,20 +579,39 @@ void OperationGUI_FilletDlg::enableWidgets()
 //=================================================================================
 GEOM::GEOM_IOperations_ptr OperationGUI_FilletDlg::createOperation()
 {
-  return getGeomEngine()->GetILocalOperations( getStudyId() );
+  return getGeomEngine()->GetILocalOperations(getStudyId());
 }
 
 //=================================================================================
-// function : ClickOnApply()
+// function : isValid()
 // purpose  : Verify validity of input data
 //=================================================================================
-bool OperationGUI_FilletDlg::isValid( QString& )
+bool OperationGUI_FilletDlg::isValid (QString& msg)
 {
-  switch ( getConstructorId() )
+  bool ok = true;
+  switch (getConstructorId())
   {
-    case 0: return !myShape->_is_nil();
-    case 1: return !myShape->_is_nil() && myEdges.Extent() > 0;
-    case 2: return !myShape->_is_nil() && myFaces.Extent() > 0;
+    case 0:
+      ok = Group1->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+      return !myShape->_is_nil() && ok;
+    case 1:
+      if (Group2->RadioButton1->isChecked())
+       ok = Group2->SpinBox_DX->isValid( msg, !IsPreview() );
+      else
+      {
+       ok = Group2->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+       ok = Group2->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok;
+      }
+      return !myShape->_is_nil() && myEdges.Extent() > 0 && ok;
+    case 2:
+      if (Group3->RadioButton1->isChecked())
+       ok = Group3->SpinBox_DX->isValid( msg, !IsPreview() );
+      else
+      {
+       ok = Group3->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+       ok = Group3->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok;
+      }
+      return !myShape->_is_nil() && myFaces.Extent() > 0 && ok;
     default: return false;
   }
 }
@@ -599,84 +620,124 @@ bool OperationGUI_FilletDlg::isValid( QString& )
 // function : execute
 // purpose  :
 //=================================================================================
-bool OperationGUI_FilletDlg::execute( ObjectList& objects )
+bool OperationGUI_FilletDlg::execute (ObjectList& objects)
 {
+  QStringList aParameters;
   GEOM::GEOM_Object_var anObj;
 
   int anId = getConstructorId();
-  if ( anId == 0 )
-    anObj = GEOM::GEOM_ILocalOperations::_narrow(
-      getOperation() )->MakeFilletAll( myShape, getRadius() );
-  else if ( anId == 1 )
-  {
+  if (anId == 0) {
+    anObj = GEOM::GEOM_ILocalOperations::_narrow(getOperation())->
+      MakeFilletAll(myShape, getRadius());
+    if (!anObj->_is_nil())
+      aParameters << Group1->SpinBox_DX->text();
+  }
+  else if (anId == 1) {
     GEOM::ListOfLong_var aList = new GEOM::ListOfLong;
-    aList->length( myEdges.Extent() );
+    aList->length(myEdges.Extent());
 
-    for ( int i = 1, n = myEdges.Extent(); i <= n; i++ )
-      aList[ i - 1 ] = myEdges( i );
-    if ( Group2->RadioButton1->isChecked() )
-      anObj = GEOM::GEOM_ILocalOperations::_narrow(
-              getOperation() )->MakeFilletEdges( myShape, getRadius(), aList );
+    for (int i = 1, n = myEdges.Extent(); i <= n; i++)
+      aList[ i - 1 ] = myEdges(i);
+
+    if (Group2->RadioButton1->isChecked())
+    {
+      anObj = GEOM::GEOM_ILocalOperations::_narrow(getOperation())->
+        MakeFilletEdges(myShape, getRadius(), aList);
+      if (!anObj->_is_nil())
+       aParameters << Group2->SpinBox_DX->text();
+    }
     else
-      anObj = GEOM::GEOM_ILocalOperations::_narrow( getOperation() )->MakeFilletEdgesR1R2( myShape,
-                                                   (Group2->SpinBox_DY->GetValue()),
-                                                   (Group2->SpinBox_DZ->GetValue()),
-                                                   aList );
+    {
+      anObj = GEOM::GEOM_ILocalOperations::_narrow(getOperation())->
+        MakeFilletEdgesR1R2(myShape,
+                            Group2->SpinBox_DY->value(),
+                            Group2->SpinBox_DZ->value(),
+                            aList);
+      if (!anObj->_is_nil())
+      {
+       aParameters << Group2->SpinBox_DY->text();
+       aParameters << Group2->SpinBox_DZ->text();
+      }
+    }
   }
-  else if ( anId == 2 )
-  {
-    int i = 0;
+  else if (anId == 2) {
     GEOM::ListOfLong_var aList = new GEOM::ListOfLong;
-    aList->length( myFaces.Extent() );
+    aList->length(myFaces.Extent());
 
-    for ( int i = 1, n = myFaces.Extent(); i <= n; i++ )
-      aList[ i - 1 ] = myFaces( i );
-    if ( Group3->RadioButton1->isChecked() )
-       anObj = GEOM::GEOM_ILocalOperations::_narrow(
-               getOperation() )->MakeFilletFaces( myShape, getRadius(), aList );
-    else
-       anObj = GEOM::GEOM_ILocalOperations::_narrow(
-               getOperation() )->MakeFilletFacesR1R2( myShape, (Group3->SpinBox_DY->GetValue()),
-                                                      (Group3->SpinBox_DZ->GetValue()), aList );
+    for (int i = 1, n = myFaces.Extent(); i <= n; i++)
+      aList[ i - 1 ] = myFaces(i);
+
+    if (Group3->RadioButton1->isChecked()) {
+      anObj = GEOM::GEOM_ILocalOperations::_narrow(getOperation())->
+        MakeFilletFaces(myShape, getRadius(), aList);
+      if (!anObj->_is_nil())
+       aParameters << Group3->SpinBox_DX->text();
+    }
+    else {
+      anObj = GEOM::GEOM_ILocalOperations::_narrow(getOperation())->
+        MakeFilletFacesR1R2(myShape,
+                            Group3->SpinBox_DY->value(),
+                            Group3->SpinBox_DZ->value(), aList);
+      if (!anObj->_is_nil())
+      {
+       aParameters << Group3->SpinBox_DY->text();
+       aParameters << Group3->SpinBox_DZ->text();
+      }
+    }
   }
 
-  if ( !anObj->_is_nil() )
-    objects.push_back( anObj._retn() );
+  if (!anObj->_is_nil())
+  {
+    if (!IsPreview())
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    objects.push_back(anObj._retn());
+  }
 
   return true;
 }
 
 //=================================================================================
 // function : getRadius
-// purpose  : Get radius     
+// purpose  : Get radius
 //=================================================================================
 double OperationGUI_FilletDlg::getRadius() const
 {
   int anId = getConstructorId();
-  if      ( anId == 0 ) return Group1->SpinBox_DX->GetValue();
-  else if ( anId == 1 ) return Group2->SpinBox_DX->GetValue();
-  else                  return Group3->SpinBox_DX->GetValue();
+  if      (anId == 0) return Group1->SpinBox_DX->value();
+  else if (anId == 1) return Group2->SpinBox_DX->value();
+  else                return Group3->SpinBox_DX->value();
 }
 
 //=================================================================================
 // function : RadiobuttonClicked
 // purpose  :
 //=================================================================================
-
-void OperationGUI_FilletDlg::RadioButton_Clicked()
+void OperationGUI_FilletDlg::RadioButtonClicked()
 {
-    bool flag = ( (Group2->RadioButton1->isChecked()) && (Group3->RadioButton1->isChecked()) );
-    flag = !flag;
-
-    Group2->SpinBox_DX->setEnabled(flag);
-    Group2->SpinBox_DY->setEnabled(!flag);
-    Group2->SpinBox_DZ->setEnabled(!flag);
-    Group2->RadioButton1->setChecked(flag);
-    Group2->RadioButton2->setChecked(!flag);
-    Group3->SpinBox_DX->setEnabled(flag);
-    Group3->SpinBox_DY->setEnabled(!flag);
-    Group3->SpinBox_DZ->setEnabled(!flag);
-    Group3->RadioButton1->setChecked(flag);
-    Group3->RadioButton2->setChecked(!flag);
-    displayPreview();  
+  const QObject* s = sender();
+
+  bool flag = s == Group2->RadioButton1 || s == Group3->RadioButton1;
+
+  Group2->RadioButton1->blockSignals(true);
+  Group2->RadioButton2->blockSignals(true);
+  Group3->RadioButton1->blockSignals(true);
+  Group3->RadioButton2->blockSignals(true);
+
+  Group2->SpinBox_DX->setEnabled(flag);
+  Group2->SpinBox_DY->setEnabled(!flag);
+  Group2->SpinBox_DZ->setEnabled(!flag);
+  Group2->RadioButton1->setChecked(flag);
+  Group2->RadioButton2->setChecked(!flag);
+  Group3->SpinBox_DX->setEnabled(flag);
+  Group3->SpinBox_DY->setEnabled(!flag);
+  Group3->SpinBox_DZ->setEnabled(!flag);
+  Group3->RadioButton1->setChecked(flag);
+  Group3->RadioButton2->setChecked(!flag);
+
+  Group2->RadioButton1->blockSignals(false);
+  Group2->RadioButton2->blockSignals(false);
+  Group3->RadioButton1->blockSignals(false);
+  Group3->RadioButton2->blockSignals(false);
+
+  displayPreview();
 }
index c89491bafa6a251f1b1d05b41ca8a7ff0bd36cec..5a5a71a333442245e3287c8fde8980be76fc42ee 100644 (file)
@@ -1,34 +1,32 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : OperationGUI_FilletDlg.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
-#ifndef DIALOGBOX_FILLET_H
-#define DIALOGBOX_FILLET_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : OperationGUI_FilletDlg.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
+//
+#ifndef OPERATIONGUI_FILLETDLG_H
+#define OPERATIONGUI_FILLETDLG_H
 
-#include "GEOMBase_Skeleton.h"
+#include <GEOMBase_Skeleton.h>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 
@@ -41,48 +39,49 @@ class DlgRef_2Sel3Spin2Rb;
 //=================================================================================
 class OperationGUI_FilletDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
-
+  Q_OBJECT
+      
 public:
-    OperationGUI_FilletDlg(GeometryGUI* theGeometryGUI, QWidget* parent);
-    ~OperationGUI_FilletDlg();
-
+  OperationGUI_FilletDlg( GeometryGUI*, QWidget* );
+  ~OperationGUI_FilletDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual                             GEOM::GEOM_IOperations_ptr createOperation();
-    virtual                             bool isValid( QString& msg );
-    virtual                             bool execute( ObjectList& objects );
+  // redefined from GEOMBase_Helper
+  virtual                             GEOM::GEOM_IOperations_ptr createOperation();
+  virtual                             bool isValid( QString& );
+  virtual                             bool execute( ObjectList& );
 
 private slots:
-    void                                ClickOnOk();
-    bool                                ClickOnApply();
-    void                                ActivateThisDialog();
-    void                                LineEditReturnPressed();
-    void                                SelectionIntoArgument();
-    void                                SetEditCurrentArgument();
-    void                                ValueChangedInSpinBox( double newValue );
-    void                                ConstructorsClicked( int constructorId );
-    void                                RadioButton_Clicked();
-
+  void                                ClickOnOk();
+  bool                                ClickOnApply();
+  void                                ActivateThisDialog();
+  void                                LineEditReturnPressed();
+  void                                SelectionIntoArgument();
+  void                                SetEditCurrentArgument();
+  void                                ValueChangedInSpinBox( double );
+  void                                ConstructorsClicked( int );
+  void                                RadioButtonClicked();
+  
 private:
-    void                                Init();
-    void                                enterEvent( QEvent* e );
-    void                                reset();
-    int                                 getConstructorId() const;
-    void                                activateSelection();
-    void                                enableWidgets();
-    double                              getRadius() const;
+  void                                Init();
+  void                                enterEvent( QEvent* );
+  void                                activateSelection();
+  void                                enableWidgets();
+  double                              getRadius() const;
 
 private:
-    int                                 myConstructorId;
-
-    GEOM::GEOM_Object_var               myShape;
-    TColStd_IndexedMapOfInteger         myEdges;
-    TColStd_IndexedMapOfInteger         myFaces;
+  int                                 myConstructorId;
+  
+  GEOM::GEOM_Object_var               myShape;
+  TColStd_IndexedMapOfInteger         myEdges;
+  TColStd_IndexedMapOfInteger         myFaces;
 
-    DlgRef_1Sel1Spin*                   Group1;
-    DlgRef_2Sel3Spin2Rb*                Group2;
-    DlgRef_2Sel3Spin2Rb*                Group3;
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
+  
+  DlgRef_1Sel1Spin*                   Group1;
+  DlgRef_2Sel3Spin2Rb*                Group2;
+  DlgRef_2Sel3Spin2Rb*                Group3;
 };
 
-#endif // DIALOGBOX_FILLET_H
+#endif // OPERATIONGUI_FILLETDLG_H
diff --git a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
new file mode 100644 (file)
index 0000000..778af7b
--- /dev/null
@@ -0,0 +1,353 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : OperationGUI_GetShapesOnShapeDlg.cxx
+// Author : Sergey KUUL, Open CASCADE S.A.S. (sergey.kuul@opencascade.com)
+//
+#include "OperationGUI_GetShapesOnShapeDlg.h"
+
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+
+//==============================================================================
+// class    : OperationGUI_GetShapesOnShapeDlg()
+// purpose  : Constructs a OperationGUI_GetShapesOnShapeDlg which is 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.
+//=================================================================================
+OperationGUI_GetShapesOnShapeDlg::OperationGUI_GetShapesOnShapeDlg (GeometryGUI* theGeometryGUI,
+                                                                    QWidget* parent)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, false)
+{
+  SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr();
+  QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_SHAPES_ON_SHAPE")));
+  QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
+
+  setWindowTitle(tr("GEOM_SHAPES_ON_SHAPE_TITLE"));
+
+  /***************************************************************/
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_SHAPES_ON_SHAPE"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_2Sel2List(centralWidget());
+  //GroupPoints->GroupBox1->setTitle(tr("GEOM_PARTITION"));
+  GroupPoints->GroupBox1->setTitle("Input data");
+  GroupPoints->TextLabel1->setText(tr("GEOM_SHAPES_ON_SHAPE_ESHAPE"));
+  GroupPoints->TextLabel2->setText(tr("GEOM_SHAPES_ON_SHAPE_CSHAPE"));
+  GroupPoints->TextLabel3->setText(tr("GEOM_RECONSTRUCTION_LIMIT"));
+  GroupPoints->TextLabel4->setText(tr("GEOM_SHAPES_ON_SHAPE_STATE"));
+  GroupPoints->PushButton1->setIcon(image2);
+  GroupPoints->PushButton2->setIcon(image2);
+  GroupPoints->LineEdit1->setReadOnly(true);
+  GroupPoints->LineEdit2->setReadOnly(true);
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
+  /***************************************************************/
+
+  setHelpFileName("shapesonshape_page.html");
+
+  Init();
+}
+
+//=================================================================================
+// function : ~OperationGUI_GetShapesOnShapeDlg
+// purpose  : Destroys the object and frees any allocated resources
+//=================================================================================
+OperationGUI_GetShapesOnShapeDlg::~OperationGUI_GetShapesOnShapeDlg()
+{
+}
+
+//=================================================================================
+// function : Init()
+// purpose  :
+//=================================================================================
+void OperationGUI_GetShapesOnShapeDlg::Init()
+{
+  // type for sub shape selection
+  GroupPoints->ComboBox1->addItem(tr("GEOM_RECONSTRUCTION_LIMIT_SOLID"));
+  // commented by skl for IPAL19949 - finder isn't allowed such type
+  //GroupPoints->ComboBox1->addItem(tr("GEOM_RECONSTRUCTION_LIMIT_SHELL"));
+  GroupPoints->ComboBox1->addItem(tr("GEOM_RECONSTRUCTION_LIMIT_FACE"));
+  // commented by skl for IPAL19949 - finder isn't allowed such type
+  //GroupPoints->ComboBox1->addItem(tr("GEOM_RECONSTRUCTION_LIMIT_WIRE"));
+  GroupPoints->ComboBox1->addItem(tr("GEOM_RECONSTRUCTION_LIMIT_EDGE"));
+  GroupPoints->ComboBox1->addItem(tr("GEOM_RECONSTRUCTION_LIMIT_VERTEX"));
+
+  // type for state selection
+  GroupPoints->ComboBox2->addItem(tr("GEOM_STATE_IN"));
+  GroupPoints->ComboBox2->addItem(tr("GEOM_STATE_OUT"));
+  GroupPoints->ComboBox2->addItem(tr("GEOM_STATE_ON"));
+  GroupPoints->ComboBox2->addItem(tr("GEOM_STATE_ONIN"));
+  GroupPoints->ComboBox2->addItem(tr("GEOM_STATE_ONOUT"));
+
+  GroupPoints->LineEdit1->clear();
+  GroupPoints->LineEdit2->clear();
+  myObject1 = myObject2 = GEOM::GEOM_Object::_nil();
+
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+
+  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+
+  connect(GroupPoints->ComboBox1, SIGNAL(activated(int)), this, SLOT(ComboTextChanged()));
+  connect(GroupPoints->ComboBox2, SIGNAL(activated(int)), this, SLOT(ComboTextChanged()));
+
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  initName(mainFrame()->GroupConstructors->title());
+
+  GroupPoints->TextLabel3->show();
+  GroupPoints->ComboBox1->show();
+  GroupPoints->ComboBox1->setCurrentIndex(0);
+  GroupPoints->ComboBox2->show();
+  GroupPoints->ComboBox2->setCurrentIndex(0);
+
+  globalSelection(GEOM_ALLSHAPES);
+
+  GroupPoints->PushButton1->click();
+  SelectionIntoArgument();
+}
+
+//=================================================================================
+// function : ClickOnOk()
+// purpose  :
+//=================================================================================
+void OperationGUI_GetShapesOnShapeDlg::ClickOnOk()
+{
+  if (ClickOnApply())
+    ClickOnCancel();
+}
+
+//=================================================================================
+// function : ClickOnApply()
+// purpose  :
+//=================================================================================
+bool OperationGUI_GetShapesOnShapeDlg::ClickOnApply()
+{
+  if (!onAccept())
+    return false;
+
+  initName();
+  // activate first line edit
+  GroupPoints->PushButton1->click();
+  return true;
+}
+
+//=================================================================================
+// function : SelectionIntoArgument()
+// purpose  : Called when selection is changed or on dialog initialization or activation
+//=================================================================================
+void OperationGUI_GetShapesOnShapeDlg::SelectionIntoArgument()
+{
+  myEditCurrentArgument->setText("");
+
+  if      (myEditCurrentArgument == GroupPoints->LineEdit1) myObject1 = GEOM::GEOM_Object::_nil();
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) myObject2 = GEOM::GEOM_Object::_nil();
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  QString aName = "";
+  int nbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aName, true);
+
+  if (nbSel > 0) {
+    Standard_Boolean aRes = Standard_False;
+    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aRes);
+    if (!CORBA::is_nil(aSelectedObject) && aRes && GEOMBase::IsShape(aSelectedObject)) {
+      myEditCurrentArgument->setText(aName);
+
+      // clear selection
+      disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+      myGeomGUI->getApp()->selectionMgr()->clearSelected();
+      connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+              this, SLOT(SelectionIntoArgument()));
+
+      if (myEditCurrentArgument == GroupPoints->LineEdit1) {
+        myObject1 = aSelectedObject;
+        if (myObject2->_is_nil())
+          GroupPoints->PushButton2->click();
+      }
+      else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
+        myObject2 = aSelectedObject;
+        if (myObject1->_is_nil())
+          GroupPoints->PushButton1->click();
+      }
+    }
+  }
+}
+
+//=================================================================================
+// function : SetEditCurrentArgument()
+// purpose  :
+//=================================================================================
+void OperationGUI_GetShapesOnShapeDlg::SetEditCurrentArgument()
+{
+  QPushButton* send = (QPushButton*)sender();
+
+  if      (send == GroupPoints->PushButton1) {
+    myEditCurrentArgument = GroupPoints->LineEdit1;
+
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
+  }
+  else if (send == GroupPoints->PushButton2) {
+    myEditCurrentArgument = GroupPoints->LineEdit2;
+
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+  }
+
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
+  myEditCurrentArgument->setFocus();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+}
+
+//=================================================================================
+// function : LineEditReturnPressed()
+// purpose  :
+//=================================================================================
+void OperationGUI_GetShapesOnShapeDlg::LineEditReturnPressed()
+{
+  QLineEdit* send = (QLineEdit*)sender();
+  if (send == GroupPoints->LineEdit1 || send == GroupPoints->LineEdit2)
+  {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
+}
+
+//=================================================================================
+// function : ActivateThisDialog()
+// purpose  :
+//=================================================================================
+void OperationGUI_GetShapesOnShapeDlg::ActivateThisDialog()
+{
+  GEOMBase_Skeleton::ActivateThisDialog();
+  globalSelection(GEOM_ALLSHAPES);
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+}
+
+//=================================================================================
+// function : enterEvent()
+// purpose  : when mouse enter onto the QWidget
+//=================================================================================
+void OperationGUI_GetShapesOnShapeDlg::enterEvent (QEvent*)
+{
+  if (!mainFrame()->GroupConstructors->isEnabled())
+    ActivateThisDialog();
+}
+
+//=================================================================================
+// function : createOperation
+// purpose  :
+//=================================================================================
+GEOM::GEOM_IOperations_ptr OperationGUI_GetShapesOnShapeDlg::createOperation()
+{
+  return getGeomEngine()->GetIShapesOperations(getStudyId());
+}
+
+//=================================================================================
+// function : isValid
+// purpose  :
+//=================================================================================
+bool OperationGUI_GetShapesOnShapeDlg::isValid(QString&)
+{
+  //Handle(SALOME_InteractiveObject) IO = firstIObject();
+  //Standard_Boolean testResult;
+  //GEOM::GEOM_Object_var anObject = GEOMBase::ConvertIOinGEOMObject(IO, testResult);
+  //if (!testResult || anObject->_is_nil())
+  //  return false;
+
+  return !CORBA::is_nil(myObject1) && !CORBA::is_nil(myObject2);
+}
+
+//=================================================================================
+// function : execute
+// purpose  :
+//=================================================================================
+bool OperationGUI_GetShapesOnShapeDlg::execute (ObjectList& objects)
+{
+  int aLimit = GroupPoints->ComboBox1->currentIndex();
+  switch (aLimit)
+  {
+  case 0:  aLimit = GEOM::SOLID ; break;
+  case 1:  aLimit = GEOM::FACE  ; break;
+  case 2:  aLimit = GEOM::EDGE  ; break;
+  case 3:  aLimit = GEOM::VERTEX; break;
+  default: aLimit = GEOM::SHAPE ; break;
+  }
+
+  GEOM::shape_state aState;
+  switch (GroupPoints->ComboBox2->currentIndex())
+  {
+    case 0:  aState = GEOM::ST_IN;    break;
+    case 1:  aState = GEOM::ST_OUT;   break;
+    case 2:  aState = GEOM::ST_ON;    break;
+    case 3:  aState = GEOM::ST_ONIN;  break;
+    case 4:  aState = GEOM::ST_ONOUT; break;
+    default: break;
+  }
+
+  GEOM::GEOM_Object_var anObj =
+    GEOM::GEOM_IShapesOperations::_narrow(getOperation())->
+    GetShapesOnShapeAsCompound(myObject2, myObject1,
+                               (CORBA::Short) aLimit,
+                               aState);
+
+  if (!anObj->_is_nil())
+    objects.push_back(anObj._retn());
+
+  return objects.size();
+}
+
+//=======================================================================
+//function : ComboTextChanged
+//purpose  :
+//=======================================================================
+void OperationGUI_GetShapesOnShapeDlg::ComboTextChanged()
+{
+  // VRS ???? What is it for ??? commented for a while...
+  //bool IsEnabled = GroupPoints->ComboBox1->currentIndex() < 3;
+}
diff --git a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h
new file mode 100644 (file)
index 0000000..1b81964
--- /dev/null
@@ -0,0 +1,74 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : OperationGUI_GetShapesOnShapeDlg.h
+// Author : Sergey KUUL, Open CASCADE S.A.S. (sergey.kuul@opencascade.com)
+//
+#ifndef OPERATIONGUI_GETSHAPESONSHAPEDLG_H
+#define OPERATIONGUI_GETSHAPESONSHAPEDLG_H
+
+#include <GEOMBase_Skeleton.h>
+#include <GEOMAlgo_State.hxx>
+
+class DlgRef_2Sel2List;
+
+//=================================================================================
+// class    : OperationGUI_GetShapesOnShapeDlg
+// purpose  :
+//=================================================================================
+class OperationGUI_GetShapesOnShapeDlg : public GEOMBase_Skeleton
+{
+  Q_OBJECT
+
+public:
+  OperationGUI_GetShapesOnShapeDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0 );
+  ~OperationGUI_GetShapesOnShapeDlg();
+
+protected:
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+
+private:
+  GEOM::GEOM_Object_var              myObject1;
+  GEOM::GEOM_Object_var              myObject2;
+  int                                myShapeType;
+  GEOMAlgo_State                     myState;
+  
+  DlgRef_2Sel2List*                  GroupPoints;
+
+private slots:
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               SetEditCurrentArgument();
+  void                               SelectionIntoArgument();
+  void                               LineEditReturnPressed();
+  void                               ActivateThisDialog();
+  void                               ComboTextChanged();
+};
+
+#endif // OPERATIONGUI_GETSHAPESONSHAPEDLG_H
index 4fff3b2fb7f893c5d2b9902c922b5248bb62df9e..7474b761ea2ce7bb36e42d442cb4d0dc03b5ee75 100644 (file)
@@ -1,44 +1,39 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  CEA
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it 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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : OperationGUI_MaterialDlg.cxx
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
 //
-//  File   : OperationGUI_MaterialDlg.cxx
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-//  $Header$
-
 #include "OperationGUI_MaterialDlg.h"
 #include "OperationGUI_PartitionDlg.h"
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-
-#include "utilities.h"
+#include <DlgRef.h>
+#include <GEOMBase.h>
+#include <GeometryGUI.h>
 
-#include <qlabel.h>
-#include <qlistview.h>
-#include <qspinbox.h>
-
-using namespace std;
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : OperationGUI_MaterialDlg()
@@ -47,37 +42,39 @@ 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 (GeometryGUI* theGeometryGUI, QWidget* parent,
-                                                    const char* name, GEOM::ListOfGO ListShapes,
-                                                    bool modal, WFlags fl)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+OperationGUI_MaterialDlg::OperationGUI_MaterialDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                    GEOM::ListOfGO ListShapes, bool modal )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal )
 {
   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"));
+  setWindowTitle( tr( "GEOM_MATERIAL_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_PARTITION"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1List1Spin1Btn_QTD(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_PARTITION"));
-
-  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);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_PARTITION" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_1List1Spin1Btn( centralWidget() );
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_PARTITION" ) );
+
+  QStringList columns;
+  columns << tr( "GEOM_MATERIAL_SHAPE" ) << tr( "GEOM_MATERIAL_MATERIAL" );
+  GroupPoints->ListView1->setHeaderLabels( columns );
+  GroupPoints->ListView1->setSelectionMode( QAbstractItemView::ExtendedSelection );
+  GroupPoints->ListView1->setSortingEnabled( false );
+
+  GroupPoints->TextLabel1->setText( tr( "GEOM_MATERIAL_ID" ) );
+  GroupPoints->PushButton1->setText( tr( "GEOM_MATERIAL_SET" ) );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
   /***************************************************************/
 
   setHelpFileName("partition_page.html"); 
@@ -102,43 +99,32 @@ void OperationGUI_MaterialDlg::Init()
 {
   // get materials list from the parent dialog
   OperationGUI_PartitionDlg* aParentDlg =
-    dynamic_cast<OperationGUI_PartitionDlg*>(myParentDlg);
-  if (aParentDlg)
+    qobject_cast<OperationGUI_PartitionDlg*>( parentWidget() );
+  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++) {
+  for ( int ind = 0; ind < myListShapes.length(); ind++ ) {
     GEOM::GEOM_Object_var anObject = myListShapes[ind];
-    if (!anObject->_is_nil()) {
-      MESSAGE("Insert " << GEOMBase::GetName( anObject ));
-      if (ind < myListMaterials.length())
-       aMaterialId = QString::number(myListMaterials[ind]);
-      else 
-       aMaterialId = "0";
-      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);
+    if ( !anObject->_is_nil() ) {
+      QStringList labels;
+      labels << GEOMBase::GetName( anObject );
+      labels << ( ind < myListMaterials.length() ? 
+                 QString::number( myListMaterials[ind] ) : QString( "0" ) );
+      GroupPoints->ListView1->addTopLevelItem( new QTreeWidgetItem( labels ) );
     }
   }
-  MESSAGE("Filled");
 
   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  buttonApply->close(TRUE);
-  buttonCancel->setText(tr("GEOM_BUT_CANCEL"));
-
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetMaterial()));
-
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  buttonApply()->setAttribute( Qt::WA_DeleteOnClose );
+  buttonApply()->close();
+  buttonCancel()->setText( tr( "GEOM_BUT_CANCEL" ) );
+  
+  connect( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetMaterial() ) );
+  
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 }
 
 
@@ -148,28 +134,22 @@ void OperationGUI_MaterialDlg::Init()
 //=================================================================================
 void OperationGUI_MaterialDlg::ClickOnOk()
 {
-  SUIT_Session::session()->activeApplication()->putInfo(tr(""));
+  SUIT_Session::session()->activeApplication()->putInfo( "" );
 
   int nbSh = myListShapes.length();  
-  myListMaterials.length(nbSh);
+  myListMaterials.length( nbSh );
 
-  QListViewItemIterator it (GroupPoints->ListView1);
-  for (int i = 0; it.current() != 0; it++, i++) {
-    QString aMatIdStr = it.current()->text(myMaterCol);
-    myListMaterials[i] = aMatIdStr.toInt();
-    MESSAGE("For shape # " << i << " material ID = " << myListMaterials[i]);
-  }
+  QTreeWidgetItemIterator it( GroupPoints->ListView1 );
+  for ( int i = 0; *it; it++, i++ )
+    myListMaterials[i] = (*it)->text( 1 ).toInt();
 
   // set materials list to the parent dialog
   OperationGUI_PartitionDlg* aParentDlg =
-    dynamic_cast<OperationGUI_PartitionDlg*>(myParentDlg);
-  if (aParentDlg)
-  {
-    aParentDlg->SetListMaterials(myListMaterials);
-  }
+    qobject_cast<OperationGUI_PartitionDlg*>( parentWidget() );
+  if ( aParentDlg )
+    aParentDlg->SetListMaterials( myListMaterials );
 
   ClickOnCancel();
-  return;
 }
 
 
@@ -199,15 +179,13 @@ void OperationGUI_MaterialDlg::SelectionIntoArgument()
 //=================================================================================
 void OperationGUI_MaterialDlg::SetMaterial()
 {
-  int aMatId = GroupPoints->SpinBox1->value();
-  QString aMatIdStr;
-  aMatIdStr.setNum(aMatId);
-  QListViewItemIterator it (GroupPoints->ListView1);
-  for (; it.current() != 0; it++) {
-    if (it.current()->isSelected())
-      it.current()->setText(myMaterCol, aMatIdStr);
+  QString aMatIdStr = QString::number( GroupPoints->SpinBox1->value() );
+  QList<QTreeWidgetItem*> selectedItems = GroupPoints->ListView1->selectedItems();
+
+  QListIterator<QTreeWidgetItem*> it( selectedItems );
+  while ( it.hasNext() ) {
+    it.next()->setText( 1, aMatIdStr );
   }
-  return;
 }
 
 
@@ -218,8 +196,8 @@ void OperationGUI_MaterialDlg::SetMaterial()
 void OperationGUI_MaterialDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
   return;
 }
 
@@ -228,8 +206,8 @@ void OperationGUI_MaterialDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void OperationGUI_MaterialDlg::enterEvent(QEvent* e)
+void OperationGUI_MaterialDlg::enterEvent( QEvent* )
 {
-  if (!GroupConstructors->isEnabled())
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     this->ActivateThisDialog();
 }
index 39111f553e6e4c859b2d4838289ef62ba3abba12..a4ed8d65e08a6cc6b698a7f3fa4f278e87e688f6 100644 (file)
@@ -1,35 +1,34 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  CEA
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it 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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : OperationGUI_MaterialDlg.h
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-
-#ifndef DIALOGBOX_MATERIAL_H
-#define DIALOGBOX_MATERIAL_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : OperationGUI_MaterialDlg.h
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
+//
+#ifndef OPERATIONGUI_MATERIALDLG_H
+#define OPERATIONGUI_MATERIALDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1List1Spin1Btn_QTD.h"
+#include <GEOMBase_Skeleton.h>
 
+class DlgRef_1List1Spin1Btn;
 
 //=================================================================================
 // class    : OperationGUI_MaterialDlg
 //=================================================================================
 class OperationGUI_MaterialDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    OperationGUI_MaterialDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
-                             const char* name, GEOM::ListOfGO ListShapes,
-                             bool modal = FALSE, WFlags fl = 0);
-    ~OperationGUI_MaterialDlg();
-
+  OperationGUI_MaterialDlg( GeometryGUI*, QWidget*, GEOM::ListOfGO,
+                           bool = false );
+  ~OperationGUI_MaterialDlg();
+  
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-
-    QWidget* myParentDlg;
-
-    GEOM::ListOfGO   myListShapes;
-    GEOM::ListOfLong myListMaterials;
-
-    DlgRef_1List1Spin1Btn_QTD* GroupPoints;
-
-    int myShapeCol;
-    int myMaterCol;
-
+  void                       Init();
+  void                       enterEvent( QEvent* );
+  
+private:
+  GEOM::ListOfGO             myListShapes;
+  GEOM::ListOfLong           myListMaterials;
+  
+  DlgRef_1List1Spin1Btn*     GroupPoints;
+  
 private slots:
-    void ClickOnOk();
-    void ActivateThisDialog();
-    void SelectionIntoArgument();
-    void SetMaterial();
+  void                       ClickOnOk();
+  void                       ActivateThisDialog();
+  void                       SelectionIntoArgument();
+  void                       SetMaterial();
 };
 
-#endif // DIALOGBOX_MATERIAL_H
+#endif // OPERATIONGUI_MATERIALDLG_H
index 2c736f5b705d47de091fdc004983a895b40af56e..e52df271c4f2bf71e5cdbf5ff4c4ad22a1506ef1 100644 (file)
@@ -1,45 +1,41 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : OperationGUI_PartitionDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : OperationGUI_PartitionDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "OperationGUI_PartitionDlg.h"
 
-#include "GEOMImpl_Types.hxx"
-
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qlabel.h>
+#include <GEOMImpl_Types.hxx>
 
-#include "utilities.h"
+#include <SUIT_Desktop.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : OperationGUI_PartitionDlg()
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-OperationGUI_PartitionDlg::OperationGUI_PartitionDlg(GeometryGUI* theGeometryGUI, QWidget* parent)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, "OperationGUI_PartitionDlg", false,
-                     WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+OperationGUI_PartitionDlg::OperationGUI_PartitionDlg( GeometryGUI* theGeometryGUI, QWidget* parent )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, false )
 {
   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")));
+  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"));
+  setWindowTitle( tr( "GEOM_PARTITION_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_PARTITION"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_PARTITION" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setIcon( image1 );
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
 
   // Full partition (contains half-space partition)
-  GroupPoints = new DlgRef_2Sel1List1Check_QTD(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_PARTITION"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS"));
-  GroupPoints->TextLabel2->setText(tr("GEOM_TOOL_OBJECT"));
-  GroupPoints->TextLabel3->setText(tr("GEOM_RECONSTRUCTION_LIMIT"));
-  GroupPoints->PushButton1->setPixmap(image2);
-  GroupPoints->PushButton2->setPixmap(image2);
+  GroupPoints = new DlgRef_2Sel1List1Check( centralWidget() );
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_PARTITION" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_OBJECTS" ) );
+  GroupPoints->TextLabel2->setText( tr( "GEOM_TOOL_OBJECT" ) );
+  GroupPoints->TextLabel3->setText( tr( "GEOM_RECONSTRUCTION_LIMIT" ) );
+  GroupPoints->PushButton1->setIcon( image2 );
+  GroupPoints->PushButton2->setIcon( image2 );
   GroupPoints->LineEdit1->setReadOnly( true );
   GroupPoints->LineEdit2->setReadOnly( true );
-  GroupPoints->radioButton4->setText(tr("GEOM_KEEP_NONLIMIT_SHAPES"));
+  GroupPoints->LineEdit1->setEnabled(true);
+  GroupPoints->LineEdit2->setEnabled(false);
+  GroupPoints->CheckButton1->setText( tr( "GEOM_KEEP_NONLIMIT_SHAPES" ) );
 
-  Layout1->addWidget(GroupPoints, 2, 0);
-  /***************************************************************/
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
 
-  setHelpFileName("partition_page.html");
+  /***************************************************************/
 
+  setHelpFileName( "partition_page.html" );
   Init();
 }
 
@@ -95,6 +96,15 @@ OperationGUI_PartitionDlg::~OperationGUI_PartitionDlg()
   // no need to delete child widgets, Qt does it all for us
 }
 
+void OperationGUI_PartitionDlg::SetListMaterials( GEOM::ListOfLong ListMaterials )
+{
+  myListMaterials = ListMaterials; 
+}
+  
+GEOM::ListOfLong OperationGUI_PartitionDlg::GetListMaterials()
+{ 
+  return myListMaterials; 
+}
 
 //=================================================================================
 // function : Init()
@@ -103,34 +113,37 @@ OperationGUI_PartitionDlg::~OperationGUI_PartitionDlg()
 void OperationGUI_PartitionDlg::Init()
 {
   /* type for sub shape selection */
-  GroupPoints->ComboBox1->insertItem(tr("GEOM_RECONSTRUCTION_LIMIT_SOLID"));
-  GroupPoints->ComboBox1->insertItem(tr("GEOM_RECONSTRUCTION_LIMIT_SHELL"));
-  GroupPoints->ComboBox1->insertItem(tr("GEOM_RECONSTRUCTION_LIMIT_FACE"));
-  GroupPoints->ComboBox1->insertItem(tr("GEOM_RECONSTRUCTION_LIMIT_WIRE"));
-  GroupPoints->ComboBox1->insertItem(tr("GEOM_RECONSTRUCTION_LIMIT_EDGE"));
-  GroupPoints->ComboBox1->insertItem(tr("GEOM_RECONSTRUCTION_LIMIT_VERTEX"));
-  GroupPoints->radioButton4->setChecked(FALSE);
+  GroupPoints->ComboBox1->addItem( tr( "GEOM_RECONSTRUCTION_LIMIT_SOLID" ) );
+  GroupPoints->ComboBox1->addItem( tr( "GEOM_RECONSTRUCTION_LIMIT_SHELL" ) );
+  GroupPoints->ComboBox1->addItem( tr( "GEOM_RECONSTRUCTION_LIMIT_FACE" ) );
+  GroupPoints->ComboBox1->addItem( tr( "GEOM_RECONSTRUCTION_LIMIT_WIRE" ) );
+  GroupPoints->ComboBox1->addItem( tr( "GEOM_RECONSTRUCTION_LIMIT_EDGE" ) );
+  GroupPoints->ComboBox1->addItem( tr( "GEOM_RECONSTRUCTION_LIMIT_VERTEX" ) );
+  GroupPoints->CheckButton1->setChecked( false );
+  
+  mainFrame()->GroupBoxPublish->show();
 
   /* 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()));
-  connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+
+  connect( this, SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
   
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
   
-  connect(GroupPoints->ComboBox1, SIGNAL(activated(int)), this, SLOT(ComboTextChanged()));
+  connect( GroupPoints->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( GroupPoints->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
   
-  connect(GroupPoints->radioButton4, SIGNAL(stateChanged(int)), this, SLOT(ReverseSense(int)));
+  connect( GroupPoints->ComboBox1, SIGNAL( activated( int ) ), this, SLOT( ComboTextChanged() ) );
 
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
   
   initName( tr( "GEOM_PARTITION" ) );
+
   ConstructorsClicked( 0 );
+  GroupPoints->PushButton1->click();
 }
 
 
@@ -138,51 +151,52 @@ void OperationGUI_PartitionDlg::Init()
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void OperationGUI_PartitionDlg::ConstructorsClicked(int constructorId)
+void OperationGUI_PartitionDlg::ConstructorsClicked( int constructorId )
 {
-  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
   globalSelection();
   
-  myListShapes.length(0);
-  myListTools.length(0);
-  myListKeepInside.length(0);
-  myListRemoveInside.length(0);
-  myListMaterials.length(0);
-
-  switch (constructorId)
-    {
-    case 0: /*Full partition */
-      {
-       GroupPoints->GroupBox1->setTitle(tr("GEOM_PARTITION"));
-       GroupPoints->TextLabel2->setText(tr("GEOM_TOOL_OBJECT"));
-       resize(0, 0);
-       GroupPoints->TextLabel3->show();
-       GroupPoints->ComboBox1->show();
-       GroupPoints->ComboBox1->setCurrentItem(0);
-       GroupPoints->radioButton4->show();
-       break;
-      }
-    case 1: /*Half-space partition */
-      {
-
-       GroupPoints->GroupBox1->setTitle(tr("GEOM_PARTITION_HALFSPACE"));
-       GroupPoints->TextLabel3->hide();
-       GroupPoints->ComboBox1->hide();
-       GroupPoints->TextLabel2->setText(tr("GEOM_PLANE"));
-       GroupPoints->radioButton4->hide();
-       resize(0, 0);
-       break;
-      }
-    }
+  myListShapes.length( 0 );
+  myListTools.length( 0 );  
+  myListKeepInside.length( 0 );
+  myListRemoveInside.length( 0 );
+  myListMaterials.length( 0 );
+  
+  switch ( constructorId ) {
+  case 0: /*Full partition */
+    GroupPoints->GroupBox1->setTitle( tr( "GEOM_PARTITION" ) );
+    GroupPoints->TextLabel2->setText( tr( "GEOM_TOOL_OBJECT" ) );
+    GroupPoints->TextLabel3->show();
+    GroupPoints->ComboBox1->show();
+    GroupPoints->ComboBox1->setCurrentIndex( 0 );
+    GroupPoints->CheckButton1->show();
+    GroupPoints->PushButton1->setDown( true );
+    GroupPoints->PushButton2->setDown( false );
+    GroupPoints->LineEdit1->setEnabled(true);
+    GroupPoints->LineEdit2->setEnabled(false);
+    break;
+  case 1: /*Half-space partition */
+    GroupPoints->GroupBox1->setTitle( tr( "GEOM_PARTITION_HALFSPACE" ) );
+    GroupPoints->TextLabel3->hide();
+    GroupPoints->ComboBox1->hide();
+    GroupPoints->TextLabel2->setText( tr( "GEOM_PLANE" ) );
+    GroupPoints->CheckButton1->hide();
+    GroupPoints->PushButton1->setDown( true );
+    GroupPoints->LineEdit1->setEnabled(true);
+    break;
+  } 
 
   myEditCurrentArgument = GroupPoints->LineEdit1;
   GroupPoints->LineEdit1->clear();
   GroupPoints->LineEdit2->clear();
 
+  qApp->processEvents();
+  updateGeometry();
+  resize( minimumSizeHint() );
+
   myEditCurrentArgument->setFocus();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-  MESSAGE(width()<<" "<<height());
+  connect( myGeomGUI->getApp()->selectionMgr(), 
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 }
 
 
@@ -221,12 +235,14 @@ void OperationGUI_PartitionDlg::SelectionIntoArgument()
   myEditCurrentArgument->setText( "" );
   QString aString = "";
   
-  int nbSel = GEOMBase::GetNameOfSelectedIObjects( selectedIO(), aString, true );
-
-  if ( nbSel < 1 )
-  {
-    if ( myEditCurrentArgument == GroupPoints->LineEdit1 )
-    {
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  int nbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aString, true);
+    
+  if ( nbSel < 1 ) {
+    if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) {
       myListShapes.length( 0 );
       myListMaterials.length( 0 );
     }
@@ -236,22 +252,21 @@ void OperationGUI_PartitionDlg::SelectionIntoArgument()
   
   // One and only one plane can be selected
   
-  if ( getConstructorId() == 1 && myEditCurrentArgument == GroupPoints->LineEdit2 && nbSel != 1 )
-  {
+  if ( getConstructorId() == 1 &&
+       myEditCurrentArgument == GroupPoints->LineEdit2 && 
+       nbSel != 1 ) {
     myListTools.length( 0 );
     return;
   }
   
-  if ( myEditCurrentArgument == GroupPoints->LineEdit1 )
-  {
-    GEOMBase::ConvertListOfIOInListOfGO( selectedIO(), myListShapes, true );
+  if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) {
+    GEOMBase::ConvertListOfIOInListOfGO(aSelList, myListShapes, true);
     myListMaterials.length( 0 );
     if ( !myListShapes.length() )
       return;
   }
-  else if ( myEditCurrentArgument == GroupPoints->LineEdit2 )
-  {
-    GEOMBase::ConvertListOfIOInListOfGO( selectedIO(), myListTools, true );
+  else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) {
+    GEOMBase::ConvertListOfIOInListOfGO(aSelList, myListTools, true);
     if ( !myListTools.length() )
       return;
   }
@@ -268,19 +283,27 @@ void OperationGUI_PartitionDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
   
-  if(send == GroupPoints->PushButton1)
+  if ( send == GroupPoints->PushButton1 ) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
-  else if(send == GroupPoints->PushButton2)
-  {
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(true);
+    GroupPoints->LineEdit2->setEnabled(false);
+  }
+  else if ( send == GroupPoints->PushButton2 ) {
+    myGeomGUI->getApp()->selectionMgr()->clearSelected(); //clear prewious selection
     myEditCurrentArgument = GroupPoints->LineEdit2;
-    if( getConstructorId()==1 )
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+    GroupPoints->LineEdit2->setEnabled(true);
+    if ( getConstructorId() == 1 )
       globalSelection( GEOM_PLANE  );
   }
  
   globalSelection( GEOM_ALLSHAPES );
-
+      
   myEditCurrentArgument->setFocus();
   SelectionIntoArgument();
+  send->setDown(true);
 }
 
 
@@ -292,12 +315,11 @@ void OperationGUI_PartitionDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
 
-  if(send == GroupPoints->LineEdit1 ||
-     send == GroupPoints->LineEdit2 )
-    {
+  if ( send == GroupPoints->LineEdit1 || 
+       send == GroupPoints->LineEdit2 ) {
       myEditCurrentArgument = send;
       GEOMBase_Skeleton::LineEditReturnPressed();
-    }
+  }
 }
 
 
@@ -308,10 +330,10 @@ void OperationGUI_PartitionDlg::LineEditReturnPressed()
 void OperationGUI_PartitionDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), 
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
-  ConstructorsClicked( getConstructorId() );
+  ConstructorsClicked( getConstructorId() ); 
 }
 
 
@@ -319,9 +341,9 @@ void OperationGUI_PartitionDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void OperationGUI_PartitionDlg::enterEvent(QEvent* e)
+void OperationGUI_PartitionDlg::enterEvent( QEvent* )
 {
-  if (!GroupConstructors->isEnabled())
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     this->ActivateThisDialog();
 }
 
@@ -340,10 +362,10 @@ GEOM::GEOM_IOperations_ptr OperationGUI_PartitionDlg::createOperation()
 // function : isValid
 // purpose  :
 //=================================================================================
-bool OperationGUI_PartitionDlg::isValid( QString& msg )
+bool OperationGUI_PartitionDlg::isValid( QString& )
 {
-  return (myListShapes.length()     || myListTools.length() ||
-         myListKeepInside.length() || myListRemoveInside.length());
+  return ( myListShapes.length()     || myListTools.length() ||
+          myListKeepInside.length() || myListRemoveInside.length() );
 }
 
 
@@ -360,13 +382,13 @@ bool OperationGUI_PartitionDlg::execute( ObjectList& objects )
 
   int aLimit = GetLimit();
   int aConstructorId = getConstructorId();
-
   int aKeepNonlimitShapes = 0;
-  if (aConstructorId == 1) {
+
+  if ( aConstructorId == 1 ) {
     aLimit = GEOM::SHAPE;
   }
   else {
-    if(GroupPoints->radioButton4->isChecked()) {
+    if ( GroupPoints->CheckButton1->isChecked() ) {
       aKeepNonlimitShapes = 1;
     }
     else {
@@ -374,39 +396,42 @@ bool OperationGUI_PartitionDlg::execute( ObjectList& objects )
     }
   }
 
-  if (isValid( msg )) {
-
-    anObj = GEOM::GEOM_IBooleanOperations::_narrow(getOperation())->
-      MakePartition(myListShapes, myListTools,
-                    myListKeepInside, myListRemoveInside,
-                   aLimit, false, myListMaterials, aKeepNonlimitShapes);
+  if ( isValid( msg ) ) {
+    anObj = GEOM::GEOM_IBooleanOperations::_narrow( getOperation() )->
+      MakePartition( myListShapes, myListTools,
+                    myListKeepInside, myListRemoveInside,
+                    aLimit, false, myListMaterials, aKeepNonlimitShapes );
     res = true;
   }
 
-  if (!anObj->_is_nil())
+  if ( !anObj->_is_nil() )
     objects.push_back( anObj._retn() );
 
   return res;
 }
 
-
 //=================================================================================
-// function : closeEvent
+// function : restoreSubShapes
 // purpose  :
 //=================================================================================
-void OperationGUI_PartitionDlg::closeEvent( QCloseEvent* e )
+void OperationGUI_PartitionDlg::restoreSubShapes( SALOMEDS::Study_ptr   theStudy,
+                                                  SALOMEDS::SObject_ptr theSObject )
 {
-  GEOMBase_Skeleton::closeEvent( e );
+  if ( mainFrame()->CheckBoxRestoreSS->isChecked() ) {
+    // empty list of arguments means that all arguments should be restored
+    getGeomEngine()->RestoreSubShapesSO( theStudy, theSObject, GEOM::ListOfGO(),
+                                        /*theFindMethod=*/GEOM::FSM_GetInPlaceByHistory,
+                                        /*theInheritFirstArg=*/myListShapes.length() == 1 ); // ? false
+  }
 }
 
-
 //=======================================================================
 //function : ComboTextChanged
 //purpose  : 
 //=======================================================================
 void OperationGUI_PartitionDlg::ComboTextChanged()
 {
-  bool IsEnabled = GroupPoints->ComboBox1->currentItem() < 3;
+  //bool IsEnabled = GroupPoints->ComboBox1->currentItem() < 3;
   //GroupPoints->LineEdit3->setEnabled(IsEnabled);
   //GroupPoints->LineEdit4->setEnabled(IsEnabled);
   //GroupPoints->TextLabel4->setEnabled(IsEnabled);
@@ -415,17 +440,15 @@ void OperationGUI_PartitionDlg::ComboTextChanged()
   //GroupPoints->PushButton4->setEnabled(IsEnabled);
 }
 
-
 //=================================================================================
 // function : GetLimit()
 // purpose  : 
 //=================================================================================
 int OperationGUI_PartitionDlg::GetLimit() const
 {
-  int aLimit = GroupPoints->ComboBox1->currentItem();
+  int aLimit = GroupPoints->ComboBox1->currentIndex();
 
-  switch (aLimit)
-  {
+  switch ( aLimit ) {
   case 0:  aLimit = GEOM::SOLID ; break;
   case 1:  aLimit = GEOM::SHELL ; break;
   case 2:  aLimit = GEOM::FACE  ; break;
index ba321be37033aa2a9188f867f08212fc03768e12..a540a05eb0be74c1b8606203b1ef50aa2c4894b5 100644 (file)
@@ -1,35 +1,34 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : OperationGUI_PartitionDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : OperationGUI_PartitionDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef OPERATIONGUI_PARTITIONDLG_H
+#define OPERATIONGUI_PARTITIONDLG_H
 
-#ifndef DIALOGBOX_PARTITION_H
-#define DIALOGBOX_PARTITION_H
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel1List1Check_QTD.h"
+class DlgRef_2Sel1List1Check;
 
 //=================================================================================
 // class    : OperationGUI_PartitionDlg
 //=================================================================================
 class OperationGUI_PartitionDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    OperationGUI_PartitionDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0);
-    ~OperationGUI_PartitionDlg();
-
-    void SetListMaterials(GEOM::ListOfLong ListMaterials)
-    { myListMaterials = ListMaterials; }
-
-    GEOM::ListOfLong GetListMaterials()
-    { return myListMaterials; }
+  OperationGUI_PartitionDlg( GeometryGUI*, QWidget* = 0 );
+  ~OperationGUI_PartitionDlg();
+  
+  void                               SetListMaterials( GEOM::ListOfLong );
+  GEOM::ListOfLong                   GetListMaterials();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-
-    virtual void closeEvent( QCloseEvent* e );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr );
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    int GetLimit() const;
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  int                                GetLimit() const;
 
-    GEOM::ListOfGO   myListShapes;
-    GEOM::ListOfLong myListMaterials;
-    GEOM::ListOfGO   myListTools;
-    GEOM::ListOfGO   myListRemoveInside;
-    GEOM::ListOfGO   myListKeepInside;
+private:
+  GEOM::ListOfGO                     myListShapes;
+  GEOM::ListOfLong                   myListMaterials;
+  GEOM::ListOfGO                     myListTools;
+  GEOM::ListOfGO                     myListRemoveInside;
+  GEOM::ListOfGO                     myListKeepInside;
 
-    DlgRef_2Sel1List1Check_QTD* GroupPoints;
+  DlgRef_2Sel1List1Check*            GroupPoints;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ComboTextChanged();
-    void ConstructorsClicked(int constructorId);
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ComboTextChanged();
+  void                               ConstructorsClicked( int );
 };
 
-#endif // DIALOGBOX_PARTITION_H
+#endif // OPERATIONGUI_PARTITIONDLG_H
index 74a06a7fda9d87d995dc912b3e3262fc62aa5475..eee79547825c9b898aebaac0efb90b41db5be67a 100644 (file)
@@ -1,31 +1,30 @@
-#  GEOM PARTITION : partition algorithm
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY 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 PARTITION : partition algorithm
 #  File   : Makefile.in
 #  Author : Marc Tajchman (CEA)
 #  Module : GEOM
 #  $Header$
-
+#
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
index 0c1c5179cde8f80971dff0d2321feadf25b5cbe9..1f4c8ed3077c6e37966638bccf8249f4c08c065c 100644 (file)
@@ -1,44 +1,23 @@
-// 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
-//
---  GEOM PARTITION : partition algorithm
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
---  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
+--  Copyright (C) 2003-2007  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   : Partition.cdl
 --  Author : Benedicte MARTIN 
index 371186e5897b68db34c2213ff559b2cf251956e5..31ed37847f3a4da64244967561ae73f8bcb16c32 100644 (file)
@@ -1,44 +1,23 @@
-// 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
-//
---  GEOM PARTITION : partition algorithm
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
---  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
+--  Copyright (C) 2003-2007  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   : Partition_Inter2d.cdl
 --  Author : Benedicte MARTIN
index 2760b23e68191aa6784834a08f2d525e0e927853..4469bb5b8f664d02de7404dba51c5042c823e5e6 100644 (file)
@@ -1,7 +1,7 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R& D, LEG, PRINCIPIA R& D, BUREAU VERITAS
+//  Copyright (C) 2003-2007  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 along with this library; if 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
-//
-//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+//  GEOM PARTITION : partition algorithm
 //  File   : Partition_Inter2d.cxx
 //  Author : Benedicte MARTIN
 //  Module : GEOM
 //  $Header$
-
+//
 #include "Partition_Inter2d.ixx"
 
 #include "utilities.h"
index da882ca0799546e7378ab72de9e713e3a36133f8..5942fcf141c37ae0dc9b7664a1d223e9c621bcd3 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Inter2d.hxx
 //  Module : GEOM
-
+//
 #ifndef _Partition_Inter2d_HeaderFile
 #define _Partition_Inter2d_HeaderFile
 
index 3725060ed6ef6bc419afaec30a005221b427ad28..954e70da92b11f2bf52f09217f5f0113b89d2cd7 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Inter2d.ixx
 //  Module : GEOM
-
+//
 #include "Partition_Inter2d.jxx"
 
  
index 944b3a55c01c9aed3d550082e4334e41f9a050e9..30cc24a04688422326eb966359573b7adf6e2f40 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Inter2d.jxx
 //  Module : GEOM
-
+//
 #ifndef _BRepAlgo_AsDes_HeaderFile
 #include <BRepAlgo_AsDes.hxx>
 #endif
index fbbfd63fb46c668d0df3d606da0bfc5d1e5280b4..f37cbbb9ab50d1e569c1c0faaba44e02ff392871 100644 (file)
@@ -1,44 +1,23 @@
-// 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
-//
---  GEOM PARTITION : partition algorithm
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
---  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
+--  Copyright (C) 2003-2007  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   : Partition_Inter3d.cdl
 --  Author : Benedicte MARTIN
index 771fc19d10505d88bd207d493294413acb3c2108..87de801359b9aeb93a0896dd5e2e2ed5ad3440c6 100644 (file)
@@ -1,31 +1,30 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Inter3d.cxx
 //  Author : Benedicte MARTIN
 //  Module : GEOM
 //  $Header$
-
+//
 #include "Partition_Inter2d.hxx"
 #include "Partition_Inter3d.ixx"
 #include "utilities.h"
index bb2b431069e8d05a97663f57c3cce01d22509d87..1573cc5f1e49dc7573b421589e69d923bf2ebb14 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Inter3d.hxx
 //  Module : GEOM
-
+//
 #ifndef _Partition_Inter3d_HeaderFile
 #define _Partition_Inter3d_HeaderFile
 
index 438ff8665e610ba9b7261ee5d92477fd61e37df6..a760097d07aafdf2c9c895e7faa8089f8813ba3d 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Inter3d.ixx
 //  Module : GEOM
-
+//
 #include "Partition_Inter3d.jxx"
 
  
index 90453e54789f2f2a6fd1b61b19e2005d623184bd..54e7732e36220c86c0946e0aba2525d89cbe46e6 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Inter3d.jxx
 //  Module : GEOM
-
+//
 #ifndef _BRepAlgo_AsDes_HeaderFile
 #include <BRepAlgo_AsDes.hxx>
 #endif
index c474632b35c36d9d7554496bdca7da6f8a711dd0..05bbf3e8bd06b37558ad1764d07f7d0dcf0bca04 100644 (file)
@@ -1,44 +1,23 @@
-// 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
-//
---  GEOM PARTITION : partition algorithm
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
---  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
+--  Copyright (C) 2003-2007  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   : Partition_Loop.cdl
 --  Author : Benedicte MARTIN
index f118f857d7f9d7f74b90785567f2eda8a2229255..807bc74af470cc17a1948ddfb5e86ed792cdea66 100644 (file)
@@ -1,31 +1,30 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Loop.cxx
 //  Author : Benedicte MARTIN
 //  Module : GEOM
 //  $Header$
-
+//
 #include <stdio.h>
 
 #include "Partition_Loop.ixx"
index 52f2629cac7b02c0bac1dfd8f9b5df5bc65a2d8e..6d8113716c631c52b2145124d5e1bfe8d241a79d 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Loop.hxx
 //  Module : GEOM
-
+//
 #ifndef _Partition_Loop_HeaderFile
 #define _Partition_Loop_HeaderFile
 
index 64eb2d66b15de9b71d56c27d1495ff28657bf52d..3b69d33db36d0e2c7ef86ddba1178cc9cb8d3161 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Loop.ixx
 //  Module : GEOM
-
+//
 #include "Partition_Loop.jxx"
 
  
index c23bd520666d2c346a97e7d78404b2158a552513..a9384fe3afc7bc7d3147819477296eab059dbb35 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Loop.jxx
 //  Module : GEOM
-
+//
 #ifndef _TopoDS_Face_HeaderFile
 #include <TopoDS_Face.hxx>
 #endif
index dfdf625041b83af31df795fa01ca6d80d18cb684..ee7ac34040df20602dc2ad8aa824cbf30227cd9b 100644 (file)
@@ -1,27 +1,23 @@
-// 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
-//
---  GEOM PARTITION : partition algorithm
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
---  Copyright (C) 2003  CEA/DEN, EDF R&D
+--  Copyright (C) 2003-2007  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   : Partition_Loop2d.cdl
 --  Author : Benedicte MARTIN
index 73172877868ceb7bbf3f2a926d5343b5a9d400fc..534e76a41521d3989ffa4956694b27ef6cc51dc2 100644 (file)
@@ -1,29 +1,30 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
 //
-//  GEOM PARTITION : partition algorithm
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Loop2d.cxx
 //  Author : Benedicte MARTIN
 //  Module : GEOM
 //  $Header$
-
+//
 #include "Partition_Loop2d.ixx"
 
 #include "utilities.h"
index eaba040f36eae1e0e5ec33153688c4e6f017df9b..e60b515a1543cfc6e86e6b15b917b610d136ede2 100644 (file)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
 //
-//  GEOM PARTITION : partition algorithm
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Loop2d.hxx
 //  Module : GEOM
-
+//
 #ifndef _Partition_Loop2d_HeaderFile
 #define _Partition_Loop2d_HeaderFile
 
index 1868d7d4bdd2f91f120e7f1cffd277c87ec730d9..18b728c33763674dca3ca0e791f6e8458171688a 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include "Partition_Loop2d.jxx"
 
  
index b4127d344b0a2b706af9f4715a5570e99d11f23f..0118ee22e9fac92140e23f9248bf912417135b74 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Face_HeaderFile
 #include <TopoDS_Face.hxx>
 #endif
index 7b22622563f6ab5485ec392e48fa81fe76de25f0..33e90df74b14693c24fc98c668eb32d1487f218c 100644 (file)
@@ -1,27 +1,23 @@
-// 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
-//
---  GEOM PARTITION : partition algorithm
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
---  Copyright (C) 2003  CEA/DEN, EDF R&D
+--  Copyright (C) 2003-2007  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   : Partition_Loop3d.cdl
 --  Module : GEOM
index 4d83a4616efa9b58c1804348301d6842365a5135..ccca4a36b96a1a985db9c01728abd89338bd38fe 100644 (file)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
 //
-//  GEOM PARTITION : partition algorithm
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Loop3d.cxx
 //  Module : GEOM
-
+//
 #include "Partition_Loop3d.ixx"
 
 #include <TopExp_Explorer.hxx>
index 38be1c3ee862fc1c034581de2f4a2794366a0404..cf7a2f2096fd7a5a512972b764084bd244aea1a1 100644 (file)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
 //
-//  GEOM PARTITION : partition algorithm
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Loop3d.hxx
 //  Module : GEOM
-
+//
 #ifndef _Partition_Loop3d_HeaderFile
 #define _Partition_Loop3d_HeaderFile
 
index 75c6f942ab8e38fc8ce8e2fba619c0e76b2adcde..83205eb5e3566654962d53b83e880b321ae368cb 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #include "Partition_Loop3d.jxx"
 
  
index 9a6f3efaa77f6e41065f2001c738d0d3b75c897f..7b8e1f45f0d4522df39f60b7b9234449746f6b5d 100644 (file)
@@ -1,22 +1,24 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  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
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
index 4d742be40c74c86bc69279b326225d8de825337f..1954b9748f97307e54563d6c4f080c9c6079f61b 100644 (file)
@@ -1,44 +1,23 @@
-// 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
-//
---  GEOM PARTITION : partition algorithm
+--  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 --
---  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
+--  Copyright (C) 2003-2007  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   : Partition_Spliter.cdl
 --  Author : Benedicte MARTIN
index 1bb919fe5127623022128ec51b92cefcd284f574..b9f437e426f4acc44d205d19c71cd1fde33d250e 100644 (file)
@@ -1,31 +1,30 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Spliter.cxx
 //  Author : Benedicte MARTIN
 //  Module : GEOM
 //  $Header$
-
+//
 #include "Partition_Inter2d.hxx"
 #include "Partition_Inter3d.hxx"
 #include "Partition_Loop2d.hxx"
index 04b60c0dee811a516e2f9d5f4ff6d67286b3979e..1b71e20b1c9c93271abdd65c669f39ab898d5b8c 100644 (file)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
 //
-//  GEOM PARTITION : partition algorithm
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Spliter.hxx
 //  Module : GEOM
-
+//
 #ifndef _Partition_Spliter_HeaderFile
 #define _Partition_Spliter_HeaderFile
 
index cd1c199c57a583ffa93404e5cab4037e1839c5da..3443f3150d328fbb44798ac67a41043d4f5fda94 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Spliter.ixx
 //  Module : GEOM
-
+//
 #include "Partition_Spliter.jxx"
 
  
index f89faca05c1c0b0fa76aa3b806469420f84be70c..79d17ddb4c84f50f2891a211b98346a33ed598b9 100644 (file)
@@ -1,29 +1,28 @@
-//  GEOM PARTITION : partition algorithm
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 PARTITION : partition algorithm
 //  File   : Partition_Spliter.jxx
 //  Module : GEOM
-
+//
 #ifndef _BRepAlgo_AsDes_HeaderFile
 #include <BRepAlgo_AsDes.hxx>
 #endif
index 4ca0d879398d64a48fadd8b3d56cc7f1fb60bcff..4825e3f477790db0e6d9e170362134ff1dca7d42 100644 (file)
@@ -1,83 +1,96 @@
-#  GEOM PRIMITIVEGUI : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : PrimitiveGUI
 #
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =                        \
+       PrimitiveGUI.h                  \
+       PrimitiveGUI_BoxDlg.h           \
+       PrimitiveGUI_CylinderDlg.h      \
+       PrimitiveGUI_SphereDlg.h        \
+       PrimitiveGUI_TorusDlg.h         \
+       PrimitiveGUI_ConeDlg.h          
 
 # Libraries targets
 lib_LTLIBRARIES = libPrimitiveGUI.la
 
-dist_libPrimitiveGUI_la_SOURCES = \
-       PrimitiveGUI.cxx \
-       PrimitiveGUI_BoxDlg.cxx \
-       PrimitiveGUI_CylinderDlg.cxx \
-       PrimitiveGUI_SphereDlg.cxx \
-       PrimitiveGUI_TorusDlg.cxx \
-       PrimitiveGUI_ConeDlg.cxx
+dist_libPrimitiveGUI_la_SOURCES =      \
+       PrimitiveGUI.h                  \
+       PrimitiveGUI_BoxDlg.h           \
+       PrimitiveGUI_ConeDlg.h          \
+       PrimitiveGUI_CylinderDlg.h      \
+       PrimitiveGUI_SphereDlg.h        \
+       PrimitiveGUI_TorusDlg.h         \
+       PrimitiveGUI_FaceDlg.h          \
+       PrimitiveGUI_DiskDlg.h          \
+                                       \
+       PrimitiveGUI.cxx                \
+       PrimitiveGUI_BoxDlg.cxx         \
+       PrimitiveGUI_CylinderDlg.cxx    \
+       PrimitiveGUI_SphereDlg.cxx      \
+       PrimitiveGUI_TorusDlg.cxx       \
+       PrimitiveGUI_ConeDlg.cxx        \
+       PrimitiveGUI_FaceDlg.cxx        \
+       PrimitiveGUI_DiskDlg.cxx
 
-MOC_FILES = \
-       PrimitiveGUI_BoxDlg_moc.cxx \
-       PrimitiveGUI_CylinderDlg_moc.cxx \
-       PrimitiveGUI_SphereDlg_moc.cxx \
-       PrimitiveGUI_TorusDlg_moc.cxx \
-       PrimitiveGUI_ConeDlg_moc.cxx
+MOC_FILES =                                    \
+       PrimitiveGUI_BoxDlg_moc.cxx             \
+       PrimitiveGUI_CylinderDlg_moc.cxx        \
+       PrimitiveGUI_SphereDlg_moc.cxx          \
+       PrimitiveGUI_TorusDlg_moc.cxx           \
+       PrimitiveGUI_ConeDlg_moc.cxx            \
+       PrimitiveGUI_FaceDlg_moc.cxx            \
+       PrimitiveGUI_DiskDlg_moc.cxx
 
-nodist_libPrimitiveGUI_la_SOURCES= \
+nodist_libPrimitiveGUI_la_SOURCES =    \
        $(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl
-
-#LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libPrimitiveGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../DlgRef \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(srcdir)/../GEOMFiltersSelection \
-       -I$(top_builddir)/idl \
+libPrimitiveGUI_la_CPPFLAGS =                  \
+       $(QT_INCLUDES)                          \
+       $(VTK_INCLUDES)                         \
+       $(CAS_CPPFLAGS)                         \
+       $(PYTHON_INCLUDES)                      \
+       $(BOOST_CPPFLAGS)                       \
+       $(KERNEL_CXXFLAGS)                      \
+       $(GUI_CXXFLAGS)                         \
+       $(CORBA_CXXFLAGS)                       \
+       $(CORBA_INCLUDES)                       \
+       -I$(srcdir)/../GEOMGUI                  \
+       -I$(srcdir)/../DlgRef                   \
+       -I$(srcdir)/../GEOMBase                 \
+       -I$(srcdir)/../OBJECT                   \
+       -I$(srcdir)/../GEOMClient               \
+       -I$(srcdir)/../GEOMImpl                 \
+       -I$(srcdir)/../GEOMFiltersSelection     \
+       -I$(top_builddir)/src/DlgRef            \
+       -I$(top_builddir)/idl                   \
        -I$(top_builddir)/salome_adm/unix
 
-libPrimitiveGUI_la_LDFLAGS  = \
-       ../GEOMFiltersSelection/libGEOMFiltersSelection.la \
+libPrimitiveGUI_la_LDFLAGS =                                   \
+       ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \
        ../GEOMBase/libGEOMBase.la
index 45ca54db0855f9a1b8d2b8c51a07db43890bde0e..b6c831abac0f6dcfee72d99060251ebc0aa4ecc4 100644 (file)
@@ -1,53 +1,48 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : PrimitiveGUI.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
-
 #include "PrimitiveGUI.h"
-#include "GeometryGUI.h"
 
-#include "SUIT_Session.h"
-#include "SUIT_Desktop.h"
+#include <GeometryGUI.h>
 
-#include "SalomeApp_Application.h"
+#include <SUIT_Desktop.h>
+#include <SalomeApp_Application.h>
 
 #include "PrimitiveGUI_BoxDlg.h"      // Method BOX
 #include "PrimitiveGUI_CylinderDlg.h" // Method CYLINDER
 #include "PrimitiveGUI_SphereDlg.h"   // Method SPHERE
 #include "PrimitiveGUI_TorusDlg.h"    // Method TORUS
 #include "PrimitiveGUI_ConeDlg.h"     // Method CONE
-
-using namespace std;
+#include "PrimitiveGUI_FaceDlg.h"     // Method FACE
+#include "PrimitiveGUI_DiskDlg.h"     // Method DISK
 
 //=======================================================================
 // function : PrimitiveGUI()
 // purpose  : Constructor
 //=======================================================================
-PrimitiveGUI::PrimitiveGUI(GeometryGUI* parent) : GEOMGUI(parent)
+PrimitiveGUI::PrimitiveGUI( GeometryGUI* parent ) : GEOMGUI( parent )
 {
 }
 
@@ -59,56 +54,59 @@ PrimitiveGUI::~PrimitiveGUI()
 {
 }
 
-
 //=======================================================================
 // function : OnGUIEvent()
 // purpose  : 
 //=======================================================================
-bool PrimitiveGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
+bool PrimitiveGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 {
   SalomeApp_Application* app = getGeometryGUI()->getApp();
-  if (!app) return false;
+  if ( !app ) return false;
 
   getGeometryGUI()->EmitSignalDeactivateDialog();
 
   QDialog* aDlg = NULL;
 
-  switch (theCommandID)
-  {
-    case 4021: // BOX
-       aDlg = new PrimitiveGUI_BoxDlg(getGeometryGUI(), parent, "");
-       break;
-    case 4022: // CYLINDER
-       aDlg = new PrimitiveGUI_CylinderDlg(getGeometryGUI(), parent, "");
-       break;
-    case 4023: // SPHERE
-       aDlg = new PrimitiveGUI_SphereDlg(getGeometryGUI(), parent, "");
-       break;
-    case 4024: // TORUS
-       aDlg = new PrimitiveGUI_TorusDlg(getGeometryGUI(), parent, "");
-       break;
-    case 4025: // CONE
-       aDlg = new PrimitiveGUI_ConeDlg(getGeometryGUI(), parent, "");
-       break;
-    default:
-       app->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
-       break;
-    }
+  switch ( theCommandID ) {
+  case 4021: // BOX
+    aDlg = new PrimitiveGUI_BoxDlg( getGeometryGUI(), parent );
+    break;
+  case 4022: // CYLINDER
+    aDlg = new PrimitiveGUI_CylinderDlg( getGeometryGUI(), parent );
+    break;
+  case 4023: // SPHERE
+    aDlg = new PrimitiveGUI_SphereDlg( getGeometryGUI(), parent );
+    break;
+  case 4024: // TORUS
+    aDlg = new PrimitiveGUI_TorusDlg( getGeometryGUI(), parent );
+    break;
+  case 4025: // CONE
+    aDlg = new PrimitiveGUI_ConeDlg( getGeometryGUI(), parent);
+    break;
+  case 4026: // FACE
+    aDlg = new PrimitiveGUI_FaceDlg( getGeometryGUI(), parent);
+    break;
+  case 4027: // DISK
+    aDlg = new PrimitiveGUI_DiskDlg( getGeometryGUI(), parent);
+    break;
+  default:
+    app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
+    break;
+  }
 
-  if (aDlg != NULL)
+  if ( aDlg != NULL )
     aDlg->show();
 
   return true;
 }
 
-
 //=====================================================================================
 // EXPORTED METHODS
 //=====================================================================================
 extern "C"
 {
-#ifdef WNT
-       __declspec( dllexport )
+#ifdef WIN32
+  __declspec( dllexport )
 #endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
index ff2267323adbe769333a1029146b58dfd41326b7..df97571dff7a213a99e6a631d0a4af5e95691876 100644 (file)
@@ -1,35 +1,32 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : PrimitiveGUI.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
 #ifndef PRIMITIVEGUI_H
 #define PRIMITIVEGUI_H
 
-#include "GEOMGUI.h"
-
+#include <GEOMGUI.h>
   
 //=================================================================================
 // class    : PrimitiveGUI
 class PrimitiveGUI : public GEOMGUI
 {
 public:
-  PrimitiveGUI(GeometryGUI* parent);
+  PrimitiveGUI( GeometryGUI* );
   ~PrimitiveGUI();
 
-  bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent);
+  bool OnGUIEvent( int, SUIT_Desktop* );
 };
 
 #endif
diff --git a/src/PrimitiveGUI/PrimitiveGUI.pro b/src/PrimitiveGUI/PrimitiveGUI.pro
new file mode 100644 (file)
index 0000000..ed65cfc
--- /dev/null
@@ -0,0 +1,65 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = PrimitiveGUI
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+INCLUDEPATH += $${QT_INCLUDES} $${VTK_INCLUDES} $${CAS_CPPFLAGS} $${PYTHON_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} $${CORBA_INCLUDES} ../GEOMGUI ../DlgRef ../GEOMBase ../OBJECT ../GEOMClient ../GEOMImpl ../GEOMFiltersSelection $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lGEOMFiltersSelection -lGEOMBase
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+SOURCES  = PrimitiveGUI.cxx
+SOURCES += PrimitiveGUI_BoxDlg.cxx
+SOURCES += PrimitiveGUI_CylinderDlg.cxx
+SOURCES += PrimitiveGUI_SphereDlg.cxx
+SOURCES += PrimitiveGUI_TorusDlg.cxx
+SOURCES += PrimitiveGUI_ConeDlg.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index 4ff84badbada16883695d387d4715eb24d4d7060..ab47b76d39101dd0728d1667f4d7ce896713f1b0 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI_BoxDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : PrimitiveGUI_BoxDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "PrimitiveGUI_BoxDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
+// OCCT Includes
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
 #include <TopExp.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
-
+#include <GEOMImpl_Types.hxx>
+//#include <ostream>
 
 //=================================================================================
 // class    : PrimitiveGUI_BoxDlg()
-// purpose  : Constructs a PrimitiveGUI_BoxDlg which is a child of 'parent', with the 
+// purpose  : Constructs a PrimitiveGUI_BoxDlg which is 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.
 //=================================================================================
-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)
+PrimitiveGUI_BoxDlg::PrimitiveGUI_BoxDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                          bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myInitial(true)
 {
-  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")));
-  QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
+  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")));
+  QPixmap image2 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_BOX_TITLE"));
+  setWindowTitle(tr("GEOM_BOX_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_BOX"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_BOX"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image1);
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
 
-  GroupPoints = new DlgRef_2Sel_QTD(this, "GroupPoints");
+  GroupPoints = new DlgRef_2Sel(centralWidget());
   GroupPoints->GroupBox1->setTitle(tr("GEOM_DIAGONAL_POINTS"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_POINT_I").arg("1"));
-  GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg("2"));
-  GroupPoints->PushButton1->setPixmap(image2);
-  GroupPoints->PushButton2->setPixmap(image2);
+  GroupPoints->TextLabel1->setText(tr("GEOM_POINT_I").arg(1));
+  GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg(2));
+  GroupPoints->PushButton1->setIcon(image2);
+  GroupPoints->PushButton2->setIcon(image2);
 
-  GroupDimensions = new DlgRef_3Spin(this, "GroupDimensions");
+  GroupDimensions = new DlgRef_3Spin(centralWidget());
   GroupDimensions->GroupBox1->setTitle(tr("GEOM_BOX_OBJ"));
   GroupDimensions->TextLabel1->setText(tr("GEOM_DX"));
   GroupDimensions->TextLabel2->setText(tr("GEOM_DY"));
   GroupDimensions->TextLabel3->setText(tr("GEOM_DZ"));
 
-  Layout1->addWidget(GroupPoints, 2, 0);
-  Layout1->addWidget(GroupDimensions, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
+  layout->addWidget(GroupDimensions);
   /***************************************************************/
 
   setHelpFileName("create_box_page.html");
-  
+
   Init();
 }
 
-
 //=================================================================================
 // function : ~DialogBox_Box()
 // purpose  : Destroys the object and frees any allocated resources
@@ -104,39 +102,39 @@ PrimitiveGUI_BoxDlg::~PrimitiveGUI_BoxDlg()
   // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void PrimitiveGUI_BoxDlg::Init()
 {
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
-  
-  myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
-    
-  /* Get setting of step value from file configuration */
+  // Get setting of step value from file configuration
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
-  
-  /* min, max, step and decimals for spin boxes */
-  GroupDimensions->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupDimensions->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupDimensions->SpinBox_DZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
+  double step = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100);
+
+  // min, max, step and decimals for spin boxes
+  initSpinBox(GroupDimensions->SpinBox_DX, 0.000001, COORD_MAX, step, 6); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupDimensions->SpinBox_DY, 0.000001, COORD_MAX, step, 6); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupDimensions->SpinBox_DZ, 0.000001, COORD_MAX, step, 6); // VSR: TODO: DBL_DIGITS_DISPLAY
+
+  // init variables
+  GroupPoints->LineEdit1->setReadOnly(true);
+  GroupPoints->LineEdit2->setReadOnly(true);
+
+  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit2->setText("");
+  myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
 
   double initValue = 200.0;
-  GroupDimensions->SpinBox_DX->SetValue(initValue);
-  GroupDimensions->SpinBox_DY->SetValue(initValue);
-  GroupDimensions->SpinBox_DZ->SetValue(initValue);
+  GroupDimensions->SpinBox_DX->setValue(initValue);
+  GroupDimensions->SpinBox_DY->setValue(initValue);
+  GroupDimensions->SpinBox_DZ->setValue(initValue);
 
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  // 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(this,          SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
 
   connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
@@ -147,58 +145,65 @@ void PrimitiveGUI_BoxDlg::Init()
   connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
   connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
   connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
-  
-  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(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double)));
+
+  initName(tr("GEOM_BOX"));
 
-  initName( tr( "GEOM_BOX" ) );
-  ConstructorsClicked(0);
+  setConstructorId(1); // simplest constructor
+  ConstructorsClicked(1);
+}
+
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void PrimitiveGUI_BoxDlg::SetDoubleSpinBoxStep (double step)
+{
+  GroupDimensions->SpinBox_DX->setSingleStep(step);
+  GroupDimensions->SpinBox_DY->setSingleStep(step);
+  GroupDimensions->SpinBox_DZ->setSingleStep(step);
 }
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void PrimitiveGUI_BoxDlg::ConstructorsClicked(int constructorId)
+void PrimitiveGUI_BoxDlg::ConstructorsClicked (int constructorId)
 {
-  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  switch (constructorId) {
+  case 0:
+    {
+      GroupDimensions->hide();
+      GroupPoints->show();
 
-  switch (constructorId)
+      GroupPoints->PushButton1->click();
+      break;
+    }
+  case 1:
     {
-    case 0:
-      {
-       //      globalSelection( GEOM_POINT );
-        globalSelection(); // close local contexts, if any
-       localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
-
-       GroupDimensions->hide();
-       resize(0, 0);
-       GroupPoints->show();
-
-       myEditCurrentArgument = GroupPoints->LineEdit1;
-       GroupPoints->LineEdit1->setText("");
-       GroupPoints->LineEdit2->setText("");
-       myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
-       
-       connect(myGeomGUI->getApp()->selectionMgr(), 
-               SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-       break;
-      }
-    case 1:
-      {
-       GroupPoints->hide();
-        globalSelection(); // close local contexts, if any
-       resize(0, 0);
-       GroupDimensions->show();
-       
-       break;
-      }
+      GroupPoints->hide();
+      GroupDimensions->show();
+      disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+      globalSelection(); // close local contexts, if any
+
+      displayPreview();
+      break;
     }
-  displayPreview();
+  }
+
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
+
+  if (myInitial) {
+    // on dialog initialization we init the first field with a selected object (if any)
+    SelectionIntoArgument();
+    myInitial = false;
+  }
+  else {
+    displayPreview();
+  }
 }
 
 //=================================================================================
@@ -207,7 +212,7 @@ void PrimitiveGUI_BoxDlg::ConstructorsClicked(int constructorId)
 //=================================================================================
 void PrimitiveGUI_BoxDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
@@ -217,63 +222,68 @@ void PrimitiveGUI_BoxDlg::ClickOnOk()
 //=================================================================================
 bool PrimitiveGUI_BoxDlg::ClickOnApply()
 {
-  if ( !onAccept() )
+  if (!onAccept())
     return false;
-  
+
   initName();
-  ConstructorsClicked( getConstructorId() );
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void PrimitiveGUI_BoxDlg::SelectionIntoArgument()
 {
   if (getConstructorId() != 0)
     return;
 
+  erasePreview();
   myEditCurrentArgument->setText("");
 
-  if (IObjectCount() != 1) 
-  {
-    if (myEditCurrentArgument == GroupPoints->LineEdit1)
-      myPoint1 = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == GroupPoints->LineEdit2)
-      myPoint2 = GEOM::GEOM_Object::_nil();
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
+    if      (myEditCurrentArgument == GroupPoints->LineEdit1) myPoint1 = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == GroupPoints->LineEdit2) myPoint2 = 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(aSelList.First(), testResult);
 
   if (!testResult || CORBA::is_nil(aSelectedObject))
     return;
 
-  TopoDS_Shape aShape;
   QString aName = GEOMBase::GetName(aSelectedObject);
+
+  // Get Selected object if selected subshape
+  TopoDS_Shape aShape;
   if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
   {
-    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
     TColStd_IndexedMapOfInteger aMap;
-    aSelMgr->GetIndexes(firstIObject(), aMap);
+    aSelMgr->GetIndexes(aSelList.First(), aMap);
     if (aMap.Extent() == 1) // Local Selection
     {
-      int anIndex = aMap( 1 );
-      aName.append( ":vertex_" + QString::number( anIndex ) );   
+      int anIndex = aMap(1);
+      aName.append(":vertex_" + QString::number(anIndex));        
 
       //Find SubShape Object in Father
       GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
-      
-      if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-       GEOM::GEOM_IShapesOperations_var aShapesOp =
-         getGeomEngine()->GetIShapesOperations( getStudyId() );
-       aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+
+      if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+        GEOM::GEOM_IShapesOperations_var aShapesOp =
+          getGeomEngine()->GetIShapesOperations(getStudyId());
+        aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+      }
+      else {
+        aSelectedObject = aFindedObject; // get Object from study        
       }
-      else
-       aSelectedObject = aFindedObject; // get Object from study       
     }
     else // Global Selection
     {
@@ -286,10 +296,22 @@ void PrimitiveGUI_BoxDlg::SelectionIntoArgument()
 
   myEditCurrentArgument->setText(aName);
 
-  if (myEditCurrentArgument == GroupPoints->LineEdit1)
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
     myPoint1 = aSelectedObject;
-  else if (myEditCurrentArgument == GroupPoints->LineEdit2)
+    if (!myPoint1->_is_nil() && myPoint2->_is_nil())
+      GroupPoints->PushButton2->click();
+  }
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
     myPoint2 = aSelectedObject;
+    if (!myPoint2->_is_nil() && myPoint1->_is_nil())
+      GroupPoints->PushButton1->click();
+  }
 
   displayPreview();
 }
@@ -302,17 +324,42 @@ void PrimitiveGUI_BoxDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
 
-  if(send == GroupPoints->PushButton1)
+  // ?? Commented, because we need this flag in ConstructorsClicked, because
+  // SelectionIntoArgument must be called only on dialog creation, and must not be called on
+  // simple switch between constructors (as we need to keep old values in fields in this case)
+
+  // clear selection
+  //disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  //if (myInitial)
+  //  myInitial = false;
+  //else
+  //  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+
+  if (send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
-  else if(send == GroupPoints->PushButton2)
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
+  }
+  else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+  }
+
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
+  myEditCurrentArgument->setFocus();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
 
-  //  globalSelection( GEOM_POINT );
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
   globalSelection(); // close local contexts, if any
-  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+  localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
-  myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
 }
 
 //=================================================================================
@@ -322,14 +369,12 @@ void PrimitiveGUI_BoxDlg::SetEditCurrentArgument()
 void PrimitiveGUI_BoxDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1 || send == GroupPoints->LineEdit2)
-    {
-      myEditCurrentArgument = send;
-      GEOMBase_Skeleton::LineEditReturnPressed();
-    }
+  if (send == GroupPoints->LineEdit1 || send == GroupPoints->LineEdit2) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
 }
 
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -337,24 +382,24 @@ void PrimitiveGUI_BoxDlg::LineEditReturnPressed()
 void PrimitiveGUI_BoxDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
-
-  ConstructorsClicked( getConstructorId() );
+  if (getConstructorId() == 0) {
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+    connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+            this, SLOT(SelectionIntoArgument()));
+  }
+  displayPreview();
 }
 
-
 //=================================================================================
 // function : enterEvent [REDEFINED]
 // purpose  :
 //=================================================================================
-void PrimitiveGUI_BoxDlg::enterEvent(QEvent* e)
+void PrimitiveGUI_BoxDlg::enterEvent (QEvent*)
 {
-  if ( !GroupConstructors->isEnabled() )
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-
 //=================================================================================
 // function : ValueChangedInSpinBox()
 // purpose  :
@@ -364,86 +409,90 @@ void PrimitiveGUI_BoxDlg::ValueChangedInSpinBox()
   displayPreview();
 }
 
-
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
 GEOM::GEOM_IOperations_ptr PrimitiveGUI_BoxDlg::createOperation()
 {
-  return getGeomEngine()->GetI3DPrimOperations( getStudyId() );
+  return getGeomEngine()->GetI3DPrimOperations(getStudyId());
 }
 
-
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool PrimitiveGUI_BoxDlg::isValid( QString& msg )
+bool PrimitiveGUI_BoxDlg::isValid (QString& msg)
 {
-  return getConstructorId() == 0 ? !(myPoint1->_is_nil() || myPoint2->_is_nil()) : true;
-}
+  bool ok = true;
+  if( getConstructorId() == 1 )
+  {
+    ok = GroupDimensions->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok;
 
+    ok = fabs( GroupDimensions->SpinBox_DX->value() ) > Precision::Confusion() && ok;
+    ok = fabs( GroupDimensions->SpinBox_DY->value() ) > Precision::Confusion() && ok;
+    ok = fabs( GroupDimensions->SpinBox_DZ->value() ) > Precision::Confusion() && ok;
+  }
+  return getConstructorId() == 0 ? !(myPoint1->_is_nil() || myPoint2->_is_nil()) : ok;
+}
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool PrimitiveGUI_BoxDlg::execute( ObjectList& objects )
+bool PrimitiveGUI_BoxDlg::execute (ObjectList& objects)
 {
   bool res = false;
-  
+
   GEOM::GEOM_Object_var anObj;
-  
-  switch ( getConstructorId() ) 
-  {
-  case 0 :
-    { 
-      if ( !CORBA::is_nil( myPoint1 ) &&  !CORBA::is_nil( myPoint2 ) ) {
-       anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->MakeBoxTwoPnt( myPoint1, myPoint2 );
-       res = true;
+
+  switch (getConstructorId()) {
+  case 0:
+    {
+      if (!CORBA::is_nil(myPoint1) && !CORBA::is_nil(myPoint2)) {
+        anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->MakeBoxTwoPnt(myPoint1, myPoint2);
+        res = true;
       }
-      
-      break;
     }
-  case 1 :
+    break;
+  case 1:
     {
-      double x = GroupDimensions->SpinBox_DX->GetValue();
-      double y = GroupDimensions->SpinBox_DY->GetValue();
-      double z = GroupDimensions->SpinBox_DZ->GetValue();
-      
-      anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->MakeBoxDXDYDZ( x, y, z );
+      double x = GroupDimensions->SpinBox_DX->value();
+      double y = GroupDimensions->SpinBox_DY->value();
+      double z = GroupDimensions->SpinBox_DZ->value();
+
+      anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->MakeBoxDXDYDZ(x, y, z);
+      if (!anObj->_is_nil() && !IsPreview())
+      {
+       QStringList aParameters;
+       aParameters << GroupDimensions->SpinBox_DX->text();
+       aParameters << GroupDimensions->SpinBox_DY->text();
+       aParameters << GroupDimensions->SpinBox_DZ->text();
+       anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+      }
       res = true;
-      break;
     }
+    break;
   }
-  
-  if ( !anObj->_is_nil() )
-  objects.push_back( anObj._retn() );
-  
-  return res;
-}
 
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void  PrimitiveGUI_BoxDlg::closeEvent( QCloseEvent* e )
-{
-  GEOMBase_Skeleton::closeEvent( e );
+  if (!anObj->_is_nil())
+    objects.push_back(anObj._retn());
+
+  return res;
 }
 
 //=================================================================================
-// function : addSubshapeToStudy
+// function : addSubshapesToStudy
 // purpose  : virtual method to add new SubObjects if local selection
 //=================================================================================
 void PrimitiveGUI_BoxDlg::addSubshapesToStudy()
 {
-  QMap<QString, GEOM::GEOM_Object_var> objMap;
-  if ( getConstructorId() == 0 ) 
-  {
+  if (getConstructorId() == 0) {
+    QMap<QString, GEOM::GEOM_Object_var> objMap;
     objMap[GroupPoints->LineEdit1->text()] = myPoint1;
     objMap[GroupPoints->LineEdit2->text()] = myPoint2;
-    addSubshapesToFather( objMap );
+    addSubshapesToFather(objMap);
   }
 }
index 5ff6bf50cac8e9f95202b44466e99f6cc2b0bb09..8cb75c19b878799e15ac3d0dd206908e7f6f2d7f 100644 (file)
@@ -1,38 +1,35 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : PrimitiveGUI_BoxDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_BOX_H
-#define DIALOGBOX_BOX_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI_BoxDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef PRIMITIVEGUI_BOXDLG_H
+#define PRIMITIVEGUI_BOXDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel_QTD.h"
-#include "DlgRef_3Spin.h"
+#include <GEOMBase_Skeleton.h>
 
-using namespace std;
+class DlgRef_2Sel;
+class DlgRef_3Spin;
 
 //=================================================================================
 // class    : PrimitiveGUI_BoxDlg
@@ -40,39 +37,42 @@ using namespace std;
 //=================================================================================
 class PrimitiveGUI_BoxDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
-    
+  Q_OBJECT
+
 public:
-    PrimitiveGUI_BoxDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                       const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~PrimitiveGUI_BoxDlg();
-    
+  PrimitiveGUI_BoxDlg( GeometryGUI*, QWidget* = 0, bool modal = false, Qt::WindowFlags = 0 );
+  ~PrimitiveGUI_BoxDlg();
+
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
-    virtual void closeEvent( QCloseEvent* e );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
+
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+
+private:
+  GEOM::GEOM_Object_var              myPoint1, myPoint2; /* Points containing the vector */
 
-private :
-    void Init();
-    void enterEvent(QEvent* e);
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
 
-    GEOM::GEOM_Object_var myPoint1, myPoint2;   /* Points containing the vector */ 
-    
-    DlgRef_2Sel_QTD* GroupPoints;
-    DlgRef_3Spin* GroupDimensions;
+  DlgRef_2Sel*                       GroupPoints;
+  DlgRef_3Spin*                      GroupDimensions;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ConstructorsClicked(int);
-    void ValueChangedInSpinBox();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               ValueChangedInSpinBox();
+  void                               SetDoubleSpinBoxStep( double );
 };
 
-#endif // DIALOGBOX_BOX_H
+#endif // PRIMITIVEGUI_BOXDLG_H
index e2ad901fe6f69f1bc29e6e6dadfcb8c6a09ae2b9..5bbe434789fbe33daf34fc6c7acbb6ae9cc8ee07 100644 (file)
@@ -1,38 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI_ConeDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : PrimitiveGUI_ConeDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "PrimitiveGUI_ConeDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+
+// OCCT Includes
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : PrimitiveGUI_ConeDlg()
-// purpose  : Constructs a PrimitiveGUI_ConeDlg which is a child of 'parent', with the 
+// purpose  : Constructs a PrimitiveGUI_ConeDlg which is 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.
 //=================================================================================
-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)
+PrimitiveGUI_ConeDlg::PrimitiveGUI_ConeDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                            bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myInitial(true)
 {
-  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")));
-  QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  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")));
+  QPixmap image2 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_CONE_TITLE"));
+  setWindowTitle(tr("GEOM_CONE_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_CONE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_CONE"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image1);
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
 
-  GroupPoints = new DlgRef_2Sel3Spin(this, "GroupPoints");
+  GroupPoints = new DlgRef_2Sel3Spin(centralWidget());
   GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   GroupPoints->TextLabel1->setText(tr("GEOM_BASE_POINT"));
   GroupPoints->TextLabel2->setText(tr("GEOM_VECTOR"));
-  GroupPoints->TextLabel3->setText(tr("GEOM_RADIUS_I").arg("1"));
-  GroupPoints->TextLabel4->setText(tr("GEOM_RADIUS_I").arg("2"));
+  GroupPoints->TextLabel3->setText(tr("GEOM_RADIUS_I").arg(1));
+  GroupPoints->TextLabel4->setText(tr("GEOM_RADIUS_I").arg(2));
   GroupPoints->TextLabel5->setText(tr("GEOM_HEIGHT"));
-  GroupPoints->PushButton1->setPixmap(image2);
-  GroupPoints->PushButton2->setPixmap(image2);
+  GroupPoints->PushButton1->setIcon(image2);
+  GroupPoints->PushButton2->setIcon(image2);
 
-  GroupDimensions = new DlgRef_3Spin(this, "GroupDimensions");
+  GroupDimensions = new DlgRef_3Spin(centralWidget());
   GroupDimensions->GroupBox1->setTitle(tr("GEOM_BOX_OBJ"));
-  GroupDimensions->TextLabel1->setText(tr("GEOM_RADIUS_I").arg("1"));
-  GroupDimensions->TextLabel2->setText(tr("GEOM_RADIUS_I").arg("2"));
+  GroupDimensions->TextLabel1->setText(tr("GEOM_RADIUS_I").arg(1));
+  GroupDimensions->TextLabel2->setText(tr("GEOM_RADIUS_I").arg(2));
   GroupDimensions->TextLabel3->setText(tr("GEOM_HEIGHT"));
 
-  Layout1->addWidget(GroupPoints, 2, 0);
-  Layout1->addWidget(GroupDimensions, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
+  layout->addWidget(GroupDimensions);
   /***************************************************************/
 
-  setHelpFileName( "create_cone_page.html" );
-  
+  setHelpFileName("create_cone_page.html");
+
   Init();
 }
 
-
 //=================================================================================
 // function : ~PrimitiveGUI_ConeDlg()
 // purpose  : Destroys the object and frees any allocated resources
 //=================================================================================
 PrimitiveGUI_ConeDlg::~PrimitiveGUI_ConeDlg()
 {
-    // no need to delete child widgets, Qt does it all for us
+  // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void PrimitiveGUI_ConeDlg::Init()
 {
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
-  
-  myPoint = myDir = GEOM::GEOM_Object::_nil();
-  
-  /* Get setting of step value from file configuration */
+  // Get setting of step value from file configuration
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
-  
-  /* min, max, step and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator(0.000, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox_DY->RangeStepAndValidator(0.000, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox_DZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupDimensions->SpinBox_DX->RangeStepAndValidator(0.000, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupDimensions->SpinBox_DY->RangeStepAndValidator(0.000, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupDimensions->SpinBox_DZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-
-  double aRadius1(100.0), aRadius2(0.0), aHeight(300.0); 
-  GroupPoints->SpinBox_DX->SetValue(aRadius1);
-  GroupPoints->SpinBox_DY->SetValue(aRadius2);
-  GroupPoints->SpinBox_DZ->SetValue(aHeight);
-  GroupDimensions->SpinBox_DX->SetValue(aRadius1);
-  GroupDimensions->SpinBox_DY->SetValue(aRadius2);
-  GroupDimensions->SpinBox_DZ->SetValue(aHeight);
-
-  /* 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)));
+  double step = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100);
+
+  // min, max, step and decimals for spin boxes & initial values
+  initSpinBox(GroupPoints->SpinBox_DX, 0.0, COORD_MAX, step, 5); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupPoints->SpinBox_DY, 0.0, COORD_MAX, step, 5); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupPoints->SpinBox_DZ, 0.00001, COORD_MAX, step, 5); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupDimensions->SpinBox_DX, 0.0, COORD_MAX, step, 5); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupDimensions->SpinBox_DY, 0.0, COORD_MAX, step, 5); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupDimensions->SpinBox_DZ, 0.00001, COORD_MAX, step, 5); // VSR: TODO: DBL_DIGITS_DISPLAY
+
+  // init variables
+  GroupPoints->LineEdit1->setReadOnly(true);
+  GroupPoints->LineEdit2->setReadOnly(true);
+
+  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit2->setText("");
+  myPoint = myDir = GEOM::GEOM_Object::_nil();
+
+  double aRadius1(100.0), aRadius2(0.0), aHeight(300.0);
+  GroupPoints->SpinBox_DX->setValue(aRadius1);
+  GroupPoints->SpinBox_DY->setValue(aRadius2);
+  GroupPoints->SpinBox_DZ->setValue(aHeight);
+  GroupDimensions->SpinBox_DX->setValue(aRadius1);
+  GroupDimensions->SpinBox_DY->setValue(aRadius2);
+  GroupDimensions->SpinBox_DZ->setValue(aHeight);
+
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(this,          SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
 
   connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
@@ -152,69 +151,75 @@ void PrimitiveGUI_ConeDlg::Init()
   connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
   connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
 
-  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
-  connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
-  connect(GroupPoints->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupPoints->SpinBox_DX,     SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupPoints->SpinBox_DY,     SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupPoints->SpinBox_DZ,     SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
   connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
   connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
   connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
 
-  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(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-  
-  initName( tr( "GEOM_CONE" ) );
-  ConstructorsClicked(0);
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double)));
+
+  initName(tr("GEOM_CONE"));
+
+  setConstructorId(1); // simplest constructor
+  ConstructorsClicked(1);
 }
 
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void PrimitiveGUI_ConeDlg::SetDoubleSpinBoxStep (double step)
+{
+  GroupPoints->SpinBox_DX->setSingleStep(step);
+  GroupPoints->SpinBox_DY->setSingleStep(step);
+  GroupPoints->SpinBox_DZ->setSingleStep(step);
+  GroupDimensions->SpinBox_DX->setSingleStep(step);
+  GroupDimensions->SpinBox_DY->setSingleStep(step);
+  GroupDimensions->SpinBox_DZ->setSingleStep(step);
+}
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void PrimitiveGUI_ConeDlg::ConstructorsClicked(int constructorId)
+void PrimitiveGUI_ConeDlg::ConstructorsClicked (int constructorId)
 {
-  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
-  
-  switch(constructorId)
-    { 
-    case 0 :
-      {
-       //      globalSelection( GEOM_POINT );
-        globalSelection(); // to break prvious local selection
-       localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
-       GroupDimensions->hide();
-       resize(0, 0);
-       GroupPoints->show();
-       
-       myEditCurrentArgument = GroupPoints->LineEdit1;
-       GroupPoints->LineEdit1->setText(tr(""));
-       GroupPoints->LineEdit2->setText(tr(""));
-       myPoint = myDir = GEOM::GEOM_Object::_nil();
-       
-       connect(myGeomGUI->getApp()->selectionMgr(), 
-               SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-       break;
-      }
-    case 1 :
-      { 
-       GroupPoints->hide();
-        globalSelection(); // close local contexts, if any
-       resize( 0, 0 );
-       GroupDimensions->show();
-
-       break;
-      }
+  switch (constructorId) {
+  case 0:
+    {
+      GroupDimensions->hide();
+      GroupPoints->show();
+
+      GroupPoints->PushButton1->click();
+      break;
     }
-  displayPreview();
-}
+  case 1:
+    {
+      GroupPoints->hide();
+      GroupDimensions->show();
+      disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+      globalSelection(); // close local contexts, if any
 
+      displayPreview();
+      break;
+    }
+  }
+
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
+
+  if (myInitial) {
+    // on dialog initialization we init the first field with a selected object (if any)
+    SelectionIntoArgument();
+    myInitial = false;
+  }
+  else {
+    displayPreview();
+  }
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -222,74 +227,67 @@ void PrimitiveGUI_ConeDlg::ConstructorsClicked(int constructorId)
 //=================================================================================
 void PrimitiveGUI_ConeDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool PrimitiveGUI_ConeDlg::ClickOnApply()
 {
-  if ( !onAccept() )
+  if (!onAccept())
     return false;
 
   initName();
-  ConstructorsClicked( getConstructorId() );
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
-
-//=======================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=======================================================================
-void PrimitiveGUI_ConeDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed or other case
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void PrimitiveGUI_ConeDlg::SelectionIntoArgument()
 {
   if (getConstructorId() != 0)
     return;
 
-  if (IObjectCount() != 1)
-  {
-    if (myEditCurrentArgument == GroupPoints->LineEdit1)
-      myPoint = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == GroupPoints->LineEdit2)
-      myDir = GEOM::GEOM_Object::_nil();
+  erasePreview();
+  myEditCurrentArgument->setText("");
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
+    if      (myEditCurrentArgument == GroupPoints->LineEdit1) myPoint = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == GroupPoints->LineEdit2) myDir   = GEOM::GEOM_Object::_nil();
     return;
   }
 
-  /* nbSel == 1 */
+  // nbSel == 1
   Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
-  
-  if(!testResult || CORBA::is_nil( aSelectedObject ))
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+
+  if (!testResult || CORBA::is_nil(aSelectedObject))
     return;
 
-  TopoDS_Shape aShape;
-  QString aName = GEOMBase::GetName( aSelectedObject );
+  QString aName = GEOMBase::GetName(aSelectedObject);
 
+  // Get Selected object if selected subshape
+  TopoDS_Shape aShape;
   if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
   {
     TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
     if (myEditCurrentArgument == GroupPoints->LineEdit2)
       aNeedType = TopAbs_EDGE;
 
-    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
     TColStd_IndexedMapOfInteger aMap;
-    aSelMgr->GetIndexes( firstIObject(), aMap );
-    if (aMap.Extent() == 1)
+    aSelMgr->GetIndexes(aSelList.First(), aMap);
+    if (aMap.Extent() == 1) // Local Selection
     {
       int anIndex = aMap(1);
       if (aNeedType == TopAbs_EDGE)
@@ -300,15 +298,16 @@ void PrimitiveGUI_ConeDlg::SelectionIntoArgument()
       //Find SubShape Object in Father
       GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
 
-      if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-       GEOM::GEOM_IShapesOperations_var aShapesOp =
-         getGeomEngine()->GetIShapesOperations(getStudyId());
-       aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+      if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+        GEOM::GEOM_IShapesOperations_var aShapesOp =
+          getGeomEngine()->GetIShapesOperations(getStudyId());
+        aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+      }
+      else {
+        aSelectedObject = aFindedObject; // get Object from study
       }
-      else
-       aSelectedObject = aFindedObject; // get Object from study       
     }
-    else
+    else // Global Selection
     {
       if (aShape.ShapeType() != aNeedType) {
         aSelectedObject = GEOM::GEOM_Object::_nil();
@@ -319,10 +318,22 @@ void PrimitiveGUI_ConeDlg::SelectionIntoArgument()
 
   myEditCurrentArgument->setText(aName);
 
-  if (myEditCurrentArgument == GroupPoints->LineEdit1)
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
     myPoint = aSelectedObject;
-  else if (myEditCurrentArgument == GroupPoints->LineEdit2)
+    if (!myPoint->_is_nil() && myDir->_is_nil())
+      GroupPoints->PushButton2->click();
+  }
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
     myDir = aSelectedObject;
+    if (!myDir->_is_nil() && myPoint->_is_nil())
+      GroupPoints->PushButton1->click();
+  }
 
   displayPreview();
 }
@@ -334,22 +345,38 @@ void PrimitiveGUI_ConeDlg::SelectionIntoArgument()
 void PrimitiveGUI_ConeDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  
-  if(send == GroupPoints->PushButton1) {
+
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  if (send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
-    globalSelection( GEOM_POINT ); // to break prvious local selection
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
+
+    globalSelection(GEOM_POINT); // to break previous local selection
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
   }
-  else if(send == GroupPoints->PushButton2) {
+  else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
-    globalSelection( GEOM_LINE );// to break prvious local selection
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+
+    globalSelection(GEOM_LINE);// to break previous local selection
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
   }
-  
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
-}
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
 
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
+}
 
 //=================================================================================
 // function : LineEditReturnPressed()
@@ -358,12 +385,11 @@ void PrimitiveGUI_ConeDlg::SetEditCurrentArgument()
 void PrimitiveGUI_ConeDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1 ||
-     send == GroupPoints->LineEdit2)
-    {
-      myEditCurrentArgument = send;
-      GEOMBase_Skeleton::LineEditReturnPressed();
-    }
+  if (send == GroupPoints->LineEdit1 ||
+      send == GroupPoints->LineEdit2) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
 }
 
 //=================================================================================
@@ -373,33 +399,23 @@ void PrimitiveGUI_ConeDlg::LineEditReturnPressed()
 void PrimitiveGUI_ConeDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
 
-  ConstructorsClicked(getConstructorId());
-}
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-//=================================================================================
-// function : DeactivateActiveDialog()
-// purpose  : public slot to deactivate if active
-//=================================================================================
-void PrimitiveGUI_ConeDlg::DeactivateActiveDialog()
-{
-  GEOMBase_Skeleton::DeactivateActiveDialog();
+  ConstructorsClicked( getConstructorId() );
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void PrimitiveGUI_ConeDlg::enterEvent(QEvent* e)
+void PrimitiveGUI_ConeDlg::enterEvent (QEvent*)
 {
-  if ( !GroupConstructors->isEnabled() )
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-
 //=================================================================================
 // function : ValueChangedInSpinBox()
 // purpose  :
@@ -409,76 +425,88 @@ void PrimitiveGUI_ConeDlg::ValueChangedInSpinBox()
   displayPreview();
 }
 
-
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
 GEOM::GEOM_IOperations_ptr  PrimitiveGUI_ConeDlg::createOperation()
 {
-  return getGeomEngine()->GetI3DPrimOperations( getStudyId() );
+  return getGeomEngine()->GetI3DPrimOperations(getStudyId());
 }
 
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool  PrimitiveGUI_ConeDlg::isValid( QString& msg )
+bool  PrimitiveGUI_ConeDlg::isValid (QString& msg)
 {
-  return getConstructorId() == 0 ? !(myPoint->_is_nil() || myDir->_is_nil()) : true;
+  if (!getRadius1() && !getRadius2())
+    return false;
+
+  bool ok = true;
+  if( getConstructorId() == 0 )
+  {
+    ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupPoints->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupPoints->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok;
+  }
+  else if( getConstructorId() == 1 )
+  {
+    ok = GroupDimensions->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DZ->isValid( msg, !IsPreview() ) && ok;
+  }
+  ok = fabs( getHeight() ) > Precision::Confusion() && ok;
+  return getConstructorId() == 0 ? !(myPoint->_is_nil() || myDir->_is_nil()) && ok : ok;
 }
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool PrimitiveGUI_ConeDlg::execute( ObjectList& objects )
+bool PrimitiveGUI_ConeDlg::execute (ObjectList& objects)
 {
   bool res = false;
-  
+
   GEOM::GEOM_Object_var anObj;
 
-  switch ( getConstructorId() ) 
-  {
-  case 0 :
-  {
-    if ( !CORBA::is_nil( myPoint ) && !CORBA::is_nil( myDir ) ){
-      anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->MakeConePntVecR1R2H( myPoint, 
-                                                                                           myDir, 
-                                                                                           getRadius1(),
-                                                                                           getRadius2(),
-                                                                                           getHeight());
+  switch (getConstructorId()) {
+  case 0:
+    if (!CORBA::is_nil(myPoint) && !CORBA::is_nil(myDir)) {
+      anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+        MakeConePntVecR1R2H(myPoint, myDir, getRadius1(), getRadius2(), getHeight());
+      if (!anObj->_is_nil() && !IsPreview())
+      {
+       QStringList aParameters;
+       aParameters << GroupPoints->SpinBox_DX->text();
+       aParameters << GroupPoints->SpinBox_DY->text();
+       aParameters << GroupPoints->SpinBox_DZ->text();
+       anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+      }
       res = true;
     }
     break;
-  }
-  case 1 :
+  case 1:
+    anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+      MakeConeR1R2H(getRadius1(), getRadius2(), getHeight());
+    if (!anObj->_is_nil() && !IsPreview())
     {
-      anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->MakeConeR1R2H( getRadius1(),
-                                                                                     getRadius2(),
-                                                                                     getHeight());
-      res = true;
-      break;
+      QStringList aParameters;
+      aParameters << GroupDimensions->SpinBox_DX->text();
+      aParameters << GroupDimensions->SpinBox_DY->text();
+      aParameters << GroupDimensions->SpinBox_DZ->text();
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
     }
+    res = true;
+    break;
   }
 
-  if ( !anObj->_is_nil() )
-    objects.push_back( anObj._retn() );
+  if (!anObj->_is_nil())
+    objects.push_back(anObj._retn());
 
   return res;
 }
 
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void PrimitiveGUI_ConeDlg::closeEvent( QCloseEvent* e )
-{
-  // myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
-
 //=================================================================================
 // function : getRadius1()
 // purpose  :
@@ -487,13 +515,12 @@ double PrimitiveGUI_ConeDlg::getRadius1() const
 {
   int aConstructorId = getConstructorId();
   if (aConstructorId == 0)
-    return GroupPoints->SpinBox_DX->GetValue();
+    return GroupPoints->SpinBox_DX->value();
   else if (aConstructorId == 1)
-    return GroupDimensions->SpinBox_DX->GetValue();
+    return GroupDimensions->SpinBox_DX->value();
   return 0;
 }
 
-
 //=================================================================================
 // function : getRadius2()
 // purpose  :
@@ -502,24 +529,23 @@ double PrimitiveGUI_ConeDlg::getRadius2() const
 {
   int aConstructorId = getConstructorId();
   if (aConstructorId == 0)
-    return GroupPoints->SpinBox_DY->GetValue();
+    return GroupPoints->SpinBox_DY->value();
   else if (aConstructorId == 1)
-    return GroupDimensions->SpinBox_DY->GetValue();
+    return GroupDimensions->SpinBox_DY->value();
   return 0;
 }
 
-
 //=================================================================================
-// function : getRadius2()
+// function : getHeight()
 // purpose  :
 //=================================================================================
 double PrimitiveGUI_ConeDlg::getHeight() const
 {
   int aConstructorId = getConstructorId();
   if (aConstructorId == 0)
-    return GroupPoints->SpinBox_DZ->GetValue();
+    return GroupPoints->SpinBox_DZ->value();
   else if (aConstructorId == 1)
-    return GroupDimensions->SpinBox_DZ->GetValue();
+    return GroupDimensions->SpinBox_DZ->value();
   return 0;
 }
 
@@ -531,8 +557,7 @@ void PrimitiveGUI_ConeDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
 
-switch (getConstructorId())
-  {
+  switch (getConstructorId()) {
   case 0:
     objMap[GroupPoints->LineEdit1->text()] = myPoint;
     objMap[GroupPoints->LineEdit2->text()] = myDir;
@@ -540,5 +565,5 @@ switch (getConstructorId())
   case 1:
     return;
   }
addSubshapesToFather( objMap );
 addSubshapesToFather(objMap);
 }
index f6b3f94cf6bc93a386f2e449affeee0f89c1dd92..2d1d6dc83e4dc14714842f150ea4394448b6c2af 100644 (file)
@@ -1,36 +1,35 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : PrimitiveGUI_ConeDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI_ConeDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef PRIMITIVEGUI_CONEDLG_H
+#define PRIMITIVEGUI_CONEDLG_H
 
-#ifndef DIALOGBOX_CONE_H
-#define DIALOGBOX_CONE_H
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel3Spin.h"
-#include "DlgRef_3Spin.h"
+class DlgRef_2Sel3Spin;
+class DlgRef_3Spin;
 
 //=================================================================================
 // class    : PrimitiveGUI_ConeDlg
 //=================================================================================
 class PrimitiveGUI_ConeDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    PrimitiveGUI_ConeDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                        const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~PrimitiveGUI_ConeDlg();
-
+  PrimitiveGUI_ConeDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~PrimitiveGUI_ConeDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
-    virtual void closeEvent( QCloseEvent* e );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
+
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  double                             getRadius1() const;
+  double                             getRadius2() const;
+  double                             getHeight() const;
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    double getRadius1() const;
-    double getRadius2() const;
-    double getHeight() const;
+  GEOM::GEOM_Object_var              myPoint, myDir;
 
-    GEOM::GEOM_Object_var myPoint, myDir;
-    
-    DlgRef_2Sel3Spin* GroupPoints;
-    DlgRef_3Spin* GroupDimensions;
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
+  
+  DlgRef_2Sel3Spin*                  GroupPoints;
+  DlgRef_3Spin*                      GroupDimensions;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ClickOnCancel();
-    void ActivateThisDialog();
-    void DeactivateActiveDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ConstructorsClicked(int);
-    void ValueChangedInSpinBox();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               ValueChangedInSpinBox();
+  void                               SetDoubleSpinBoxStep( double );
 };
 
-#endif // DIALOGBOX_CONE_H
+#endif // PRIMITIVEGUI_CONEDLG_H
index 82de95d33dc6382d17149cc4defea6ce66bfd004..b77bd11a36ee62b7b0373fb1d973e232e02efe79 100644 (file)
@@ -1,38 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI_CylinderDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : PrimitiveGUI_CylinderDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "PrimitiveGUI_CylinderDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+
+// OCCT Includes
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : PrimitiveGUI_CylinderDlg()
-// purpose  : Constructs a PrimitiveGUI_CylinderDlg which is a child of 'parent', with the 
+// purpose  : Constructs a PrimitiveGUI_CylinderDlg which is 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.
 //=================================================================================
-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)
+PrimitiveGUI_CylinderDlg::PrimitiveGUI_CylinderDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                    bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myInitial(true)
 {
-  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")));
-  QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  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")));
+  QPixmap image2 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_CYLINDER_TITLE"));
+  setWindowTitle(tr("GEOM_CYLINDER_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_CYLINDER"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_CYLINDER"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image1);
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
 
-  GroupPoints = new DlgRef_2Sel2Spin(this, "GroupPoints");
+  GroupPoints = new DlgRef_2Sel2Spin(centralWidget());
   GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   GroupPoints->TextLabel1->setText(tr("GEOM_BASE_POINT"));
   GroupPoints->TextLabel2->setText(tr("GEOM_VECTOR"));
   GroupPoints->TextLabel3->setText(tr("GEOM_RADIUS"));
   GroupPoints->TextLabel4->setText(tr("GEOM_HEIGHT"));
-  GroupPoints->PushButton1->setPixmap(image2);
-  GroupPoints->PushButton2->setPixmap(image2);
+  GroupPoints->PushButton1->setIcon(image2);
+  GroupPoints->PushButton2->setIcon(image2);
 
-  GroupDimensions = new DlgRef_2Spin(this, "GroupDimensions");
+  GroupDimensions = new DlgRef_2Spin(centralWidget());
   GroupDimensions->GroupBox1->setTitle(tr("GEOM_BOX_OBJ"));
   GroupDimensions->TextLabel1->setText(tr("GEOM_RADIUS"));
   GroupDimensions->TextLabel2->setText(tr("GEOM_HEIGHT"));
 
-  Layout1->addWidget(GroupPoints, 2, 0);
-  Layout1->addWidget(GroupDimensions, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
+  layout->addWidget(GroupDimensions);
   /***************************************************************/
 
   setHelpFileName("create_cylinder_page.html");
@@ -95,53 +94,51 @@ PrimitiveGUI_CylinderDlg::PrimitiveGUI_CylinderDlg(GeometryGUI* theGeometryGUI,
   Init();
 }
 
-
 //=================================================================================
 // function : ~PrimitiveGUI_CylinderDlg()
 // purpose  : Destroys the object and frees any allocated resources
 //=================================================================================
 PrimitiveGUI_CylinderDlg::~PrimitiveGUI_CylinderDlg()
 {
-    // no need to delete child widgets, Qt does it all for us
+  // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void PrimitiveGUI_CylinderDlg::Init()
 {
-  /* init variables */
+  // Get setting of step value from file configuration
+  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+  double step = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100);
+
+  // min, max, step and decimals for spin boxes & initial values
+  initSpinBox(GroupPoints->SpinBox_DX, 0.00001, COORD_MAX, step, 5); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupPoints->SpinBox_DY, 0.00001, COORD_MAX, step, 5); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupDimensions->SpinBox_DX, 0.00001, COORD_MAX, step, 5); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupDimensions->SpinBox_DY, 0.00001, COORD_MAX, step, 5); // VSR: TODO: DBL_DIGITS_DISPLAY
+
+  // init variables
   myEditCurrentArgument = GroupPoints->LineEdit1;
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
+  GroupPoints->LineEdit1->setReadOnly(true);
+  GroupPoints->LineEdit2->setReadOnly(true);
 
+  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit2->setText("");
   myPoint = myDir = GEOM::GEOM_Object::_nil();
-  
-  /* Get setting of step value from file configuration */
-  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
-
-  /* min, max, step and decimals for spin boxes & initial values */
-  /* First constructor : radius */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  /* First constructor : algebric height */
-  GroupPoints->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  /* Second constructor : radius */
-  GroupDimensions->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  /* Second constructor : algebric height */
-  GroupDimensions->SpinBox_DY->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-
-  GroupPoints->SpinBox_DX->SetValue(100.0);
-  GroupPoints->SpinBox_DY->SetValue(300.0);
-  GroupDimensions->SpinBox_DX->SetValue(100.0);  
-  GroupDimensions->SpinBox_DY->SetValue(300.0);  
-
-  /* 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)));
+
+  double aRadius(100.0), aHeight(300.0);
+  GroupPoints->SpinBox_DX->setValue(aRadius);
+  GroupPoints->SpinBox_DY->setValue(aHeight);
+  GroupDimensions->SpinBox_DX->setValue(aRadius);
+  GroupDimensions->SpinBox_DY->setValue(aHeight);
+
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(this,          SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
 
   connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
@@ -149,65 +146,76 @@ void PrimitiveGUI_CylinderDlg::Init()
   connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
   connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
 
-  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
-  connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupPoints->SpinBox_DX,     SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupPoints->SpinBox_DY,     SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
   connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
   connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
 
-  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(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-  
-  initName( tr( "GEOM_CYLINDER" ) );
-  ConstructorsClicked(0);
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double)));
+
+  initName(tr("GEOM_CYLINDER"));
+
+  setConstructorId(1); // simplest constructor
+  ConstructorsClicked(1);
 }
 
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void PrimitiveGUI_CylinderDlg::SetDoubleSpinBoxStep (double step)
+{
+  GroupPoints->SpinBox_DX->setSingleStep(step);
+  GroupPoints->SpinBox_DY->setSingleStep(step);
+  GroupDimensions->SpinBox_DX->setSingleStep(step);
+  GroupDimensions->SpinBox_DY->setSingleStep(step);
+}
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void PrimitiveGUI_CylinderDlg::ConstructorsClicked(int constructorId)
+void PrimitiveGUI_CylinderDlg::ConstructorsClicked (int constructorId)
 {
   disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
-    
-  switch (constructorId)
-    { 
-    case 0 :
-      {
-        globalSelection( GEOM_POINT ); // to break previous local selection
-       localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
-
-       GroupDimensions->hide();
-       resize(0, 0);
-       GroupPoints->show();
-       
-       myEditCurrentArgument = GroupPoints->LineEdit1;
-       GroupPoints->LineEdit1->setText(tr(""));
-       GroupPoints->LineEdit2->setText(tr(""));
-       myPoint = myDir = GEOM::GEOM_Object::_nil();
-
-       connect(myGeomGUI->getApp()->selectionMgr(), 
-               SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-       break;
-      }
-    case 1 :
-      { 
-       GroupPoints->hide();
-        globalSelection(); // close local contexts, if any
-       resize( 0, 0 );
-       GroupDimensions->show();
-       
-       break;
-      }
+
+  switch (constructorId) {
+  case 0:
+    {
+      GroupDimensions->hide();
+      GroupPoints->show();
+
+      GroupPoints->PushButton1->click();
+      break;
     }
-  displayPreview();
-}
+  case 1:
+    {
+      GroupPoints->hide();
+      GroupDimensions->show();
+      disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+      globalSelection(); // close local contexts, if any
+      break;
+    }
+  }
 
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
+
+  if (myInitial) {
+    myInitial = false;
+    if (constructorId == 0) {
+      // on dialog initialization we init the first field with a selected object (if any)
+      SelectionIntoArgument();
+    }
+    else {
+      displayPreview();
+    }
+  }
+  else {
+    displayPreview();
+  }
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -215,49 +223,42 @@ void PrimitiveGUI_CylinderDlg::ConstructorsClicked(int constructorId)
 //=================================================================================
 void PrimitiveGUI_CylinderDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool PrimitiveGUI_CylinderDlg::ClickOnApply()
 {
-  if ( !onAccept() )
+  if (!onAccept())
     return false;
 
   initName();
-  ConstructorsClicked( getConstructorId() );
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
-
-//=======================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=======================================================================
-void PrimitiveGUI_CylinderDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed or other case
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void PrimitiveGUI_CylinderDlg::SelectionIntoArgument()
 {
   if (getConstructorId() != 0)
     return;
 
+  erasePreview();
   myEditCurrentArgument->setText("");
 
-  if (IObjectCount() != 1) 
-  {
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
     if (myEditCurrentArgument == GroupPoints->LineEdit1)
       myPoint = GEOM::GEOM_Object::_nil();
     else if (myEditCurrentArgument == GroupPoints->LineEdit2)
@@ -265,14 +266,16 @@ void PrimitiveGUI_CylinderDlg::SelectionIntoArgument()
     return;
   }
 
-  /* nbSel == 1 */
+  // nbSel == 1
   Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult);
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
   if (!testResult || CORBA::is_nil(aSelectedObject))
     return;
 
   QString aName = GEOMBase::GetName(aSelectedObject);
+
+  // Get Selected object if selected subshape
   TopoDS_Shape aShape;
   if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
   {
@@ -280,11 +283,9 @@ void PrimitiveGUI_CylinderDlg::SelectionIntoArgument()
     if (myEditCurrentArgument == GroupPoints->LineEdit2)
       aNeedType = TopAbs_EDGE;
 
-    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
     TColStd_IndexedMapOfInteger aMap;
-    aSelMgr->GetIndexes(firstIObject(), aMap);
-    if (aMap.Extent() == 1) // Local Selection
-    {
+    aSelMgr->GetIndexes(aSelList.First(), aMap);
+    if (aMap.Extent() == 1) { // Local Selection
       int anIndex = aMap(1);
       if (aNeedType == TopAbs_EDGE)
         aName.append(":edge_" + QString::number(anIndex));
@@ -294,16 +295,16 @@ void PrimitiveGUI_CylinderDlg::SelectionIntoArgument()
       //Find SubShape Object in Father
       GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
 
-      if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-       GEOM::GEOM_IShapesOperations_var aShapesOp =
-         getGeomEngine()->GetIShapesOperations(getStudyId());
-       aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+      if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+        GEOM::GEOM_IShapesOperations_var aShapesOp =
+          getGeomEngine()->GetIShapesOperations(getStudyId());
+        aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+      }
+      else {
+        aSelectedObject = aFindedObject; // get Object from study
       }
-      else
-       aSelectedObject = aFindedObject; // get Object from study
     }
-    else // Global Selection
-    {
+    else { // Global Selection
       if (aShape.ShapeType() != aNeedType) {
         aSelectedObject = GEOM::GEOM_Object::_nil();
         aName = "";
@@ -313,10 +314,23 @@ void PrimitiveGUI_CylinderDlg::SelectionIntoArgument()
 
   myEditCurrentArgument->setText(aName);
 
-  if (myEditCurrentArgument == GroupPoints->LineEdit1)
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
     myPoint = aSelectedObject;
-  else if (myEditCurrentArgument == GroupPoints->LineEdit2)
+    if (!myPoint->_is_nil() && myDir->_is_nil())
+      GroupPoints->PushButton2->click();
+  }
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
     myDir = aSelectedObject;
+    if (!myDir->_is_nil() && myPoint->_is_nil())
+      GroupPoints->PushButton1->click();
+  }
+
   displayPreview();
 }
 
@@ -327,36 +341,51 @@ void PrimitiveGUI_CylinderDlg::SelectionIntoArgument()
 void PrimitiveGUI_CylinderDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  
+
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
   if (send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
-    globalSelection( GEOM_POINT ); // to break previous local selection
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
+
+    globalSelection(GEOM_POINT); // to break previous local selection
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
   }
   else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
-    globalSelection( GEOM_LINE );  // to break previous local selection
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+
+    globalSelection(GEOM_LINE);  // to break previous local selection
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
   }
-  
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
-}
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
 
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
+}
 
 //=================================================================================
 // function : LineEditReturnPressed()
 // purpose  :
 //=================================================================================
 void PrimitiveGUI_CylinderDlg::LineEditReturnPressed()
-{  
+{
   QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1 ||
-     send == GroupPoints->LineEdit2)
-    {
-      myEditCurrentArgument = send;
-      GEOMBase_Skeleton::LineEditReturnPressed();
-    }
+  if (send == GroupPoints->LineEdit1 ||
+      send == GroupPoints->LineEdit2) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
 }
 
 //=================================================================================
@@ -366,106 +395,106 @@ void PrimitiveGUI_CylinderDlg::LineEditReturnPressed()
 void PrimitiveGUI_CylinderDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
 
-  ConstructorsClicked(getConstructorId());
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void PrimitiveGUI_CylinderDlg::enterEvent(QEvent* e)
+void PrimitiveGUI_CylinderDlg::enterEvent (QEvent*)
 {
-  if ( !GroupConstructors->isEnabled() )
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-
-//=================================================================================
-// function : DeactivateActiveDialog()
-// purpose  : public slot to deactivate if active
-//=================================================================================
-void PrimitiveGUI_CylinderDlg::DeactivateActiveDialog()
-{
-  GEOMBase_Skeleton::DeactivateActiveDialog();
-}
-
-
 //=================================================================================
-// function : ValueChangedInSpinBox
+// function : ValueChangedInSpinBox()
 // purpose  :
 //=================================================================================
-void PrimitiveGUI_CylinderDlg::ValueChangedInSpinBox( )
-{  
+void PrimitiveGUI_CylinderDlg::ValueChangedInSpinBox()
+{
   displayPreview();
 }
 
-
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
 GEOM::GEOM_IOperations_ptr PrimitiveGUI_CylinderDlg::createOperation()
 {
-  return getGeomEngine()->GetI3DPrimOperations( getStudyId() );
+  return getGeomEngine()->GetI3DPrimOperations(getStudyId());
 }
 
-
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool PrimitiveGUI_CylinderDlg::isValid( QString& msg )
+bool PrimitiveGUI_CylinderDlg::isValid (QString& msg)
 {
-  return getConstructorId() == 0 ? !(myPoint->_is_nil() || myDir->_is_nil() ) : true;
+  bool ok = true;
+  if( getConstructorId() == 0 )
+  {
+    ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupPoints->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+  }
+  else if( getConstructorId() == 1 )
+  {
+    ok = GroupDimensions->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+  }
+  ok = fabs( getHeight() ) > Precision::Confusion() && ok;
+  return getConstructorId() == 0 ? !(myPoint->_is_nil() || myDir->_is_nil()) && ok : ok;
 }
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool  PrimitiveGUI_CylinderDlg::execute( ObjectList& objects )
+bool PrimitiveGUI_CylinderDlg::execute (ObjectList& objects)
 {
   bool res = false;
-  
+
   GEOM::GEOM_Object_var anObj;
-  
-  switch ( getConstructorId() ) 
-    {
-    case 0 :
-      {
-       if ( !CORBA::is_nil( myPoint ) && !CORBA::is_nil( myDir )) {
-         anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->MakeCylinderPntVecRH(myPoint, myDir, getRadius(), getHeight());
-         res = true;
-       }
-       break;
-      }
-    case 1 :
-      {
-       anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->MakeCylinderRH(getRadius(), getHeight());
-       res = true;
 
-       break;
+  switch (getConstructorId()) {
+  case 0:
+    if (!CORBA::is_nil(myPoint) && !CORBA::is_nil(myDir)) {
+      anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+        MakeCylinderPntVecRH(myPoint, myDir, getRadius(), getHeight());
+      if (!anObj->_is_nil() && !IsPreview())
+      {
+       QStringList aParameters;
+       aParameters << GroupPoints->SpinBox_DX->text();
+       aParameters << GroupPoints->SpinBox_DY->text();
+       anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
       }
+      res = true;
     }
-  
-  if ( !anObj->_is_nil() )
-    objects.push_back( anObj._retn() );
-  
-  return res;
-}
+    break;
+  case 1:
+    anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+      MakeCylinderRH(getRadius(), getHeight());
+    if (!anObj->_is_nil() && !IsPreview())
+    {
+      QStringList aParameters;
+      aParameters << GroupDimensions->SpinBox_DX->text();
+      aParameters << GroupDimensions->SpinBox_DY->text();
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    }
+    res = true;
+    break;
+  }
 
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void  PrimitiveGUI_CylinderDlg::closeEvent( QCloseEvent* e )
-{
-  GEOMBase_Skeleton::closeEvent( e );
-}
+  if (!anObj->_is_nil())
+    objects.push_back(anObj._retn());
 
+  return res;
+}
 
 //=================================================================================
 // function : getRadius()
@@ -475,9 +504,9 @@ double PrimitiveGUI_CylinderDlg::getRadius() const
 {
   int aConstructorId = getConstructorId();
   if (aConstructorId == 0)
-    return GroupPoints->SpinBox_DX->GetValue();
+    return GroupPoints->SpinBox_DX->value();
   else if (aConstructorId == 1)
-    return GroupDimensions->SpinBox_DX->GetValue();
+    return GroupDimensions->SpinBox_DX->value();
   return 0;
 }
 
@@ -489,9 +518,9 @@ double PrimitiveGUI_CylinderDlg::getHeight() const
 {
   int aConstructorId = getConstructorId();
   if (aConstructorId == 0)
-    return GroupPoints->SpinBox_DY->GetValue();
+    return GroupPoints->SpinBox_DY->value();
   else if (aConstructorId == 1)
-    return GroupDimensions->SpinBox_DY->GetValue();
+    return GroupDimensions->SpinBox_DY->value();
   return 0;
 }
 
@@ -503,8 +532,7 @@ void PrimitiveGUI_CylinderDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
 
-switch (getConstructorId())
-  {
+  switch (getConstructorId()) {
   case 0:
     objMap[GroupPoints->LineEdit1->text()] = myPoint;
     objMap[GroupPoints->LineEdit2->text()] = myDir;
@@ -512,5 +540,5 @@ switch (getConstructorId())
   case 1:
     return;
   }
addSubshapesToFather( objMap );
 addSubshapesToFather(objMap);
 }
index 1980db249877208c5ae2d70710c8a776efb18a43..0e6fc18fdcede5f9bdec38e200d70fe7f3ad6b84 100644 (file)
@@ -1,37 +1,35 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : PrimitiveGUI_CylinderDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_CYLINDER_H
-#define DIALOGBOX_CYLINDER_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI_CylinderDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef PRIMITIVEGUI_CYLINDERDLG_H
+#define PRIMITIVEGUI_CYLINDERDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel2Spin.h"
-#include "DlgRef_2Spin.h"
+#include <GEOMBase_Skeleton.h>
 
+class DlgRef_2Sel2Spin;
+class DlgRef_2Spin;
 
 //=================================================================================
 // class    : PrimitiveGUI_CylinderDlg
 //=================================================================================
 class PrimitiveGUI_CylinderDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    PrimitiveGUI_CylinderDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                            const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~PrimitiveGUI_CylinderDlg();
+  PrimitiveGUI_CylinderDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~PrimitiveGUI_CylinderDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
-    virtual void closeEvent( QCloseEvent* e );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    double getRadius() const;
-    double getHeight() const;
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  double                             getRadius() const;
+  double                             getHeight() const;
+  
+private:
+  GEOM::GEOM_Object_var              myPoint, myDir;
 
-    GEOM::GEOM_Object_var myPoint, myDir;
-      
-    DlgRef_2Sel2Spin* GroupPoints;
-    DlgRef_2Spin* GroupDimensions;
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
+  
+  DlgRef_2Sel2Spin*                  GroupPoints;
+  DlgRef_2Spin*                      GroupDimensions;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ClickOnCancel();
-    void ActivateThisDialog();
-    void DeactivateActiveDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ConstructorsClicked(int);
-    void ValueChangedInSpinBox();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               ValueChangedInSpinBox();
+  void                               SetDoubleSpinBoxStep( double );
 };
 
-#endif // DIALOGBOX_CYLINDER_H
+#endif // PRIMITIVEGUI_CYLINDERDLG_H
diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
new file mode 100755 (executable)
index 0000000..9344092
--- /dev/null
@@ -0,0 +1,645 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI_DiskDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#include "PrimitiveGUI_DiskDlg.h"
+
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+
+// OCCT Includes
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS.hxx>
+#include <TopExp.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+
+//=================================================================================
+// class    : PrimitiveGUI_DiskDlg()
+// purpose  : Constructs a PrimitiveGUI_DiskDlg which is 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.
+//=================================================================================
+PrimitiveGUI_DiskDlg::PrimitiveGUI_DiskDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                            bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myInitial(true)
+{
+  SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+  QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_DISK_PNT_VEC_R")));
+  QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
+  QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_DISK_THREE_POINTS")));
+  QPixmap image3 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_DISK_R")));
+
+  setWindowTitle(tr("GEOM_DISK_TITLE"));
+
+  /***************************************************************/
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_DISK"));
+  mainFrame()->RadioButton1->setIcon(image3);
+  mainFrame()->RadioButton2->setIcon(image0);
+  mainFrame()->RadioButton3->setIcon(image2);
+
+  GroupPntVecR = new DlgRef_2Sel1Spin(centralWidget());
+  GroupPntVecR->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
+  GroupPntVecR->TextLabel1->setText(tr("GEOM_CENTER_POINT"));
+  GroupPntVecR->TextLabel2->setText(tr("GEOM_VECTOR"));
+  GroupPntVecR->TextLabel3->setText(tr("GEOM_RADIUS"));
+  GroupPntVecR->PushButton1->setIcon(image1);
+  GroupPntVecR->PushButton2->setIcon(image1);
+  GroupPntVecR->LineEdit1->setReadOnly(true);
+  GroupPntVecR->LineEdit2->setReadOnly(true);
+
+  Group3Pnts = new DlgRef_3Sel(centralWidget());
+  Group3Pnts->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
+  Group3Pnts->TextLabel1->setText(tr("GEOM_POINT1"));
+  Group3Pnts->TextLabel2->setText(tr("GEOM_POINT2"));
+  Group3Pnts->TextLabel3->setText(tr("GEOM_POINT3"));
+  Group3Pnts->PushButton1->setIcon(image1);
+  Group3Pnts->PushButton2->setIcon(image1);
+  Group3Pnts->PushButton3->setIcon(image1);
+  Group3Pnts->LineEdit1->setReadOnly(true);
+  Group3Pnts->LineEdit2->setReadOnly(true);
+  Group3Pnts->LineEdit3->setReadOnly(true);
+
+  GroupDimensions = new DlgRef_1Spin(centralWidget());
+  GroupDimensions->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
+  GroupDimensions->TextLabel1->setText(tr("GEOM_RADIUS"));
+
+  GroupOrientation = new DlgRef_3Radio(centralWidget());
+  GroupOrientation->GroupBox1->setTitle(tr("GEOM_ORIENTATION"));
+  GroupOrientation->RadioButton1->setText(tr("GEOM_WPLANE_OXY"));
+  GroupOrientation->RadioButton2->setText(tr("GEOM_WPLANE_OYZ"));
+  GroupOrientation->RadioButton3->setText(tr("GEOM_WPLANE_OZX"));
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPntVecR);
+  layout->addWidget(Group3Pnts);
+  layout->addWidget(GroupDimensions);
+  layout->addWidget(GroupOrientation);
+  /***************************************************************/
+
+  setHelpFileName("create_disk_page.html");
+
+  Init();
+}
+
+//=================================================================================
+// function : ~PrimitiveGUI_DiskDlg()
+// purpose  : Destroys the object and frees any allocated resources
+//=================================================================================
+PrimitiveGUI_DiskDlg::~PrimitiveGUI_DiskDlg()
+{
+}
+
+//=================================================================================
+// function : Init()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_DiskDlg::Init()
+{
+  // Get setting of step value from file configuration
+  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+  double aStep = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100);
+
+  // min, max, step and decimals for spin boxes & initial values
+  initSpinBox(GroupPntVecR->SpinBox_DX, 0.00001, COORD_MAX, aStep, 5); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupDimensions->SpinBox_DX, 0.00001, COORD_MAX, aStep, 5); // VSR: TODO: DBL_DIGITS_DISPLAY
+
+  // init variables
+  myEditCurrentArgument = GroupPntVecR->LineEdit1;
+  myOrientationType = 1;
+  GroupOrientation->RadioButton1->setChecked(true);
+
+  GroupPntVecR->LineEdit1->setText("");
+  GroupPntVecR->LineEdit2->setText("");
+  Group3Pnts->LineEdit1->setText("");
+  Group3Pnts->LineEdit2->setText("");
+  Group3Pnts->LineEdit3->setText("");
+  myPoint = myDir = myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil();
+
+  GroupPntVecR->SpinBox_DX->setValue(100);
+  GroupDimensions->SpinBox_DX->setValue(100);
+
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(this,          SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
+
+  connect(GroupPntVecR->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPntVecR->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+
+  connect(GroupPntVecR->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPntVecR->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+
+  connect(Group3Pnts->PushButton1,   SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(Group3Pnts->PushButton2,   SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(Group3Pnts->PushButton3,   SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+
+  connect(Group3Pnts->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(Group3Pnts->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(Group3Pnts->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+
+  connect(GroupPntVecR->SpinBox_DX,    SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+
+  connect(GroupOrientation->RadioButton1, SIGNAL(clicked()), this, SLOT(RadioButtonClicked()));
+  connect(GroupOrientation->RadioButton2, SIGNAL(clicked()), this, SLOT(RadioButtonClicked()));
+  connect(GroupOrientation->RadioButton3, SIGNAL(clicked()), this, SLOT(RadioButtonClicked()));
+
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double)));
+  connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()),               this, SLOT(ClickOnCancel()));
+
+  initName(tr("GEOM_DISK"));
+
+  ConstructorsClicked(0);
+}
+
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void PrimitiveGUI_DiskDlg::SetDoubleSpinBoxStep (double step)
+{
+  GroupDimensions->SpinBox_DX->setSingleStep(step);
+  GroupPntVecR->SpinBox_DX->setSingleStep(step);
+}
+
+//=================================================================================
+// function : RadioBittonClicked()
+// purpose  : Radio button management
+//=================================================================================
+void PrimitiveGUI_DiskDlg::RadioButtonClicked()
+{
+  if (GroupOrientation->RadioButton1->isChecked())
+    myOrientationType = 1;
+  else if (GroupOrientation->RadioButton2->isChecked())
+    myOrientationType = 2;
+  else if (GroupOrientation->RadioButton3->isChecked())
+    myOrientationType = 3;
+  displayPreview();
+}
+
+//=================================================================================
+// function : ConstructorsClicked()
+// purpose  : Radio button management
+//=================================================================================
+void PrimitiveGUI_DiskDlg::ConstructorsClicked (int constructorId)
+{
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+
+  switch (constructorId) {
+  case 0:
+    {
+      GroupPntVecR->hide();
+      Group3Pnts->hide();
+      GroupDimensions->show();
+      GroupOrientation->show();
+
+      disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+      globalSelection(); // close local contexts, if any
+      break;
+    }
+  case 1:
+    {
+      GroupDimensions->hide();
+      GroupOrientation->hide();
+      GroupPntVecR->show();
+      Group3Pnts->hide();
+
+      GroupPntVecR->PushButton1->click();
+      break;
+    }
+  case 2:
+    {
+      GroupDimensions->hide();
+      GroupOrientation->hide();
+      GroupPntVecR->hide();
+      Group3Pnts->show();
+
+      Group3Pnts->PushButton1->click();
+      break;
+    }
+  }
+
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
+
+  if (myInitial) {
+    myInitial = false;
+    if (constructorId == 1 || constructorId == 2) {
+      // on dialog initialization we init the first field with a selected object (if any)
+      SelectionIntoArgument();
+    }
+    else {
+      displayPreview();
+    }
+  }
+  else {
+    displayPreview();
+  }
+}
+
+//=================================================================================
+// function : ClickOnOk()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_DiskDlg::ClickOnOk()
+{
+  if (ClickOnApply())
+    ClickOnCancel();
+}
+
+//=================================================================================
+// function : ClickOnApply()
+// purpose  :
+//=================================================================================
+bool PrimitiveGUI_DiskDlg::ClickOnApply()
+{
+  if (!onAccept())
+    return false;
+
+  initName();
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
+  return true;
+}
+
+//=================================================================================
+// function : SelectionIntoArgument()
+// purpose  : Called when selection is changed or on dialog initialization or activation
+//=================================================================================
+void PrimitiveGUI_DiskDlg::SelectionIntoArgument()
+{
+  if (getConstructorId() == 0)
+    return;
+
+  erasePreview();
+  myEditCurrentArgument->setText("");
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1) {
+    if      (myEditCurrentArgument == GroupPntVecR->LineEdit1) myPoint  = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == GroupPntVecR->LineEdit2) myDir    = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == Group3Pnts->LineEdit1)   myPoint1 = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == Group3Pnts->LineEdit2)   myPoint2 = GEOM::GEOM_Object::_nil();
+    else if (myEditCurrentArgument == Group3Pnts->LineEdit3)   myPoint3 = GEOM::GEOM_Object::_nil();
+    return;
+  }
+
+  // nbSel == 1
+  Handle(SALOME_InteractiveObject) anIO = aSelList.First();
+  Standard_Boolean testResult = Standard_False;
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(anIO, testResult);
+
+  if (!testResult || CORBA::is_nil(aSelectedObject))
+    return;
+
+  QString aName = GEOMBase::GetName(aSelectedObject);
+
+  // If selected Vertex or Edge on the some Shape Get selection Subshape
+  TopoDS_Shape aShape;
+  if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
+  {
+    TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
+    if (myEditCurrentArgument == GroupPntVecR->LineEdit2)
+      aNeedType = TopAbs_EDGE;
+
+    TColStd_IndexedMapOfInteger aMap;
+    aSelMgr->GetIndexes(anIO, aMap);
+    if (aMap.Extent() == 1) { // Local Selection
+      int anIndex = aMap(1);
+      if (aNeedType == TopAbs_EDGE)
+        aName += QString(":edge_%1").arg(anIndex);
+      else
+        aName += QString(":vertex_%1").arg(anIndex);
+
+      //Find SubShape Object in Father
+      GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
+
+      if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+        GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
+        aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+      }
+      else {
+        aSelectedObject = aFindedObject; // get Object from study
+      }
+    }
+    else { // Global Selection
+      if (aShape.ShapeType() != aNeedType) {
+        aSelectedObject = GEOM::GEOM_Object::_nil();
+        aName = "";
+      }
+    }
+  }
+
+  myEditCurrentArgument->setText(aName);
+
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  if (myEditCurrentArgument == GroupPntVecR->LineEdit1) {
+    myPoint = aSelectedObject;
+    if (!myPoint->_is_nil() && myDir->_is_nil())
+      GroupPntVecR->PushButton2->click();
+  }
+  else if (myEditCurrentArgument == GroupPntVecR->LineEdit2) {
+    myDir = aSelectedObject;
+    if (!myDir->_is_nil() && myPoint->_is_nil())
+      GroupPntVecR->PushButton1->click();
+  }
+  else if (myEditCurrentArgument == Group3Pnts->LineEdit1) {
+    myPoint1 = aSelectedObject;
+    if (!myPoint1->_is_nil() && myPoint2->_is_nil())
+      Group3Pnts->PushButton2->click();
+  }
+  else if (myEditCurrentArgument == Group3Pnts->LineEdit2) {
+    myPoint2 = aSelectedObject;
+    if (!myPoint2->_is_nil() && myPoint3->_is_nil())
+      Group3Pnts->PushButton3->click();
+  }
+  else if (myEditCurrentArgument == Group3Pnts->LineEdit3) {
+    myPoint3 = aSelectedObject;
+    if (!myPoint3->_is_nil() && myPoint1->_is_nil())
+      Group3Pnts->PushButton1->click();
+  }
+
+  displayPreview();
+}
+
+//=================================================================================
+// function : SetEditCurrentArgument()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_DiskDlg::SetEditCurrentArgument()
+{
+  QPushButton* send = (QPushButton*)sender();
+
+  if (send == GroupPntVecR->PushButton1) {
+    myEditCurrentArgument = GroupPntVecR->LineEdit1;
+
+    GroupPntVecR->PushButton2->setDown(false);
+    GroupPntVecR->LineEdit2->setEnabled(false);
+  }
+  else if (send == GroupPntVecR->PushButton2) {
+    myEditCurrentArgument = GroupPntVecR->LineEdit2;
+
+    GroupPntVecR->PushButton1->setDown(false);
+    GroupPntVecR->LineEdit1->setEnabled(false);
+  }
+  else if (send == Group3Pnts->PushButton1) {
+    myEditCurrentArgument = Group3Pnts->LineEdit1;
+
+    Group3Pnts->PushButton2->setDown(false);
+    Group3Pnts->PushButton3->setDown(false);
+    Group3Pnts->LineEdit2->setEnabled(false);
+    Group3Pnts->LineEdit3->setEnabled(false);
+  }
+  else if (send == Group3Pnts->PushButton2) {
+    myEditCurrentArgument = Group3Pnts->LineEdit2;
+
+    Group3Pnts->PushButton1->setDown(false);
+    Group3Pnts->PushButton3->setDown(false);
+    Group3Pnts->LineEdit1->setEnabled(false);
+    Group3Pnts->LineEdit3->setEnabled(false);
+  }
+  else if (send == Group3Pnts->PushButton3) {
+    myEditCurrentArgument = Group3Pnts->LineEdit3;
+
+    Group3Pnts->PushButton1->setDown(false);
+    Group3Pnts->PushButton2->setDown(false);
+    Group3Pnts->LineEdit1->setEnabled(false);
+    Group3Pnts->LineEdit2->setEnabled(false);
+  }
+
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  if (myEditCurrentArgument == GroupPntVecR->LineEdit2) {
+    globalSelection(); // close local contexts, if any
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
+  }
+  else {
+    globalSelection(); // close local contexts, if any
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+  }
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
+  myEditCurrentArgument->setFocus();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
+}
+
+//=================================================================================
+// function : LineEditReturnPressed()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_DiskDlg::LineEditReturnPressed()
+{
+QLineEdit* send = (QLineEdit*)sender();
+  if (send == GroupPntVecR->LineEdit1 ||
+      send == GroupPntVecR->LineEdit2 ||
+      send == Group3Pnts->LineEdit1 ||
+      send == Group3Pnts->LineEdit2 ||
+      send == Group3Pnts->LineEdit3) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
+}
+
+//=================================================================================
+// function : ActivateThisDialog()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_DiskDlg::ActivateThisDialog()
+{
+  GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
+  ConstructorsClicked( getConstructorId() );
+}
+
+//=================================================================================
+// function : enterEvent()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_DiskDlg::enterEvent (QEvent*)
+{
+  if (!mainFrame()->GroupConstructors->isEnabled())
+    ActivateThisDialog();
+}
+
+//=================================================================================
+// function : ValueChangedInSpinBox()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_DiskDlg::ValueChangedInSpinBox()
+{
+  displayPreview();
+}
+
+//=================================================================================
+// function : createOperation
+// purpose  :
+//=================================================================================
+GEOM::GEOM_IOperations_ptr PrimitiveGUI_DiskDlg::createOperation()
+{
+  return getGeomEngine()->GetI3DPrimOperations(getStudyId());
+}
+
+//=================================================================================
+// function : isEqual
+// purpose  : it may also be needed to check for min distance between gp_Pnt-s...
+//=================================================================================
+static bool isEqual (const GEOM::GEOM_Object_var& thePnt1, const GEOM::GEOM_Object_var& thePnt2)
+{
+  return thePnt1->_is_equivalent(thePnt2);
+}
+
+//=================================================================================
+// function : isValid
+// purpose  :
+//=================================================================================
+bool PrimitiveGUI_DiskDlg::isValid (QString& msg)
+{
+  bool ok = true;
+  if( getConstructorId() == 0 )
+    ok = GroupDimensions->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+  else if( getConstructorId() == 1 )
+    ok = GroupPntVecR->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+
+  const int id = getConstructorId();
+  if (id == 0)
+    return ok;
+  else if (id == 1)
+    return !myPoint->_is_nil() && !myDir->_is_nil() && getRadius() > 0 && ok;
+  else if (id == 2)
+    return !myPoint1->_is_nil() && !myPoint2->_is_nil() && !myPoint3->_is_nil() &&
+      !isEqual(myPoint1, myPoint2) && !isEqual(myPoint1, myPoint3) && !isEqual(myPoint2, myPoint3);
+  return false;
+}
+
+//=================================================================================
+// function : execute
+// purpose  :
+//=================================================================================
+bool PrimitiveGUI_DiskDlg::execute (ObjectList& objects)
+{
+  bool res = false;
+  QStringList aParameters;
+
+  GEOM::GEOM_Object_var anObj;
+
+  switch (getConstructorId()) {
+  case 0:
+    anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+      MakeDiskR(getRadius(), myOrientationType);
+    if (!anObj->_is_nil() && !IsPreview())
+    {
+      aParameters << GroupDimensions->SpinBox_DX->text();
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    }
+    res = true;
+    break;
+  case 1:
+    anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+      MakeDiskPntVecR(myPoint, myDir, getRadius());
+    if (!anObj->_is_nil() && !IsPreview())
+    {
+      aParameters << GroupPntVecR->SpinBox_DX->text();
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    }
+    res = true;
+    break;
+  case 2:
+    anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+      MakeDiskThreePnt(myPoint1, myPoint2, myPoint3);
+    res = true;
+    break;
+  }
+
+  if (!anObj->_is_nil())
+    objects.push_back(anObj._retn());
+
+  return res;
+}
+
+//=================================================================================
+// function : getRadius()
+// purpose  :
+//=================================================================================
+double PrimitiveGUI_DiskDlg::getRadius() const
+{
+  double r = 0.;
+  switch (getConstructorId()) {
+  case 0:
+    r = GroupDimensions->SpinBox_DX->value(); break;
+  case 1:
+    r = GroupPntVecR->SpinBox_DX->value(); break;
+  }
+  return r;
+}
+
+//=================================================================================
+// function : addSubshapeToStudy
+// purpose  : virtual method to add new SubObjects if local selection
+//=================================================================================
+void PrimitiveGUI_DiskDlg::addSubshapesToStudy()
+{
+  QMap<QString, GEOM::GEOM_Object_var> objMap;
+
+  switch (getConstructorId()) {
+  case 1:
+    objMap[GroupPntVecR->LineEdit1->text()] = myPoint;
+    objMap[GroupPntVecR->LineEdit2->text()] = myDir;
+    break;
+  case 2:
+    objMap[Group3Pnts->LineEdit1->text()] = myPoint1;
+    objMap[Group3Pnts->LineEdit2->text()] = myPoint2;
+    objMap[Group3Pnts->LineEdit3->text()] = myPoint3;
+    break;
+  }
+  addSubshapesToFather(objMap);
+}
diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h
new file mode 100755 (executable)
index 0000000..83ddb2d
--- /dev/null
@@ -0,0 +1,89 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI_DiskDlg.h
+// Author : Dmitry Matveitchev, OCN
+//
+#ifndef BASICGUI_DISKDLG_H
+#define BASICGUI_DISKDLG_H
+
+#include <GEOMBase_Skeleton.h>
+
+class DlgRef_3Sel;
+class DlgRef_2Sel1Spin;
+class DlgRef_1Spin;
+class DlgRef_3Radio;
+
+//=================================================================================
+// class    : PrimitiveGUI_DiskDlg
+// purpose  :
+//=================================================================================
+class PrimitiveGUI_DiskDlg : public GEOMBase_Skeleton
+{
+  Q_OBJECT
+
+public:
+  PrimitiveGUI_DiskDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~PrimitiveGUI_DiskDlg();
+
+protected:
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  
+  virtual void                       addSubshapesToStudy();
+  
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  double                             getRadius() const;
+  int                                myOrientationType;
+
+private:
+  GEOM::GEOM_Object_var              myPoint, myDir, myPoint1, myPoint2, myPoint3;
+
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
+
+  DlgRef_2Sel1Spin*                  GroupPntVecR;
+  DlgRef_3Sel*                       Group3Pnts;
+  DlgRef_1Spin*                      GroupDimensions;
+  DlgRef_3Radio*                     GroupOrientation;
+
+private slots:
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+
+  void                               ActivateThisDialog();
+    
+  void                               SelectionIntoArgument();
+
+  void                               ConstructorsClicked( int );
+  void                               LineEditReturnPressed();
+  void                               SetEditCurrentArgument();
+  void                               ValueChangedInSpinBox();
+  void                               SetDoubleSpinBoxStep( double );
+  void                               RadioButtonClicked();
+};
+
+#endif // BASICGUI_DISKDLG_H
diff --git a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx
new file mode 100755 (executable)
index 0000000..3f6d5fe
--- /dev/null
@@ -0,0 +1,547 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI_FaceDlg.cxx
+// Author : Dmitry Matveitchev, OCN.
+//
+#include "PrimitiveGUI_FaceDlg.h"
+
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+
+#include <TopoDS_Shape.hxx>
+#include <TopoDS.hxx>
+#include <TopExp.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+
+#include <GEOMImpl_Types.hxx>
+
+//=================================================================================
+// class    : PrimitiveGUI_FaceDlg()
+// purpose  : Constructs a PrimitiveGUI_FaceDlg which is 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.
+//=================================================================================
+PrimitiveGUI_FaceDlg::PrimitiveGUI_FaceDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                   bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
+{
+  QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_FACE_OBJ_HW")));
+  QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
+  QPixmap image2 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_FACE_HW")));
+
+  setWindowTitle( tr( "GEOM_FACE_TITLE" ) );
+  /***************************************************************/
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_FACE" ) );
+  mainFrame()->RadioButton1->setIcon( image2 );
+  mainFrame()->RadioButton2->setIcon( image0 );
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPlane = new DlgRef_1Sel2Spin( centralWidget() );
+  GroupPlane->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
+  GroupPlane->TextLabel1->setText( tr( "GEOM_EDGE" ) );
+  GroupPlane->TextLabel2->setText( tr( "GEOM_HEIGHT" ) );
+  GroupPlane->TextLabel3->setText( tr( "GEOM_WIDTH" ) );
+  GroupPlane->PushButton1->setIcon( image1 );
+  GroupPlane->LineEdit1->setReadOnly( true );
+
+  GroupType = new DlgRef_3Radio( centralWidget() );
+  GroupType->GroupBox1->setTitle( tr( "GEOM_OBJECT_TYPE" ) );
+  GroupType->RadioButton1->setText( tr( "GEOM_EDGE" ) );
+  GroupType->RadioButton2->setText( tr( "GEOM_FACE" ) );
+  GroupType->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  GroupType->RadioButton3->close();
+
+  GroupDimensions = new DlgRef_2Spin( centralWidget() );
+  GroupDimensions->GroupBox1->setTitle( tr( "GEOM_BOX_OBJ" ) );
+  GroupDimensions->TextLabel1->setText( tr( "GEOM_HEIGHT" ) );
+  GroupDimensions->TextLabel2->setText( tr( "GEOM_WIDTH" ) );
+
+  GroupOrientation = new DlgRef_3Radio( centralWidget() );
+
+  GroupOrientation->GroupBox1->setTitle( tr( "GEOM_ORIENTATION" ) );
+  GroupOrientation->RadioButton1->setText( tr( "GEOM_WPLANE_OXY" ) );
+  GroupOrientation->RadioButton2->setText( tr( "GEOM_WPLANE_OYZ" ) );
+  GroupOrientation->RadioButton3->setText( tr( "GEOM_WPLANE_OZX" ) );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupType );
+  layout->addWidget( GroupPlane );
+  layout->addWidget( GroupDimensions );
+  layout->addWidget( GroupOrientation );
+
+  /***************************************************************/
+
+  setHelpFileName( "create_squareface_page.html" );
+
+  Init();
+}
+
+
+//=================================================================================
+// function : ~PrimitiveGUI_FaceDlg()
+// purpose  : Destroys the object and frees any allocated resources
+//=================================================================================
+PrimitiveGUI_FaceDlg::~PrimitiveGUI_FaceDlg()
+{  
+}
+
+
+//=================================================================================
+// function : Init()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_FaceDlg::Init()
+{
+  /* init variables */
+  myEditCurrentArgument = GroupPlane->LineEdit1;
+  GroupType->RadioButton1->setChecked(true);
+  myEdge = GEOM::GEOM_Object::_nil();
+  myFace = GEOM::GEOM_Object::_nil();
+  globalSelection(); // close local contexts, if any
+  //  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+
+  myOrientationType = 1;
+
+  /* Get setting of step value from file configuration */
+  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+  double aStep = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100 );
+
+  double aDefaultSize = 100.0;
+  /* min, max, step and decimals for spin boxes */
+  initSpinBox( GroupPlane->SpinBox_DX, 0.00001, COORD_MAX, aStep, 5 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupPlane->SpinBox_DX->setValue( aDefaultSize );
+  initSpinBox( GroupPlane->SpinBox_DY, 0.00001, COORD_MAX, aStep, 5 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupPlane->SpinBox_DY->setValue( aDefaultSize );
+
+  initSpinBox( GroupDimensions->SpinBox_DX, 0.00001, COORD_MAX, aStep, 5 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupDimensions->SpinBox_DX->setValue( aDefaultSize );
+  initSpinBox( GroupDimensions->SpinBox_DY, 0.00001, COORD_MAX, aStep, 5 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupDimensions->SpinBox_DY->setValue( aDefaultSize );
+
+       
+  /* signals and slots connections */
+  connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
+  connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( ClickOnCancel() ) );
+  connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
+
+  connect( this,           SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
+
+  connect( buttonOk(),     SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(),  SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+
+  connect( GroupPlane->PushButton1,  SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPlane->LineEdit1,    SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+  connect( GroupPlane->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupPlane->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+
+  connect( GroupDimensions->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+  connect( GroupDimensions->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+
+  connect( GroupOrientation->RadioButton1, SIGNAL( clicked() ), this, SLOT( RadioButtonClicked() ) );
+  connect( GroupOrientation->RadioButton2, SIGNAL( clicked() ), this, SLOT( RadioButtonClicked() ) );
+  connect( GroupOrientation->RadioButton3, SIGNAL( clicked() ), this, SLOT( RadioButtonClicked() ) );
+
+  connect( GroupType->RadioButton1, SIGNAL( clicked() ), this, SLOT( TypeButtonClicked() ) );
+  connect( GroupType->RadioButton2, SIGNAL( clicked() ), this, SLOT( TypeButtonClicked() ) );
+
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+  
+  initName( tr( "GEOM_FACE" ) );
+
+  ConstructorsClicked( 0 );
+}
+
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void PrimitiveGUI_FaceDlg::SetDoubleSpinBoxStep( double step )
+{
+  GroupPlane->SpinBox_DX->setSingleStep(step);
+  GroupPlane->SpinBox_DY->setSingleStep(step);
+}
+
+//=================================================================================
+// function : ValueChangedInSpinBox()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_FaceDlg::ValueChangedInSpinBox( double newValue )
+{
+  displayPreview();
+}
+
+//=================================================================================
+// function : RadioBittonClicked()
+// purpose  : Radio button management
+//=================================================================================
+void PrimitiveGUI_FaceDlg::RadioButtonClicked()
+{
+  if ( GroupOrientation->RadioButton1->isChecked() )
+    myOrientationType = 1;
+  else if ( GroupOrientation->RadioButton2->isChecked() )
+    myOrientationType = 2;
+  else if ( GroupOrientation->RadioButton3->isChecked() )
+    myOrientationType = 3;
+  displayPreview();
+}
+
+//=================================================================================
+// function : TypeBittonClicked()
+// purpose  : Radio button management
+//=================================================================================
+void PrimitiveGUI_FaceDlg::TypeButtonClicked()
+{
+  if ( GroupType->RadioButton1->isChecked() ) {
+    globalSelection(); // close local contexts, if any
+    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+    GroupPlane->TextLabel1->setText( tr( "GEOM_EDGE" ) );
+  }
+  else if ( GroupType->RadioButton2->isChecked() ) {
+    globalSelection(); // close local contexts, if any
+    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_FACE );
+    GroupPlane->TextLabel1->setText( tr( "GEOM_FACE" ) );
+  }
+}
+
+//=================================================================================
+// function : ClickOnOk()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_FaceDlg::ClickOnOk()
+{
+  if ( ClickOnApply() )
+    ClickOnCancel();
+}
+
+//=================================================================================
+// function : ClickOnApply()
+// purpose  :
+//=================================================================================
+bool PrimitiveGUI_FaceDlg::ClickOnApply()
+{
+  if ( !onAccept() )
+    return false;
+  
+  initName();
+
+  myEditCurrentArgument->setText( "" );
+  ConstructorsClicked( getConstructorId() );
+
+  return true;
+}
+
+//=================================================================================
+// function : ConstructorsClicked()
+// purpose  : Radio button management
+//=================================================================================
+void PrimitiveGUI_FaceDlg::ConstructorsClicked( int constructorId )
+{  
+  erasePreview();
+  switch ( constructorId ) {
+  case 0:
+    {
+      globalSelection(); // close local contexts, if any
+      GroupPlane->hide();
+      GroupDimensions->show();
+      GroupOrientation->show();
+      GroupType->hide();
+      GroupOrientation->RadioButton1->setChecked( true );
+      myOrientationType = 1;
+      break;
+    }
+  case 1:
+    {
+      globalSelection(); // close local contexts, if any
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+      myEditCurrentArgument = GroupPlane->LineEdit1;
+      myEditCurrentArgument->setText("");
+      myEdge = GEOM::GEOM_Object::_nil();
+      myFace = GEOM::GEOM_Object::_nil();
+      GroupType->RadioButton1->setChecked( true );
+      TypeButtonClicked();
+      GroupDimensions->hide();
+      GroupOrientation->hide();
+      GroupType->show();
+      GroupPlane->show();
+      break;
+    }
+  }
+
+  qApp->processEvents();
+  updateGeometry();
+  resize( minimumSizeHint() );
+  SelectionIntoArgument();
+  //displayPreview();
+}
+
+//=================================================================================
+// function : SelectionIntoArgument()
+// purpose  : Called when selection as changed or other case
+//=================================================================================
+void PrimitiveGUI_FaceDlg::SelectionIntoArgument()
+{
+  if (getConstructorId() == 0) {
+    displayPreview();
+    return;
+  }
+
+  myEditCurrentArgument->setText( "" );
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if ( aSelList.Extent() != 1 ) {
+    if ( myEditCurrentArgument == GroupPlane->LineEdit1 )  myEdge = GEOM::GEOM_Object::_nil();
+    return;
+  }
+
+  // nbSel == 1 
+  Standard_Boolean aRes = Standard_False;
+  TopAbs_ShapeEnum aNeedType = TopAbs_EDGE;
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( aSelList.First(), aRes );
+  if ( !CORBA::is_nil( aSelectedObject ) && aRes ) {
+    QString aName = GEOMBase::GetName( aSelectedObject );
+    
+    TopoDS_Shape aShape;
+    if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) {
+      if (GroupType->RadioButton2->isChecked())
+       aNeedType = TopAbs_FACE;
+
+      TColStd_IndexedMapOfInteger aMap;
+      aSelMgr->GetIndexes( aSelList.First(), aMap );
+      if ( aMap.Extent() == 1 ) { // Local Selection
+       int anIndex = aMap( 1 );
+       if ( aNeedType == TopAbs_EDGE )
+          aName += QString( ":edge_%1" ).arg( anIndex );
+        else
+         aName += QString( ":face_%1" ).arg( anIndex );
+
+       //Find SubShape Object in Father
+       GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather( aSelectedObject, aName );
+
+       if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
+         GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
+         aSelectedObject = aShapesOp->GetSubShape( aSelectedObject, anIndex );
+       }
+       else
+         aSelectedObject = aFindedObject; // get Object from study
+      }
+      else { // Global Selection
+        if ( aShape.ShapeType() != aNeedType ) {
+          aSelectedObject = GEOM::GEOM_Object::_nil();
+          aName = "";
+        }
+      }
+    }
+
+    myEditCurrentArgument->setText( aName );
+    if ( myEditCurrentArgument == GroupPlane->LineEdit1 && aNeedType == TopAbs_EDGE )
+      myEdge = aSelectedObject;
+    else if ( myEditCurrentArgument == GroupPlane->LineEdit1 && aNeedType == TopAbs_FACE )
+      myFace = aSelectedObject;
+  }
+  displayPreview();
+}
+
+
+//=================================================================================
+// function : SetEditCurrentArgument()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_FaceDlg::SetEditCurrentArgument()
+{
+  QPushButton* send = (QPushButton*)sender();
+
+  globalSelection(); // close previous local contexts
+  if ( send == GroupPlane->PushButton1 ) {
+    myEditCurrentArgument = GroupPlane->LineEdit1;
+    if (GroupType->RadioButton1->isChecked())
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+    else if (GroupType->RadioButton1->isChecked())
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_FACE );
+  }
+
+  myEditCurrentArgument->setFocus();
+  SelectionIntoArgument();
+}
+
+
+//=================================================================================
+// function : LineEditReturnPressed()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_FaceDlg::LineEditReturnPressed()
+{
+  QLineEdit* send = (QLineEdit*)sender();
+  if ( send == GroupPlane->LineEdit1 )  myEditCurrentArgument = GroupPlane->LineEdit1;
+  else return;
+  GEOMBase_Skeleton::LineEditReturnPressed();
+}
+
+
+//=================================================================================
+// function : ActivateThisDialog()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_FaceDlg::ActivateThisDialog()
+{
+  GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
+  ConstructorsClicked( getConstructorId() );
+}
+
+//=================================================================================
+// function : DeactivateActiveDialog()
+// purpose  : public slot to deactivate if active
+//=================================================================================
+void PrimitiveGUI_FaceDlg::DeactivateActiveDialog()
+{
+  GEOMBase_Skeleton::DeactivateActiveDialog();
+}
+
+//=================================================================================
+// function : enterEvent()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_FaceDlg::enterEvent( QEvent* )
+{
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
+    ActivateThisDialog();
+}
+
+//=================================================================================
+// function : createOperation
+// purpose  :
+//=================================================================================
+GEOM::GEOM_IOperations_ptr PrimitiveGUI_FaceDlg::createOperation()
+{
+  return myGeomGUI->GetGeomGen()->GetI3DPrimOperations( getStudyId() );
+}
+
+//=================================================================================
+// function : isValid
+// purpose  :
+//=================================================================================
+bool PrimitiveGUI_FaceDlg::isValid( QString& msg )
+{
+  bool ok = true;
+  if( getConstructorId() == 0 )
+  {
+    ok = GroupDimensions->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+  }
+  else if( getConstructorId() == 1 )
+  {
+    ok = GroupPlane->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupPlane->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+  }
+
+  const int id = getConstructorId();
+  if ( id == 0 )
+    return ok;
+  else if ( id == 1 ) {
+    if (GroupType->RadioButton1->isChecked())
+      return !myEdge->_is_nil() && ok;
+    else if (GroupType->RadioButton2->isChecked())
+      return !myFace->_is_nil() && ok;
+  }
+  return false;
+}
+
+//=================================================================================
+// function : execute
+// purpose  :
+//=================================================================================
+bool PrimitiveGUI_FaceDlg::execute (ObjectList& objects)
+{
+  bool res = false;
+  QStringList aParameters;
+  GEOM::GEOM_Object_var anObj;
+  switch (getConstructorId()) {
+  case 0:
+    anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+      MakeFaceHW(GroupDimensions->SpinBox_DX->value(),
+                 GroupDimensions->SpinBox_DY->value(), myOrientationType);
+    if (!anObj->_is_nil() && !IsPreview())
+    {
+      aParameters << GroupDimensions->SpinBox_DX->text();
+      aParameters << GroupDimensions->SpinBox_DY->text();
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    }
+    res = true;
+    break;
+  case 1:
+    if (GroupType->RadioButton1->isChecked())
+      anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+        MakeFaceObjHW(myEdge, GroupPlane->SpinBox_DX->value(), GroupPlane->SpinBox_DY->value());
+    else if (GroupType->RadioButton2->isChecked())
+      anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+        MakeFaceObjHW(myFace, GroupPlane->SpinBox_DX->value(), GroupPlane->SpinBox_DY->value());
+    if (!anObj->_is_nil() && !IsPreview())
+    {
+      aParameters << GroupPlane->SpinBox_DX->text();
+      aParameters << GroupPlane->SpinBox_DY->text();
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    }
+    res = true;
+    break;
+  }
+
+  if (!anObj->_is_nil())
+    objects.push_back(anObj._retn());
+
+  return res;
+}
+
+//=================================================================================
+// function : addSubshapeToStudy
+// purpose  : virtual method to add new SubObjects if local selection
+//=================================================================================
+void PrimitiveGUI_FaceDlg::addSubshapesToStudy()
+{
+  QMap<QString, GEOM::GEOM_Object_var> objMap;
+  switch ( getConstructorId() ) {
+  case 1 :
+    if ( GroupType->RadioButton1->isChecked() )
+      objMap[GroupPlane->LineEdit1->text()] = myEdge;
+    if ( GroupType->RadioButton2->isChecked() )
+      objMap[GroupPlane->LineEdit1->text()] = myFace;
+    break;
+  }
+  addSubshapesToFather( objMap );
+}
diff --git a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h
new file mode 100755 (executable)
index 0000000..90d034e
--- /dev/null
@@ -0,0 +1,86 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BasicGUI_FaceDlg.h
+// Author : Dmitry Matveithev, OCN.
+//
+#ifndef BASICGUI_FACEDLG_H
+#define BASICGUI_FACEDLG_H
+
+#include <GEOMBase_Skeleton.h>
+
+class DlgRef_2Spin;
+class DlgRef_1Sel2Spin;
+class DlgRef_3Radio;
+
+//=================================================================================
+// class    : PrimitiveGUI_FaceDlg
+// purpose  :
+//=================================================================================
+class PrimitiveGUI_FaceDlg : public GEOMBase_Skeleton
+{ 
+  Q_OBJECT
+
+public:
+  PrimitiveGUI_FaceDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~PrimitiveGUI_FaceDlg();
+  
+protected:
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
+    
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  
+private:
+  GEOM::GEOM_Object_var              myEdge;
+  GEOM::GEOM_Object_var              myFace;
+
+  int                                myOrientationType;
+  
+  DlgRef_2Spin*                      GroupDimensions;
+  DlgRef_1Sel2Spin*                  GroupPlane;
+  DlgRef_3Radio*                     GroupOrientation;
+  DlgRef_3Radio*                     GroupType;
+    
+private slots:
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+
+  void                               ActivateThisDialog();
+  void                               DeactivateActiveDialog();
+  void                               ConstructorsClicked( int );    
+    
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ValueChangedInSpinBox( double );
+  void                               SetDoubleSpinBoxStep( double );
+  void                               RadioButtonClicked();
+  void                               TypeButtonClicked();
+};
+
+#endif // BASICGUI_FACEDLG_H
index 8b0dbb107526521b67a65eca33012403319bdf39..6fc293005d19334c908758395155505f43bb890a 100644 (file)
@@ -1,37 +1,38 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI_SphereDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : PrimitiveGUI_SphereDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "PrimitiveGUI_SphereDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : PrimitiveGUI_SphereDlg()
@@ -54,42 +49,45 @@ 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(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+PrimitiveGUI_SphereDlg::PrimitiveGUI_SphereDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                               bool modal, Qt::WindowFlags fl )
+  :GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl )
 {
-  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")));
-  QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  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" ) ) );
+  QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_SPHERE_TITLE"));
+  setWindowTitle( tr( "GEOM_SPHERE_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_SPHERE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel1Spin(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_SPHERE_CR"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_CENTER"));
-  GroupPoints->TextLabel2->setText(tr("GEOM_RADIUS"));
-  GroupPoints->PushButton1->setPixmap(image2);
-
-  GroupDimensions = new DlgRef_1Spin(this, "GroupDimensions");
-  GroupDimensions->GroupBox1->setTitle(tr("GEOM_SPHERE_RO"));
-  GroupDimensions->TextLabel1->setText(tr("GEOM_RADIUS"));
-
-  Layout1->addWidget(GroupPoints, 2, 0);
-  Layout1->addWidget(GroupDimensions, 2, 0);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_SPHERE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setIcon( image1 );
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_1Sel1Spin( centralWidget() );
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_SPHERE_CR" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_CENTER" ) );
+  GroupPoints->TextLabel2->setText( tr( "GEOM_RADIUS" ) );
+  GroupPoints->PushButton1->setIcon( image2 );
+
+  GroupDimensions = new DlgRef_1Spin( centralWidget() );
+  GroupDimensions->GroupBox1->setTitle( tr( "GEOM_SPHERE_RO" ) );
+  GroupDimensions->TextLabel1->setText( tr( "GEOM_RADIUS" ) );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
+  layout->addWidget( GroupDimensions );
   /***************************************************************/
 
-  setHelpFileName("create_sphere_page.html");
+  setHelpFileName( "create_sphere_page.html" );
 
   Init();
 }
 
+
 //=================================================================================
 // function : ~PrimitiveGUI_SphereDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -99,6 +97,7 @@ PrimitiveGUI_SphereDlg::~PrimitiveGUI_SphereDlg()
   /* no need to delete child widgets, Qt does it all for us */
 }
 
+
 //=================================================================================
 // function : Init()
 // purpose  :
@@ -113,76 +112,91 @@ void PrimitiveGUI_SphereDlg::Init()
   
   /* Get setting of step value from file configuration */
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
+  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100 );
 
   /* min, max, step and decimals for spin boxes */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupDimensions->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox_DX->SetValue(100.0);
-  GroupDimensions->SpinBox_DX->SetValue(100.0);
+  initSpinBox( GroupPoints->SpinBox_DX, 0.000001, COORD_MAX, step, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( GroupDimensions->SpinBox_DX, 0.000001, COORD_MAX, step, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupPoints->SpinBox_DX->setValue( 100.0 );
+  GroupDimensions->SpinBox_DX->setValue( 100.0 );
   
   /* 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( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+
+  connect( this,          SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPoints->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
-  connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
-  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect( GroupDimensions->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox() ) );
+  connect( GroupPoints->SpinBox_DX,     SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox() ) );
 
-  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)),
-          GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
-  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)),
-          GroupDimensions->SpinBox_DX, SLOT(SetStep(double)));
+  connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
 
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  initName(tr("GEOM_SPHERE"));
-  ConstructorsClicked(0);
+  initName( tr( "GEOM_SPHERE" ) );
+
+  setConstructorId( 1 ); // simplest constructor
+  ConstructorsClicked( 1 );
+}
+
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void PrimitiveGUI_SphereDlg::SetDoubleSpinBoxStep( double step )
+{
+  GroupPoints->SpinBox_DX->setSingleStep(step);
+  GroupDimensions->SpinBox_DX->setSingleStep(step);
 }
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void PrimitiveGUI_SphereDlg::ConstructorsClicked (int constructorId)
+void PrimitiveGUI_SphereDlg::ConstructorsClicked( int constructorId )
 {
-  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
-
-  switch (constructorId)
+  disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
+  
+  switch ( constructorId ) {
+  case 0:
     {
-    case 0:
-      {
-        globalSelection(); // close local contexts, if any
-       localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
-       GroupDimensions->hide();
-       resize(0, 0);
-       GroupPoints->show();
-
-       myEditCurrentArgument = GroupPoints->LineEdit1;
-       GroupPoints->LineEdit1->setText("");
-       myPoint = GEOM::GEOM_Object::_nil();
-
-       connect(myGeomGUI->getApp()->selectionMgr(), 
-               SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-       break;
-      }
-    case 1:
-      {
-       GroupPoints->hide();
-        globalSelection(); // close local contexts, if any
-       resize(0, 0);
-       GroupDimensions->show();
-       
-       break;
-      }
+      globalSelection(); // close local contexts, if any
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+
+      GroupDimensions->hide();
+      GroupPoints->show();
+      
+      myEditCurrentArgument = GroupPoints->LineEdit1;
+      GroupPoints->LineEdit1->setText( "" );
+      myPoint = GEOM::GEOM_Object::_nil();
+      
+      connect( myGeomGUI->getApp()->selectionMgr(), 
+              SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+      break;
+    }
+  case 1:
+    {
+      globalSelection(); // close local contexts, if any
+      
+      GroupPoints->hide();
+      GroupDimensions->show();
+      
+      break;
     }
+  }
+
+  qApp->processEvents();
+  updateGeometry();
+  resize( minimumSizeHint() );
+
   displayPreview();
 }
 
+
 //=================================================================================
 // function : ClickOnOk()
 // purpose  :
@@ -193,6 +207,7 @@ void PrimitiveGUI_SphereDlg::ClickOnOk()
     ClickOnCancel();
 }
 
+
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
@@ -207,14 +222,6 @@ bool PrimitiveGUI_SphereDlg::ClickOnApply()
   return true;
 }
 
-//=================================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=================================================================================
-void PrimitiveGUI_SphereDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
 
 //=================================================================================
 // function : SelectionIntoArgument()
@@ -222,49 +229,49 @@ void PrimitiveGUI_SphereDlg::ClickOnCancel()
 //=================================================================================
 void PrimitiveGUI_SphereDlg::SelectionIntoArgument()
 {
-  if (getConstructorId() != 0)
+  if ( getConstructorId() != 0 )
     return;
 
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
 
-  if (IObjectCount() != 1) 
-  {
+  if (aSelList.Extent() != 1) {
     myPoint = GEOM::GEOM_Object::_nil();
     return;
   }
 
   /* nbSel == 1 ! */
   Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult);
+  GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
-  if (!testResult || CORBA::is_nil(aSelectedObject))
+  if ( !testResult || CORBA::is_nil( aSelectedObject ) )
     return;
-
-  QString aName = GEOMBase::GetName(aSelectedObject);
+  QString aName = GEOMBase::GetName( aSelectedObject );
   TopoDS_Shape aShape;
-  if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
-  {
-    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull() ) {
     TColStd_IndexedMapOfInteger aMap;
-    aSelMgr->GetIndexes(firstIObject(), aMap);
-    if (aMap.Extent() == 1) // Local Selection
-    {
+    aSelMgr->GetIndexes(aSelList.First(), aMap);
+    if ( aMap.Extent() == 1 ) { // Local Selection
       int anIndex = aMap( 1 );
       aName.append( ":vertex_" + QString::number( anIndex ) );
 
       //Find SubShape Object in Father
-      GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
+      GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName );
 
       if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
        GEOM::GEOM_IShapesOperations_var aShapesOp =
          getGeomEngine()->GetIShapesOperations( getStudyId() );
-       aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+       aSelectedObject = aShapesOp->GetSubShape( aSelectedObject, anIndex );
       }
-      else
+      else {
        aSelectedObject = aFindedObject; // get Object from study
+      }
     }
-    else // Global Selection
-    {
+    else { // Global Selection
       if (aShape.ShapeType() != TopAbs_VERTEX) {
         aSelectedObject = GEOM::GEOM_Object::_nil();
         aName = "";
@@ -272,7 +279,7 @@ void PrimitiveGUI_SphereDlg::SelectionIntoArgument()
     }
   }
 
-  myEditCurrentArgument->setText(aName);
+  myEditCurrentArgument->setText( aName );
   myPoint = aSelectedObject;
 
   displayPreview();
@@ -285,13 +292,13 @@ void PrimitiveGUI_SphereDlg::SelectionIntoArgument()
 void PrimitiveGUI_SphereDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1)
-    {
-      myEditCurrentArgument = send;
-      GEOMBase_Skeleton::LineEditReturnPressed();
-    }
+  if ( send == GroupPoints->LineEdit1 ) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
 }
 
+
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -300,7 +307,7 @@ void PrimitiveGUI_SphereDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
   
-  if (send == GroupPoints->PushButton1) {
+  if ( send == GroupPoints->PushButton1 ) {
     GroupPoints->LineEdit1->setFocus();
     myEditCurrentArgument = GroupPoints->LineEdit1;
     globalSelection(); // close local contexts, if any
@@ -309,6 +316,7 @@ void PrimitiveGUI_SphereDlg::SetEditCurrentArgument()
   }
 }
 
+
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -316,12 +324,13 @@ void PrimitiveGUI_SphereDlg::SetEditCurrentArgument()
 void PrimitiveGUI_SphereDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
-
-  ConstructorsClicked(getConstructorId());
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+  
+  ConstructorsClicked( getConstructorId() );
 }
 
+
 //=================================================================================
 // function : DeactivateActiveDialog()
 // purpose  : public slot to deactivate if active
@@ -331,16 +340,18 @@ void PrimitiveGUI_SphereDlg::DeactivateActiveDialog()
   GEOMBase_Skeleton::DeactivateActiveDialog();
 }
 
+
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void PrimitiveGUI_SphereDlg::enterEvent(QEvent* e)
+void PrimitiveGUI_SphereDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
+
 //=================================================================================
 // function : ValueChangedInSpinBox()
 // purpose  :
@@ -350,6 +361,7 @@ void PrimitiveGUI_SphereDlg::ValueChangedInSpinBox()
   displayPreview();
 }
 
+
 //=================================================================================
 // function : createOperation
 // purpose  :
@@ -359,59 +371,66 @@ GEOM::GEOM_IOperations_ptr PrimitiveGUI_SphereDlg::createOperation()
   return getGeomEngine()->GetI3DPrimOperations( getStudyId() );
 }
 
+
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
 bool PrimitiveGUI_SphereDlg::isValid( QString& msg  )
 {
-  return getConstructorId() == 0 ? !myPoint->_is_nil() : true;
+  bool ok = true;
+  if( getConstructorId() == 0 )
+    ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+  else if( getConstructorId() == 1 )
+    ok = GroupDimensions->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+  return getConstructorId() == 0 ? !myPoint->_is_nil() && ok : ok;
 }
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool PrimitiveGUI_SphereDlg::execute (ObjectList& objects)
+bool PrimitiveGUI_SphereDlg::execute( ObjectList& objects )
 {
   bool res = false;
-
+  
   GEOM::GEOM_Object_var anObj;
 
-  switch (getConstructorId()) 
-  {
-  case 0:
+  switch ( getConstructorId() ) {
+  case 0 :
     {
-      if (!CORBA::is_nil(myPoint)) {
-       anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->
-          MakeSpherePntR(myPoint, getRadius());
+      if ( !CORBA::is_nil( myPoint ) ) {
+       anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->MakeSpherePntR( myPoint, getRadius() );
+       if (!anObj->_is_nil() && !IsPreview())
+        {
+         QStringList aParameters;
+         aParameters << GroupPoints->SpinBox_DX->text();
+         anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+       }
        res = true;
       }
       break;
     }
-  case 1:
+  case 1 :
     {
-      anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->
-        MakeSphereR(getRadius());
+      anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->MakeSphereR( getRadius() );
+      if (!anObj->_is_nil() && !IsPreview())
+      {
+       QStringList aParameters;
+       aParameters << GroupDimensions->SpinBox_DX->text();
+       anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+      }
       res = true;
       break;
     }
   }
-
-  if (!anObj->_is_nil())
-    objects.push_back(anObj._retn());
-
+  
+  if ( !anObj->_is_nil() )
+    objects.push_back( anObj._retn() );
+  
   return res;
 }
 
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void PrimitiveGUI_SphereDlg::closeEvent( QCloseEvent* e )
-{
-  GEOMBase_Skeleton::closeEvent( e );
-}
 
 //=================================================================================
 // function : getRadius()
@@ -420,10 +439,10 @@ void PrimitiveGUI_SphereDlg::closeEvent( QCloseEvent* e )
 double PrimitiveGUI_SphereDlg::getRadius() const
 {
   int aConstructorId = getConstructorId();
-  if (aConstructorId == 0)
-    return GroupPoints->SpinBox_DX->GetValue();
-  else if (aConstructorId == 1)
-    return GroupDimensions->SpinBox_DX->GetValue();
+  if ( aConstructorId == 0 )
+    return GroupPoints->SpinBox_DX->value();
+  else if ( aConstructorId == 1 )
+    return GroupDimensions->SpinBox_DX->value();
   return 0;
 }
 
@@ -435,13 +454,12 @@ void PrimitiveGUI_SphereDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
 
-switch (getConstructorId())
-  {
+  switch ( getConstructorId() ) {
   case 0:
     objMap[GroupPoints->LineEdit1->text()] = myPoint;
     break;
   case 1:
     return;
   }
- addSubshapesToFather( objMap );
 addSubshapesToFather( objMap );
 }
index 8e1297ffabe926fd2b7ce0af09e8c320510cbdcd..80ffe3f272a4cb7f170cf5858487972a97d1463a 100644 (file)
@@ -1,37 +1,35 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : PrimitiveGUI_SphereDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_SPHERE_H
-#define DIALOGBOX_SPHERE_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI_SphereDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef PRIMITIVEGUI_SPHEREDLG_H
+#define PRIMITIVEGUI_SPHEREDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel1Spin.h"
-#include "DlgRef_1Spin.h"
+#include <GEOMBase_Skeleton.h>
 
+class DlgRef_1Sel1Spin;
+class DlgRef_1Spin;
 
 //=================================================================================
 // class    : PrimitiveGUI_SphereDlg
 //=================================================================================
 class PrimitiveGUI_SphereDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    PrimitiveGUI_SphereDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                          const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~PrimitiveGUI_SphereDlg();
+  PrimitiveGUI_SphereDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~PrimitiveGUI_SphereDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
-    virtual void closeEvent( QCloseEvent* e );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    double getRadius() const;
-
-    GEOM::GEOM_Object_var myPoint; /* Center point */
-    
-    DlgRef_1Sel1Spin* GroupPoints;
-    DlgRef_1Spin* GroupDimensions;
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  double                             getRadius() const;
+  
+private:
+  GEOM::GEOM_Object_var              myPoint; /* Center point */
+  
+  DlgRef_1Sel1Spin*                  GroupPoints;
+  DlgRef_1Spin*                      GroupDimensions;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ClickOnCancel();
-    void ActivateThisDialog();
-    void DeactivateActiveDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ConstructorsClicked(int);
-    void ValueChangedInSpinBox();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               DeactivateActiveDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               ValueChangedInSpinBox();
+  void                               SetDoubleSpinBoxStep( double );
 };
 
 #endif // DIALOGBOX_SPHERE_H
index 00fc1c109619a30a2012a98814d8e8c092edbd57..a756fdf623340ec678f0037baf18f738883aab1f 100644 (file)
@@ -1,38 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI_TorusDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : PrimitiveGUI_TorusDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "PrimitiveGUI_TorusDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
+// OCCT Includes
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : PrimitiveGUI_TorusDlg()
 //            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(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                      WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+PrimitiveGUI_TorusDlg::PrimitiveGUI_TorusDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                              bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myInitial(true)
 {
   SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
-  QPixmap image0(aResMgr->loadPixmap("GEOM", tr("ICON_DLG_TORUS_PV")));
-  QPixmap image1(aResMgr->loadPixmap("GEOM", tr("ICON_DLG_TORUS_DXYZ")));
-  QPixmap image2(aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
+  QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_TORUS_PV")));
+  QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_TORUS_DXYZ")));
+  QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_TORUS_TITLE"));
+  setWindowTitle(tr("GEOM_TORUS_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_TORUS"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_TORUS"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image1);
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
 
-  GroupPoints = new DlgRef_2Sel2Spin(this, "GroupPoints");
+  GroupPoints = new DlgRef_2Sel2Spin(centralWidget());
   GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   GroupPoints->TextLabel1->setText(tr("GEOM_BASE_POINT"));
   GroupPoints->TextLabel2->setText(tr("GEOM_VECTOR"));
-  GroupPoints->TextLabel3->setText(tr("GEOM_RADIUS_I").arg("1"));
-  GroupPoints->TextLabel4->setText(tr("GEOM_RADIUS_I").arg("2"));
-  GroupPoints->PushButton1->setPixmap(image2);
-  GroupPoints->PushButton2->setPixmap(image2);
+  GroupPoints->TextLabel3->setText(tr("GEOM_RADIUS_I").arg(1));
+  GroupPoints->TextLabel4->setText(tr("GEOM_RADIUS_I").arg(2));
+  GroupPoints->PushButton1->setIcon(image2);
+  GroupPoints->PushButton2->setIcon(image2);
 
-  GroupDimensions = new DlgRef_2Spin(this, "GroupDimensions");
+  GroupDimensions = new DlgRef_2Spin(centralWidget());
   GroupDimensions->GroupBox1->setTitle(tr("GEOM_BOX_OBJ"));
-  GroupDimensions->TextLabel1->setText(tr("GEOM_RADIUS_I").arg("1"));
-  GroupDimensions->TextLabel2->setText(tr("GEOM_RADIUS_I").arg("2"));
+  GroupDimensions->TextLabel1->setText(tr("GEOM_RADIUS_I").arg(1));
+  GroupDimensions->TextLabel2->setText(tr("GEOM_RADIUS_I").arg(2));
 
-  Layout1->addWidget(GroupPoints, 2, 0);
-  Layout1->addWidget(GroupDimensions, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
+  layout->addWidget(GroupDimensions);
   /***************************************************************/
 
   setHelpFileName("create_torus_page.html");
@@ -94,50 +95,49 @@ PrimitiveGUI_TorusDlg::PrimitiveGUI_TorusDlg(GeometryGUI* theGeometryGUI, QWidge
   Init();
 }
 
-
 //=================================================================================
 // function : ~PrimitiveGUI_TorusDlg()
 // purpose  : Destroys the object and frees any allocated resources
 //=================================================================================
 PrimitiveGUI_TorusDlg::~PrimitiveGUI_TorusDlg()
 {
-    // no need to delete child widgets, Qt does it all for us
+  // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void PrimitiveGUI_TorusDlg::Init()
 {
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
+  // Get setting of step value from file configuration
+  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+  double step = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100);
 
-  myPoint = myDir = GEOM::GEOM_Object::_nil();
+  // min, max, step and decimals for spin boxes & initial values
+  initSpinBox(GroupPoints->SpinBox_DX, 0.000001, COORD_MAX, step, 6); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupPoints->SpinBox_DY, 0.000001, COORD_MAX, step, 6); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupDimensions->SpinBox_DX, 0.000001, COORD_MAX, step, 6); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupDimensions->SpinBox_DY, 0.000001, COORD_MAX, step, 6); // VSR: TODO: DBL_DIGITS_DISPLAY
 
-  /* Get setting of step value from file configuration */
-  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
+  // init variables
+  GroupPoints->LineEdit1->setReadOnly(true);
+  GroupPoints->LineEdit2->setReadOnly(true);
 
-  /* min, max, step and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox_DY->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupDimensions->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupDimensions->SpinBox_DY->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
+  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit2->setText("");
+  myPoint = myDir = GEOM::GEOM_Object::_nil();
 
-  GroupPoints->SpinBox_DX->SetValue(300.0);
-  GroupPoints->SpinBox_DY->SetValue(100.0);
-  GroupDimensions->SpinBox_DX->SetValue(300.0);
-  GroupDimensions->SpinBox_DY->SetValue(100.0);
+  GroupPoints->SpinBox_DX->setValue(300.0);
+  GroupPoints->SpinBox_DY->setValue(100.0);
+  GroupDimensions->SpinBox_DX->setValue(300.0);
+  GroupDimensions->SpinBox_DY->setValue(100.0);
 
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  // 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(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
 
   connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
@@ -145,25 +145,29 @@ void PrimitiveGUI_TorusDlg::Init()
   connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
   connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
 
-  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
-  connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupPoints->SpinBox_DX,     SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(GroupPoints->SpinBox_DY,     SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
   connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
   connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
 
-  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(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double)));
 
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
+  initName(tr("GEOM_TORUS"));
 
-  initName( tr( "GEOM_TORUS" ) );
-  ConstructorsClicked(0);
+  setConstructorId(1); // simplest constructor
+  ConstructorsClicked(1);
+}
+
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void PrimitiveGUI_TorusDlg::SetDoubleSpinBoxStep (double step)
+{
+  GroupPoints->SpinBox_DX->setSingleStep(step);
+  GroupPoints->SpinBox_DY->setSingleStep(step);
+  GroupDimensions->SpinBox_DX->setSingleStep(step);
+  GroupDimensions->SpinBox_DY->setSingleStep(step);
 }
 
 //=================================================================================
@@ -174,42 +178,43 @@ void PrimitiveGUI_TorusDlg::ConstructorsClicked (int constructorId)
 {
   disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
 
-  switch (constructorId)
-  {
+  switch (constructorId) {
   case 0:
     {
-      globalSelection(); // close local contexts, if any
-      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
-
       GroupDimensions->hide();
-      resize(0, 0);
       GroupPoints->show();
 
-      myEditCurrentArgument = GroupPoints->LineEdit1;
-      GroupPoints->LineEdit1->setText(tr(""));
-      GroupPoints->LineEdit2->setText(tr(""));
-      myPoint = myDir = GEOM::GEOM_Object::_nil();
-
-      connect(myGeomGUI->getApp()->selectionMgr(),
-              SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-      SelectionIntoArgument();
-
+      GroupPoints->PushButton1->click();
       break;
     }
   case 1:
     {
       GroupPoints->hide();
-      globalSelection(); // close local contexts, if any
-      resize(0, 0);
       GroupDimensions->show();
-
+      disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+      globalSelection(); // close local contexts, if any
       break;
     }
   }
 
-  displayPreview();
-}
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
 
+  if (myInitial) {
+    myInitial = false;
+    if (constructorId == 0) {
+      // on dialog initialization we init the first field with a selected object (if any)
+      SelectionIntoArgument();
+    }
+    else {
+      displayPreview();
+    }
+  }
+  else {
+    displayPreview();
+  }
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -221,7 +226,6 @@ void PrimitiveGUI_TorusDlg::ClickOnOk()
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
@@ -232,38 +236,43 @@ bool PrimitiveGUI_TorusDlg::ClickOnApply()
     return false;
 
   initName();
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed or other case
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void PrimitiveGUI_TorusDlg::SelectionIntoArgument()
 {
   if (getConstructorId() != 0)
     return;
 
+  erasePreview();
   myEditCurrentArgument->setText("");
 
-  if (IObjectCount() != 1)
-  {
-    if (myEditCurrentArgument == GroupPoints->LineEdit1)
-      myPoint = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == GroupPoints->LineEdit2)
-      myDir = GEOM::GEOM_Object::_nil();
+  if      (myEditCurrentArgument == GroupPoints->LineEdit1) myPoint = GEOM::GEOM_Object::_nil();
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) myDir   = GEOM::GEOM_Object::_nil();
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1)
     return;
-  }
 
-  /* nbSel == 1 */
+  // nbSel == 1
   Standard_Boolean testResult = Standard_False;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult);
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
   if (!testResult || CORBA::is_nil(aSelectedObject))
     return;
 
   QString aName = GEOMBase::GetName(aSelectedObject);
+
+  // Get Selected object if selected subshape
   TopoDS_Shape aShape;
   if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
   {
@@ -271,11 +280,9 @@ void PrimitiveGUI_TorusDlg::SelectionIntoArgument()
     if (myEditCurrentArgument == GroupPoints->LineEdit2)
       aNeedType = TopAbs_EDGE;
 
-    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
     TColStd_IndexedMapOfInteger aMap;
-    aSelMgr->GetIndexes(firstIObject(), aMap);
-    if (aMap.Extent() == 1) // Local Selection
-    {
+    aSelMgr->GetIndexes(aSelList.First(), aMap);
+    if (aMap.Extent() == 1) { // Local Selection
       int anIndex = aMap(1);
       if (aNeedType == TopAbs_EDGE)
         aName.append(":edge_" + QString::number(anIndex));
@@ -285,16 +292,16 @@ void PrimitiveGUI_TorusDlg::SelectionIntoArgument()
       //Find SubShape Object in Father
       GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
 
-      if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-       GEOM::GEOM_IShapesOperations_var aShapesOp =
-         getGeomEngine()->GetIShapesOperations( getStudyId() );
-       aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+      if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+        GEOM::GEOM_IShapesOperations_var aShapesOp =
+          getGeomEngine()->GetIShapesOperations(getStudyId());
+        aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+      }
+      else {
+        aSelectedObject = aFindedObject; // get Object from study
       }
-      else
-       aSelectedObject = aFindedObject; // get Object from study
     }
-    else // Global Selection
-    {
+    else { // Global Selection
       if (aShape.ShapeType() != aNeedType) {
         aSelectedObject = GEOM::GEOM_Object::_nil();
         aName = "";
@@ -304,30 +311,26 @@ void PrimitiveGUI_TorusDlg::SelectionIntoArgument()
 
   myEditCurrentArgument->setText(aName);
 
-  if (myEditCurrentArgument == GroupPoints->LineEdit1)
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
     myPoint = aSelectedObject;
-  else if (myEditCurrentArgument == GroupPoints->LineEdit2)
+    if (!myPoint->_is_nil() && myDir->_is_nil())
+      GroupPoints->PushButton2->click();
+  }
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
     myDir = aSelectedObject;
+    if (!myDir->_is_nil() && myPoint->_is_nil())
+      GroupPoints->PushButton1->click();
+  }
 
   displayPreview();
 }
 
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose  :
-//=================================================================================
-void PrimitiveGUI_TorusDlg::LineEditReturnPressed()
-{
-  QLineEdit* send = (QLineEdit*)sender();
-  if (send == GroupPoints->LineEdit1 ||
-      send == GroupPoints->LineEdit2)
-  {
-    myEditCurrentArgument = send;
-    GEOMBase_Skeleton::LineEditReturnPressed();
-  }
-}
-
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -335,22 +338,52 @@ void PrimitiveGUI_TorusDlg::LineEditReturnPressed()
 void PrimitiveGUI_TorusDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  globalSelection( GEOM_POINT ); // to break previous local selection
 
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
   if (send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
+
+    globalSelection(GEOM_POINT); // to break previous local selection
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
   }
   else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
-    GEOM::GEOM_Object_var anObj;
-    localSelection( anObj, TopAbs_EDGE );
+
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+
+    globalSelection(GEOM_LINE);  // to break previous local selection
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
   }
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
 }
 
+//=================================================================================
+// function : LineEditReturnPressed()
+// purpose  :
+//=================================================================================
+void PrimitiveGUI_TorusDlg::LineEditReturnPressed()
+{
+  QLineEdit* send = (QLineEdit*)sender();
+  if (send == GroupPoints->LineEdit1 ||
+      send == GroupPoints->LineEdit2) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
+}
 
 //=================================================================================
 // function : ActivateThisDialog()
@@ -360,26 +393,24 @@ void PrimitiveGUI_TorusDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
 
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+  
   ConstructorsClicked( getConstructorId() );
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void PrimitiveGUI_TorusDlg::enterEvent(QEvent* e)
+void PrimitiveGUI_TorusDlg::enterEvent (QEvent*)
 {
-  if ( !GroupConstructors->isEnabled() )
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-
 //=================================================================================
-// function : ValueChangedInSpinBox
+// function : ValueChangedInSpinBox()
 // purpose  :
 //=================================================================================
 void PrimitiveGUI_TorusDlg::ValueChangedInSpinBox()
@@ -387,58 +418,76 @@ void PrimitiveGUI_TorusDlg::ValueChangedInSpinBox()
   displayPreview();
 }
 
-
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
 GEOM::GEOM_IOperations_ptr PrimitiveGUI_TorusDlg::createOperation()
 {
-  return getGeomEngine()->GetI3DPrimOperations( getStudyId() );
+  return getGeomEngine()->GetI3DPrimOperations(getStudyId());
 }
 
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool PrimitiveGUI_TorusDlg::isValid( QString& msg )
+bool PrimitiveGUI_TorusDlg::isValid (QString& msg)
 {
-  return getConstructorId() == 0 ? !(myPoint->_is_nil() || myDir->_is_nil()) : true;
+  bool ok = true;
+  if( getConstructorId() == 0 )
+  {
+    ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupPoints->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+  }
+  else if( getConstructorId() == 1 )
+  {
+    ok = GroupDimensions->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+  }
+  return getConstructorId() == 0 ? !(myPoint->_is_nil() || myDir->_is_nil()) && ok : ok;
 }
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool PrimitiveGUI_TorusDlg::execute( ObjectList& objects )
+bool PrimitiveGUI_TorusDlg::execute (ObjectList& objects)
 {
   bool res = false;
 
   GEOM::GEOM_Object_var anObj;
 
-  switch ( getConstructorId() )
-  {
+  switch (getConstructorId()) {
   case 0:
-    {
-      if (!CORBA::is_nil( myPoint ) && !CORBA::is_nil( myDir ))
+    if (!CORBA::is_nil(myPoint) && !CORBA::is_nil(myDir)) {
+      anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+        MakeTorusPntVecRR(myPoint, myDir, getRadius1(), getRadius2());
+      if (!anObj->_is_nil() && !IsPreview())
       {
-        anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->
-          MakeTorusPntVecRR(myPoint, myDir, getRadius1(), getRadius2());
-        res = true;
+       QStringList aParameters;
+       aParameters << GroupPoints->SpinBox_DX->text();
+       aParameters << GroupPoints->SpinBox_DY->text();
+       anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
       }
-      break;
+      res = true;
     }
+    break;
   case 1:
+    anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())->
+      MakeTorusRR(getRadius1(), getRadius2());
+    if (!anObj->_is_nil() && !IsPreview())
     {
-      anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->
-        MakeTorusRR(getRadius1(), getRadius2());
-      res = true;
-      break;
+      QStringList aParameters;
+      aParameters << GroupDimensions->SpinBox_DX->text();
+      aParameters << GroupDimensions->SpinBox_DY->text();
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
     }
+    res = true;
+    break;
   }
 
-  if ( !anObj->_is_nil() )
-    objects.push_back( anObj._retn() );
+  if (!anObj->_is_nil())
+    objects.push_back(anObj._retn());
 
   return res;
 }
@@ -451,9 +500,9 @@ double PrimitiveGUI_TorusDlg::getRadius1() const
 {
   int aConstructorId = getConstructorId();
   if (aConstructorId == 0)
-    return GroupPoints->SpinBox_DX->GetValue();
+    return GroupPoints->SpinBox_DX->value();
   else if (aConstructorId == 1)
-    return GroupDimensions->SpinBox_DX->GetValue();
+    return GroupDimensions->SpinBox_DX->value();
   return 0;
 }
 
@@ -465,9 +514,9 @@ double PrimitiveGUI_TorusDlg::getRadius2() const
 {
   int aConstructorId = getConstructorId();
   if (aConstructorId == 0)
-    return GroupPoints->SpinBox_DY->GetValue();
+    return GroupPoints->SpinBox_DY->value();
   else if (aConstructorId == 1)
-    return GroupDimensions->SpinBox_DY->GetValue();
+    return GroupDimensions->SpinBox_DY->value();
   return 0;
 }
 
@@ -479,8 +528,7 @@ void PrimitiveGUI_TorusDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
 
-switch (getConstructorId())
-  {
+  switch (getConstructorId()) {
   case 0:
     objMap[GroupPoints->LineEdit1->text()] = myPoint;
     objMap[GroupPoints->LineEdit2->text()] = myDir;
@@ -488,5 +536,5 @@ switch (getConstructorId())
   case 1:
     return;
   }
addSubshapesToFather( objMap );
 addSubshapesToFather(objMap);
 }
index 1703b6a43fa573bada4cf3568c326f2046dbab8e..c173b0edfb995523798d8a46c7f0f70ab5cb9e1c 100644 (file)
@@ -1,37 +1,35 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : PrimitiveGUI_TorusDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_TORUS_H
-#define DIALOGBOX_TORUS_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : PrimitiveGUI_TorusDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef PRIMITIVEGUI_TORUSDLG_H
+#define PRIMITIVEGUI_TORUSDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel2Spin.h"
-#include "DlgRef_2Spin.h"
+#include <GEOMBase_Skeleton.h>
 
+class DlgRef_2Sel2Spin;
+class DlgRef_2Spin;
 
 //=================================================================================
 // class    : PrimitiveGUI_TorusDlg
 //=================================================================================
 class PrimitiveGUI_TorusDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    PrimitiveGUI_TorusDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                         const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~PrimitiveGUI_TorusDlg();
-
+  PrimitiveGUI_TorusDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
+  ~PrimitiveGUI_TorusDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-
-    double getRadius1() const;
-    double getRadius2() const;
-
-    GEOM::GEOM_Object_var myPoint, myDir;
-
-    DlgRef_2Sel2Spin* GroupPoints;
-    DlgRef_2Spin* GroupDimensions;
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  double                             getRadius1() const;
+  double                             getRadius2() const;
+  
+private:
+  GEOM::GEOM_Object_var              myPoint, myDir;
 
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
+  
+  DlgRef_2Sel2Spin*                  GroupPoints;
+  DlgRef_2Spin*                      GroupDimensions;
+  
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ConstructorsClicked(int);
-    void ValueChangedInSpinBox();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               ValueChangedInSpinBox();
+  void                               SetDoubleSpinBoxStep( double );
 };
 
-#endif // DIALOGBOX_TORUS_H
+#endif // PRIMITIVEGUI_TORUSDLG_H
index 8dfb76e6c4e6bd971f1d62b0ff639adf571a10e1..51e90f1bb1cb0b6f81d0afad5c40587d92b185aa 100644 (file)
-#  GEOM REPAIRGUI : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM REPAIRGUI : 
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : RepairGUI
 #
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =                                \
+       RepairGUI.h                             \
+       RepairGUI_SewingDlg.h                   \
+       RepairGUI_SuppressFacesDlg.h            \
+       RepairGUI_ShapeProcessDlg.h             \
+       RepairGUI_CloseContourDlg.h             \
+       RepairGUI_RemoveIntWiresDlg.h           \
+       RepairGUI_RemoveHolesDlg.h              \
+       RepairGUI_DivideEdgeDlg.h               \
+       RepairGUI_FreeBoundDlg.h                \
+       RepairGUI_FreeFacesDlg.h                \
+       RepairGUI_ChangeOrientationDlg.h        \
+       RepairGUI_GlueDlg.h                     \
+       RepairGUI_RemoveExtraEdgesDlg.h
 
 # Libraries targets
 lib_LTLIBRARIES = libRepairGUI.la
 
-dist_libRepairGUI_la_SOURCES = \
-       RepairGUI.cxx \
-       RepairGUI_SewingDlg.cxx \
-       RepairGUI_SuppressFacesDlg.cxx \
-       RepairGUI_ShapeProcessDlg.cxx \
-       RepairGUI_CloseContourDlg.cxx \
-       RepairGUI_RemoveIntWiresDlg.cxx \
-       RepairGUI_RemoveHolesDlg.cxx \
-       RepairGUI_DivideEdgeDlg.cxx \
-       RepairGUI_FreeBoundDlg.cxx \
-       RepairGUI_FreeFacesDlg.cxx \
-       RepairGUI_ChangeOrientationDlg.cxx \
-       RepairGUI_GlueDlg.cxx \
+dist_libRepairGUI_la_SOURCES =                 \
+       RepairGUI.h                             \
+       RepairGUI_SewingDlg.h                   \
+       RepairGUI_SuppressFacesDlg.h            \
+       RepairGUI_ShapeProcessDlg.h             \
+       RepairGUI_CloseContourDlg.h             \
+       RepairGUI_RemoveIntWiresDlg.h           \
+       RepairGUI_RemoveHolesDlg.h              \
+       RepairGUI_DivideEdgeDlg.h               \
+       RepairGUI_FreeBoundDlg.h                \
+       RepairGUI_FreeFacesDlg.h                \
+       RepairGUI_ChangeOrientationDlg.h        \
+       RepairGUI_GlueDlg.h                     \
+       RepairGUI_RemoveExtraEdgesDlg.h         \
+                                               \
+       RepairGUI.cxx                           \
+       RepairGUI_SewingDlg.cxx                 \
+       RepairGUI_SuppressFacesDlg.cxx          \
+       RepairGUI_ShapeProcessDlg.cxx           \
+       RepairGUI_CloseContourDlg.cxx           \
+       RepairGUI_RemoveIntWiresDlg.cxx         \
+       RepairGUI_RemoveHolesDlg.cxx            \
+       RepairGUI_DivideEdgeDlg.cxx             \
+       RepairGUI_FreeBoundDlg.cxx              \
+       RepairGUI_FreeFacesDlg.cxx              \
+       RepairGUI_ChangeOrientationDlg.cxx      \
+       RepairGUI_GlueDlg.cxx                   \
        RepairGUI_RemoveExtraEdgesDlg.cxx
 
-MOC_FILES = \
-       RepairGUI_SewingDlg_moc.cxx \
-       RepairGUI_SuppressFacesDlg_moc.cxx \
-       RepairGUI_ShapeProcessDlg_moc.cxx \
-       RepairGUI_CloseContourDlg_moc.cxx \
-       RepairGUI_RemoveIntWiresDlg_moc.cxx \
-       RepairGUI_RemoveHolesDlg_moc.cxx \
-       RepairGUI_DivideEdgeDlg_moc.cxx  \
-       RepairGUI_FreeBoundDlg_moc.cxx \
-       RepairGUI_FreeFacesDlg_moc.cxx \
-       RepairGUI_ChangeOrientationDlg_moc.cxx \
-       RepairGUI_GlueDlg_moc.cxx \
+MOC_FILES =                                    \
+       RepairGUI_SewingDlg_moc.cxx             \
+       RepairGUI_SuppressFacesDlg_moc.cxx      \
+       RepairGUI_ShapeProcessDlg_moc.cxx       \
+       RepairGUI_CloseContourDlg_moc.cxx       \
+       RepairGUI_RemoveIntWiresDlg_moc.cxx     \
+       RepairGUI_RemoveHolesDlg_moc.cxx        \
+       RepairGUI_DivideEdgeDlg_moc.cxx         \
+       RepairGUI_FreeBoundDlg_moc.cxx          \
+       RepairGUI_FreeFacesDlg_moc.cxx          \
+       RepairGUI_ChangeOrientationDlg_moc.cxx  \
+       RepairGUI_GlueDlg_moc.cxx               \
        RepairGUI_RemoveExtraEdgesDlg_moc.cxx
 
-nodist_libRepairGUI_la_SOURCES= \
+nodist_libRepairGUI_la_SOURCES =               \
        $(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
-
-#LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libRepairGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../DlgRef \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(top_builddir)/idl \
+libRepairGUI_la_CPPFLAGS =                     \
+       $(QT_INCLUDES)                          \
+       $(VTK_INCLUDES)                         \
+       $(CAS_CPPFLAGS)                         \
+       $(PYTHON_INCLUDES)                      \
+       $(BOOST_CPPFLAGS)                       \
+       $(KERNEL_CXXFLAGS)                      \
+       $(GUI_CXXFLAGS)                         \
+       $(CORBA_CXXFLAGS)                       \
+       $(CORBA_INCLUDES)                       \
+       -I$(srcdir)/../GEOMGUI                  \
+       -I$(srcdir)/../DlgRef                   \
+       -I$(srcdir)/../GEOMBase                 \
+       -I$(srcdir)/../OBJECT                   \
+       -I$(srcdir)/../GEOMClient               \
+       -I$(srcdir)/../GEOMImpl                 \
+       -I$(top_builddir)/src/DlgRef            \
+       -I$(top_builddir)/idl                   \
        -I$(top_builddir)/salome_adm/unix
 
-libRepairGUI_la_LDFLAGS  = \
+libRepairGUI_la_LDFLAGS = \
        ../GEOMBase/libGEOMBase.la
index 9ab000be25a8ab26542faf18173ca16f829ba769..ff1045d495e716d9c8303c440db5f4444b26390b 100644 (file)
@@ -1,37 +1,35 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : RepairGUI.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "RepairGUI.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
+#include <GeometryGUI.h>
 
-#include "SalomeApp_Application.h"
+#include <SUIT_Desktop.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
 
 #include "RepairGUI_SewingDlg.h"        // Method SEWING
 #include "RepairGUI_SuppressFacesDlg.h" // Method SUPPRESS FACES
 #include "RepairGUI_ChangeOrientationDlg.h" // Method CHANGE ORIENTATION
 #include "RepairGUI_RemoveExtraEdgesDlg.h" // Method REMOVE EXTRA EDGES
 
-#include "utilities.h"
-
-using namespace std;
-
 //=======================================================================
 // function : RepairGUI()
 // purpose  : Constructor
 //=======================================================================
-RepairGUI::RepairGUI( GeometryGUI* parent ) : GEOMGUI( parent )
+RepairGUI::RepairGUI( GeometryGUI* parent )
+  : GEOMGUI( parent )
 {
 }
 
@@ -71,29 +66,29 @@ RepairGUI::~RepairGUI()
 // function : OnGUIEvent()
 // purpose  : 
 //=======================================================================
-bool RepairGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
+bool RepairGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 {
   SalomeApp_Application* app = getGeometryGUI()->getApp();
-  if (!app) return false;
+  if ( !app ) return false;
 
   getGeometryGUI()->EmitSignalDeactivateDialog();
 
   QDialog* aDlg = NULL;
-  switch (theCommandID) {
-    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;
-    case 611: aDlg = new RepairGUI_ChangeOrientationDlg (getGeometryGUI(), parent, ""); break;
-    case 612: aDlg = new RepairGUI_RemoveExtraEdgesDlg (getGeometryGUI(), parent, ""); break;  
+  switch ( theCommandID ) {
+    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;
+    case 611: aDlg = new RepairGUI_ChangeOrientationDlg ( getGeometryGUI(), parent ); break;
+    case 612: aDlg = new RepairGUI_RemoveExtraEdgesDlg  ( getGeometryGUI(), parent ); break;  
     default:
-      app->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
+      app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
       break;
   }
 
@@ -110,7 +105,7 @@ bool RepairGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
 extern "C"
 {
 #ifdef WNT
-       __declspec( dllexport )
+  __declspec( dllexport )
 #endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
index a999162397493c10cc48b269aa9e82ead0723df9..c829b3b80e672a39967522155e68f810533eefc5 100644 (file)
@@ -1,35 +1,32 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : RepairGUI.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
 #ifndef REPAIRGUI_H
 #define REPAIRGUI_H
 
-#include "GEOMGUI.h"
-#include "GEOMBase.h"
+#include <GEOMGUI.h>
 
 //=================================================================================
 // class    : RepairGUI
 class RepairGUI : public GEOMGUI
 {
 public:
-  RepairGUI( GeometryGUI* parent );
+  RepairGUI( GeometryGUI* );
   ~RepairGUI();
 
-  bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent);
+  bool OnGUIEvent( int, SUIT_Desktop* );
 };
 
-#endif
+#endif // REPAIRGUI_H
index 72f84baeb6236a894781b5176c296b986f2c5af8..485127b1fb13a0a5572f23612fa99f2aa83d8df3 100644 (file)
@@ -1,44 +1,42 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_ChangeOrientationDlg.cxx
+// Author : Sergey KUUL, Open CASCADE S.A.S. (sergey.kuul@opencascade.com)
 //
-//  File   : RepairGUI_ChangeOrientationDlg.cxx
-//  Author : Sergey KUUL
-//  Module : GEOM
-
 #include "RepairGUI_ChangeOrientationDlg.h"
 
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SUIT_Session.h"
-#include "SALOME_ListIteratorOfListIO.hxx"
-
-#include "GEOMImpl_Types.hxx"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include <TopAbs.hxx>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
 
-#include <qlabel.h>
+#include <GEOMImpl_Types.hxx>
 
-using namespace std;
+#include <TopAbs.hxx>
 
 //=================================================================================
 // class    : RepairGUI_ChangeOrientationDlg()
@@ -47,34 +45,37 @@ using namespace std;
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-RepairGUI_ChangeOrientationDlg::RepairGUI_ChangeOrientationDlg(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)
+RepairGUI_ChangeOrientationDlg::RepairGUI_ChangeOrientationDlg( GeometryGUI* theGeometryGUI,
+                                                               QWidget* parent,
+                                                               bool modal )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal )
 {
   //QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SUPRESS_FACE")));
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CHANGE_ORIENTATION")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_CHANGE_ORIENTATION" ) ));
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
     
-  setCaption(tr("GEOM_CHANGE_ORIENTATION_TITLE"));
+  setWindowTitle( tr( "GEOM_CHANGE_ORIENTATION_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_CHANGE_ORIENTATION_TITLE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel1Check_QTD(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_CHANGE_ORIENTATION"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_SELECTED_SHAPE"));
-  GroupPoints->CheckButton1->setText(tr("GEOM_CREATE_COPY"));
-  GroupPoints->PushButton1->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_CHANGE_ORIENTATION_TITLE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_1Sel1Check( centralWidget() );
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_CHANGE_ORIENTATION" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_SELECTED_SHAPE" ) );
+  GroupPoints->CheckButton1->setText( tr( "GEOM_CREATE_COPY" ) );
+  GroupPoints->PushButton1->setIcon( image1 );
 //  GroupPoints->LineEdit1->setReadOnly( true );
+  
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
 
-  Layout1->addWidget(GroupPoints, 2, 0);
-
-  setHelpFileName("change_orientation_operation_page.html");
+  setHelpFileName( "change_orientation_operation_page.html" );
 
   Init();
 }
@@ -98,21 +99,21 @@ void RepairGUI_ChangeOrientationDlg::Init()
   /* init variables */
   myEditCurrentArgument = GroupPoints->LineEdit1;
 
-  GroupPoints->CheckButton1->setChecked(true);
+  GroupPoints->CheckButton1->setChecked( true );
 
   myOkObject = false;
 
   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPoints->PushButton1,  SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints->LineEdit1,    SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
-  connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool)));
+  connect( GroupPoints->CheckButton1, SIGNAL( toggled( bool ) ), this, SLOT( CreateCopyModeChanged( bool ) ) );
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   initName( tr( "CHANGE_ORIENTATION_NEW_OBJ_NAME" ) );
 }
@@ -136,12 +137,12 @@ void RepairGUI_ChangeOrientationDlg::ClickOnOk()
 bool RepairGUI_ChangeOrientationDlg::ClickOnApply()
 {
 //  if ( !onAccept() )
-  if ( !onAccept(GroupPoints->CheckButton1->isChecked()) )
+  if ( !onAccept( GroupPoints->CheckButton1->isChecked() ) )
     return false;
 
   initName();
 
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   
   return true;
 }
@@ -153,12 +154,16 @@ bool RepairGUI_ChangeOrientationDlg::ClickOnApply()
 //=================================================================================
 void RepairGUI_ChangeOrientationDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   QString aName;
   
-  if(myEditCurrentArgument == GroupPoints->LineEdit1) {
-    if (IObjectCount() != 1) {
-      if (myEditCurrentArgument == GroupPoints->LineEdit1)
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) {
+    if ( aSelList.Extent() != 1 ) {
+      if ( myEditCurrentArgument == GroupPoints->LineEdit1 )
         myOkObject = false;
       return;
     }
@@ -167,18 +172,17 @@ void RepairGUI_ChangeOrientationDlg::SelectionIntoArgument()
   // nbSel == 1
   Standard_Boolean testResult = Standard_False;
   GEOM::GEOM_Object_ptr aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
-
-  if (!testResult)
+    GEOMBase::ConvertIOinGEOMObject( aSelList.First(), testResult );
+  
+  if ( !testResult )
     return;
 
-  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
+  if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) {
     myObject = aSelectedObject;
     myOkObject = true;
   }
 
   myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
-
 }
 
 
@@ -190,8 +194,7 @@ void RepairGUI_ChangeOrientationDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
 
-  if( send == GroupPoints->PushButton1 )
-  {
+  if ( send == GroupPoints->PushButton1 ) {
     GroupPoints->LineEdit1->setFocus();
     myEditCurrentArgument = GroupPoints->LineEdit1;
   }
@@ -206,7 +209,7 @@ void RepairGUI_ChangeOrientationDlg::SetEditCurrentArgument()
 void RepairGUI_ChangeOrientationDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if( send == GroupPoints->LineEdit1 ) {
+  if ( send == GroupPoints->LineEdit1 ) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
@@ -220,9 +223,8 @@ void RepairGUI_ChangeOrientationDlg::LineEditReturnPressed()
 void RepairGUI_ChangeOrientationDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 }
 
 
@@ -230,24 +232,13 @@ void RepairGUI_ChangeOrientationDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  : Mouse enter onto the dialog to activate it
 //=================================================================================
-void RepairGUI_ChangeOrientationDlg::enterEvent(QEvent* e)
+void RepairGUI_ChangeOrientationDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
 
-//=================================================================================
-// function : closeEvent()
-// purpose  :
-//=================================================================================
-void RepairGUI_ChangeOrientationDlg::closeEvent(QCloseEvent* e)
-{
-  //myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
-
 //=================================================================================
 // function : createOperation
 // purpose  :
@@ -262,7 +253,7 @@ GEOM::GEOM_IOperations_ptr RepairGUI_ChangeOrientationDlg::createOperation()
 // function : isValid
 // purpose  :
 //=================================================================================
-bool RepairGUI_ChangeOrientationDlg::isValid( QString& msg )
+bool RepairGUI_ChangeOrientationDlg::isValid( QString& )
 {
   return myOkObject;
 }
@@ -277,11 +268,11 @@ bool RepairGUI_ChangeOrientationDlg::execute( ObjectList& objects )
   bool toCreateCopy = GroupPoints->CheckButton1->isChecked();
 
   GEOM::GEOM_Object_var anObj;
-  if(toCreateCopy) {
-    anObj = GEOM::GEOM_IHealingOperations::_narrow(getOperation())->ChangeOrientationCopy(myObject);
+  if ( toCreateCopy ) {
+    anObj = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )->ChangeOrientationCopy( myObject );
   }
   else {
-    anObj = GEOM::GEOM_IHealingOperations::_narrow(getOperation())->ChangeOrientation(myObject);
+    anObj = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )->ChangeOrientation( myObject );
   }
 
   if ( !anObj->_is_nil() )
@@ -295,7 +286,7 @@ bool RepairGUI_ChangeOrientationDlg::execute( ObjectList& objects )
 // function :  CreateCopyModeChanged()
 // purpose  :
 //=================================================================================
-void RepairGUI_ChangeOrientationDlg::CreateCopyModeChanged(bool isCreateCopy)
+void RepairGUI_ChangeOrientationDlg::CreateCopyModeChanged( bool isCreateCopy )
 {
-  GroupBoxName->setEnabled(isCreateCopy);
+  mainFrame()->GroupBoxName->setEnabled( isCreateCopy );
 }
index 19f5be34c0fa830fe356c87d7339c7166c5c522c..e248bc7f7cd2034c4df0d2c6f6278c8bafcb4cb9 100644 (file)
@@ -1,38 +1,34 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : RepairGUI_ChangeOrientationDlg.h
-//  Author : Sergey KUUL
-//  Module : GEOM
-
-#ifndef DIALOGBOX_CHANGEORIENTATION_H
-#define DIALOGBOX_CHANGEORIENTATION_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_ChangeOrientationDlg.h
+// Author : Sergey KUUL, Open CASCADE S.A.S. (sergey.kuul@opencascade.com)
+//
+#ifndef REPAIRGUI_CHANGEORIENTATIONDLG_H
+#define REPAIRGUI_CHANGEORIENTATIONDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel1Check_QTD.h"
-#include <qcheckbox.h>
+#include <GEOMBase_Skeleton.h>
 
-//#include <TColStd_IndexedMapOfInteger.hxx>
+class DlgRef_1Sel1Check;
 
 //=================================================================================
 // class    : RepairGUI_ChangeOrientationDlg
 //=================================================================================
 class RepairGUI_ChangeOrientationDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    RepairGUI_ChangeOrientationDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                                   const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~RepairGUI_ChangeOrientationDlg();
+  RepairGUI_ChangeOrientationDlg( GeometryGUI*, QWidget* = 0, bool = false );
+  ~RepairGUI_ChangeOrientationDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );    
-
-private :
-    void Init();
-    void enterEvent(QEvent* e);
-    void closeEvent(QCloseEvent* e);
-
-    GEOM::GEOM_Object_var myObject;
-    bool myOkObject;
-
-    DlgRef_1Sel1Check_QTD* GroupPoints;
-
-
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );    
+  
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  
+private:
+  GEOM::GEOM_Object_var              myObject;
+  bool                               myOkObject;
+  
+  DlgRef_1Sel1Check*                 GroupPoints;
+  
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void CreateCopyModeChanged(bool isCreateCopy);
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               CreateCopyModeChanged( bool );
 };
 
-#endif // DIALOGBOX_SUPPRESSFACES_H
+#endif // REPAIRGUI_CHANGEORIENTATIONDLG_H
index fc93a6154e0b834a1c05d34793cca06d5a552d5b..85705502ff33ddc36d90ba4ddfcd53b01fb71716 100644 (file)
@@ -1,47 +1,45 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_CloseContourDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : RepairGUI_CloseContourDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "RepairGUI_CloseContourDlg.h"
 
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SUIT_Session.h"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include "GEOMImpl_Types.hxx"
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
+// OCCT Includes
 #include <TopAbs.hxx>
-#include <TColStd_IndexedMapOfInteger.hxx>
 #include <TColStd_MapOfInteger.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
 
-#include <qlabel.h>
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : RepairGUI_CloseContourDlg()
@@ -50,57 +48,49 @@ 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(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)
+RepairGUI_CloseContourDlg::RepairGUI_CloseContourDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                      bool modal)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal)
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CLOSECONTOUR")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_CLOSECONTOUR")));
+  QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_CLOSECONTOUR_TITLE"));
+  setWindowTitle(tr("GEOM_CLOSECONTOUR_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_CLOSECONTOUR_TITLE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel_Ext(this, "GroupPoints");
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_CLOSECONTOUR_TITLE"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_2SelExt(centralWidget());
   GroupPoints->GroupBox1->setTitle(tr("Contour to close"));
   GroupPoints->TextLabel1->setText(tr("GEOM_SELECTED_SHAPE"));
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->LineEdit1->setReadOnly( true );
-
-  QGridLayout* aSelectWiresLay = new QGridLayout( 0, 1, 1, 0, 6, "aSelectWiresLay");
-
-  mySelectWiresBtn = new QPushButton( GroupPoints->GroupBox1, "mySelectWiresBtn" );
-  mySelectWiresBtn->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, mySelectWiresBtn->sizePolicy().hasHeightForWidth() ) );
-  mySelectWiresBtn->setText( trUtf8( "" ) );
-  mySelectWiresBtn->setPixmap(image1);
-
-  mySelectWiresEdt = new QLineEdit( GroupPoints->GroupBox1, "mySelectWiresEdt" );
-  mySelectWiresEdt->setReadOnly( true );
-
-  mySelectWiresLbl = new QLabel( tr( "Contour to close" ), GroupPoints->GroupBox1, "ContourLbl" );
-  mySelectWiresLbl->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, mySelectWiresLbl->sizePolicy().hasHeightForWidth() ) );
-
-  aSelectWiresLay->addWidget( mySelectWiresLbl, 0, 0 );
-  aSelectWiresLay->addWidget( mySelectWiresBtn, 0, 1 );
-  aSelectWiresLay->addWidget( mySelectWiresEdt, 0, 2 );
-  QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-  aSelectWiresLay->addItem( spacer, 1, 2 );
-
-  myIsVertexGr = new QButtonGroup( 2, Qt::Vertical, GroupPoints );
-  myIsVertexGr->setFrameStyle( QFrame::NoFrame );
-  myIsVertexGr->setRadioButtonExclusive( true );
-  myIsVertexGr->insert( new QRadioButton( tr( "Close by common vertex" ), myIsVertexGr ), 0 );
-  myIsVertexGr->insert( new QRadioButton( tr( "Close by new edge" ), myIsVertexGr ), 1 );
-  myIsVertexGr->find( 0 )->toggle();
-
-  Layout1->addWidget(GroupPoints, 2, 0);
-  GroupPoints->getGroupBoxLayout()->addLayout( aSelectWiresLay, 1, 0 );
-  GroupPoints->getGroupBoxLayout()->addMultiCellWidget(myIsVertexGr, 2, 2, 0, 2);
+  GroupPoints->PushButton1->setIcon(image1);
+  GroupPoints->LineEdit1->setReadOnly(true);
+
+  GroupPoints->TextLabel2->setText(tr("Contour to close"));
+  GroupPoints->PushButton2->setIcon(image1);
+  GroupPoints->LineEdit2->setReadOnly(true);
+
+  QRadioButton* rb1 = new QRadioButton(tr("Close by common vertex"), GroupPoints->Box);
+  QRadioButton* rb2 = new QRadioButton(tr("Close by new edge"),      GroupPoints->Box);
+
+  myIsVertexGr = new QButtonGroup(GroupPoints->Box);
+  myIsVertexGr->addButton(rb1, 0);
+  myIsVertexGr->addButton(rb2, 1);
+  rb1->setChecked(true);
+
+  QVBoxLayout* l = new QVBoxLayout(GroupPoints->Box);
+  l->setMargin(0); l->setSpacing(6);
+  l->addWidget(rb1);
+  l->addWidget(rb2);
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
   /***************************************************************/
 
   setHelpFileName("close_contour_operation_page.html");
@@ -108,7 +98,6 @@ RepairGUI_CloseContourDlg::RepairGUI_CloseContourDlg(GeometryGUI* theGeometryGUI
   Init();
 }
 
-
 //=================================================================================
 // function : ~RepairGUI_CloseContourDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -117,38 +106,34 @@ RepairGUI_CloseContourDlg::~RepairGUI_CloseContourDlg()
 {
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void RepairGUI_CloseContourDlg::Init()
 {
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-
+  // init variables
+  GroupPoints->LineEdit1->clear();
+  GroupPoints->LineEdit2->clear();
   myObject = GEOM::GEOM_Object::_nil();
   myWiresInd = new GEOM::short_array();
-  myWiresInd->length( 0 );
-  
-  //myGeomGUI->SetState( 0 );
-  initSelection();
+  myWiresInd->length(0);
 
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(mySelectWiresBtn, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(mySelectWiresEdt, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->PushButton1, SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton2, SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
 
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect(GroupPoints->LineEdit1,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit2,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
 
-  initName( tr( "CLOSE_CONTOUR_NEW_OBJ_NAME" ) );
-}
+  initName(tr("CLOSE_CONTOUR_NEW_OBJ_NAME"));
 
+  GroupPoints->PushButton1->click();
+  SelectionIntoArgument();
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -156,77 +141,75 @@ void RepairGUI_CloseContourDlg::Init()
 //=================================================================================
 void RepairGUI_CloseContourDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool RepairGUI_CloseContourDlg::ClickOnApply()
 {
-  if ( !onAccept() )
+  if (!onAccept())
     return false;
 
   initName();
-
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  myEditCurrentArgument->setText("");
-  myObject = GEOM::GEOM_Object::_nil();
-  myWiresInd->length( 0 );
-
-  initSelection();
-
+  // activate first line edit
+  GroupPoints->PushButton1->click();
   return true;
 }
 
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed or other case
-//          : used only by SelectButtonC1A1 (LineEditC1A1)
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void RepairGUI_CloseContourDlg::SelectionIntoArgument()
 {
-  erasePreview();
-  myEditCurrentArgument->setText( "" );
-  mySelectWiresEdt->setText( "" );
-  
-  if ( myEditCurrentArgument == GroupPoints->LineEdit1 )
+  myEditCurrentArgument->setText("");
+  // the second argument depends on the first one
+  GroupPoints->LineEdit2->setText("");
+  myWiresInd->length(0);
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1)
     myObject = GEOM::GEOM_Object::_nil();
-  else if ( myEditCurrentArgument == mySelectWiresEdt )
-    myWiresInd->length( 0 );
 
-  if ( IObjectCount() == 1 )
-  {
-    Handle(SALOME_InteractiveObject) anIO = firstIObject();
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
 
-    if ( myEditCurrentArgument == GroupPoints->LineEdit1 )  // face selection
-    {
+  if (aSelList.Extent() == 1) {
+    Handle(SALOME_InteractiveObject) anIO = aSelList.First();
+
+    if (myEditCurrentArgument == GroupPoints->LineEdit1) { // face selection
       Standard_Boolean aRes;
-      myObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
-      if ( aRes && GEOMBase::IsShape( myObject ) )
-      {
-        myEditCurrentArgument->setText( GEOMBase::GetName( myObject ) );
+      myObject = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
+      if (aRes && GEOMBase::IsShape(myObject)) {
+        myEditCurrentArgument->setText(GEOMBase::GetName(myObject));
         TopoDS_Shape aShape;
-        if ( GEOMBase::GetShape( myObject, aShape, TopAbs_WIRE ) )
-          mySelectWiresEdt->setText( myEditCurrentArgument->text() );
+        if (GEOMBase::GetShape(myObject, aShape, TopAbs_WIRE))
+          GroupPoints->LineEdit2->setText(myEditCurrentArgument->text());
+
+        // clear selection
+        disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+        myGeomGUI->getApp()->selectionMgr()->clearSelected();
+        connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+                this, SLOT(SelectionIntoArgument()));
+
+        GroupPoints->PushButton2->click();
       }
       else
         myObject = GEOM::GEOM_Object::_nil();
     }
-    else if ( myEditCurrentArgument == mySelectWiresEdt )
-    {
+    else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
       TColStd_IndexedMapOfInteger aMap;
-      myGeomGUI->getApp()->selectionMgr()->GetIndexes( anIO, aMap );
+      aSelMgr->GetIndexes(anIO, aMap);
       const int n = aMap.Extent();
-      myWiresInd->length( n );
-      for ( int i = 1; i <= n; i++ )
-        myWiresInd[ i-1 ] = aMap( i );
-      if ( n )
-        myEditCurrentArgument->setText( QString::number( n ) + "_" + tr( "GEOM_WIRE" ) + tr( "_S_" ) );
+      myWiresInd->length(n);
+      for (int i = 1; i <= n; i++)
+        myWiresInd[i-1] = aMap(i);
+      if (n)
+        myEditCurrentArgument->setText(QString::number(n) + "_" + tr("GEOM_WIRE") + tr("_S_"));
     }
   }
 }
@@ -237,20 +220,36 @@ void RepairGUI_CloseContourDlg::SelectionIntoArgument()
 //=================================================================================
 void RepairGUI_CloseContourDlg::SetEditCurrentArgument()
 {
-  const QObject* send = sender();
-  if ( send == GroupPoints->PushButton1 )
-    myEditCurrentArgument = GroupPoints->LineEdit1; 
-  else if ( send == mySelectWiresBtn && !myObject->_is_nil() )
-    myEditCurrentArgument = mySelectWiresEdt;
-  if ( myEditCurrentArgument )
-  {
+  QPushButton* send = (QPushButton*)sender();
+
+  bool isEffective = false;
+
+  if (send == GroupPoints->PushButton1) {
+    isEffective = true;
+    myEditCurrentArgument = GroupPoints->LineEdit1;
+
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
+  }
+  else if (send == GroupPoints->PushButton2 && !myObject->_is_nil()) {
+    isEffective = true;
+    myEditCurrentArgument = GroupPoints->LineEdit2;
+
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+  }
+
+  if (isEffective) {
     initSelection();
+
+    // enable line edit
+    myEditCurrentArgument->setEnabled(true);
     myEditCurrentArgument->setFocus();
-    SelectionIntoArgument();
+    // after setFocus(), because it will be setDown(false) when loses focus
+    send->setDown(true);
   }
 }
 
-
 //=================================================================================
 // function : LineEditReturnPressed()
 // purpose  :
@@ -258,14 +257,12 @@ void RepairGUI_CloseContourDlg::SetEditCurrentArgument()
 void RepairGUI_CloseContourDlg::LineEditReturnPressed()
 {
   const QObject* send = sender();
-  if( send == GroupPoints->LineEdit1 || send == mySelectWiresEdt )
-  {
+  if (send == GroupPoints->LineEdit1 || send == GroupPoints->LineEdit2) {
     myEditCurrentArgument = (QLineEdit*)send;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
 }
 
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -273,71 +270,61 @@ void RepairGUI_CloseContourDlg::LineEditReturnPressed()
 void RepairGUI_CloseContourDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
   myEditCurrentArgument = GroupPoints->LineEdit1;
-  myEditCurrentArgument->setText("");
-  mySelectWiresEdt->setText("");
+  myEditCurrentArgument->setText( "" );
+  GroupPoints->LineEdit2->setText( "" );
   myObject = GEOM::GEOM_Object::_nil();
   myWiresInd->length( 0 );
 
-  //myGeomGUI->SetState( 0 );
   initSelection();
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  : Mouse enter onto the dialog to activate it
 //=================================================================================
-void RepairGUI_CloseContourDlg::enterEvent(QEvent* e)
+void RepairGUI_CloseContourDlg::enterEvent (QEvent*)
 {
-  if ( !GroupConstructors->isEnabled() )
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-
-//=================================================================================
-// function : closeEvent()
-// purpose  :
-//=================================================================================
-void RepairGUI_CloseContourDlg::closeEvent(QCloseEvent* e)
-{
-  //myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
 GEOM::GEOM_IOperations_ptr RepairGUI_CloseContourDlg::createOperation()
 {
-  return getGeomEngine()->GetIHealingOperations( getStudyId() );
+  return getGeomEngine()->GetIHealingOperations(getStudyId());
 }
 
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool RepairGUI_CloseContourDlg::isValid( QString& msg )
+bool RepairGUI_CloseContourDlg::isValid (QString&)
 {
   TopoDS_Shape aTmpShape;
-  return !myObject->_is_nil() && ( myWiresInd->length() || GEOMBase::GetShape( myObject, aTmpShape, TopAbs_WIRE ) );
+  return !myObject->_is_nil() && (myWiresInd->length() ||
+                                  GEOMBase::GetShape(myObject, aTmpShape, TopAbs_WIRE));
 }
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool RepairGUI_CloseContourDlg::execute( ObjectList& objects )
+bool RepairGUI_CloseContourDlg::execute (ObjectList& objects)
 {
-  GEOM::GEOM_Object_var anObj = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )->CloseContour( myObject, myWiresInd, getIsByVertex() );
+  GEOM::GEOM_Object_var anObj = GEOM::GEOM_IHealingOperations::_narrow(getOperation())->
+    CloseContour(myObject, myWiresInd, getIsByVertex());
+
   bool aResult = !anObj->_is_nil();
-  if ( aResult )
-    objects.push_back( anObj._retn() );
-    
+  if (aResult)
+    objects.push_back(anObj._retn());
+
   return aResult;
 }
 
@@ -347,7 +334,7 @@ bool RepairGUI_CloseContourDlg::execute( ObjectList& objects )
 //=================================================================================
 bool RepairGUI_CloseContourDlg::getIsByVertex() const
 {
-  return myIsVertexGr->find( 0 )->isOn();
+  return myIsVertexGr->button(0)->isChecked();
 }
 
 //=================================================================================
@@ -356,20 +343,23 @@ bool RepairGUI_CloseContourDlg::getIsByVertex() const
 //=================================================================================
 void RepairGUI_CloseContourDlg::initSelection()
 {
-  if ( myEditCurrentArgument == GroupPoints->LineEdit1 )
-  {
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
     TColStd_MapOfInteger aTypes;
-    aTypes.Add( GEOM_COMPOUND );
-    aTypes.Add( GEOM_SOLID );
-    aTypes.Add( GEOM_SHELL );
-    aTypes.Add( GEOM_FACE );
-    aTypes.Add( GEOM_WIRE );
-    
-    globalSelection( aTypes );
+    aTypes.Add(GEOM_COMPOUND);
+    aTypes.Add(GEOM_SOLID);
+    aTypes.Add(GEOM_SHELL);
+    aTypes.Add(GEOM_FACE);
+    aTypes.Add(GEOM_WIRE);
+
+    globalSelection(aTypes);
   }
-  else if ( myEditCurrentArgument == mySelectWiresEdt )
-  {
-    localSelection( myObject, TopAbs_EDGE );
-    localSelection( myObject, TopAbs_WIRE );
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
+    localSelection(myObject, TopAbs_EDGE);
+    localSelection(myObject, TopAbs_WIRE);
   }
+
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 }
index 81e4233d2a634ddce156dede8c98259a71804122..71d1a3b7e653befef5b5fad16a0b8f62287f3005 100644 (file)
@@ -1,40 +1,35 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : RepairGUI_CloseContourDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_CloseContour_H
-#define DIALOGBOX_CloseContour_H
-
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_Ext.h"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_CloseContourDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef REPAIRGUI_CLOSECONTOURDLG_H
+#define REPAIRGUI_CLOSECONTOURDLG_H
 
-#include <TColStd_IndexedMapOfInteger.hxx>
+#include <GEOMBase_Skeleton.h>
 
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
+class DlgRef_2SelExt;
+class QButtonGroup;
 
 //=================================================================================
 // class    : RepairGUI_CloseContourDlg
 //=================================================================================
 class RepairGUI_CloseContourDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    RepairGUI_CloseContourDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                             const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~RepairGUI_CloseContourDlg();
-
+  RepairGUI_CloseContourDlg( GeometryGUI*, QWidget* = 0, bool = false );
+  ~RepairGUI_CloseContourDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    void closeEvent(QCloseEvent* e);
-    void initSelection();
-
-    bool getIsByVertex() const;
-
-    GEOM::GEOM_Object_var myObject;
-    GEOM::short_array_var myWiresInd;
-
-    DlgRef_1Sel_Ext* GroupPoints;
-    QButtonGroup*    myIsVertexGr;
-    QLabel*          mySelectWiresLbl;
-    QPushButton*     mySelectWiresBtn;
-    QLineEdit*       mySelectWiresEdt;
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  void                               initSelection();
+  
+  bool                               getIsByVertex() const;
 
+private:
+  GEOM::GEOM_Object_var              myObject;
+  GEOM::short_array_var              myWiresInd;
+  
+  DlgRef_2SelExt*                    GroupPoints;
+  QButtonGroup*                      myIsVertexGr;
+  
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-
-    void ActivateThisDialog();
-
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  
+  void                               ActivateThisDialog();
+  
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // DIALOGBOX_CloseContour_H
+#endif // REPAIRGUI_CLOSECONTOURDLG_H
index dcd1f68c856f4845f50df5eb3934393639026708..e7016862167d6e5a1c468011ea443e1c9d885ea5 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_DivideEdgeDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//
-//  File   : RepairGUI_DivideEdgeDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "RepairGUI_DivideEdgeDlg.h"
 
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SUIT_Session.h"
-#include "SALOME_ListIteratorOfListIO.hxx"
-
-#include "GEOMImpl_Types.hxx"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+#include <QtxDoubleSpinBox.h>
 
-#include <TopAbs.hxx>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
 
-#include <qlabel.h>
+#include <GEOMImpl_Types.hxx>
 
-using namespace std;
+#include <TopAbs.hxx>
+#include <Geom_Curve.hxx>
+#include <gp_Pnt.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Edge.hxx>
+#include <BRep_Tool.hxx>
+#include <BRepBuilderAPI_MakeVertex.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
 
 //=================================================================================
 // class    : RepairGUI_DivideEdgeDlg()
@@ -48,49 +53,55 @@ using namespace std;
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-RepairGUI_DivideEdgeDlg::RepairGUI_DivideEdgeDlg (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)
+RepairGUI_DivideEdgeDlg::RepairGUI_DivideEdgeDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                  bool modal )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_DIVIDE_EDGE")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_DIVIDE_EDGE" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_DIVIDE_EDGE_TITLE"));
+  setWindowTitle( tr( "GEOM_DIVIDE_EDGE_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_DIVIDE_EDGE_TITLE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel_Ext(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_ADD_POINT"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_EDGE"));
-  GroupPoints->PushButton1->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_DIVIDE_EDGE_TITLE"));
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_1SelExt( centralWidget() );
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_ADD_POINT" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_EDGE" ) );
+  GroupPoints->PushButton1->setIcon( image1 );
   GroupPoints->LineEdit1->setReadOnly( true );
 
-  myIsParameterGr = new QButtonGroup( 2, Qt::Vertical, GroupPoints );
-  myIsParameterGr->setFrameStyle( QFrame::NoFrame );
-  myIsParameterGr->setRadioButtonExclusive( true );
-  myIsParameterGr->insert( new QRadioButton( tr( "GEOM_BY_PARAMETER" ), myIsParameterGr ), 0 );
-  myIsParameterGr->insert( new QRadioButton( tr( "GEOM_BY_LENGTH" ), myIsParameterGr ), 1 );
-  myIsParameterGr->find( 0 )->toggle();
+  QRadioButton* rb1 = new QRadioButton( tr( "GEOM_BY_PARAMETER" ), GroupPoints->Box );
+  QRadioButton* rb2 = new QRadioButton( tr( "GEOM_BY_LENGTH" ),    GroupPoints->Box );
+
+  myIsParameterGr = new QButtonGroup( GroupPoints->Box );
+  myIsParameterGr->addButton( rb1, 0 );
+  myIsParameterGr->addButton( rb2, 1 );
+  rb1->setChecked( true );
 
-  QGridLayout* aLay = new QGridLayout( 0, 1, 2, 0, 6, "aLay" );
-  myValEdt = new QtxDblSpinBox(0., 1., 0.1, GroupPoints->GroupBox1);
-  myValEdt->setPrecision( 3 );
+  myValEdt = new SalomeApp_DoubleSpinBox( 0., 1., 0.1, 3, 32, GroupPoints->Box );
   myValEdt->setValue( 0.5 );
-  QLabel* aLbl1 = new QLabel( tr( "GEOM_VALUE" ), GroupPoints->GroupBox1 );
-  aLay->addWidget( aLbl1, 0, 0 );
-  aLay->addWidget( myValEdt, 0, 1 );
+  QLabel* aLbl1 = new QLabel( tr( "GEOM_VALUE" ), GroupPoints->Box );
+
+  QGridLayout* l = new QGridLayout( GroupPoints->Box );
+  l->setMargin( 0 ); l->setSpacing( 6 );
+  l->addWidget( rb1, 0, 0, 1, 2 );
+  l->addWidget( rb2, 1, 0, 1, 2 );
+  l->addWidget( aLbl1, 2, 0 );
+  l->addWidget( myValEdt, 2, 1 );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
 
-  Layout1->addWidget(GroupPoints, 2, 0);
-  GroupPoints->getGroupBoxLayout()->addMultiCellWidget(myIsParameterGr, 1, 1, 0, 2);
-  GroupPoints->getGroupBoxLayout()->addLayout( aLay, 2, 0 );
   /***************************************************************/
 
-  setHelpFileName("add_point_on_edge_operation_page.html");
+  setHelpFileName( "add_point_on_edge_operation_page.html" );
 
   Init();
 }
@@ -113,24 +124,60 @@ void RepairGUI_DivideEdgeDlg::Init()
   myEditCurrentArgument = GroupPoints->LineEdit1;
 
   myObject = GEOM::GEOM_Object::_nil();
-  myIndex = -1;
 
   //myGeomGUI->SetState( 0 );
   initSelection();
 
   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+
+  connect( myValEdt,   SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox() ) );
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPoints->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
-          SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   initName( tr( "DEVIDE_EDGE_NEW_OBJECT_NAME" ) );
 }
 
+//=================================================================================
+// function : ValueChangedInSpinBox()
+// purpose  : On change value in spin box
+//=================================================================================
+void RepairGUI_DivideEdgeDlg::ValueChangedInSpinBox()
+{
+  displayPreview();
+}
+
+//=================================================================================
+// function : displayPreview()
+// purpose  : On display Preview
+//=================================================================================
+void RepairGUI_DivideEdgeDlg::displayPreview()
+{
+  if ( myObject->_is_nil() )
+    return;
+
+  TopoDS_Shape aShape;
+  gp_Pnt aPnt;
+  if ( GEOMBase::GetShape( myObject, aShape, TopAbs_SHAPE ) ) {
+    if (aShape.ShapeType() == TopAbs_EDGE) {
+      Standard_Real aFP, aLP, aP;
+       Handle(Geom_Curve) aCurve = BRep_Tool::Curve(TopoDS::Edge(aShape), aFP, aLP);
+       aP = aFP + (aLP - aFP) * myValEdt->value();
+       aPnt = aCurve->Value(aP);
+       BRepBuilderAPI_MakeVertex mkVertex (aPnt);
+       aShape = mkVertex.Shape();
+       // Build prs
+       SALOME_Prs* aPrs = getDisplayer()->BuildPrs( aShape );
+       if ( aPrs != 0 && !aPrs->IsNull() )
+         GEOMBase_Helper::displayPreview( aPrs, false, true );
+    }
+  }
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -154,9 +201,8 @@ bool RepairGUI_DivideEdgeDlg::ClickOnApply()
 
   initName();
 
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   myObject = GEOM::GEOM_Object::_nil();
-  myIndex = -1;
 
   initSelection();
 
@@ -171,52 +217,58 @@ bool RepairGUI_DivideEdgeDlg::ClickOnApply()
 //=================================================================================
 void RepairGUI_DivideEdgeDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
 
   myObject = GEOM::GEOM_Object::_nil();
-  myIndex = -1;
 
-  if ( IObjectCount() == 1 )
-  {
-    Handle(SALOME_InteractiveObject) anIO = firstIObject();
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if ( aSelList.Extent() == 1 ) {
+    Handle(SALOME_InteractiveObject) anIO = aSelList.First();
     Standard_Boolean aRes;
-    GEOM::GEOM_Object_var aSelectedObj = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
-    if ( !CORBA::is_nil( aSelectedObj ) && aRes )
-    {
+    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
+    if ( !CORBA::is_nil( aSelectedObject ) && aRes ) {
+      QString aName = GEOMBase::GetName( aSelectedObject );
       TopoDS_Shape aShape;
-      if ( GEOMBase::GetShape( aSelectedObj, aShape, TopAbs_SHAPE ) )
-      {
+      if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) ) {
         const int aType = aShape.ShapeType();
-        if ( aType <= TopAbs_EDGE ) // edge, wire, face, shell, solid, compound
-        {
+        if ( aType <= TopAbs_EDGE ) {
+         // edge, wire, face, shell, solid, compound
           GEOM::short_array anIndexes;
 
           TColStd_IndexedMapOfInteger aMap;
-          SalomeApp_Application* anApp =
-            (SalomeApp_Application*)(SUIT_Session::session()->activeApplication());
-          anApp->selectionMgr()->GetIndexes( anIO, aMap );
-
-          if ( !aMap.IsEmpty() ) // subshape selection
-          {
-            myIndex = aMap( 1 );
-            myObject = aSelectedObj;
-            myEditCurrentArgument->setText( tr( "GEOM_EDGE" ) + "_1" );
+          aSelMgr->GetIndexes( anIO, aMap );
+
+          if ( aMap.Extent() == 1 ) { // local selection
+            int anIndex = aMap( 1 );
+            myEditCurrentArgument->setText( aName += QString( ":edge_%1" ).arg( anIndex ) );
+
+           //Find SubShape Object in Father
+           GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather( aSelectedObject, aName );
+           if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
+             GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
+             myObject = aShapesOp->GetSubShape( aSelectedObject, anIndex );
+           }
+           else {
+             myObject = aFindedObject; // get Object from study
+           }
           }
-          else if ( aType == TopAbs_EDGE ) // single shape selection
-          {
-            myIndex = -1;
-            myObject = aSelectedObj;
+          else if ( aType == TopAbs_EDGE ) { 
+           // single shape selection
+            myObject = aSelectedObject;
             myEditCurrentArgument->setText( GEOMBase::GetName( myObject ) );
           }
-          else // face, shell, solid or compound was selected, and NOT its subshape.
-          {
-            myIndex = -1;
+          else {
+           // face, shell, solid or compound was selected, and NOT its subshape.
             myObject = GEOM::GEOM_Object::_nil();
           }
         }
       }
     }
   }
+  displayPreview();
 }
 
 //=================================================================================
@@ -225,8 +277,7 @@ void RepairGUI_DivideEdgeDlg::SelectionIntoArgument()
 //=================================================================================
 void RepairGUI_DivideEdgeDlg::SetEditCurrentArgument()
 {
-  if( sender() == GroupPoints->PushButton1 )
-  {
+  if ( sender() == GroupPoints->PushButton1 ) {
     GroupPoints->LineEdit1->setFocus();
     myEditCurrentArgument = GroupPoints->LineEdit1;
   }
@@ -240,8 +291,7 @@ void RepairGUI_DivideEdgeDlg::SetEditCurrentArgument()
 //=================================================================================
 void RepairGUI_DivideEdgeDlg::LineEditReturnPressed()
 {
-  if( sender() == GroupPoints->LineEdit1 )
-  {
+  if ( sender() == GroupPoints->LineEdit1 ) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
@@ -255,11 +305,10 @@ void RepairGUI_DivideEdgeDlg::LineEditReturnPressed()
 void RepairGUI_DivideEdgeDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
-          SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
-  myObject = GEOM::GEOM_Object::_nil();
-  myIndex = -1;
+//  myObject = GEOM::GEOM_Object::_nil();
 
   //myGeomGUI->SetState( 0 );
   initSelection();
@@ -269,22 +318,12 @@ void RepairGUI_DivideEdgeDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  : Mouse enter onto the dialog to activate it
 //=================================================================================
-void RepairGUI_DivideEdgeDlg::enterEvent(QEvent* e)
+void RepairGUI_DivideEdgeDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
-//=================================================================================
-// function : closeEvent()
-// purpose  :
-//=================================================================================
-void RepairGUI_DivideEdgeDlg::closeEvent(QCloseEvent* e)
-{
-  //myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 
 //=================================================================================
 // function : createOperation
@@ -301,7 +340,8 @@ GEOM::GEOM_IOperations_ptr RepairGUI_DivideEdgeDlg::createOperation()
 //=================================================================================
 bool RepairGUI_DivideEdgeDlg::isValid( QString& msg )
 {
-  return !myObject->_is_nil();
+  bool ok = myValEdt->isValid( msg, !IsPreview() );
+  return !myObject->_is_nil() && ok;
 }
 
 //=================================================================================
@@ -311,10 +351,20 @@ bool RepairGUI_DivideEdgeDlg::isValid( QString& msg )
 bool RepairGUI_DivideEdgeDlg::execute( ObjectList& objects )
 {
   GEOM::GEOM_Object_var anObj = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )->DivideEdge
-    ( myObject, myIndex, myValEdt->value(), getIsByParameter() );
+    ( myObject, -1, myValEdt->value(), getIsByParameter() );
   bool aResult = !anObj->_is_nil();
   if ( aResult )
+  {
+    if ( !IsPreview() )
+    {
+      QStringList aParameters;
+      aParameters << "";
+      aParameters << myValEdt->text();
+      aParameters << "";
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    }
     objects.push_back( anObj._retn() );
+  }
 
   return aResult;
 }
@@ -325,7 +375,7 @@ bool RepairGUI_DivideEdgeDlg::execute( ObjectList& objects )
 //=================================================================================
 bool RepairGUI_DivideEdgeDlg::getIsByParameter() const
 {
-  return myIsParameterGr->find( 0 )->isOn();
+  return myIsParameterGr->button( 0 )->isChecked();
 }
 
 //=================================================================================
@@ -337,3 +387,15 @@ void RepairGUI_DivideEdgeDlg::initSelection()
   GEOM::GEOM_Object_var aNullGeomObject;
   localSelection( aNullGeomObject, TopAbs_EDGE ); // load local selection on ALL objects
 }
+
+//=================================================================================
+// function : addSubshapeToStudy
+// purpose  : virtual method to add new SubObjects if local selection
+//=================================================================================
+void RepairGUI_DivideEdgeDlg::addSubshapesToStudy()
+{
+  QMap<QString, GEOM::GEOM_Object_var> objMap;
+  objMap[GroupPoints->LineEdit1->text()] = myObject;
+
+  addSubshapesToFather( objMap );
+}
index d2099375b5f3f62f167bd4a255881863afbb9246..d7ceed40e41471c5a520ea1cdbe01ed40ae7054e 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_DivideEdgeDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//
-//  File   : RepairGUI_DivideEdgeDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_DivideEdge_H
-#define DIALOGBOX_DivideEdge_H
-
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_Ext.h"
-#include "QtxDblSpinBox.h"
+#ifndef REPAIRGUI_DIVIDEEDGEDLG_H
+#define REPAIRGUI_DIVIDEEDGEDLG_H
 
-#include <TColStd_IndexedMapOfInteger.hxx>
+#include <GEOMBase_Skeleton.h>
 
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
+class DlgRef_1SelExt;
+class SalomeApp_DoubleSpinBox;
+class QButtonGroup;
 
 //=================================================================================
 // class    : RepairGUI_DivideEdgeDlg
 //=================================================================================
 class RepairGUI_DivideEdgeDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
-
+  Q_OBJECT
+      
 public:
-    RepairGUI_DivideEdgeDlg (GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                            const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~RepairGUI_DivideEdgeDlg();
-
+  RepairGUI_DivideEdgeDlg( GeometryGUI*, QWidget* = 0, bool = false );
+  ~RepairGUI_DivideEdgeDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
+  
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    void closeEvent(QCloseEvent* e);
-    void initSelection();
-
-    bool getIsByParameter() const;
-
-    GEOM::GEOM_Object_var myObject;
-    int myIndex;
-
-    DlgRef_1Sel_Ext* GroupPoints;
-    QButtonGroup*    myIsParameterGr;
-    QtxDblSpinBox*   myValEdt;
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  void                               initSelection();
+  
+  bool                               getIsByParameter() const;
+  
+private:
+  GEOM::GEOM_Object_var              myObject;
+  
+  DlgRef_1SelExt*                    GroupPoints;
+  QButtonGroup*                      myIsParameterGr;
+  SalomeApp_DoubleSpinBox*           myValEdt;
 
 protected slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-
-    void ActivateThisDialog();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
 
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               displayPreview();
+  void                               ValueChangedInSpinBox();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // DIALOGBOX_DivideEdge_H
+#endif // REPAIRGUI_DIVIDEEDGEDLG_H
index 2231ad6b395de2fadb98f7f76a0814beb7f32800..f20e0413021165c2abbc4bb0fb3f684bd6a7aed3 100644 (file)
@@ -1,53 +1,56 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_FreeBoundDlg.cxx
+// Author : Sergey LITONIN, Open CASCADE S.A.S. (sergey.litonin@opencascade.com)
 //
-//  File   : RepairGUI_FreeBoundDlg.cxx
-//  Author : Sergey LITONIN
-//  Module : GEOM
-//  $Header$
-
 #include "RepairGUI_FreeBoundDlg.h"
-#include "GEOMBase.h"
-#include "GeometryGUI.h"
-#include "GEOM_Displayer.h"
-#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 <GEOMBase.h>
+#include <GeometryGUI.h>
+#include <GEOM_Displayer.h>
+#include <GEOMImpl_Types.hxx>
+
+#include <SalomeApp_Application.h>
+#include <LightApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
 
 #include <TColStd_MapOfInteger.hxx>
 
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qpushbutton.h>
+#include <QLineEdit>
+#include <QLabel>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QPushButton>
+#include <QKeyEvent>
 
-#define SPACING 5
-#define MARGIN 10
+#define SPACING 6
+#define MARGIN  9
 
 /*!
   Class       : RepairGUI_FreeBoundDlg
 // function : RepairGUI_FreeBoundDlg
 // purpose  : Constructor
 //=================================================================================
-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<SUIT_Desktop*>( theParent ) ),
-  myGeomGUI( theGUI )
+RepairGUI_FreeBoundDlg::RepairGUI_FreeBoundDlg( GeometryGUI* theGUI, QWidget* theParent )
+  : QDialog( theParent, false ),
+    GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( theParent ) ),
+    myGeomGUI( theGUI )
 {
-  setCaption( tr( "CAPTION" ) );
+  setAttribute( Qt::WA_DeleteOnClose );
+
+  setWindowTitle( tr( "CAPTION" ) );
 
-  QPixmap iconSelect( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr( "ICON_SELECT" ) ) );
+  QPixmap iconSelect( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
   
-  QGroupBox* aMainGrp = new QGroupBox( 1, Qt::Horizontal, tr( "FREE_BOUND" ), this );
+  QGroupBox* aMainGrp = new QGroupBox( tr( "FREE_BOUND" ), this );
   
-  QGroupBox* aSelGrp = new QGroupBox( 1, Qt::Vertical, aMainGrp );
-  aSelGrp->setInsideMargin( 0 );
-  aSelGrp->setFrameStyle( QFrame::NoFrame );
-  new QLabel( tr( "GEOM_OBJECT" ), aSelGrp );
-  ( new QPushButton( aSelGrp ) )->setPixmap( iconSelect );
-  myEdit = new QLineEdit( aSelGrp );
+  QLabel* lab = new QLabel( tr( "GEOM_OBJECT" ), aMainGrp );
+  QPushButton* btn = new QPushButton( aMainGrp );
+  btn->setIcon( iconSelect );
+  myEdit = new QLineEdit( aMainGrp );
   myEdit->setReadOnly( true );
   myEdit->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
 
   myClosedLbl = new QLabel( tr( "NUMBER_CLOSED" ), aMainGrp );
-  myOpenLbl = new QLabel( tr( "NUMBER_OPEN" ), aMainGrp );
+  myOpenLbl   = new QLabel( tr( "NUMBER_OPEN" ),   aMainGrp );
+  myClosedLbl->setMinimumWidth( 150 );
+  myOpenLbl->setMinimumWidth( 150 );
+  
+  QGridLayout* aMainGrpLayout = new QGridLayout( aMainGrp );
+  aMainGrpLayout->setMargin( MARGIN ); aMainGrpLayout->setSpacing( SPACING );
+  aMainGrpLayout->addWidget( lab,    0, 0 );
+  aMainGrpLayout->addWidget( btn,    0, 1 );
+  aMainGrpLayout->addWidget( myEdit, 0, 2 );
+  aMainGrpLayout->addWidget( myClosedLbl, 1, 0, 1, 3 );
+  aMainGrpLayout->addWidget( myOpenLbl,   2, 0, 1, 3 );
 
   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 );
+  QHBoxLayout* aBtnLay = new QHBoxLayout( aFrame );
+  aBtnLay->setMargin( MARGIN ); aBtnLay->setSpacing( SPACING );
   aBtnLay->addWidget( aCloseBtn );
-  aBtnLay->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
+  aBtnLay->addSpacing( SPACING ); aBtnLay->addStretch();
   aBtnLay->addWidget( aHelpBtn );
 
   QVBoxLayout* aLay = new QVBoxLayout( this );
@@ -97,11 +110,10 @@ RepairGUI_FreeBoundDlg::RepairGUI_FreeBoundDlg(GeometryGUI* theGUI, QWidget* the
   aLay->addWidget( aMainGrp );
   aLay->addWidget( aFrame );
 
-  //myHelpFileName = "files/salome2_sp3_measuregui_functions.htm#free_boundaries";
   myHelpFileName = "using_measurement_tools_page.html#boundaries_anchor";
 
   connect( aCloseBtn, SIGNAL( clicked() ), SLOT( onClose() ) );
-  connect( aHelpBtn, SIGNAL( clicked() ), SLOT( onHelp() ) );
+  connect( aHelpBtn,  SIGNAL( clicked() ), SLOT( onHelp() ) );
 
   Init();
 }
@@ -121,7 +133,7 @@ RepairGUI_FreeBoundDlg::~RepairGUI_FreeBoundDlg()
 void RepairGUI_FreeBoundDlg::onClose()
 {
   globalSelection();
-  disconnect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0 );
+  disconnect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 0, this, 0 );
   myGeomGUI->SetActiveDialogBox( 0 );
   reject();
   erasePreview();
@@ -133,20 +145,21 @@ void RepairGUI_FreeBoundDlg::onClose()
 //=================================================================================
 void RepairGUI_FreeBoundDlg::onHelp()
 {
-  LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
-  if (app)
-    app->onHelpContextModule(myGeomGUI ? app->moduleName(myGeomGUI->moduleName()) : QString(""), myHelpFileName);
+  LightApp_Application* app = (LightApp_Application*)( SUIT_Session::session()->activeApplication() );
+  if ( app )
+    app->onHelpContextModule( myGeomGUI ? app->moduleName( myGeomGUI->moduleName() ) : QString(""), myHelpFileName );
   else {
-               QString platform;
+    QString platform;
 #ifdef WIN32
-               platform = "winapplication";
+    platform = "winapplication";
 #else
-               platform = "application";
+    platform = "application";
 #endif
-    SUIT_MessageBox::warn1
-      (0, tr("WRN_WARNING"), tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
-       arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName),
-       tr("BUT_OK"));
+    SUIT_MessageBox::warning( this, 
+                             tr( "WRN_WARNING" ), 
+                             tr( "EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
+                             arg( app->resourceMgr()->stringValue( "ExternalBrowser", 
+                                                                   platform ) ).arg( myHelpFileName ) );
   }
 }
 
@@ -156,9 +169,9 @@ void RepairGUI_FreeBoundDlg::onHelp()
 //=================================================================================
 void RepairGUI_FreeBoundDlg::onDeactivate()
 {
-  setEnabled(false);
+  setEnabled( false );
   globalSelection();
-  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
   myGeomGUI->SetActiveDialogBox( 0 );
 }
 
@@ -171,7 +184,7 @@ void RepairGUI_FreeBoundDlg::onActivate()
   myGeomGUI->EmitSignalDeactivateDialog();
   setEnabled( true );
   myGeomGUI->SetActiveDialogBox( this );
-  connect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 
           SIGNAL( currentSelectionChanged() ), SLOT( onSelectionDone() ) );
   activateSelection();
   onSelectionDone();
@@ -183,17 +196,20 @@ void RepairGUI_FreeBoundDlg::onActivate()
 //=================================================================================
 void RepairGUI_FreeBoundDlg::onSelectionDone()
 {
-  if( IObjectCount() != 1 )
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if ( aSelList.Extent() != 1 )
     return;
 
   Standard_Boolean isOk = Standard_False;
   GEOM::GEOM_Object_var anObj =
-    GEOMBase::ConvertIOinGEOMObject( firstIObject(), isOk );
+    GEOMBase::ConvertIOinGEOMObject( aSelList.First(), isOk );
 
   if ( !isOk || anObj->_is_nil() || !GEOMBase::IsShape( anObj ) )
     return;
-  else
-  {
+  else {
     myObj = anObj;
     displayPreview( false, true, true, 3 );
   }
@@ -209,7 +225,7 @@ void RepairGUI_FreeBoundDlg::Init()
   myObj = GEOM::GEOM_Object::_nil();
 
   connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), SLOT  ( onDeactivate() ) );
-  connect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 
           SIGNAL( currentSelectionChanged() ), SLOT( onSelectionDone() ) );
 
   activateSelection();
@@ -220,7 +236,7 @@ void RepairGUI_FreeBoundDlg::Init()
 // function : enterEvent
 // purpose  : Activate dialog
 //=================================================================================
-void RepairGUI_FreeBoundDlg::enterEvent( QEvent* )
+void RepairGUI_FreeBoundDlg::enterEvent( QEvent* )
 {
   onActivate();
 }
@@ -229,7 +245,7 @@ void RepairGUI_FreeBoundDlg::enterEvent( QEvent* e )
 // function : closeEvent
 // purpose  : Close dialog
 //=================================================================================
-void RepairGUI_FreeBoundDlg::closeEvent( QCloseEvent* )
+void RepairGUI_FreeBoundDlg::closeEvent( QCloseEvent* )
 {
   onClose();
 }
@@ -261,7 +277,7 @@ GEOM::GEOM_IOperations_ptr RepairGUI_FreeBoundDlg::createOperation()
 // function : isValid
 // purpose  :
 //=================================================================================
-bool RepairGUI_FreeBoundDlg::isValid( QString& msg )
+bool RepairGUI_FreeBoundDlg::isValid( QString& )
 {
   return !myObj->_is_nil();
 }
@@ -280,8 +296,7 @@ bool RepairGUI_FreeBoundDlg::execute( ObjectList& objects )
   bool result = GEOM::GEOM_IHealingOperations::_narrow(
     getOperation() )->GetFreeBoundary( myObj, aClosed, anOpen );
 
-  if ( result )
-  {
+  if ( result ) {
     myNbClosed = aClosed->length();
     myNbOpen = anOpen->length();
     int i;
@@ -296,8 +311,7 @@ bool RepairGUI_FreeBoundDlg::execute( ObjectList& objects )
     aLabelText = tr( "NUMBER_OPEN" ) + QString( "%1" ).arg( myNbOpen );
     myOpenLbl->setText( aLabelText );
   }
-  else
-  {
+  else {
     myEdit->setText( GEOMBase::GetName( myObj ) );
     myClosedLbl->setText( tr( "NUMBER_CLOSED" ) );
     myOpenLbl->setText( tr( "NUMBER_OPEN" ) );
@@ -316,9 +330,8 @@ void RepairGUI_FreeBoundDlg::keyPressEvent( QKeyEvent* e )
   if ( e->isAccepted() )
     return;
 
-  if ( e->key() == Key_F1 )
-    {
-      e->accept();
-      onHelp();
-    }
+  if ( e->key() == Qt::Key_F1 ) {
+    e->accept();
+    onHelp();
+  }
 }
index 0594fe2d6bf148194427d79c7188b5ff9735e321..afca4ef799a7ea6d8f9cf28c7ecf465292ba814b 100644 (file)
@@ -1,39 +1,36 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : RepairGUI_FreeBoundDlg.h
-//  Author : Sergey LITONIN
-//  Module : GEOM
-
-#ifndef DIALOGBOX_WHATIS_H
-#define DIALOGBOX_WHATIS_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_FreeBoundDlg.h
+// Author : Sergey LITONIN, Open CASCADE S.A.S. (sergey.litonin@opencascade.com)
+//
+#ifndef REPAIRGUI_FREEBOUNDDLG_H
+#define REPAIRGUI_FREEBOUNDDLG_H
 
-#include <qdialog.h>
-#include "GEOMBase_Helper.h"
+#include <QDialog>
+#include <GEOMBase_Helper.h>
 
 class QLineEdit;
 class QLabel;
-class GEOM_Displayer;
 class GeometryGUI;
 
 //=================================================================================
@@ -43,11 +40,11 @@ class GeometryGUI;
 class RepairGUI_FreeBoundDlg : public QDialog,
                                public GEOMBase_Helper
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    RepairGUI_FreeBoundDlg(GeometryGUI*, QWidget*, const char* name = 0);
-    ~RepairGUI_FreeBoundDlg();
+  RepairGUI_FreeBoundDlg( GeometryGUI*, QWidget* );
+  ~RepairGUI_FreeBoundDlg();
 
 private slots:
   void                                  onClose();
@@ -58,13 +55,13 @@ private slots:
                                                                                   
 private:
   void                                  Init();
-  void                                  enterEvent( QEvent* );
-  void                                  closeEvent( QCloseEvent* );
-  void                                  keyPressEvent( QKeyEvent* );
+  void                                  enterEvent( QEvent* );
+  void                                  closeEvent( QCloseEvent* );
+  void                                  keyPressEvent( QKeyEvent* );
   void                                  activateSelection();
   
   virtual GEOM::GEOM_IOperations_ptr    createOperation();
-  virtual bool                          execute( ObjectList& objects );
+  virtual bool                          execute( ObjectList& );
   virtual bool                          isValid( QString& );
 
 private:
@@ -78,4 +75,4 @@ private:
   QString                               myHelpFileName;
 };
 
-#endif // DIALOGBOX_WHATIS_H
+#endif // REPAIRGUI_FREEBOUNDDLG_H
index e64a5f898d1ad59fc7b38a82d8b3182c45bd8263..a4319e05a2cfeaebe3661962c03b95c821d515f6 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_FreeFacesDlg.cxx
+// Author : Vladimir KLYACHIN, Open CASCADE S.A.S. (vladimir.klyachin@opencascade.com)
 //
-//
-//  File   : RepairGUI_FreeFacesDlg.cxx
-//  Author : VKN
-//  Module : GEOM
-//  $Header$
-
 #include "RepairGUI_FreeFacesDlg.h"
 
-#include "LightApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SalomeApp_Application.h"
-#include "SalomeApp_Tools.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"
+#include <SUIT_MessageBox.h>
+#include <SUIT_Session.h>
+#include <SUIT_OverrideCursor.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ResourceMgr.h>
 
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <GEOMImpl_Types.hxx>
 
-#include "GEOMImpl_Types.hxx"
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TColStd_MapOfInteger.hxx>
 #include <TopExp.hxx>
-#include "GEOMBase.h"
-#include "GeometryGUI.h"
-#include "GEOM_Displayer.h"
-
-#include <qapplication.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qpushbutton.h>
-#define SPACING 5
-#define MARGIN 10
-#define MIN_WIDTH 200
 
-using namespace std;
+#include <GEOMBase.h>
+#include <GeometryGUI.h>
+#include <GEOM_Displayer.h>
+
+#include <QLineEdit>
+#include <QLabel>
+#include <QGroupBox>
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QKeyEvent>
+
+#define SPACING 6
+#define MARGIN  9
+#define MIN_WIDTH 200
 
 //=================================================================================
 // class    : RepairGUI_FreeFacesDlg()
@@ -66,60 +65,66 @@ 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<SUIT_Desktop*>(parent)),
-   myGeomGUI(GUI)
+RepairGUI_FreeFacesDlg::RepairGUI_FreeFacesDlg( GeometryGUI* GUI, QWidget* parent,
+                                               bool modal )
+  : QDialog( parent, false ),
+    GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
+    myGeomGUI( GUI ), 
+    myDisplayer( 0 )
 {
-  myDisplayer = 0;
+  setAttribute( Qt::WA_DeleteOnClose );
+
+  setSizeGripEnabled( true );
 
-  setSizeGripEnabled( TRUE );
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_FREE_FACES_TITLE"));
+  setWindowTitle( tr( "GEOM_FREE_FACES_TITLE" ) );
 
   /***************************************************************/
 
-  QGroupBox* aMainGrp = new QGroupBox( 1, Qt::Horizontal, tr( "GEOM_SELECTED_SHAPE" ), this );
+  QGroupBox* aMainGrp = new QGroupBox( tr( "GEOM_SELECTED_SHAPE" ), this );
   
-
-  QGroupBox* aSelGrp = new QGroupBox( 1, Qt::Vertical, aMainGrp );
-
-  aSelGrp->setInsideMargin( 0 );
-  aSelGrp->setFrameStyle( QFrame::NoFrame );
-  new QLabel( tr( "GEOM_OBJECT" ), aSelGrp );
-  mySelBtn = new QPushButton( aSelGrp );
-  mySelBtn->setPixmap( image1 );
-  myEdit = new QLineEdit( aSelGrp );
+  QLabel* lab = new QLabel( tr( "GEOM_OBJECT" ), aMainGrp );
+  mySelBtn = new QPushButton( aMainGrp );
+  mySelBtn->setIcon( image1 );
+  myEdit = new QLineEdit( aMainGrp );
   myEdit->setReadOnly( true );
   myEdit->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
   myEdit->setMinimumWidth( MIN_WIDTH );
 
+  QHBoxLayout* aMainLay = new QHBoxLayout( aMainGrp );
+  aMainLay->setSpacing( SPACING );
+  aMainLay->setMargin( MARGIN );
+  aMainLay->addWidget( lab );
+  aMainLay->addWidget( mySelBtn );
+  aMainLay->addWidget( myEdit );
+
   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 );
+
+  QHBoxLayout* aBtnLay = new QHBoxLayout( aFrame );
+  aBtnLay->setSpacing( SPACING );
+  aBtnLay->setMargin( MARGIN );
   aBtnLay->addWidget( aCloseBtn );
-  aBtnLay->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
+  aBtnLay->addSpacing( SPACING );
+  aBtnLay->addStretch();
   aBtnLay->addWidget( aHelpBtn );
 
   QVBoxLayout* aLay = new QVBoxLayout( this );
   aLay->setSpacing( SPACING );
   aLay->setMargin( MARGIN );
   aLay->addWidget( aMainGrp );
-  aLay->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
+  aLay->addStretch();
   aLay->addWidget( aFrame );
 
-  //myHelpFileName = "files/salome2_sp3_measuregui_functions.htm#free_faces";
   myHelpFileName = "using_measurement_tools_page.html#faces_anchor";
 
   connect( aCloseBtn, SIGNAL( clicked() ), SLOT( onClose() ) );
-  connect( aHelpBtn, SIGNAL( clicked() ), SLOT( onHelp() ) );
-  connect( mySelBtn,    SIGNAL( clicked() ),
-           this,        SLOT  ( onSetEditCurrentArgument() ) );
+  connect( aHelpBtn,  SIGNAL( clicked() ), SLOT( onHelp() ) );
+  connect( mySelBtn,  SIGNAL( clicked() ),
+           this,      SLOT  ( onSetEditCurrentArgument() ) );
   /***************************************************************/
 
   Init();
@@ -142,7 +147,7 @@ RepairGUI_FreeFacesDlg::~RepairGUI_FreeFacesDlg()
 void RepairGUI_FreeFacesDlg::onClose()
 {
   globalSelection();
-  disconnect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0 );
+  disconnect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 0, this, 0 );
   myGeomGUI->SetActiveDialogBox( 0 );
   reject();
   erasePreview();
@@ -154,20 +159,22 @@ void RepairGUI_FreeFacesDlg::onClose()
 //=================================================================================
 void RepairGUI_FreeFacesDlg::onHelp()
 {
-  LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
-  if (app)
-    app->onHelpContextModule(myGeomGUI ? app->moduleName(myGeomGUI->moduleName()) : QString(""), myHelpFileName);
+  LightApp_Application* app = (LightApp_Application*)( SUIT_Session::session()->activeApplication() );
+  if ( app )
+    app->onHelpContextModule( myGeomGUI ? app->moduleName( myGeomGUI->moduleName() ) : QString(""), myHelpFileName );
   else {
-               QString platform;
+    QString platform;
 #ifdef WIN32
-               platform = "winapplication";
+    platform = "winapplication";
 #else
-               platform = "application";
+    platform = "application";
 #endif
-    SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"),
-                          QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
-                          arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName),
-                          QObject::tr("BUT_OK"));
+    SUIT_MessageBox::warning( this, 
+                             tr( "WRN_WARNING" ),
+                             tr( "EXTERNAL_BROWSER_CANNOT_SHOW_PAGE" ).
+                             arg( app->resourceMgr()->stringValue( "ExternalBrowser", 
+                                                                   platform ) ).
+                             arg( myHelpFileName ) );
   }
 }
 
@@ -177,9 +184,9 @@ void RepairGUI_FreeFacesDlg::onHelp()
 //=================================================================================
 void RepairGUI_FreeFacesDlg::onDeactivate()
 {
-  setEnabled(false);
+  setEnabled( false );
   globalSelection();
-  disconnect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0 );
+  disconnect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 0, this, 0 );
   myGeomGUI->SetActiveDialogBox( 0 );
 }
 
@@ -192,8 +199,8 @@ void RepairGUI_FreeFacesDlg::onActivate()
   myGeomGUI->EmitSignalDeactivateDialog();
   setEnabled( true );
   myGeomGUI->SetActiveDialogBox( this );
-  connect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-          SIGNAL( currentSelectionChanged() ), SLOT  ( onSelectionDone() ) );
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 
+          SIGNAL( currentSelectionChanged() ), SLOT( onSelectionDone() ) );
   activateSelection();
 }
 
@@ -207,7 +214,7 @@ void RepairGUI_FreeFacesDlg::Init()
 
   /* signals and slots connections */
   connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), SLOT  ( onDeactivate() ) );
-  connect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 
           SIGNAL( currentSelectionChanged() ), SLOT  ( onSelectionDone() ) );
 
   activateSelection();
@@ -221,23 +228,25 @@ void RepairGUI_FreeFacesDlg::Init()
 void RepairGUI_FreeFacesDlg::onSelectionDone()
 {
   erasePreview();
-  if( IObjectCount() != 1 )
-  {
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if ( aSelList.Extent() != 1 ) {
     myEdit->setText( "" );
     return;
   }
 
   Standard_Boolean isOk = Standard_False;
   GEOM::GEOM_Object_var anObj =
-    GEOMBase::ConvertIOinGEOMObject( firstIObject(), isOk );
+    GEOMBase::ConvertIOinGEOMObject( aSelList.First(), isOk );
 
-  if ( !isOk || anObj->_is_nil() || !GEOMBase::IsShape( anObj ) )
-  {
+  if ( !isOk || anObj->_is_nil() || !GEOMBase::IsShape( anObj ) ) {
     myEdit->setText( "" );
     return;
   }
-  else
-  {
+  else {
     myObj = anObj;
     displayPreview( false, true, true, 3 );
   }
@@ -247,7 +256,7 @@ void RepairGUI_FreeFacesDlg::onSelectionDone()
 // function : enterEvent()
 // purpose  : Mouse enter onto the dialog to activate it
 //=================================================================================
-void RepairGUI_FreeFacesDlg::enterEvent(QEvent* e)
+void RepairGUI_FreeFacesDlg::enterEvent( QEvent* )
 {
   onActivate();
 }
@@ -268,7 +277,7 @@ void RepairGUI_FreeFacesDlg::activateSelection()
 // function : closeEvent()
 // purpose  :
 //=================================================================================
-void RepairGUI_FreeFacesDlg::closeEvent(QCloseEvent* e)
+void RepairGUI_FreeFacesDlg::closeEvent( QCloseEvent* )
 {
   onClose();
 }
@@ -286,7 +295,7 @@ GEOM::GEOM_IOperations_ptr RepairGUI_FreeFacesDlg::createOperation()
 // function : isValid
 // purpose  :
 //=================================================================================
-bool RepairGUI_FreeFacesDlg::isValid( QString& msg )
+bool RepairGUI_FreeFacesDlg::isValid( QString& )
 {
   return !myObj->_is_nil() ;
 }
@@ -303,12 +312,10 @@ bool RepairGUI_FreeFacesDlg::execute( ObjectList& objects )
   TopoDS_Shape aSelShape;
   TopoDS_Shape aFace; 
   TopTools_IndexedMapOfShape anIndices;
-  if ( !myObj->_is_nil() && GEOMBase::GetShape( myObj, aSelShape ) )
-  {
+  if ( !myObj->_is_nil() && GEOMBase::GetShape( myObj, aSelShape ) ) {
     myEdit->setText( GEOMBase::GetName( myObj ) );
     QString aMess;
-    if ( !isValid( aMess ) )
-    {
+    if ( !isValid( aMess ) ) {
       erasePreview( true );
       return false;
     }
@@ -318,11 +325,9 @@ bool RepairGUI_FreeFacesDlg::execute( ObjectList& objects )
     TopExp::MapShapes( aSelShape, anIndices);
     SALOME_Prs* aPrs = 0;
     
-    for ( int i = 0, n = aFaceLst->length(); i < n; i++ )
-    {
+    for ( int i = 0, n = aFaceLst->length(); i < n; i++ ) {
       aFace = anIndices.FindKey( aFaceLst[i] );
-      try
-      {
+      try {
         getDisplayer()->SetColor( Quantity_NOC_RED );
         getDisplayer()->SetToActivate( false );
        aPrs = !aFace.IsNull() ? getDisplayer()->BuildPrs( aFace ) : 0;
@@ -369,9 +374,8 @@ void RepairGUI_FreeFacesDlg::keyPressEvent( QKeyEvent* e )
   if ( e->isAccepted() )
     return;
 
-  if ( e->key() == Key_F1 )
-    {
-      e->accept();
-      onHelp();
-    }
+  if ( e->key() == Qt::Key_F1 ) {
+    e->accept();
+    onHelp();
+  }
 }
index 582179b4d380937b520fa25232a7d495aeee8116..8cd360721112abffeff88bc16f40674fbc0af958 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_FreeFacesDlg.h
+// Author : Vladimir KLYACHIN, Open CASCADE S.A.S. (vladimir.klyachin@opencascade.com)
 //
-//
-//  File   : RepairGUI_FreeFacesDlg.h
-//  Author : VKN
-//  Module : GEOM
-
-#ifndef DIALOGBOX_FreeFaces_H
-#define DIALOGBOX_FreeFaces_H
+#ifndef REPAIRGUI_FREEFACESDLG_H
+#define REPAIRGUI_FREEFACESDLG_H
 
-#include <qdialog.h>
-#include "GEOMBase_Helper.h"
+#include <QDialog>
+#include <GEOMBase_Helper.h>
 
 class GEOM_Displayer;
 class QPushButton;
@@ -43,42 +41,41 @@ class GeometryGUI;
 class RepairGUI_FreeFacesDlg : public QDialog,
                                public GEOMBase_Helper
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    RepairGUI_FreeFacesDlg(GeometryGUI* GUI, QWidget* parent = 0,
-                          const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~RepairGUI_FreeFacesDlg();
-
+  RepairGUI_FreeFacesDlg( GeometryGUI*, QWidget* = 0, bool = false );
+  ~RepairGUI_FreeFacesDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    void closeEvent(QCloseEvent* e);
-    void keyPressEvent(QKeyEvent* e);
-    void activateSelection();
-    GEOM_Displayer* getDisplayer();
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  void                               closeEvent( QCloseEvent* );
+  void                               keyPressEvent( QKeyEvent* );
+  void                               activateSelection();
+  GEOM_Displayer*                    getDisplayer();
 
 private slots:
-    void onClose();
-    void onHelp(); 
-    void onDeactivate();
-    void onActivate();
-    void onSelectionDone();
-    void onSetEditCurrentArgument();
+  void                               onClose();
+  void                               onHelp(); 
+  void                               onDeactivate();
+  void                               onActivate();
+  void                               onSelectionDone();
+  void                               onSetEditCurrentArgument();
 
 private:
-    GEOM_Displayer*        myDisplayer;
-    GEOM::GEOM_Object_var  myObj;
-    QPushButton*           mySelBtn;
-    QLineEdit*             myEdit;
-    GeometryGUI*           myGeomGUI;
-    QString                myHelpFileName;
+  GEOM_Displayer*                    myDisplayer;
+  GEOM::GEOM_Object_var              myObj;
+  QPushButton*                       mySelBtn;
+  QLineEdit*                         myEdit;
+  GeometryGUI*                       myGeomGUI;
+  QString                            myHelpFileName;
 };
 
-#endif // DIALOGBOX_FreeFaces_H
+#endif // REPAIRGUI_FREEFACESDLG_H
index d723e1e80329e4154dc5183aecfc535f49586b11..3425fc433131600aab3db40ecf76b1ad0af2c362 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM RepairGUI : GUI for Geometry component
+// File   : RepairGUI_GlueDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S. 
 //
-//
-//  File   : RepairGUI_GlueDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
-#include "OCCViewer_ViewModel.h"
-
 #include "RepairGUI_GlueDlg.h"
-#include "DlgRef_1Sel_Ext.h"
-#include "GEOMImpl_Types.hxx"
-
-#include "QtxDblSpinBox.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Tools.h"
 
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_OverrideCursor.h"
-
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+#include <QtxDoubleSpinBox.h>
+
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <SalomeApp_Study.h>
+#include <SalomeApp_Tools.h>
+#include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_OverrideCursor.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_ViewManager.h>
+#include <OCCViewer_ViewModel.h>
+#include <SALOME_ListIteratorOfListIO.hxx>
+
+#include <GEOMImpl_Types.hxx>
 
 #include <TCollection_AsciiString.hxx>
 
-#include <qapplication.h>
-#include <qlabel.h>
-#include <qcheckbox.h>
-#include <qhbox.h>
-#include <qgrid.h>
-
-using namespace std;
-
 #define DEFAULT_TOLERANCE_VALUE 1e-07
 
 //=================================================================================
@@ -63,75 +57,75 @@ 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(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),
-  myCurrConstrId( -1 )
+RepairGUI_GlueDlg::RepairGUI_GlueDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                      bool modal )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal ),
+    myCurrConstrId( -1 )
 {
-  QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_GLUE_FACES")));
-  QPixmap image2 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_GLUE_FACES2")));
-  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 image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_GLUE_FACES2" )  ));
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_GLUE_TITLE"));
+  setWindowTitle( tr( "GEOM_GLUE_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_GLUE_TITLE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image2);
-  //RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel_Ext(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_GLUE"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_SELECTED_SHAPE"));
-  GroupPoints->PushButton1->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_GLUE_TITLE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setIcon( image2 );
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_1SelExt( centralWidget() );
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_GLUE" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_SELECTED_SHAPE" ) );
+  GroupPoints->PushButton1->setIcon( image1 );
   GroupPoints->LineEdit1->setReadOnly( true );
   
-  int aWidth = GroupPoints->TextLabel1->sizeHint().width() + 
-               GroupPoints->PushButton1->sizeHint().width() + 
-               GroupPoints->getGroupBoxLayout()->spacing();
-
-  Layout1->addWidget(GroupPoints, 2, 0);
-
-  QHBox* aHBox = new QHBox( GroupPoints->GroupBox1 );
-  aHBox->setSpacing( 5 );
-  
-  (new QLabel( tr( "GEOM_TOLERANCE" ), aHBox ))->setFixedWidth( aWidth );
-  myTolEdt = new QtxDblSpinBox( 0, 100, 1e-7, aHBox );
-  myTolEdt->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  myTolEdt->setPrecision( 10 );
+  QLabel* aTolLab = new QLabel( tr( "GEOM_TOLERANCE" ), GroupPoints->Box );
+  myTolEdt = new SalomeApp_DoubleSpinBox( 0.0, 100.0, DEFAULT_TOLERANCE_VALUE, 7, 7, GroupPoints->Box );
   myTolEdt->setValue( DEFAULT_TOLERANCE_VALUE );
-  GroupPoints->getGroupBoxLayout()->addWidget( aHBox, 3, 0 );
+
+  QGridLayout* boxLayout = new QGridLayout( GroupPoints->Box );
+  boxLayout->setMargin( 0 ); boxLayout->setSpacing( 6 );
+  boxLayout->addWidget( aTolLab,  0, 0 );
+  boxLayout->addWidget( myTolEdt, 0, 2 );
   /***************************************************************/
 
-  GroupPoints2 = new DlgRef_1Sel_Ext(this, "GroupPoints2");
-  GroupPoints2->GroupBox1->setTitle(tr("GEOM_GLUE"));
-  GroupPoints2->TextLabel1->setText(tr("GEOM_SELECTED_SHAPE"));
-  GroupPoints2->PushButton1->setPixmap(image1);
+  GroupPoints2 = new DlgRef_1SelExt( centralWidget() );
+  GroupPoints2->GroupBox1->setTitle( tr( "GEOM_GLUE" ) );
+  GroupPoints2->TextLabel1->setText( tr( "GEOM_SELECTED_SHAPE" ) );
+  GroupPoints2->PushButton1->setIcon( image1 );
   GroupPoints2->LineEdit1->setReadOnly( true );
-  Layout1->addWidget(GroupPoints2, 2, 0);
 
-  QGrid* aGrid = new QGrid( 2, Qt::Horizontal, GroupPoints2->GroupBox1 );
-  aGrid->setSpacing( 5 );
-  (new QLabel( tr( "GEOM_TOLERANCE" ), aGrid ))->setFixedWidth( aWidth );;
-  myTolEdt2 = new QtxDblSpinBox( 0, 100, 1e-7, aGrid );
-  myTolEdt2->setPrecision( 10 );
+  QLabel* aTolLab2 = new QLabel( tr( "GEOM_TOLERANCE" ), GroupPoints2->Box );
+  myTolEdt2 = new SalomeApp_DoubleSpinBox( GroupPoints2->Box );
+  initSpinBox( myTolEdt2, 0, 100, 1e-7, 7 );
   myTolEdt2->setValue( DEFAULT_TOLERANCE_VALUE );
-  myTolEdt2->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  (new QLabel( tr( "GLUE_FACES" ), aGrid ))->setFixedWidth( aWidth );;
-  myDetectBtn = new QPushButton( tr( "GEOM_DETECT" ), aGrid );
-  myDetectBtn->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  mySubShapesChk = new QCheckBox( tr( "SELECT_FACES" ), aGrid );
-  GroupPoints2->getGroupBoxLayout()->addWidget( aGrid, 3, 0 );
+
+  myDetectBtn = new QPushButton( tr( "GEOM_DETECT" ) + QString( " [%1]" ).arg( tr( "GLUE_FACES" ) ), 
+                                GroupPoints2->Box );
+  mySubShapesChk = new QCheckBox( tr( "SELECT_FACES" ), GroupPoints2->Box );
+
+  boxLayout = new QGridLayout( GroupPoints2->Box );
+  boxLayout->setMargin( 0 ); boxLayout->setSpacing( 6 );
+  boxLayout->addWidget( aTolLab2,    0, 0 );
+  boxLayout->addWidget( myTolEdt2,   0, 2 );
+  boxLayout->addWidget( myDetectBtn, 1, 0, 1, 3 );
+  boxLayout->addWidget( mySubShapesChk, 2, 0, 1, 3 );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
+  layout->addWidget( GroupPoints2 );
+
   /***************************************************************/
 
-  setHelpFileName("glue_faces_operation_page.html");
+  setHelpFileName( "glue_faces_operation_page.html" );
   
   // Disable second way of gluing if OCC viewer is not active one
-  if (SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType() 
-      != OCCViewer_Viewer::Type())
-    RadioButton2->setEnabled(false);
+  if ( myGeomGUI->getApp()->desktop()->activeWindow()->getViewManager()->getType()
+       != OCCViewer_Viewer::Type() )
+    mainFrame()->RadioButton2->setEnabled( false );
 
   Init();
 }
@@ -160,27 +154,30 @@ void RepairGUI_GlueDlg::Init()
   //myGeomGUI->SetState( 0 );
   //globalSelection( GEOM_COMPOUND );
 
+  mainFrame()->GroupBoxPublish->show();
+
   /* 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( buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect( buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect( this,          SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPoints->PushButton1,  SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints->LineEdit1,    SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
-  connect(GroupPoints2->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints2->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPoints2->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints2->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
   connect( myTolEdt2, SIGNAL( valueChanged( double ) ), this, SLOT( onTolerChanged( double ) ) );
   connect( mySubShapesChk, SIGNAL( stateChanged( int ) ), this, SLOT( onSubShapesChk() ) );
 
-  connect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-          SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()) );
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  connect(myDetectBtn, SIGNAL(clicked()), this, SLOT(onDetect()));
+  connect( myDetectBtn, SIGNAL( clicked() ), this, SLOT( onDetect() ) );
 
   initName( tr( "GLUE_NEW_OBJ_NAME" ) );
 
-  ConstructorsClicked(0);
+  ConstructorsClicked( 0 );
   
   activateSelection();
   updateButtonState();
@@ -196,58 +193,48 @@ void RepairGUI_GlueDlg::ConstructorsClicked( int constructorId )
   if ( myCurrConstrId == constructorId )
     return;
   
-  disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0);
+  disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
   
-  switch ( constructorId )
-    {
-    case 0:
-      {
-        GroupPoints2->hide();
-        resize( 0, 0 );
-        GroupPoints->show();
-        GroupPoints->LineEdit1->setText( "" );
-        myEditCurrentArgument = GroupPoints->LineEdit1;
-        
-        if ( myCurrConstrId >= 0 ) // i.e. it is not initialisation
-        {
-          // copy tolerance from previous tolerance field
-          myTolEdt->setValue( myTolEdt2->value() );
-        }
-          
-        break;
-      }
-    case 1:
-      {
-        GroupPoints->hide();
-        resize(0, 0);
-        GroupPoints2->show();
-        GroupPoints->LineEdit1->setText("");
-        myEditCurrentArgument = GroupPoints2->LineEdit1;
-        
-        if ( myCurrConstrId >= 0 ) // i.e. it is not initialisation
-        {
-          // copy tolerance from previous tolerance field
-          myTolEdt2->setValue( myTolEdt->value() );
-          mySubShapesChk->setChecked( false );
-          clearTemporary();
-        }
+  switch ( constructorId ) {
+  case 0:
+    GroupPoints2->hide();
+    GroupPoints->show();
+    GroupPoints->LineEdit1->setText( "" );
+    myEditCurrentArgument = GroupPoints->LineEdit1;
+    
+    if ( myCurrConstrId >= 0 ) {
+      // i.e. it is not initialisation
+      // copy tolerance from previous tolerance field
+      myTolEdt->setValue( myTolEdt2->value() );
+    }
+    break;
+  case 1:
+    GroupPoints->hide();
+    GroupPoints2->show();
+    GroupPoints->LineEdit1->setText( "" );
+    myEditCurrentArgument = GroupPoints2->LineEdit1;
         
-        break;
-      }
+    if ( myCurrConstrId >= 0 ) {
+      // i.e. it is not initialisation
+      // copy tolerance from previous tolerance field
+      myTolEdt2->setValue( myTolEdt->value() );
+      mySubShapesChk->setChecked( false );
+      clearTemporary();
     }
+    break;
+  }
     
-    myCurrConstrId = constructorId;
+  myCurrConstrId = constructorId;
 
   myEditCurrentArgument->setFocus();
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
   qApp->processEvents();
   updateGeometry();
-  QSize aSize = minimumSizeHint();
-  resize( width(), aSize.height() );
-  
+  resize( minimumSizeHint() );
+
   displayPreview();
   updateButtonState();
   activateSelection();
@@ -300,11 +287,15 @@ void RepairGUI_GlueDlg::SelectionIntoArgument()
   }
   
   erasePreview();
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   myObject = GEOM::GEOM_Object::_nil();
 
-  if ( IObjectCount() == 1 ) {
-    Handle(SALOME_InteractiveObject) anIO = firstIObject();
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if ( aSelList.Extent() == 1 ) {
+    Handle(SALOME_InteractiveObject) anIO = aSelList.First();
     Standard_Boolean aRes;
     myObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
     if ( aRes )
@@ -334,11 +325,11 @@ void RepairGUI_GlueDlg::SetEditCurrentArgument()
 void RepairGUI_GlueDlg::LineEditReturnPressed()
 {
   const QObject* send = sender();
-  if( send == GroupPoints->LineEdit1 ) {
+  if ( send == GroupPoints->LineEdit1 ) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
-  else if( send == GroupPoints2->LineEdit1 ) {
+  else if ( send == GroupPoints2->LineEdit1 ) {
     myEditCurrentArgument = GroupPoints2->LineEdit1;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
@@ -352,8 +343,8 @@ void RepairGUI_GlueDlg::LineEditReturnPressed()
 void RepairGUI_GlueDlg::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() ) );
 
   //GroupPoints->LineEdit1->setText("");
   //GroupPoints2->LineEdit1->setText("");
@@ -369,22 +360,12 @@ void RepairGUI_GlueDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  : Mouse enter onto the dialog to activate it
 //=================================================================================
-void RepairGUI_GlueDlg::enterEvent(QEvent* e)
+void RepairGUI_GlueDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
-//=================================================================================
-// function : closeEvent()
-// purpose  :
-//=================================================================================
-void RepairGUI_GlueDlg::closeEvent(QCloseEvent* e)
-{
-  //myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 
 //=================================================================================
 // function : createOperation
@@ -401,7 +382,20 @@ GEOM::GEOM_IOperations_ptr RepairGUI_GlueDlg::createOperation()
 //=================================================================================
 bool RepairGUI_GlueDlg::isValid( QString& msg )
 {
-  return !myObject->_is_nil() && ( IsPreview() || myTolEdt->value() > 0. );
+  bool ok = true;
+  double v = 0;
+  switch ( getConstructorId() )
+  {
+  case 0:
+    v = myTolEdt->value();
+    ok = myTolEdt->isValid( msg, !IsPreview() );
+    break;
+  case 1:
+    v = myTolEdt2->value(); 
+    ok = myTolEdt2->isValid( msg, !IsPreview() );
+    break;
+  }
+  return !myObject->_is_nil() && ( IsPreview() || v > 0. ) && ok;
 }
 
 //=================================================================================
@@ -413,24 +407,28 @@ bool RepairGUI_GlueDlg::execute( ObjectList& objects )
   bool aResult = false;
   objects.clear();
 
-  switch ( getConstructorId() )
-  {
+  switch ( getConstructorId() ) {
   case 0:
     {
       GEOM::GEOM_Object_var anObj = GEOM::GEOM_IShapesOperations::_narrow
-        ( getOperation() )->MakeGlueFaces( myObject, myTolEdt2->value(), true );
+        ( getOperation() )->MakeGlueFaces( myObject, myTolEdt->value(), true );
       aResult = !anObj->_is_nil();
-      if ( aResult )
+      if ( aResult && !IsPreview() )
+      {
+       QStringList aParameters;
+       aParameters << myTolEdt->text();
+       anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+
         objects.push_back( anObj._retn() );
+      }
       break;
     }
   case 1:
     {
-      if ( IsPreview() )
-      {
+      if ( IsPreview() ) {
         // if this method is used for displaying preview then we must detect glue faces only
         ObjectList::iterator anIter;
-        for (anIter = myTmpObjs.begin(); anIter != myTmpObjs.end(); ++anIter)
+        for ( anIter = myTmpObjs.begin(); anIter != myTmpObjs.end(); ++anIter )
           objects.push_back( GEOM::GEOM_Object::_duplicate( *anIter ) );
         return myTmpObjs.size() ? true : false;
       } // IsPreview
@@ -440,20 +438,23 @@ bool RepairGUI_GlueDlg::execute( ObjectList& objects )
       QMap<QString, char> selected;
 
       // Get names of selected objects
-      SALOME_ListIteratorOfListIO it ( selectedIO() );
+      LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+      SALOME_ListIO aSelList;
+      aSelMgr->selectedObjects(aSelList);
+
+      SALOME_ListIteratorOfListIO it (aSelList);
       for (; it.More(); it.Next()) 
-        selected.insert( it.Value()->getName(), 0 );
+        selected.insert(it.Value()->getName(), 0);
 
       // Iterate through result and select objects with names from selection
       // ObjectList toRemoveFromEnggine;
       ObjectList toGlue;
       ObjectList::iterator anIter;
-      for (anIter = myTmpObjs.begin(); anIter != myTmpObjs.end(); ++anIter) 
-      {
+      for ( anIter = myTmpObjs.begin(); anIter != myTmpObjs.end(); ++anIter ) {
         if ( selected.contains( myGeomGUI->getApp()->orb()->object_to_string(*anIter) ) )
-          toGlue.push_back(*anIter);
+          toGlue.push_back( *anIter );
       }
-
+      
       // make glue faces
       GEOM::ListOfGO_var aListForGlue = new GEOM::ListOfGO();
       aListForGlue->length( toGlue.size() );
@@ -466,7 +467,15 @@ bool RepairGUI_GlueDlg::execute( ObjectList& objects )
       aResult = !anObj->_is_nil();
 
       if ( aResult )
+      {
+       if ( !IsPreview() )
+       {
+         QStringList aParameters;
+         aParameters << myTolEdt2->text();
+         anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+       }
         objects.push_back( anObj._retn() );
+      }
 
       // Remove from engine useless objects
       clearTemporary();
@@ -480,6 +489,23 @@ bool RepairGUI_GlueDlg::execute( ObjectList& objects )
   return aResult;
 }
 
+//=================================================================================
+// function : restoreSubShapes
+// purpose  :
+//=================================================================================
+void RepairGUI_GlueDlg::restoreSubShapes( SALOMEDS::Study_ptr   theStudy,
+                                          SALOMEDS::SObject_ptr theSObject )
+{
+  if ( mainFrame()->CheckBoxRestoreSS->isChecked() ) {
+    GEOM::find_shape_method aFindMethod = GEOM::FSM_GetInPlace;
+    if ( getConstructorId() == 0 ) // MakeGlueFaces
+      aFindMethod = GEOM::FSM_GetInPlaceByHistory;
+
+    // empty list of arguments means that all arguments should be restored
+    getGeomEngine()->RestoreSubShapesSO( theStudy, theSObject, GEOM::ListOfGO(),
+                                        aFindMethod, /*theInheritFirstArg=*/true );
+  }
+}
 
 //================================================================
 // Function : clearShapeBufferLocal
@@ -498,7 +524,7 @@ void RepairGUI_GlueDlg::clearShapeBufferLocal( GEOM::GEOM_Object_ptr theObj )
     return;
 
   _PTR(Study) aStudy = getStudy()->studyDS();
-  _PTR(SObject) aSObj ( aStudy->FindObjectIOR( string( IOR.in() ) ) );
+  _PTR(SObject) aSObj ( aStudy->FindObjectIOR( std::string( IOR.in() ) ) );
   if ( !aSObj )
     return;
 
@@ -527,91 +553,72 @@ bool RepairGUI_GlueDlg::onAcceptLocal()
   _PTR(Study) aStudy = getStudy()->studyDS();
 
   bool aLocked = aStudy->GetProperties()->IsLocked();
-  if ( aLocked ) 
-  {
+  if ( aLocked ) {
     MESSAGE("GEOMBase_Helper::onAccept - ActiveStudy is locked");
-    SUIT_MessageBox::warn1 ( (QWidget*)(SUIT_Session::session()->activeApplication()->desktop()),
-      QObject::tr("WRN_WARNING"), QObject::tr("WRN_STUDY_LOCKED"), QObject::tr("BUT_OK") );
+    SUIT_MessageBox::warning( this, tr( "WRN_WARNING" ), tr( "WRN_STUDY_LOCKED" ), tr( "BUT_OK" ) );
     return false;
   }
 
   QString msg;
-  if ( !isValid( msg ) ) 
-  {
+  if ( !isValid( msg ) ) {
     showError( msg );
     return false;
   }
 
   erasePreview( false );
 
-  try 
-  {
-    if ( openCommand() ) 
-    {
+  try {
+    if ( openCommand() ) {
       SUIT_OverrideCursor wc;
-
-      SUIT_Session::session()->activeApplication()->putInfo( "" );
+      
+      myGeomGUI->getApp()->putInfo( "" );
       ObjectList objects;
       
-      if ( !execute( objects ) ) 
-      { 
+      if ( !execute( objects ) ) { 
         wc.suspend();
         abortCommand();
         showError();
       }
-      else 
-      {
+      else {
         const int nbObjs = objects.size();
-        bool withChildren = false;
-        for ( ObjectList::iterator it = objects.begin(); it != objects.end(); ++it ) 
-        {
-          QString aName("");
-          if ( nbObjs > 1 )
-          {
-            aName = strlen( getNewObjectName() ) ? GEOMBase::GetDefaultName( getNewObjectName() ) : GEOMBase::GetDefaultName(   getPrefix( *it ) );
+        for ( ObjectList::iterator it = objects.begin(); it != objects.end(); ++it ) {
+          QString aName = getNewObjectName();
+          if ( nbObjs > 1 ) {
+            if ( aName.isEmpty() )
+              aName = getPrefix( *it );
+            aName = GEOMBase::GetDefaultName( aName );
           }
-          else 
-          {
-            aName = getNewObjectName();
+          else {
             // PAL6521: use a prefix, if some dialog box doesn't reimplement getNewObjectName()
             if ( aName.isEmpty() )
               aName = GEOMBase::GetDefaultName( getPrefix( *it ) );
           }
-          addInStudy( *it, aName.latin1() );
-          withChildren = false;
+          addInStudy( *it, aName.toLatin1().data() );
           display( *it, false );
         }
-
-        if ( nbObjs ) 
-        {
+       
+        if ( nbObjs ) {
           commitCommand();
           updateObjBrowser();
-          SUIT_Session::session()->activeApplication()->putInfo( QObject::tr("GEOM_PRP_DONE") );
+          myGeomGUI->getApp()->putInfo( QObject::tr("GEOM_PRP_DONE") );
         }
-        else 
-        {
+        else {
           abortCommand();
         }
 
         // JFA 28.12.2004 BEGIN // To enable warnings
-        if ( !getOperation()->_is_nil() ) 
-        {
-          if ( !getOperation()->IsDone() ) 
-          {
+        if ( !getOperation()->_is_nil() ) {
+          if ( !getOperation()->IsDone() ) {
             wc.suspend();
            QString msgw = QObject::tr( getOperation()->GetErrorCode() );
-            SUIT_MessageBox::warn1((QWidget*)(SUIT_Session::session()->activeApplication()->desktop()),
-                                  QObject::tr( "WRN_WARNING" ), 
-                                  msgw, 
-                                  QObject::tr( "BUT_OK" ));
+            SUIT_MessageBox::warning( this, tr( "WRN_WARNING" ), msgw, tr( "BUT_OK" ) );
           }
         }
         // JFA 28.12.2004 END
       }
     }
   }
-  catch( const SALOME::SALOME_Exception& e ) 
-  {
+  catch( const SALOME::SALOME_Exception& e ) {
     SalomeApp_Tools::QtCatchCorbaException( e );
     abortCommand();
   }
@@ -637,25 +644,27 @@ void RepairGUI_GlueDlg::onDetect()
     return;
   }
 
+  buttonOk()->setEnabled( false );
+  buttonApply()->setEnabled( false );
+  globalSelection( GEOM_ALLSHAPES );
+
   GEOM::ListOfGO_var aList = GEOM::GEOM_IShapesOperations::_narrow
     ( getOperation() )->GetGlueFaces( myObject, myTolEdt2->value() );
   
-  for (int i = 0, n = aList->length(); i < n; i++
+  for ( int i = 0, n = aList->length(); i < n; i++ 
     myTmpObjs.push_back(GEOM::GEOM_Object::_duplicate(aList[i]));
   
-  if ( myTmpObjs.size() > 0  )
-  {
+  if ( myTmpObjs.size() > 0  ) {
     msg = tr( "FACES_FOR_GLUING_ARE_DETECTED" ).arg( myTmpObjs.size() );
     mySubShapesChk->setChecked( true );
   }
-  else
-  {
+  else {
     msg = tr( "THERE_ARE_NO_FACES_FOR_GLUING" );
   }
   
-  connect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
-          SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()) ) ;
-  SUIT_MessageBox::info1( this, tr( "GEOM_FREE_BOUNDS_TLT" ), msg, "Close" );
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) ) ;
+  SUIT_MessageBox::information( this, tr( "GEOM_FREE_BOUNDS_TLT" ), msg, tr( "Close" ) );
   updateButtonState();
   activateSelection();
 }
@@ -666,33 +675,32 @@ void RepairGUI_GlueDlg::onDetect()
 //=================================================================================
 void RepairGUI_GlueDlg::activateSelection()
 {
-  erasePreview(false);
+  erasePreview( false );
   
   int anId = getConstructorId();
-  if ( anId == 0 )  // Case of whole gluing
-  {
-    disconnect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
-               SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()) ) ;
+  if ( anId == 0 )  
+    // Case of whole gluing
+    disconnect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+               this, SLOT( SelectionIntoArgument() ) );
     
     globalSelection( GEOM_ALLSHAPES );
-    if (myObject->_is_nil()) 
+    if ( myObject->_is_nil()) 
       SelectionIntoArgument();
 
-    connect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
-            SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()) ) ;
+    connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+             this, SLOT( SelectionIntoArgument() ) );
   } 
-  else // Second case of gluing
-  {
+  else {
+    // Second case of gluing
     if ( !mySubShapesChk->isChecked() ) 
       globalSelection( GEOM_ALLSHAPES );
-    else 
-    {
+    else {
       displayPreview( true, false, false, 2/*line width*/, 1/*display mode*/, Quantity_NOC_RED );
-     disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
-               SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()) ) ;
+      disconnect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+                 this, SLOT( SelectionIntoArgument() ) ) ;
       globalSelection( GEOM_PREVIEW );
-      connect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
-              SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()) ) ;
+      connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+              this, SLOT( SelectionIntoArgument() ) ) ;
     } 
   }
   updateViewer();
@@ -706,20 +714,23 @@ void RepairGUI_GlueDlg::updateButtonState()
 {
   int anId = getConstructorId();
   bool hasMainObj = !myObject->_is_nil();
-  if ( anId == 0 )
-  {
-    buttonOk->setEnabled( hasMainObj );
-    buttonApply->setEnabled( hasMainObj );
+  if ( anId == 0 ) {
+    buttonOk()->setEnabled( hasMainObj );
+    buttonApply()->setEnabled( hasMainObj );
   }
   else
   {
+    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+    SALOME_ListIO aSelList;
+    aSelMgr->selectedObjects(aSelList);
+
     bool wasSelected = false;
-    SALOME_ListIteratorOfListIO it ( selectedIO() );
+    SALOME_ListIteratorOfListIO it (aSelList);
     if (it.More() > 0)
       wasSelected = true;
     bool wasDetected = myTmpObjs.size() ? true : false;
-    buttonOk->setEnabled( hasMainObj && wasDetected && wasSelected);
-    buttonApply->setEnabled( hasMainObj && wasDetected && wasSelected);
+    buttonOk()->setEnabled( hasMainObj && wasDetected && wasSelected );
+    buttonApply()->setEnabled( hasMainObj && wasDetected && wasSelected );
     mySubShapesChk->setEnabled( hasMainObj && wasDetected );
     myDetectBtn->setEnabled( hasMainObj );
     if ( !hasMainObj || !wasDetected )
@@ -734,7 +745,7 @@ void RepairGUI_GlueDlg::updateButtonState()
 void RepairGUI_GlueDlg::clearTemporary()
 {
   ObjectList::iterator anIter;
-  for (anIter = myTmpObjs.begin(); anIter != myTmpObjs.end(); ++anIter)
+  for ( anIter = myTmpObjs.begin(); anIter != myTmpObjs.end(); ++anIter )
     getGeomEngine()->RemoveObject(*anIter);
 
   myTmpObjs.clear();
@@ -772,42 +783,3 @@ void RepairGUI_GlueDlg::ClickOnCancel()
   clearTemporary();
   GEOMBase_Skeleton::ClickOnCancel();
 }
-
-//================================================================
-// Function : getEntry
-// Purpose  :
-//================================================================
-static string getEntry( GEOM::GEOM_Object_ptr object )
-{
-  SUIT_Session* session = SUIT_Session::session();
-  SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( session->activeApplication() );
-  if ( app )
-  {
-    string IOR = app->orb()->object_to_string( object );
-    if ( IOR != "" )
-    {
-      SalomeApp_Study* study = ( SalomeApp_Study* )app->activeStudy();
-      _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) );
-      if ( SO )
-        return SO->GetID();
-    }
-  }
-  return "";
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
index eef24c2ca3b2005b8a497bd1e11cf2c4fa5f8edc..8d838ab85b6fc6a475416238a8cf6896d50d795a 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_GlueDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//
-//  File   : RepairGUI_GlueDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_Glue_H
-#define DIALOGBOX_Glue_H
+#ifndef REPAIRGUI_GLUEDLG_H
+#define REPAIRGUI_GLUEDLG_H
 
-#include "GEOMBase_Skeleton.h"
+#include <GEOMBase_Skeleton.h>
 
-class QtxDblSpinBox;
-class DlgRef_1Sel_Ext;
+class DlgRef_1SelExt;
+class SalomeApp_DoubleSpinBox;
+class QPushButton;
 class QCheckBox;
 
 //=================================================================================
@@ -40,68 +39,66 @@ class QCheckBox;
 //=================================================================================
 class RepairGUI_GlueDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    RepairGUI_GlueDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                       const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
-    ~RepairGUI_GlueDlg();
+  RepairGUI_GlueDlg( GeometryGUI*, QWidget* = 0, bool = false );
+  ~RepairGUI_GlueDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr );
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    void closeEvent(QCloseEvent* e);
-    void initSelection();
-    
-    void clearTemporary();
-
-    bool onAcceptLocal();
-    void clearShapeBufferLocal( GEOM::GEOM_Object_ptr );
-    // Reimplementation of onAccept for local case of this class.
-    
-    void activateSelection();
-    void updateButtonState();
-    void selectTmpInViewer();
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  void                               initSelection();
+  
+  void                               clearTemporary();
+  
+  bool                               onAcceptLocal();
+  void                               clearShapeBufferLocal( GEOM::GEOM_Object_ptr );
+  // Reimplementation of onAccept for local case of this class.
+  
+  void                               activateSelection();
+  void                               updateButtonState();
+  void                               selectTmpInViewer();
     
 private:    
-  
-    GEOM::GEOM_Object_var myObject;
-    ObjectList            myTmpObjs;
+  GEOM::GEOM_Object_var              myObject;
+  ObjectList                         myTmpObjs;
     
-    DlgRef_1Sel_Ext* GroupPoints;
-    DlgRef_1Sel_Ext* GroupPoints2;
-    QtxDblSpinBox*   myTolEdt;
-    QtxDblSpinBox*   myTolEdt2;
-    QPushButton*     myDetectBtn;
-    QCheckBox*       mySubShapesChk;
-
-    int myCurrConstrId;
+  DlgRef_1SelExt*                    GroupPoints;
+  DlgRef_1SelExt*                    GroupPoints2;
+  SalomeApp_DoubleSpinBox*           myTolEdt;
+  SalomeApp_DoubleSpinBox*           myTolEdt2;
+  QPushButton*                       myDetectBtn;
+  QCheckBox*                         mySubShapesChk;
+  
+  int                                myCurrConstrId;
     
 protected slots:
-    virtual void ClickOnCancel();
+  virtual void                       ClickOnCancel();
     
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-
-    void ActivateThisDialog();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
 
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               ActivateThisDialog();
 
-    void ConstructorsClicked(int);
-    //void ValueChangedInSpinBox();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 
-    void onDetect();
-    void onTolerChanged( double );
-    void onSubShapesChk();
+  void                               ConstructorsClicked( int );
+  //void                               ValueChangedInSpinBox();
+  
+  void                               onDetect();
+  void                               onTolerChanged( double );
+  void                               onSubShapesChk();
 };
 
-#endif // DIALOGBOX_Glue_H
+#endif // REPAIRGUI_GLUEDLG_H
index 930fb95c44563af25376becc68a4d25519fb4999..850926fe63390ac799b15212a3670efce6bce2db 100644 (file)
@@ -1,35 +1,42 @@
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY 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
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
+//  Copyright (C) 2003-2007  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
+//
+//  GEOM RepairGUI : GUI for Geometry component
 //  File   : RepairGUI_RemoveExtraEdgesDlg.cxx
-//  Author : Michael Zorin
-//  Module : GEOM
-//  $Header: 
-
+//  Author : Michael Zorin, Open CASCADE S.A.S.
+//
 #include "RepairGUI_RemoveExtraEdgesDlg.h"
 
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SUIT_Session.h"
-
-#include "GEOMImpl_Types.hxx"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include <TColStd_MapOfInteger.hxx>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
 
-#include <qlabel.h>
+#include <GEOMImpl_Types.hxx>
 
-using namespace std;
+#include <TColStd_MapOfInteger.hxx>
 
 //=================================================================================
 // class    : RepairGUI_RemoveExtraEdgesDlg()
@@ -38,32 +45,37 @@ using namespace std;
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-RepairGUI_RemoveExtraEdgesDlg::RepairGUI_RemoveExtraEdgesDlg(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)
+RepairGUI_RemoveExtraEdgesDlg::RepairGUI_RemoveExtraEdgesDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                             bool modal )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_REMOVE_EXTRA_EDGES")));
-  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_REMOVE_EXTRA_EDGES" ) ) );
+  QPixmap image1( aResMgr->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
     
-  setCaption(tr("GEOM_REMOVE_EXTRA_EDGES_TITLE"));
+  setWindowTitle( tr( "GEOM_REMOVE_EXTRA_EDGES_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_REMOVE_EXTRA_EDGES_TITLE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel_QTD(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_REMOVE_EXTRA_EDGES"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_SELECTED_SHAPE"));
-  GroupPoints->PushButton1->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_REMOVE_EXTRA_EDGES_TITLE"));
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_1Sel( centralWidget() );
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_REMOVE_EXTRA_EDGES" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_SELECTED_SHAPE" ) );
+  GroupPoints->PushButton1->setIcon( image1 );
   GroupPoints->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget(GroupPoints, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
+
   /***************************************************************/
   
-  setHelpFileName("remove_extra_edges_operation_page.html");
+  setHelpFileName( "remove_extra_edges_operation_page.html" );
 
   Init();
 }
@@ -91,15 +103,17 @@ void RepairGUI_RemoveExtraEdgesDlg::Init()
 
   activateSelection();
   
+  mainFrame()->GroupBoxPublish->show();
+
   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPoints->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
   initName( tr( "REMOVE_EXTRA_EDGES_NEW_OBJ_NAME" ) );
 }
@@ -126,9 +140,11 @@ bool RepairGUI_RemoveExtraEdgesDlg::ClickOnApply()
 
   initName();
 
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   myObject = GEOM::GEOM_Object::_nil();
   
+  myOkObject = false;
+
   activateSelection();
 
   return true;
@@ -142,12 +158,16 @@ bool RepairGUI_RemoveExtraEdgesDlg::ClickOnApply()
 //=================================================================================
 void RepairGUI_RemoveExtraEdgesDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   QString aName;
   
-  if(myEditCurrentArgument == GroupPoints->LineEdit1) {
-    if (IObjectCount() != 1) {
-      if (myEditCurrentArgument == GroupPoints->LineEdit1)
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) {
+    if ( aSelList.Extent() != 1 ) {
+      if ( myEditCurrentArgument == GroupPoints->LineEdit1 )
         myOkObject = false;
       return;
     }
@@ -156,12 +176,12 @@ void RepairGUI_RemoveExtraEdgesDlg::SelectionIntoArgument()
   // nbSel == 1
   Standard_Boolean testResult = Standard_False;
   GEOM::GEOM_Object_ptr aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
+    GEOMBase::ConvertIOinGEOMObject( aSelList.First(), testResult );
 
-  if (!testResult)
+  if ( !testResult )
     return;
   
-  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
+  if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) {
     myObject = aSelectedObject;
     myOkObject = true;
   }
@@ -175,8 +195,7 @@ void RepairGUI_RemoveExtraEdgesDlg::SelectionIntoArgument()
 //=================================================================================
 void RepairGUI_RemoveExtraEdgesDlg::SetEditCurrentArgument()
 {
-  if( sender() == GroupPoints->PushButton1 )
-  {
+  if( sender() == GroupPoints->PushButton1 ) {
     GroupPoints->LineEdit1->setFocus();
     myEditCurrentArgument = GroupPoints->LineEdit1;
   }
@@ -190,8 +209,7 @@ void RepairGUI_RemoveExtraEdgesDlg::SetEditCurrentArgument()
 //=================================================================================
 void RepairGUI_RemoveExtraEdgesDlg::LineEditReturnPressed()
 {
-  if( sender() == GroupPoints->LineEdit1 )
-  {
+  if ( sender() == GroupPoints->LineEdit1 ) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
@@ -205,8 +223,8 @@ void RepairGUI_RemoveExtraEdgesDlg::LineEditReturnPressed()
 void RepairGUI_RemoveExtraEdgesDlg::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();
 }
@@ -218,20 +236,11 @@ void RepairGUI_RemoveExtraEdgesDlg::ActivateThisDialog()
 //=================================================================================
 void RepairGUI_RemoveExtraEdgesDlg::enterEvent(QEvent* e)
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
 
-//=================================================================================
-// function : closeEvent()
-// purpose  :
-//=================================================================================
-void RepairGUI_RemoveExtraEdgesDlg::closeEvent(QCloseEvent* e)
-{
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : activateSelection
 // purpose  : activate selection of solids and compounds
@@ -270,10 +279,25 @@ bool RepairGUI_RemoveExtraEdgesDlg::execute( ObjectList& objects )
 {
   GEOM::GEOM_Object_var anObj;
   
-  anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->RemoveExtraEdges(myObject);
+  anObj = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() )->RemoveExtraEdges( myObject );
   
   if ( !anObj->_is_nil() )
     objects.push_back( anObj._retn() );
 
   return true;
 }
+
+//=================================================================================
+// function : restoreSubShapes
+// purpose  :
+//=================================================================================
+void RepairGUI_RemoveExtraEdgesDlg::restoreSubShapes( SALOMEDS::Study_ptr   theStudy,
+                                                      SALOMEDS::SObject_ptr theSObject )
+{
+  if ( mainFrame()->CheckBoxRestoreSS->isChecked() ) {
+    // empty list of arguments means that all arguments should be restored
+    getGeomEngine()->RestoreSubShapesSO( theStudy, theSObject, GEOM::ListOfGO(),
+                                        /*theFindMethod=*/GEOM::FSM_GetInPlace, // ? GetInPlaceByHistory
+                                        /*theInheritFirstArg=*/true );
+  }
+}
index 41c881eeceb9418c91c3a71e8c1e5e7246695163..ffc49ce267519207fddd585833c1e4816bbdc3a2 100644 (file)
@@ -1,35 +1,34 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
 //  File   : RepairGUI_RemoveExtraEdgesDlg.h
-//  Author : Michael ZORIN
-//  Module : GEOM
+//  Author : Michael ZORIN, Open CASCADE S.A.S.
+//
+#ifndef REPAIRGUI_REMOVEEXTRAEDGESDLG_H
+#define REPAIRGUI_REMOVEEXTRAEDGESDLG_H
 
-#ifndef DIALOGBOX_REMOVEEXTRAEDGES_H
-#define DIALOGBOX_REMOVEEXTRAEDGES_H
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_QTD.h"
+class DlgRef_1Sel;
 
 //=================================================================================
 // class    : RepairGUI_RemoveExtraEdgesDlg
 //=================================================================================
 class RepairGUI_RemoveExtraEdgesDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    RepairGUI_RemoveExtraEdgesDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                                 const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~RepairGUI_RemoveExtraEdgesDlg();
+  RepairGUI_RemoveExtraEdgesDlg( GeometryGUI*, QWidget* = 0, bool = false );
+  ~RepairGUI_RemoveExtraEdgesDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );    
-
-private :
-    void Init();
-    void enterEvent(QEvent* e);
-    void closeEvent(QCloseEvent* e);
-
-    void activateSelection();
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );    
+  virtual void                       restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr );
 
-    GEOM::GEOM_Object_var myObject;
-    bool myOkObject;
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  void                               activateSelection();
 
-    DlgRef_1Sel_QTD* GroupPoints;
+private:
+  GEOM::GEOM_Object_var              myObject;
+  bool                               myOkObject;
 
+  DlgRef_1Sel*                       GroupPoints;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
 
-    void ActivateThisDialog();
+  void                               ActivateThisDialog();
 
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // DIALOGBOX_REMOVEEXTRAEDGES_H
+#endif // REPAIRGUI_REMOVEEXTRAEDGESDLG_H
index 44b22b5efed70e94af87713241025ef7e1b39d12..3ef74ca4a92685d6d8956f4c7c39c9b2463648c3 100644 (file)
@@ -1,46 +1,46 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_RemoveHolesDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : RepairGUI_RemoveHolesDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "RepairGUI_RemoveHolesDlg.h"
 
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_Session.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include "SALOME_ListIteratorOfListIO.hxx"
-
-#include "GEOMImpl_Types.hxx"
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_MessageBox.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
+// OCCT Includes
 #include <TopAbs.hxx>
 #include <TColStd_MapOfInteger.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
 
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : RepairGUI_RemoveHolesDlg()
@@ -49,60 +49,42 @@ 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(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)
+RepairGUI_RemoveHolesDlg::RepairGUI_RemoveHolesDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                    bool modal)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal)
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SUPPRESS_HOLES")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_SUPPRESS_HOLES")));
+  QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_REMOVE_HOLES_TITLE"));
+  setWindowTitle(tr("GEOM_REMOVE_HOLES_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_REMOVE_HOLES_TITLE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel_Ext(this, "GroupPoints");
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_REMOVE_HOLES_TITLE"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_1Sel1Check1Sel(centralWidget());
   GroupPoints->GroupBox1->setTitle(tr("GEOM_HOLES"));
   GroupPoints->TextLabel1->setText(tr("GEOM_SELECTED_SHAPE"));
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->LineEdit1->setReadOnly( true );
-
-  Layout1->addWidget(GroupPoints, 2, 0);
-
-  myAllChk = new QCheckBox( tr( "GEOM_REMOVE_ALL_HOLES" ), GroupPoints->GroupBox1 );
-
-  QGridLayout* aSelectWiresLay = new QGridLayout( 0, 1, 1, 0, 6, "aSelectWiresLay");
-
-  mySelectWiresBtn = new QPushButton( GroupPoints->GroupBox1, "mySelectWiresBtn" );
-  mySelectWiresBtn->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, mySelectWiresBtn->sizePolicy().hasHeightForWidth() ) );
-  mySelectWiresBtn->setText( trUtf8( "" ) );
-  mySelectWiresBtn->setPixmap(image1);
-
-  mySelectWiresEdt = new QLineEdit( GroupPoints->GroupBox1, "mySelectWiresEdt" );
-  mySelectWiresEdt->setReadOnly( true );
-
-  mySelectWiresLbl = new QLabel( tr( "GEOM_WIRES_TO_REMOVE" ), GroupPoints->GroupBox1, "TextLabel1" );
-  mySelectWiresLbl->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, mySelectWiresLbl->sizePolicy().hasHeightForWidth() ) );
-
-  aSelectWiresLay->addWidget( mySelectWiresLbl, 0, 0 );
-       aSelectWiresLay->addWidget( mySelectWiresBtn, 0, 1 );
-  aSelectWiresLay->addWidget( mySelectWiresEdt, 0, 2 );
-  QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-  aSelectWiresLay->addItem( spacer, 1, 2 );
-
-  QGridLayout* aDetectLay = new QGridLayout( 0, 1, 1, 0, 6, "aDetectLay" );  
-       myFreeBoundBtn = new QPushButton( tr( "GEOM_DETECT" ), GroupPoints->GroupBox1 );
-  QLabel* aLbl = new QLabel( tr( "GEOM_FREE_BOUNDARIES" ), GroupPoints->GroupBox1 );
-  aDetectLay->addWidget( aLbl, 0, 0 );
-  aDetectLay->addWidget( myFreeBoundBtn, 0, 1 );
-  
-  GroupPoints->getGroupBoxLayout()->addMultiCellWidget( myAllChk, 1, 1, 0, 2 );
-  GroupPoints->getGroupBoxLayout()->addLayout( aSelectWiresLay, 2, 0 );
-  GroupPoints->getGroupBoxLayout()->addLayout( aDetectLay, 3, 0 );
+  GroupPoints->PushButton1->setIcon(image1);
+  GroupPoints->LineEdit1->setReadOnly(true);
+  GroupPoints->CheckButton1->setText(tr("GEOM_REMOVE_ALL_HOLES"));
+  GroupPoints->TextLabel2->setText(tr("GEOM_WIRES_TO_REMOVE"));
+  GroupPoints->PushButton2->setIcon(image1);
+  GroupPoints->LineEdit2->setReadOnly(true);
+
+  myFreeBoundBtn = new QPushButton(tr("GEOM_DETECT") + QString(" [%1]").arg(tr("GEOM_FREE_BOUNDARIES")),
+                                    GroupPoints->Box);
+  QVBoxLayout* l = new QVBoxLayout(GroupPoints->Box);
+  l->setMargin(0); l->setSpacing(0);
+  l->addWidget(myFreeBoundBtn);
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
   /***************************************************************/
 
   setHelpFileName("suppress_holes_operation_page.html");
@@ -110,7 +92,6 @@ RepairGUI_RemoveHolesDlg::RepairGUI_RemoveHolesDlg(GeometryGUI* theGeometryGUI,
   Init();
 }
 
-
 //=================================================================================
 // function : ~RepairGUI_RemoveHolesDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -119,44 +100,41 @@ RepairGUI_RemoveHolesDlg::~RepairGUI_RemoveHolesDlg()
 {
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void RepairGUI_RemoveHolesDlg::Init()
 {
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  
+  // init variables
+  GroupPoints->LineEdit1->clear();
+  GroupPoints->LineEdit2->clear();
   myObject = GEOM::GEOM_Object::_nil();
   myWiresInd = new GEOM::short_array();
-  myWiresInd->length( 0 );
-
-  //myGeomGUI->SetState( 0 );
-  initSelection();
+  myWiresInd->length(0);
 
   myClosed = -1;
   myOpen = -1;
-  
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(mySelectWiresBtn, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(mySelectWiresEdt, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect(GroupPoints->PushButton1, SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton2, SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
 
-  connect( myAllChk, SIGNAL( clicked() ), this, SLOT( onRemoveAllClicked() ) );
-  connect( myFreeBoundBtn, SIGNAL(clicked()), this, SLOT(onDetect()) );
+  connect(GroupPoints->LineEdit1,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit2,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
 
-  initName( tr( "REMOVE_HOLES_NEW_OBJ_NAME" ) );
-}
+  connect(GroupPoints->CheckButton1, SIGNAL(clicked()), this, SLOT(onRemoveAllClicked()));
+
+  connect(myFreeBoundBtn, SIGNAL(clicked()), this, SLOT(onDetect()));
 
+  initName(tr("REMOVE_HOLES_NEW_OBJ_NAME"));
+
+  GroupPoints->PushButton1->click();
+  SelectionIntoArgument();
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -164,7 +142,7 @@ void RepairGUI_RemoveHolesDlg::Init()
 //=================================================================================
 void RepairGUI_RemoveHolesDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
@@ -174,57 +152,65 @@ void RepairGUI_RemoveHolesDlg::ClickOnOk()
 //=================================================================================
 bool RepairGUI_RemoveHolesDlg::ClickOnApply()
 {
-  if ( !onAccept() )
+  if (!onAccept())
     return false;
 
   initName();
-
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  myEditCurrentArgument->setText("");
-  mySelectWiresEdt->setText("");
-  myObject = GEOM::GEOM_Object::_nil();
-  myWiresInd->length( 0 );
-
-  initSelection();
-
+  // activate first line edit
+  GroupPoints->PushButton1->click();
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void RepairGUI_RemoveHolesDlg::SelectionIntoArgument()
 {
   erasePreview();
   myEditCurrentArgument->setText("");
-  if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myObject = GEOM::GEOM_Object::_nil();
-  else if ( myEditCurrentArgument == mySelectWiresEdt ) myWiresInd->length( 0 );
+  // the second argument depends on the first one
+  GroupPoints->LineEdit2->setText("");
+  myWiresInd->length(0);
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1)
+    myObject = GEOM::GEOM_Object::_nil();
 
-  if ( IObjectCount() == 1 )
-  {
-    Handle(SALOME_InteractiveObject) anIO = firstIObject();
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
 
-    if ( myEditCurrentArgument == GroupPoints->LineEdit1 )     // face selection
-    {
+  if (aSelList.Extent() == 1) {
+    Handle(SALOME_InteractiveObject) anIO = aSelList.First();
+
+    if (myEditCurrentArgument == GroupPoints->LineEdit1) { // face selection
       Standard_Boolean aRes;
-      myObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
-      if ( aRes && GEOMBase::IsShape( myObject ) )
-        myEditCurrentArgument->setText( GEOMBase::GetName( myObject ) );
+      myObject = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
+      if (aRes && GEOMBase::IsShape(myObject)) {
+        myEditCurrentArgument->setText(GEOMBase::GetName(myObject));
+
+        // clear selection
+        disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+        myGeomGUI->getApp()->selectionMgr()->clearSelected();
+        connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+                this, SLOT(SelectionIntoArgument()));
+
+        if (!GroupPoints->CheckButton1->isChecked())
+          GroupPoints->PushButton2->click();
+      }
       else
         myObject = GEOM::GEOM_Object::_nil();
     }
-    else if ( myEditCurrentArgument == mySelectWiresEdt && !myAllChk->isChecked() )
-    {
+    else if (myEditCurrentArgument == GroupPoints->LineEdit2 &&
+             !GroupPoints->CheckButton1->isChecked()) {
       TColStd_IndexedMapOfInteger aMap;
-      ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->GetIndexes( anIO, aMap );
+      aSelMgr->GetIndexes(anIO, aMap);
       const int n = aMap.Extent();
-      myWiresInd->length( n );
-      for ( int i = 1; i <= n; i++ )
-       myWiresInd[i-1] = aMap( i );
-      if ( n )
-       myEditCurrentArgument->setText( QString::number( n ) + "_" + tr( "GEOM_WIRE" ) + tr( "_S_" ) );
+      myWiresInd->length(n);
+      for (int i = 1; i <= n; i++)
+        myWiresInd[i-1] = aMap(i);
+      if (n)
+        myEditCurrentArgument->setText(QString::number(n) + "_" + tr("GEOM_WIRE") + tr("_S_"));
     }
   }
 }
@@ -235,20 +221,36 @@ void RepairGUI_RemoveHolesDlg::SelectionIntoArgument()
 //=================================================================================
 void RepairGUI_RemoveHolesDlg::SetEditCurrentArgument()
 {
-  const QObject* send = sender();
-  if ( send == GroupPoints->PushButton1 )
-    myEditCurrentArgument = GroupPoints->LineEdit1; 
-  else if ( send == mySelectWiresBtn && !myObject->_is_nil() )
-    myEditCurrentArgument = mySelectWiresEdt;
-  if ( myEditCurrentArgument )
-  {
+  QPushButton* send = (QPushButton*)sender();
+
+  bool isEffective = false;
+
+  if (send == GroupPoints->PushButton1) {
+    isEffective = true;
+    myEditCurrentArgument = GroupPoints->LineEdit1;
+
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
+  }
+  else if (send == GroupPoints->PushButton2 && !myObject->_is_nil()) {
+    isEffective = true;
+    myEditCurrentArgument = GroupPoints->LineEdit2;
+
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+  }
+
+  if (isEffective) {
     initSelection();
+
+    // enable line edit
+    myEditCurrentArgument->setEnabled(true);
     myEditCurrentArgument->setFocus();
-    SelectionIntoArgument();
+    // after setFocus(), because it will be setDown(false) when loses focus
+    send->setDown(true);
   }
 }
 
-
 //=================================================================================
 // function : LineEditReturnPressed()
 // purpose  :
@@ -256,14 +258,12 @@ void RepairGUI_RemoveHolesDlg::SetEditCurrentArgument()
 void RepairGUI_RemoveHolesDlg::LineEditReturnPressed()
 {
   const QObject* send = sender();
-  if( send == GroupPoints->LineEdit1 || send == mySelectWiresEdt )
-  {
+  if (send == GroupPoints->LineEdit1 || send == GroupPoints->LineEdit2) {
     myEditCurrentArgument = (QLineEdit*)send;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
 }
 
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -271,97 +271,86 @@ void RepairGUI_RemoveHolesDlg::LineEditReturnPressed()
 void RepairGUI_RemoveHolesDlg::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() ) );
 
   myEditCurrentArgument = GroupPoints->LineEdit1;
-  myEditCurrentArgument->setText("");
-  mySelectWiresEdt->setText("");
+  myEditCurrentArgument->setText( "" );
+  GroupPoints->LineEdit2->setText( "" );
   myObject = GEOM::GEOM_Object::_nil();
   myWiresInd->length( 0 );
 
   myClosed = -1;
   myOpen = -1;
 
-  //myGeomGUI->SetState( 0 );
   initSelection();
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  : Mouse enter onto the dialog to activate it
 //=================================================================================
-void RepairGUI_RemoveHolesDlg::enterEvent(QEvent* e)
+void RepairGUI_RemoveHolesDlg::enterEvent (QEvent*)
 {
-  if ( !GroupConstructors->isEnabled() )
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-
-//=================================================================================
-// function : closeEvent()
-// purpose  :
-//=================================================================================
-void RepairGUI_RemoveHolesDlg::closeEvent(QCloseEvent* e)
-{
-  //myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
 GEOM::GEOM_IOperations_ptr RepairGUI_RemoveHolesDlg::createOperation()
 {
-  return getGeomEngine()->GetIHealingOperations( getStudyId() );
+  return getGeomEngine()->GetIHealingOperations(getStudyId());
 }
 
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool RepairGUI_RemoveHolesDlg::isValid( QString& msg )
+bool RepairGUI_RemoveHolesDlg::isValid (QString&)
 {
   myClosed = -1;
-  return !myObject->_is_nil() && ( IsPreview() || myAllChk->isChecked() || myWiresInd->length() );
+  return !myObject->_is_nil() && (IsPreview() || GroupPoints->CheckButton1->isChecked() || myWiresInd->length());
 }
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool RepairGUI_RemoveHolesDlg::execute( ObjectList& objects )
+bool RepairGUI_RemoveHolesDlg::execute (ObjectList& objects)
 {
   bool aResult = false;
-  if ( IsPreview() ) // called from onDetect(): detect free boundary edges, highlight them (add to objects), display message dialog
-  {
+
+  if (IsPreview()) {
+    // called from onDetect(): detect free boundary edges,
+    // highlight them (add to objects), display message dialog
     GEOM::ListOfGO_var aClosed, anOpen;
 
-    aResult = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )->GetFreeBoundary( myObject, aClosed, anOpen );
+    aResult = GEOM::GEOM_IHealingOperations::_narrow(getOperation())->
+      GetFreeBoundary(myObject, aClosed, anOpen);
 
-    if ( aResult )
-    {
+    if (aResult) {
       myClosed = aClosed->length();
       myOpen = anOpen->length();
       int i;
-      for ( i = 0; i < myClosed; i++ )
-       objects.push_back( aClosed[i]._retn() );
-      for ( i = 0; i < myOpen; i++ )
-       objects.push_back( anOpen[i]._retn() );
+      for (i = 0; i < myClosed; i++)
+        objects.push_back(aClosed[i]._retn());
+      for (i = 0; i < myOpen; i++)
+        objects.push_back(anOpen[i]._retn());
     }
     else
       myClosed = -1;
   }
-  else
-  {
-    GEOM::GEOM_Object_var anObj = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )->FillHoles( myObject, myWiresInd );
+  else {
+    GEOM::GEOM_Object_var anObj = GEOM::GEOM_IHealingOperations::_narrow(getOperation())->
+      FillHoles(myObject, myWiresInd);
     aResult = !anObj->_is_nil();
-    if ( aResult )
-      objects.push_back( anObj._retn() );
+    if (aResult)
+      objects.push_back(anObj._retn());
   }
-       
+
   return aResult;
 }
 
@@ -371,14 +360,13 @@ bool RepairGUI_RemoveHolesDlg::execute( ObjectList& objects )
 //=================================================================================
 void RepairGUI_RemoveHolesDlg::onRemoveAllClicked()
 {
-  bool b = myAllChk->isOn();
-  mySelectWiresLbl->setEnabled( !b );
-  mySelectWiresBtn->setEnabled( !b );
-  mySelectWiresEdt->setEnabled( !b );
-  if ( b )
-  {
-    mySelectWiresEdt->setText( "" );
-    myWiresInd->length( 0 );
+  bool b = GroupPoints->CheckButton1->isChecked();
+  GroupPoints->TextLabel2->setEnabled(!b);
+  GroupPoints->PushButton2->setEnabled(!b);
+  GroupPoints->LineEdit2->setEnabled(!b);
+  if (b) {
+    GroupPoints->LineEdit2->setText("");
+    myWiresInd->length(0);
   }
 }
 
@@ -388,23 +376,25 @@ void RepairGUI_RemoveHolesDlg::onRemoveAllClicked()
 //=================================================================================
 void RepairGUI_RemoveHolesDlg::initSelection()
 {
-  if ( myEditCurrentArgument == GroupPoints->LineEdit1 )
-  {
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
     TColStd_MapOfInteger aTypes;
-    aTypes.Add( GEOM_COMPOUND );
-    aTypes.Add( GEOM_SOLID );
-    aTypes.Add( GEOM_SHELL );
-    aTypes.Add( GEOM_FACE );
-    
-    globalSelection( aTypes );
+    aTypes.Add(GEOM_COMPOUND);
+    aTypes.Add(GEOM_SOLID);
+    aTypes.Add(GEOM_SHELL);
+    aTypes.Add(GEOM_FACE);
+
+    globalSelection(aTypes);
   }
-  else if ( myEditCurrentArgument == mySelectWiresEdt )
-  {
-    localSelection( myObject, TopAbs_EDGE );
-    localSelection( myObject, TopAbs_WIRE );
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
+    localSelection(myObject, TopAbs_EDGE);
+    localSelection(myObject, TopAbs_WIRE);
   }
-}
 
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+}
 
 //=================================================================================
 // function : onDetect
@@ -412,14 +402,13 @@ void RepairGUI_RemoveHolesDlg::initSelection()
 //=================================================================================
 void RepairGUI_RemoveHolesDlg::onDetect()
 {
-  displayPreview( false, true, true, 3 );
+  displayPreview(false, true, true, 3);
 
   // field myClosed,myOpen is initialized in execute() method, called by displayPreview().
   QString msg;
-  if ( myClosed != -1 )
-    msg = tr( "GEOM_FREE_BOUNDS_MSG" ).arg( myClosed + myOpen ).arg( myClosed ).arg( myOpen );
+  if (myClosed != -1)
+    msg = tr("GEOM_FREE_BOUNDS_MSG").arg(myClosed + myOpen).arg(myClosed).arg(myOpen);
   else
-    msg = tr( "GEOM_FREE_BOUNDS_ERROR" );
-  SUIT_MessageBox::info1( this, tr( "GEOM_FREE_BOUNDS_TLT" ), msg, "Close" );
+    msg = tr("GEOM_FREE_BOUNDS_ERROR");
+  SUIT_MessageBox::information(this, tr("GEOM_FREE_BOUNDS_TLT"), msg);
 }
-
index 88a853d4145a176c44d3fe68d584155bd755f406..efe07f6a15943f0ea55cdae6ad82ecd6b51a0409 100644 (file)
@@ -1,42 +1,35 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : RepairGUI_RemoveHolesDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_RemoveHoles_H
-#define DIALOGBOX_RemoveHoles_H
-
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_Ext.h"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_RemoveHolesDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef REPAIRGUI_REMOVEHOLESDLG_H
+#define REPAIRGUI_REMOVEHOLESDLG_H
 
-#include <TColStd_IndexedMapOfInteger.hxx>
+#include <GEOMBase_Skeleton.h>
 
-#include <qcheckbox.h>
-#include <qbuttongroup.h>
-#include <qlineedit.h>
-#include <qlabel.h>
+class DlgRef_1Sel1Check1Sel;
+class QPushButton;
 
 //=================================================================================
 // class    : RepairGUI_RemoveHolesDlg
 //=================================================================================
 class RepairGUI_RemoveHolesDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    RepairGUI_RemoveHolesDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                            const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~RepairGUI_RemoveHolesDlg();
+  RepairGUI_RemoveHolesDlg( GeometryGUI*, QWidget* = 0, bool = false );
+  ~RepairGUI_RemoveHolesDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    void closeEvent(QCloseEvent* e);
-    void initSelection();
-
-    GEOM::GEOM_Object_var myObject;
-    GEOM::short_array_var myWiresInd;
-
-    DlgRef_1Sel_Ext* GroupPoints;
-    QCheckBox*       myAllChk;
-    QLabel*          mySelectWiresLbl;
-    QPushButton*     mySelectWiresBtn;
-    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().
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  void                               initSelection();
+  
+private:
+  GEOM::GEOM_Object_var              myObject;
+  GEOM::short_array_var              myWiresInd;
+  
+  DlgRef_1Sel1Check1Sel*             GroupPoints;
+  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().
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
 
-    void ActivateThisDialog();
+  void                               ActivateThisDialog();
 
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 
-    void onRemoveAllClicked();
-    void onDetect();
+  void                               onRemoveAllClicked();
+  void                               onDetect();
 };
 
-#endif // DIALOGBOX_RemoveHoles_H
+#endif // REPAIRGUI_REMOVEHOLESDLG_H
index 483d2a16d75b1951229f5d658bf3393c951c206d..8079b166d4e3c0fd2a82df72c20a4563c8d6c499 100644 (file)
@@ -1,44 +1,45 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_RemoveIntWiresDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : RepairGUI_RemoveIntWiresDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "RepairGUI_RemoveIntWiresDlg.h"
 
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SUIT_Session.h"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include "GEOMImpl_Types.hxx"
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
+// OCCT Includes
 #include <TopAbs.hxx>
 #include <TColStd_MapOfInteger.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
 
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : RepairGUI_RemoveIntWiresDlg()
@@ -47,53 +48,36 @@ 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(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)
+RepairGUI_RemoveIntWiresDlg::RepairGUI_RemoveIntWiresDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                          bool modal)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal)
 {
-  QPixmap image0 (myGeomGUI->getApp()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SUPPRESS_INT_WIRES")));
-  QPixmap image1 (myGeomGUI->getApp()->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"));
+  setWindowTitle(tr("GEOM_REMOVE_INTERNAL_WIRES_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_REMOVE_INTERNAL_WIRES_TITLE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel_Ext(this, "GroupPoints");
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_REMOVE_INTERNAL_WIRES_TITLE"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_1Sel1Check1Sel(centralWidget());
   GroupPoints->GroupBox1->setTitle(tr("GEOM_INTERNAL_WIRES"));
   GroupPoints->TextLabel1->setText(tr("GEOM_SELECTED_FACE"));
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->LineEdit1->setReadOnly( true );
-
-  Layout1->addWidget(GroupPoints, 2, 0);
-
-  myAllChk = new QCheckBox( tr( "GEOM_REMOVE_ALL_INT_WIRES" ), GroupPoints->GroupBox1 );
-
-  QGridLayout* aSelectWiresLay = new QGridLayout( 0, 1, 1, 0, 6, "aSelectWiresLay");
-
-  mySelectWiresBtn = new QPushButton( GroupPoints->GroupBox1, "mySelectWiresBtn" );
-  mySelectWiresBtn->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, mySelectWiresBtn->sizePolicy().hasHeightForWidth() ) );
-  mySelectWiresBtn->setText( trUtf8( "" ) );
-  mySelectWiresBtn->setPixmap(image1);
-  
-  mySelectWiresEdt = new QLineEdit( GroupPoints->GroupBox1, "mySelectWiresEdt" );
-  mySelectWiresEdt->setReadOnly( true );
-
-  mySelectWiresLbl = new QLabel( tr( "GEOM_WIRES_TO_REMOVE" ), GroupPoints->GroupBox1, "TextLabel1" );
-  mySelectWiresLbl->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, mySelectWiresLbl->sizePolicy().hasHeightForWidth() ) );
-
-  aSelectWiresLay->addWidget( mySelectWiresLbl, 0, 0 );
-       aSelectWiresLay->addWidget( mySelectWiresBtn, 0, 1 );  
-  aSelectWiresLay->addWidget( mySelectWiresEdt, 0, 2 );
-  QSpacerItem* spacer = new QSpacerItem( 0, 16, QSizePolicy::Minimum, QSizePolicy::Expanding );
-  aSelectWiresLay->addItem( spacer, 1, 2 );
-
-  GroupPoints->getGroupBoxLayout()->addMultiCellWidget( myAllChk, 1, 1, 0, 2 );
-  GroupPoints->getGroupBoxLayout()->addLayout( aSelectWiresLay, 2, 0 );  
+  GroupPoints->PushButton1->setIcon(image1);
+  GroupPoints->LineEdit1->setReadOnly(true);
+  GroupPoints->CheckButton1->setText(tr("GEOM_REMOVE_ALL_INT_WIRES"));
+  GroupPoints->TextLabel2->setText(tr("GEOM_WIRES_TO_REMOVE"));
+  GroupPoints->PushButton2->setIcon(image1);
+  GroupPoints->LineEdit2->setReadOnly(true);
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
   /***************************************************************/
 
   setHelpFileName("suppress_internal_wires_operation_page.html");
@@ -101,7 +85,6 @@ RepairGUI_RemoveIntWiresDlg::RepairGUI_RemoveIntWiresDlg(GeometryGUI* theGeometr
   Init();
 }
 
-
 //=================================================================================
 // function : ~RepairGUI_RemoveIntWiresDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -110,48 +93,44 @@ RepairGUI_RemoveIntWiresDlg::~RepairGUI_RemoveIntWiresDlg()
 {
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void RepairGUI_RemoveIntWiresDlg::Init()
 {
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-
+  // init variables
+  GroupPoints->LineEdit1->clear();
+  GroupPoints->LineEdit2->clear();
   myObject = GEOM::GEOM_Object::_nil();
-       myWiresInd = new GEOM::short_array();
-       myWiresInd->length( 0 );
+  myWiresInd = new GEOM::short_array();
+  myWiresInd->length(0);
 
-  //myGeomGUI->SetState( 0 );
-  initSelection(); 
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
 
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect(GroupPoints->PushButton1, SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton2, SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(mySelectWiresBtn, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(mySelectWiresEdt, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit1,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit2,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect(GroupPoints->CheckButton1, SIGNAL(clicked()), this, SLOT(onRemoveAllClicked()));
 
-  connect( myAllChk, SIGNAL( clicked() ), this, SLOT( onRemoveAllClicked() ) );
+  initName(tr("REMOVE_INT_WIRES_NEW_OBJ_NAME"));
 
-  initName( tr( "REMOVE_INT_WIRES_NEW_OBJ_NAME" ) );
+  GroupPoints->PushButton1->click();
+  SelectionIntoArgument();
 }
 
-
 //=================================================================================
 // function : ClickOnOk()
 // purpose  : Same than click on apply but close this dialog.
 //=================================================================================
 void RepairGUI_RemoveIntWiresDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
@@ -161,58 +140,66 @@ void RepairGUI_RemoveIntWiresDlg::ClickOnOk()
 //=================================================================================
 bool RepairGUI_RemoveIntWiresDlg::ClickOnApply()
 {
-  if ( !onAccept() )
-       return false;
+  if (!onAccept())
+    return false;
 
   initName();
-
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  myEditCurrentArgument->setText("");
-  mySelectWiresEdt->setText("");
-  myObject = GEOM::GEOM_Object::_nil();
-       myWiresInd->length( 0 );
-
-       initSelection();
-
+  // activate first line edit
+  GroupPoints->PushButton1->click();
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void RepairGUI_RemoveIntWiresDlg::SelectionIntoArgument()
 {
   myEditCurrentArgument->setText("");
-  if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myObject = GEOM::GEOM_Object::_nil();
-  else if ( myEditCurrentArgument == mySelectWiresEdt ) myWiresInd->length( 0 );
-
-  if ( IObjectCount() == 1 )
-    {
-      Handle(SALOME_InteractiveObject) anIO = firstIObject();
-      
-      if ( myEditCurrentArgument == GroupPoints->LineEdit1 )   // face selection
-       {
-         Standard_Boolean aRes;
-         myObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
-         if ( aRes && GEOMBase::IsShape( myObject ) )
-           myEditCurrentArgument->setText( GEOMBase::GetName( myObject ) );
-         else
-           myObject = GEOM::GEOM_Object::_nil();
-       }
-      else if ( myEditCurrentArgument == mySelectWiresEdt && !myAllChk->isChecked() )
-       {
-         TColStd_IndexedMapOfInteger aMap;
-         ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->GetIndexes( anIO, aMap );
-         const int n = aMap.Extent();
-         myWiresInd->length( n );
-         for ( int i = 1; i <= n; i++ )
-           myWiresInd[i-1] = aMap( i );
-         if ( n )
-           myEditCurrentArgument->setText( QString::number( n ) + "_" + tr( "GEOM_WIRE" ) + tr( "_S_" ) );
-       }
+  // the second argument depends on the first one
+  GroupPoints->LineEdit2->setText("");
+  myWiresInd->length(0);
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1)
+    myObject = GEOM::GEOM_Object::_nil();
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() == 1) {
+    Handle(SALOME_InteractiveObject) anIO = aSelList.First();
+
+    if (myEditCurrentArgument == GroupPoints->LineEdit1) { // face selection
+      Standard_Boolean aRes;
+      myObject = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
+      if (aRes && GEOMBase::IsShape(myObject)) {
+        myEditCurrentArgument->setText(GEOMBase::GetName(myObject));
+
+        // clear selection
+        disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+        myGeomGUI->getApp()->selectionMgr()->clearSelected();
+        connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+                this, SLOT(SelectionIntoArgument()));
+
+        if (!GroupPoints->CheckButton1->isChecked())
+          GroupPoints->PushButton2->click();
+      }
+      else
+        myObject = GEOM::GEOM_Object::_nil();
     }
+    else if (myEditCurrentArgument == GroupPoints->LineEdit2 &&
+             !GroupPoints->CheckButton1->isChecked()) {
+      TColStd_IndexedMapOfInteger aMap;
+      aSelMgr->GetIndexes(anIO, aMap);
+      const int n = aMap.Extent();
+      myWiresInd->length(n);
+      for (int i = 1; i <= n; i++)
+        myWiresInd[i-1] = aMap(i);
+      if (n)
+        myEditCurrentArgument->setText(QString::number(n) + "_" + tr("GEOM_WIRE") + tr("_S_"));
+    }
+  }
 }
 
 //=================================================================================
@@ -221,20 +208,35 @@ void RepairGUI_RemoveIntWiresDlg::SelectionIntoArgument()
 //=================================================================================
 void RepairGUI_RemoveIntWiresDlg::SetEditCurrentArgument()
 {
-       const QObject* send = sender();
-  if ( send == GroupPoints->PushButton1 )
-       myEditCurrentArgument = GroupPoints->LineEdit1;
-  else if ( send == mySelectWiresBtn && !myObject->_is_nil() )
-       myEditCurrentArgument = mySelectWiresEdt;
-
-  if ( myEditCurrentArgument )
-  {
-       initSelection();
-       myEditCurrentArgument->setFocus();
-       SelectionIntoArgument();
+  QPushButton* send = (QPushButton*)sender();
+
+  bool isEffective = false;
+
+  if (send == GroupPoints->PushButton1) {
+    isEffective = true;
+    myEditCurrentArgument = GroupPoints->LineEdit1;
+
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
   }
-}
+  else if (send == GroupPoints->PushButton2 && !myObject->_is_nil()) {
+    isEffective = true;
+    myEditCurrentArgument = GroupPoints->LineEdit2;
 
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+  }
+
+  if (isEffective) {
+    initSelection();
+
+    // enable line edit
+    myEditCurrentArgument->setEnabled(true);
+    myEditCurrentArgument->setFocus();
+    // after setFocus(), because it will be setDown(false) when loses focus
+    send->setDown(true);
+  }
+}
 
 //=================================================================================
 // function : LineEditReturnPressed()
@@ -242,15 +244,13 @@ void RepairGUI_RemoveIntWiresDlg::SetEditCurrentArgument()
 //=================================================================================
 void RepairGUI_RemoveIntWiresDlg::LineEditReturnPressed()
 {
-       const QObject* send = sender();
-  if( send == GroupPoints->LineEdit1 || send == mySelectWiresEdt )
-  {
+  const QObject* send = sender();
+  if (send == GroupPoints->LineEdit1 || send == GroupPoints->LineEdit2) {
     myEditCurrentArgument = (QLineEdit*)send;
-         GEOMBase_Skeleton::LineEditReturnPressed();
-       }
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
 }
 
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -258,12 +258,12 @@ void RepairGUI_RemoveIntWiresDlg::LineEditReturnPressed()
 void RepairGUI_RemoveIntWiresDlg::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() ) );
 
   myEditCurrentArgument = GroupPoints->LineEdit1;
-  myEditCurrentArgument->setText("");
-  mySelectWiresEdt->setText("");
+  myEditCurrentArgument->setText( "" );
+  GroupPoints->LineEdit2->setText( "" );
   myObject = GEOM::GEOM_Object::_nil();
   myWiresInd->length( 0 );
 
@@ -275,51 +275,42 @@ void RepairGUI_RemoveIntWiresDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  : Mouse enter onto the dialog to activate it
 //=================================================================================
-void RepairGUI_RemoveIntWiresDlg::enterEvent(QEvent* e)
+void RepairGUI_RemoveIntWiresDlg::enterEvent (QEvent*)
 {
-  if ( !GroupConstructors->isEnabled() )
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-//=================================================================================
-// function : closeEvent()
-// purpose  :
-//=================================================================================
-void RepairGUI_RemoveIntWiresDlg::closeEvent(QCloseEvent* e)
-{
-  //myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
 GEOM::GEOM_IOperations_ptr RepairGUI_RemoveIntWiresDlg::createOperation()
 {
-  return getGeomEngine()->GetIHealingOperations( getStudyId() );
+  return getGeomEngine()->GetIHealingOperations(getStudyId());
 }
 
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool RepairGUI_RemoveIntWiresDlg::isValid( QString& msg )
+bool RepairGUI_RemoveIntWiresDlg::isValid (QString&)
 {
-       return !myObject->_is_nil() && ( myAllChk->isChecked() || myWiresInd->length() );
+  return !myObject->_is_nil() && (GroupPoints->CheckButton1->isChecked() || myWiresInd->length());
 }
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool RepairGUI_RemoveIntWiresDlg::execute( ObjectList& objects )
+bool RepairGUI_RemoveIntWiresDlg::execute (ObjectList& objects)
 {
-  GEOM::GEOM_Object_var anObj = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )->
-    RemoveIntWires( myObject, myWiresInd );
+  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() );
+  if (aResult)
+    objects.push_back(anObj._retn());
 
   return aResult;
 }
@@ -330,14 +321,13 @@ bool RepairGUI_RemoveIntWiresDlg::execute( ObjectList& objects )
 //=================================================================================
 void RepairGUI_RemoveIntWiresDlg::onRemoveAllClicked()
 {
-  bool b = myAllChk->isOn();
-  mySelectWiresLbl->setEnabled( !b );
-  mySelectWiresBtn->setEnabled( !b );
-  mySelectWiresEdt->setEnabled( !b );
-  if ( b )
-  {
-    mySelectWiresEdt->setText( "" );
-    myWiresInd->length( 0 );
+  bool b = GroupPoints->CheckButton1->isChecked();
+  GroupPoints->TextLabel2->setEnabled(!b);
+  GroupPoints->PushButton2->setEnabled(!b);
+  GroupPoints->LineEdit2->setEnabled(!b);
+  if (b) {
+    GroupPoints->LineEdit2->setText("");
+    myWiresInd->length(0);
   }
 }
 
@@ -347,19 +337,22 @@ void RepairGUI_RemoveIntWiresDlg::onRemoveAllClicked()
 //=================================================================================
 void RepairGUI_RemoveIntWiresDlg::initSelection()
 {
-  if ( myEditCurrentArgument == GroupPoints->LineEdit1 )
-  {
-       TColStd_MapOfInteger aTypes;
-       aTypes.Add( GEOM_COMPOUND );
-       aTypes.Add( GEOM_SOLID );
-       aTypes.Add( GEOM_SHELL );
-       aTypes.Add( GEOM_FACE );
-       
-       globalSelection( aTypes );
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
+    TColStd_MapOfInteger aTypes;
+    aTypes.Add(GEOM_COMPOUND);
+    aTypes.Add(GEOM_SOLID);
+    aTypes.Add(GEOM_SHELL);
+    aTypes.Add(GEOM_FACE);
+
+    globalSelection(aTypes);
   }
-  else if ( myEditCurrentArgument == mySelectWiresEdt )
-  {
-    //localSelection( myObject, TopAbs_EDGE );
-    localSelection( myObject, TopAbs_WIRE );
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
+    //localSelection(myObject, TopAbs_EDGE);
+    localSelection(myObject, TopAbs_WIRE);
   }
+
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 }
index 17cf0f364395cdb3995872e06d30bd686489155d..838a6ecde2ca2ae2b34462113208b5af1bd8a91a 100644 (file)
@@ -1,42 +1,34 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : RepairGUI_RemoveIntWiresDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_RemoveIntWires_H
-#define DIALOGBOX_RemoveIntWires_H
-
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_Ext.h"
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_RemoveIntWiresDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef REPAIRGUI_REMOVEINTWIRESDLG_H
+#define REPAIRGUI_REMOVEINTWIRESDLG_H
 
-#include <TColStd_IndexedMapOfInteger.hxx>
+#include <GEOMBase_Skeleton.h>
 
-#include <qcheckbox.h>
-#include <qbuttongroup.h>
-#include <qlineedit.h>
-#include <qlabel.h>
+class DlgRef_1Sel1Check1Sel;
 
 //=================================================================================
 // class    : RepairGUI_RemoveIntWiresDlg
 //=================================================================================
 class RepairGUI_RemoveIntWiresDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    RepairGUI_RemoveIntWiresDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                               const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~RepairGUI_RemoveIntWiresDlg();
-
+  RepairGUI_RemoveIntWiresDlg( GeometryGUI*, QWidget* = 0, bool = false );
+  ~RepairGUI_RemoveIntWiresDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    void closeEvent(QCloseEvent* e);
-    void initSelection();
-
-    GEOM::GEOM_Object_var myObject;
-    GEOM::short_array_var myWiresInd;
-
-    DlgRef_1Sel_Ext* GroupPoints;
-    QCheckBox*       myAllChk;
-    QLabel*          mySelectWiresLbl;
-    QPushButton*     mySelectWiresBtn;
-    QLineEdit*       mySelectWiresEdt;
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  void                               initSelection();
+  
+private:
+  GEOM::GEOM_Object_var              myObject;
+  GEOM::short_array_var              myWiresInd;
+  
+  DlgRef_1Sel1Check1Sel*             GroupPoints;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-
-    void ActivateThisDialog();
-
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-
-    void onRemoveAllClicked();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  
+  void                               ActivateThisDialog();
+  
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  
+  void                               onRemoveAllClicked();
 };
 
-#endif // DIALOGBOX_RemoveIntWires_H
+#endif // REPAIRGUI_REMOVEINTWIRESDLG_H
index 78a12bbfb465042afa178e3ae4147bf6a4dc7a0c..a5d6465d92d050570f6e8d71b940f16211d66b58 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_SewingDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//
-//  File   : RepairGUI_SewingDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "RepairGUI_SewingDlg.h"
 
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+#include <QtxDoubleSpinBox.h>
+
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <SUIT_Session.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_ResourceMgr.h>
 
-#include "GEOMImpl_Types.hxx"
+#include <GEOMImpl_Types.hxx>
 
 #include <TopAbs.hxx>
 #include <TColStd_MapOfInteger.hxx>
 
 #define DEFAULT_TOLERANCE_VALUE 1e-07
 
-using namespace std;
-
 //=================================================================================
 // class    : RepairGUI_SewingDlg()
 // purpose  : Constructs a RepairGUI_SewingDlg  which is a child of 'parent', with the
@@ -50,46 +50,46 @@ 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(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)
+RepairGUI_SewingDlg::RepairGUI_SewingDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                         bool modal )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SEWING")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_SEWING" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_SEWING_TITLE"));
+  setWindowTitle( tr( "GEOM_SEWING_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_SEWING_TITLE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel_Ext(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_SEWING"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_SELECTED_SHAPE"));
-  GroupPoints->PushButton1->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_SEWING_TITLE" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_1SelExt( centralWidget() );
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_SEWING" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_SELECTED_SHAPE" ) );
+  GroupPoints->PushButton1->setIcon( image1 );
   GroupPoints->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget(GroupPoints, 2, 0);
-
-  QGridLayout* aLay = new QGridLayout( 0, 2, 2, 0, 6, "aLay" );
-  myTolEdt = new QtxDblSpinBox( 0, 100, 1e-7, GroupPoints->GroupBox1 );//QAD_SpinBoxDbl( GroupPoints->GroupBox1, 0, 100, 1e-7, 10, 1e-10 );
-  myTolEdt->setPrecision( 10 );
+  QGridLayout* aLay = new QGridLayout( GroupPoints->Box );
+  aLay->setMargin( 0 ); aLay->setSpacing( 6 );
+  myTolEdt = new SalomeApp_DoubleSpinBox( 0.0, 100.0, DEFAULT_TOLERANCE_VALUE, 7, 10, GroupPoints->Box );
   myTolEdt->setValue( DEFAULT_TOLERANCE_VALUE );
-  QLabel* aLbl1 = new QLabel( tr( "GEOM_TOLERANCE" ), GroupPoints->GroupBox1 );
-       myFreeBoundBtn = new QPushButton( tr( "GEOM_DETECT" ), GroupPoints->GroupBox1 );
-  QLabel* aLbl2 = new QLabel( tr( "GEOM_FREE_BOUNDARIES" ), GroupPoints->GroupBox1 );
-  aLay->addWidget( aLbl1, 0, 0 );
-  aLay->addWidget( myTolEdt, 0, 1 );
-  aLay->addWidget( aLbl2, 1, 0 );
-  aLay->addWidget( myFreeBoundBtn, 1, 1 );
-
-  GroupPoints->getGroupBoxLayout()->addLayout( aLay, 3, 0 );
+  QLabel* aLbl1 = new QLabel( tr( "GEOM_TOLERANCE" ), GroupPoints->Box );
+  myFreeBoundBtn = new QPushButton( tr( "GEOM_DETECT" ) + QString( " [%1]" ).arg( tr( "GEOM_FREE_BOUNDARIES" ) ), 
+                                   GroupPoints->Box );
+  aLay->addWidget( aLbl1,          0, 0 );
+  aLay->addWidget( myTolEdt,       0, 1 );
+  aLay->addWidget( myFreeBoundBtn, 1, 0, 1, 2 );
+
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
   /***************************************************************/
 
-  setHelpFileName("sewing_operation_page.html");
+  setHelpFileName( "sewing_operation_page.html" );
 
   Init();
 }
@@ -122,16 +122,16 @@ void RepairGUI_SewingDlg::Init()
   myOpen = -1;
        
   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPoints->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
-  connect(myFreeBoundBtn, SIGNAL(clicked()), this, SLOT(onDetect()));
+  connect( myFreeBoundBtn, SIGNAL( clicked() ), this, SLOT( onDetect() ) );
 
   initName( tr( "SEWING_NEW_OBJ_NAME" ) );
 }
@@ -158,7 +158,7 @@ bool RepairGUI_SewingDlg::ClickOnApply()
 
   initName();
 
-  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit1->setText( "" );
   myObject = GEOM::GEOM_Object::_nil();
 
   initSelection();
@@ -174,12 +174,15 @@ bool RepairGUI_SewingDlg::ClickOnApply()
 void RepairGUI_SewingDlg::SelectionIntoArgument()
 {
   erasePreview();
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   myObject = GEOM::GEOM_Object::_nil();
 
-  if ( IObjectCount() == 1 )
-  {
-    Handle(SALOME_InteractiveObject) anIO = firstIObject();
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if ( aSelList.Extent() == 1 ) {
+    Handle(SALOME_InteractiveObject) anIO = aSelList.First();
     Standard_Boolean aRes;
     myObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
     if ( aRes )
@@ -194,8 +197,7 @@ void RepairGUI_SewingDlg::SelectionIntoArgument()
 void RepairGUI_SewingDlg::SetEditCurrentArgument()
 {
   const QObject* send = sender();
-  if ( send == GroupPoints->PushButton1 )
-  {
+  if ( send == GroupPoints->PushButton1 ) {
     myEditCurrentArgument->setFocus();
     SelectionIntoArgument();
   }
@@ -209,8 +211,7 @@ void RepairGUI_SewingDlg::SetEditCurrentArgument()
 void RepairGUI_SewingDlg::LineEditReturnPressed()
 {
   const QObject* send = sender();
-  if( send == GroupPoints->LineEdit1 )
-  {
+  if( send == GroupPoints->LineEdit1 ) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
@@ -224,10 +225,10 @@ void RepairGUI_SewingDlg::LineEditReturnPressed()
 void RepairGUI_SewingDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
-  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit1->setText( "" );
   myObject = GEOM::GEOM_Object::_nil();
 
   myClosed = -1;
@@ -242,23 +243,13 @@ void RepairGUI_SewingDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  : Mouse enter onto the dialog to activate it
 //=================================================================================
-void RepairGUI_SewingDlg::enterEvent(QEvent* e)
+void RepairGUI_SewingDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
 
-//=================================================================================
-// function : closeEvent()
-// purpose  :
-//=================================================================================
-void RepairGUI_SewingDlg::closeEvent(QCloseEvent* e)
-{
-  //myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : createOperation
 // purpose  :
@@ -275,7 +266,8 @@ GEOM::GEOM_IOperations_ptr RepairGUI_SewingDlg::createOperation()
 bool RepairGUI_SewingDlg::isValid( QString& msg )
 {
   myClosed = -1;
-  return !myObject->_is_nil() && ( IsPreview() || myTolEdt->value() > 0. );
+  bool ok = myTolEdt->isValid( msg, !IsPreview() );
+  return !myObject->_is_nil() && ( IsPreview() || myTolEdt->value() > 0. ) && ok;
 }
 
 //=================================================================================
@@ -285,14 +277,12 @@ bool RepairGUI_SewingDlg::isValid( QString& msg )
 bool RepairGUI_SewingDlg::execute( ObjectList& objects )
 {
   bool aResult = false;
-  if ( IsPreview() ) // called from onDetect(): detect free boundary edges, highlight them (add to objects), display message dialog
-  {
+  if ( IsPreview() ) { // called from onDetect(): detect free boundary edges, highlight them (add to objects), display message dialog
     GEOM::ListOfGO_var aClosed, anOpen;
 
     aResult = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )->GetFreeBoundary( myObject, aClosed, anOpen );
 
-    if ( aResult )
-    {
+    if ( aResult ) {
       myClosed = aClosed->length();
       myOpen = anOpen->length();
       int i;
@@ -304,12 +294,19 @@ bool RepairGUI_SewingDlg::execute( ObjectList& objects )
     else
       myClosed = -1;
   }
-  else
-  {
+  else {
     GEOM::GEOM_Object_var anObj = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )->Sew( myObject, myTolEdt->value() );
     aResult = !anObj->_is_nil();
     if ( aResult )
+    {
+      if ( !IsPreview() )
+      {
+       QStringList aParameters;
+       aParameters << myTolEdt->text();
+       anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+      }
       objects.push_back( anObj._retn() );
+    }
   }
 
   return aResult;
@@ -342,5 +339,5 @@ void RepairGUI_SewingDlg::onDetect()
     msg = tr( "GEOM_FREE_BOUNDS_MSG" ).arg( myClosed + myOpen ).arg( myClosed ).arg( myOpen );
   else
     msg = tr( "GEOM_FREE_BOUNDS_ERROR" );
-  SUIT_MessageBox::info1( this, tr( "GEOM_FREE_BOUNDS_TLT" ), msg, "Close" );
+  SUIT_MessageBox::information( this, tr( "GEOM_FREE_BOUNDS_TLT" ), msg );
 }
index 54483c317c8ac9d181aa9a6f801e7a8ea75e75d0..3bd6dfb7e85e7feb06bbf8700d0e2a255387aad2 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_SewingDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//
-//  File   : RepairGUI_SewingDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_Sewing_H
-#define DIALOGBOX_Sewing_H
-
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_Ext.h"
-#include "QtxDblSpinBox.h"
+#ifndef REPAIRGUI_SEWINGDLG_H
+#define REPAIRGUI_SEWINGDLG_H
 
-#include <TColStd_IndexedMapOfInteger.hxx>
+#include <GEOMBase_Skeleton.h>
 
-#include <qcheckbox.h>
-#include <qbuttongroup.h>
-#include <qlineedit.h>
-#include <qlabel.h>
+class DlgRef_1SelExt;
+class SalomeApp_DoubleSpinBox;
+class QPushButton;
 
 //=================================================================================
 // class    : RepairGUI_SewingDlg
 //=================================================================================
 class RepairGUI_SewingDlg : public GEOMBase_Skeleton
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    RepairGUI_SewingDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                       const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~RepairGUI_SewingDlg();
+  RepairGUI_SewingDlg( GeometryGUI*, QWidget* = 0, bool = false );
+  ~RepairGUI_SewingDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    void closeEvent(QCloseEvent* e);
-    void initSelection();
-
-    GEOM::GEOM_Object_var myObject;
-
-    DlgRef_1Sel_Ext* GroupPoints;
-    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().
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  void                               initSelection();
 
+private:
+  GEOM::GEOM_Object_var              myObject;
+
+  DlgRef_1SelExt*                    GroupPoints;
+  SalomeApp_DoubleSpinBox*           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().
+  
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-
-    void ActivateThisDialog();
-
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-
-    void onDetect();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  
+  void                               ActivateThisDialog();
+  
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  
+  void                               onDetect();
 };
 
-#endif // DIALOGBOX_Sewing_H
+#endif // REPAIRGUI_SEWINGDLG_H
index f0533536b0c6dc21aacdce5f4661852e6ceaf24d..1c4761341e4bef38bb5978aa629f3fcb7f2e1b8c 100755 (executable)
@@ -1,49 +1,51 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_ShapeProcessDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : RepairGUI_ShapeProcessDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "RepairGUI_ShapeProcessDlg.h"
 
-#include "GEOMImpl_Types.hxx"
-
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SUIT_Session.h"
-#include "SALOME_ListIteratorOfListIO.hxx"
-#include "SALOME_ListIO.hxx"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+#include <GEOMImpl_Types.hxx>
+#include <QtxDoubleSpinBox.h>
+
+#include <SalomeApp_Application.h>
+#include <SalomeApp_DoubleSpinBox.h>
+#include <SalomeApp_IntSpinBox.h>
+#include <LightApp_SelectionMgr.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_MessageBox.h>
+#include <SALOME_ListIteratorOfListIO.hxx>
+#include <SALOME_ListIO.hxx>
 
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_MapOfInteger.hxx>
 
-#include <qheader.h>
-#include <qlabel.h>
-#include <qmessagebox.h>
-
-using namespace std;
+#include <QListWidget>
+#include <QStackedLayout>
 
 //=================================================================================
 // class    : RepairGUI_ShapeProcessDlg()
@@ -52,12 +54,11 @@ 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(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)
+RepairGUI_ShapeProcessDlg::RepairGUI_ShapeProcessDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                     bool modal )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal )
 {
-  setHelpFileName("shape_processing_operation_page.html");
+  setHelpFileName( "shape_processing_operation_page.html" );
   init();
 }
 
@@ -80,265 +81,245 @@ void RepairGUI_ShapeProcessDlg::init()
   initParamsValues();
   initSelection();
        
-  setCaption(tr("GEOM_SHAPEPROCESS_TITLE"));
+  setWindowTitle( tr( "GEOM_SHAPEPROCESS_TITLE" ) );
 
-  GroupConstructors->hide();
+  mainFrame()->GroupConstructors->hide();
   
   // select widget on the top 
-  mySelectWdgt = new DlgRef_1Sel_QTD( this, "SelectedObjects" );
-  mySelectWdgt->GroupBox1->setTitle( tr("GEOM_SHAPE") );
-  mySelectWdgt->TextLabel1->setText( tr("GEOM_SELECTED_OBJECTS") );
-  mySelectWdgt->PushButton1->setPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")) );
+  mySelectWdgt = new DlgRef_1Sel( centralWidget() );
+  mySelectWdgt->GroupBox1->setTitle( tr( "GEOM_SHAPE" ) );
+  mySelectWdgt->TextLabel1->setText( tr( "GEOM_SELECTED_OBJECTS" ) );
+  mySelectWdgt->PushButton1->setIcon( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
   mySelectWdgt->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget( mySelectWdgt, 0, 0 );
-
   // layout the two group boxes in the middle, add a list of operations
-  QFrame* aMidFrame = new QFrame( this );
-  QGridLayout* aMidLay = new QGridLayout( aMidFrame, 1, 3, 0, 5 );
-  QGroupBox* anOperGr = new QGroupBox( tr("GEOM_OPERATIONS"), aMidFrame );
-  QVBoxLayout* aOperLay = new QVBoxLayout( anOperGr, 0, 0 );
-
-  myOpList = new QListView( anOperGr );
-  myOpList->setSorting( -1 );
-  myOpList->addColumn( "Operations" );
-  myOpList->header()->hide();
-  aOperLay->addWidget( myOpList );
-  QStringList::ConstIterator it = myOpLst.end();
-  do // iterating from end to begin so to keep the order of items in the listview.     
-    new QCheckListItem ( myOpList, *(--it), QCheckListItem::CheckBox );
-  while ( it != myOpLst.begin() );
+  QGroupBox* anOperGr = new QGroupBox( tr( "GEOM_OPERATIONS" ), centralWidget() );
+
+  // operations list widget
+  myOpList = new QListWidget( anOperGr );
+  myOpList->setSortingEnabled( false );
+  myOpList->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) );
 
-  QGroupBox* aParamsGr = new QGroupBox( tr("GEOM_PARAMETERS"), aMidFrame );
-  aMidLay->addWidget( anOperGr, 0, 0 );
-  aMidLay->addMultiCellWidget( aParamsGr, 0, 0, 1, 3 );
-  aMidLay->setColStretch( 0, 1 );
-  aMidLay->setColStretch( 1, 2 );
+  QVBoxLayout* aOperLay = new QVBoxLayout( anOperGr );
+  aOperLay->setMargin( 9 );
+  aOperLay->addWidget( myOpList );
 
-  Layout1->addWidget( aMidFrame, 2, 0 );
-  Layout1->setRowStretch( 0, 0 );
-  Layout1->setRowStretch( 1, 1 );
+  QGroupBox* aParamsGr = new QGroupBox( tr( "GEOM_PARAMETERS" ), centralWidget() );
 
   // add a widget stack to the parameters group box
-  myStack = new QWidgetStack( aParamsGr );
-  QVBoxLayout* aVParamsLay = new QVBoxLayout( aParamsGr );
-  aVParamsLay->addWidget( myStack );
+  QStackedLayout* aStack = new QStackedLayout( aParamsGr );
 
   // continueties values..
-  QStringList aContinueties = QStringList::split( ",", "C0,G1,C1,G2,C2,C3,CN" );
-
-  // FixShape
-  QFrame* aFrame = new QFrame( myStack );
-  QGridLayout* aLay = new QGridLayout( aFrame, 10, 2, 0, 5 );
-
-  myFixShapeTol3D = new QtxDblSpinBox( 0, 100, 1e-7, aFrame );//QAD_SpinBoxDbl( aFrame, 0, 100, 1e-7, 10, 1e-10 );
-  myFixShapeTol3D->setPrecision( 10 );
-  myFixShapeMaxTol3D = new QtxDblSpinBox( 0, 100, 1e-7, aFrame );//QAD_SpinBoxDbl( aFrame, 0, 100, 1e-7, 10, 1e-10 );
-  myFixShapeMaxTol3D->setPrecision( 10 );
-
-  aLay->addWidget( new QLabel( tr("GEOM_3D_TOLERANCE"), aFrame ), 0, 0 );
-  aLay->addWidget( myFixShapeTol3D, 0, 1 );
-  aLay->addWidget( new QLabel( tr("GEOM_MAX_3D_TOLERANCE"), aFrame ), 1, 0 );
-  aLay->addWidget( myFixShapeMaxTol3D, 1, 1 );
-  aLay->setRowStretch( 9, 2 );
-
-  myStack->addWidget( aFrame, myOpLst.findIndex( "FixShape" ) );
-
-  // FixFaceSize  
-  aFrame = new QFrame( myStack );
-  aLay = new QGridLayout( aFrame, 10, 2, 0, 5 );
-
-  myFixFaceSizeTol = new QtxDblSpinBox( 0, 100, 1e-7, aFrame );//QAD_SpinBoxDbl( aFrame, 0, 100, 1e-7, 10, 1e-10 );
-  myFixFaceSizeTol->setPrecision( 10 );
-
-  aLay->addWidget( new QLabel( tr("GEOM_TOLERANCE"), aFrame ), 0, 0 );
-  aLay->addWidget( myFixFaceSizeTol, 0, 1 );
-  aLay->setRowStretch( 9, 2 );
-
-  myStack->addWidget( aFrame, myOpLst.findIndex( "FixFaceSize" ) );
-
-  // DropSmallEdges
-  aFrame = new QFrame( myStack );
-  aLay = new QGridLayout( aFrame, 10, 2, 0, 5 );
-
-  myDropSmallEdgesTol3D = new QtxDblSpinBox( 0, 100, 1e-7, aFrame );//QAD_SpinBoxDbl( aFrame, 0, 100, 1e-7, 10, 1e-10 );
-  myDropSmallEdgesTol3D->setPrecision( 10 );
-  
-  aLay->addWidget( new QLabel( tr("GEOM_3D_TOLERANCE"), aFrame ), 0, 0 );
-  aLay->addWidget( myDropSmallEdgesTol3D, 0, 1 );
-  aLay->setRowStretch( 9, 2 );
-
-  myStack->addWidget( aFrame, myOpLst.findIndex( "DropSmallEdges" ) );
-
-  // SplitAngle
-  aFrame = new QFrame( myStack );
-  aLay = new QGridLayout( aFrame, 10, 2, 0, 5 );
-
-  mySplitAngleAngle = new QtxDblSpinBox( 0, 360, 1, aFrame );//QAD_SpinBoxDbl( aFrame, 0, 360, 1 );
-  mySplitAngleMaxTol = new QtxDblSpinBox( 0, 100, 1e-7, aFrame );//QAD_SpinBoxDbl( aFrame, 0, 100, 1e-7, 10, 1e-10 );
-  mySplitAngleMaxTol->setPrecision( 10 );
-
-  aLay->addWidget( new QLabel( tr("GEOM_ANGLE_1"), aFrame ), 0, 0 );
-  aLay->addWidget( mySplitAngleAngle, 0, 1 );
-  aLay->addWidget( new QLabel( tr("GEOM_MAX_TOLERANCE"), aFrame ), 1, 0 );
-  aLay->addWidget( mySplitAngleMaxTol, 1, 1 );
-  aLay->setRowStretch( 9, 2 );
-
-  myStack->addWidget( aFrame, myOpLst.findIndex( "SplitAngle" ) );
-
-  // SplitClosedFaces
-  aFrame = new QFrame( myStack );
-  aLay = new QGridLayout( aFrame, 10, 2, 0, 5 );
-
-  mySplitClosedFacesNum = new QSpinBox( aFrame );
-  
-  aLay->addWidget( new QLabel( tr("GEOM_NUM_SPLIT_POINTS"), aFrame ), 0, 0 );
-  aLay->addWidget( mySplitClosedFacesNum, 0, 1 );
-  aLay->setRowStretch( 9, 2 );
-
-  myStack->addWidget( aFrame, myOpLst.findIndex( "SplitClosedFaces" ) );
-
-  // SplitContinuity
-  aFrame = new QFrame( myStack );
-  aLay = new QGridLayout( aFrame, 10, 2, 0, 5 );
-
-  mySplitContTol3D = new QtxDblSpinBox( 0, 100, 1e-7, aFrame );//QAD_SpinBoxDbl( aFrame, 0, 100, 1e-7, 10, 1e-10 );
-  mySplitContTol3D->setPrecision( 10 );
-  mySplitContSurfCont = new QComboBox( aFrame );
-  mySplitContSurfCont->insertStringList( aContinueties );
-  mySplitContCurvCont = new QComboBox( aFrame );
-  mySplitContCurvCont->insertStringList( aContinueties );
-
-  aLay->addWidget( new QLabel( tr("GEOM_3D_TOLERANCE"), aFrame ), 0, 0 );
-  aLay->addWidget( mySplitContTol3D, 0, 1 );
-  aLay->addWidget( new QLabel( tr("GEOM_SURFACE_CONTINUTY"), aFrame ), 1, 0 );
-  aLay->addWidget( mySplitContSurfCont, 1, 1 );
-  aLay->addWidget( new QLabel( tr("GEOM_CURVE_CONTINUTY"), aFrame ), 2, 0 );
-  aLay->addWidget( mySplitContCurvCont, 2, 1 );
-  aLay->setRowStretch( 9, 2 );
-  
-  myStack->addWidget( aFrame, myOpLst.findIndex( "SplitContinuity" ) );
-
-  // BSplineRestriction
-  aFrame = new QFrame( myStack );
-  aLay = new QGridLayout( aFrame, 10, 2, 0, 5 );
-
-  myBSplineSurfModeChk = new QCheckBox( tr("GEOM_SURFACE_MODE"), aFrame );
-  myBSpline3DCurveChk = new QCheckBox( tr("GEOM_3D_CURVE_MODE"), aFrame );
-  myBSpline2DCurveChk = new QCheckBox( tr("GEOM_2D_CURVE_MODE"), aFrame );
-
-  myBSplineTol3D = new QtxDblSpinBox( 0, 100, 1e-7, aFrame );//QAD_SpinBoxDbl( aFrame, 0, 100, 1e-7, 10, 1e-10 );
-  myBSplineTol3D->setPrecision( 10 );
-
-  myBSplineTol2D = new QtxDblSpinBox( 0, 100, 1e-7, aFrame );//QAD_SpinBoxDbl( aFrame, 0, 100, 1e-7, 10, 1e-10 );
-  myBSplineTol2D->setPrecision( 10 );
-
-  myBSplineDegree = new QSpinBox( aFrame );
-  myBSplineSegments = new QSpinBox( aFrame );
-  myBSpline2DCont = new QComboBox( aFrame );
-  myBSpline2DCont->insertStringList( aContinueties );
-  myBSpline3DCont = new QComboBox( aFrame );
-  myBSpline3DCont->insertStringList( aContinueties );
-
-  myBSplineSurfModeChk->setChecked( true );
-  myBSpline3DCurveChk->setChecked( true );
-  myBSpline2DCurveChk->setChecked( true );
-
-  aLay->addWidget( myBSplineSurfModeChk, 0, 0 );
-  aLay->addWidget( myBSpline3DCurveChk, 1, 0 );
-  aLay->addWidget( myBSpline2DCurveChk, 2, 0 );
-  aLay->addWidget( new QLabel( tr("GEOM_3D_TOLERANCE"), aFrame), 3, 0 );
-  aLay->addWidget( myBSplineTol3D, 3, 1 );
-  aLay->addWidget( new QLabel( tr("GEOM_2D_TOLERANCE"), aFrame), 4, 0 );
-  aLay->addWidget( myBSplineTol2D, 4, 1 );
-  aLay->addWidget( new QLabel( tr("GEOM_REQUIRED_DEGREE"), aFrame), 5, 0 );
-  aLay->addWidget( myBSplineDegree, 5, 1 );
-  aLay->addWidget( new QLabel( tr("GEOM_REQUIRED_NUM_SEGMENTS"), aFrame), 6, 0 );
-  aLay->addWidget( myBSplineSegments, 6, 1 );
-  aLay->addWidget( new QLabel( tr("GEOM_3D_CONTINUTY"), aFrame), 7, 0 );
-  aLay->addWidget( myBSpline3DCont, 7, 1 );
-  aLay->addWidget( new QLabel( tr("GEOM_2D_CONTINUTY"), aFrame), 8, 0 );
-  aLay->addWidget( myBSpline2DCont, 8, 1 );
-  aLay->setRowStretch( 9, 2 );
+  QStringList aContinueties = QString( "C0,G1,C1,G2,C2,C3,CN" ).split( "," );
+
+  // fill in the widgets
+  for ( int i = 0; i < myOpLst.count(); i++ ) {
+    QListWidgetItem* item = new QListWidgetItem( myOpLst[i] );
+    item->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable );
+    item->setCheckState( Qt::Unchecked );
+    myOpList->addItem( item );
+
+    QWidget* w;
+    if ( myOpLst[i] == "FixShape" ) {
+      // FixShape
+      w = new QWidget( aParamsGr );
+      QGridLayout* aLay = new QGridLayout( w );
+      aLay->setMargin( 9 ); aLay->setSpacing( 6 );
+      
+      myFixShapeTol3D = new SalomeApp_DoubleSpinBox( 0., 100., 1e-7, 10, 10, w );
+      myFixShapeMaxTol3D = new SalomeApp_DoubleSpinBox( 0., 100., 1e-7, 10, 10, w );
+      
+      aLay->addWidget( new QLabel( tr( "GEOM_3D_TOLERANCE" ), w ), 0, 0 );
+      aLay->addWidget( myFixShapeTol3D, 0, 1 );
+      aLay->addWidget( new QLabel( tr( "GEOM_MAX_3D_TOLERANCE" ), w ), 1, 0 );
+      aLay->addWidget( myFixShapeMaxTol3D, 1, 1 );
+      aLay->setRowStretch( aLay->rowCount(), 5 );
+    }
+    else if ( myOpLst[i] == "FixFaceSize" ) {
+      // FixFaceSize  
+      w = new QWidget( aParamsGr );
+      QGridLayout* aLay = new QGridLayout( w );
+      aLay->setMargin( 9 ); aLay->setSpacing( 6 );
+      
+      myFixFaceSizeTol = new SalomeApp_DoubleSpinBox( 0., 100., 1e-7, 10, 10, w );
+      
+      aLay->addWidget( new QLabel( tr( "GEOM_TOLERANCE" ), w ), 0, 0 );
+      aLay->addWidget( myFixFaceSizeTol, 0, 1 );
+      aLay->setRowStretch( aLay->rowCount(), 5 );
+    }
+    else if ( myOpLst[i] == "DropSmallEdges" ) {
+      // DropSmallEdges
+      w = new QWidget( aParamsGr );
+      QGridLayout* aLay = new QGridLayout( w );
+      aLay->setMargin( 9 ); aLay->setSpacing( 6 );
+      
+      myDropSmallEdgesTol3D = new SalomeApp_DoubleSpinBox( 0., 100., 1e-7, 10, 10, w );
   
-  myStack->addWidget( aFrame, myOpLst.findIndex( "BSplineRestriction" ) );
-
-  // ToBezier
-  aFrame = new QFrame( myStack );
-  aLay = new QGridLayout( aFrame, 10, 2, 0, 5 );
-
-  myToBezierSurfModeChk = new QCheckBox( tr("GEOM_SURFACE_MODE"), aFrame );
-  myToBezier3DCurveChk = new QCheckBox( tr("GEOM_3D_CURVE_MODE"), aFrame );
-  myToBezier2DCurveChk = new QCheckBox( tr("GEOM_2D_CURVE_MODE"), aFrame );
+      aLay->addWidget( new QLabel( tr( "GEOM_3D_TOLERANCE" ), w ), 0, 0 );
+      aLay->addWidget( myDropSmallEdgesTol3D, 0, 1 );
+      aLay->setRowStretch( aLay->rowCount(), 5 );
+    }
+    else if ( myOpLst[i] == "SplitAngle" ) {
+      // SplitAngle
+      w = new QWidget( aParamsGr );
+      QGridLayout* aLay = new QGridLayout( w );
+      aLay->setMargin( 9 ); aLay->setSpacing( 6 );
+      
+      mySplitAngleAngle = new SalomeApp_DoubleSpinBox( 0, 360, 1, 10, 10, w );
+      mySplitAngleMaxTol = new SalomeApp_DoubleSpinBox( 0., 100., 1e-7, 10, 10, w );
+      
+      aLay->addWidget( new QLabel( tr( "GEOM_ANGLE_1" ), w ), 0, 0 );
+      aLay->addWidget( mySplitAngleAngle, 0, 1 );
+      aLay->addWidget( new QLabel( tr( "GEOM_MAX_TOLERANCE" ), w ), 1, 0 );
+      aLay->addWidget( mySplitAngleMaxTol, 1, 1 );
+      aLay->setRowStretch( aLay->rowCount(), 5 );
+    }
+    else if ( myOpLst[i] == "SplitClosedFaces" ) {
+      // SplitClosedFaces
+      w = new QWidget( aParamsGr );
+      QGridLayout* aLay = new QGridLayout( w );
+      aLay->setMargin( 9 ); aLay->setSpacing( 6 );
+      
+      mySplitClosedFacesNum = new SalomeApp_IntSpinBox( w );
   
-  myToBezierMaxTol = new QtxDblSpinBox( 0, 100, 1e-7, aFrame );//QAD_SpinBoxDbl( aFrame, 0, 100, 1e-7, 10, 1e-10 );
-  myToBezierMaxTol->setPrecision( 10 );
-
-  aLay->addWidget( myToBezierSurfModeChk, 0, 0 );
-  aLay->addWidget( myToBezier3DCurveChk, 1, 0 );
-  aLay->addWidget( myToBezier2DCurveChk, 2, 0 );
-  aLay->addWidget( new QLabel( tr("GEOM_MAX_TOLERANCE"), aFrame), 3, 0 );
-  aLay->addWidget( myToBezierMaxTol, 3, 1 );
-  aLay->setRowStretch( 9, 2 );
+      aLay->addWidget( new QLabel( tr( "GEOM_NUM_SPLIT_POINTS" ), w ), 0, 0 );
+      aLay->addWidget( mySplitClosedFacesNum, 0, 1 );
+      aLay->setRowStretch( aLay->rowCount(), 5 );
+    }      
+    else if ( myOpLst[i] == "SplitContinuity" ) {
+      // SplitContinuity
+      w = new QWidget( aParamsGr );
+      QGridLayout* aLay = new QGridLayout( w );
+      aLay->setMargin( 9 ); aLay->setSpacing( 6 );
+
+      mySplitContTol3D = new SalomeApp_DoubleSpinBox( 0., 100., 1e-7, 10, 10, w );
+      mySplitContSurfCont = new QComboBox( w );
+      mySplitContSurfCont->addItems( aContinueties );
+      mySplitContCurvCont = new QComboBox( w );
+      mySplitContCurvCont->addItems( aContinueties );
+      
+      aLay->addWidget( new QLabel( tr( "GEOM_3D_TOLERANCE" ), w ), 0, 0 );
+      aLay->addWidget( mySplitContTol3D, 0, 1 );
+      aLay->addWidget( new QLabel( tr( "GEOM_SURFACE_CONTINUTY" ), w ), 1, 0 );
+      aLay->addWidget( mySplitContSurfCont, 1, 1 );
+      aLay->addWidget( new QLabel( tr( "GEOM_CURVE_CONTINUTY" ), w ), 2, 0 );
+      aLay->addWidget( mySplitContCurvCont, 2, 1 );
+      aLay->setRowStretch( aLay->rowCount(), 5 );
+    }
+    else if ( myOpLst[i] == "BSplineRestriction" ) {
+      // BSplineRestriction
+      w = new QWidget( aParamsGr );
+      QGridLayout* aLay = new QGridLayout( w );
+      aLay->setMargin( 9 ); aLay->setSpacing( 6 );
+
+      myBSplineSurfModeChk = new QCheckBox( tr("GEOM_SURFACE_MODE"), w );
+      myBSpline3DCurveChk = new QCheckBox( tr("GEOM_3D_CURVE_MODE"), w );
+      myBSpline2DCurveChk = new QCheckBox( tr("GEOM_2D_CURVE_MODE"), w );
+
+      myBSplineTol3D = new SalomeApp_DoubleSpinBox( 0., 100., 1e-7, 10, 10, w );
+      
+      myBSplineTol2D = new SalomeApp_DoubleSpinBox( 0., 100., 1e-7, 10, 10, w );
+
+      myBSplineDegree = new SalomeApp_IntSpinBox( w );
+      myBSplineSegments = new SalomeApp_IntSpinBox( w );
+      myBSpline2DCont = new QComboBox( w );
+      myBSpline2DCont->addItems( aContinueties );
+      myBSpline3DCont = new QComboBox( w );
+      myBSpline3DCont->addItems( aContinueties );
+      
+      myBSplineSurfModeChk->setChecked( true );
+      myBSpline3DCurveChk->setChecked( true );
+      myBSpline2DCurveChk->setChecked( true );
+
+      aLay->addWidget( myBSplineSurfModeChk, 0, 0 );
+      aLay->addWidget( myBSpline3DCurveChk,  1, 0 );
+      aLay->addWidget( myBSpline2DCurveChk,  2, 0 );
+      aLay->addWidget( new QLabel( tr( "GEOM_3D_TOLERANCE" ), w ), 3, 0 );
+      aLay->addWidget( myBSplineTol3D, 3, 1 );
+      aLay->addWidget( new QLabel( tr( "GEOM_2D_TOLERANCE" ), w ), 4, 0 );
+      aLay->addWidget( myBSplineTol2D, 4, 1 );
+      aLay->addWidget( new QLabel( tr( "GEOM_REQUIRED_DEGREE" ), w ), 5, 0 );
+      aLay->addWidget( myBSplineDegree, 5, 1 );
+      aLay->addWidget( new QLabel( tr( "GEOM_REQUIRED_NUM_SEGMENTS" ), w ), 6, 0 );
+      aLay->addWidget( myBSplineSegments, 6, 1 );
+      aLay->addWidget( new QLabel( tr( "GEOM_3D_CONTINUTY" ), w ), 7, 0 );
+      aLay->addWidget( myBSpline3DCont, 7, 1 );
+      aLay->addWidget( new QLabel( tr( "GEOM_2D_CONTINUTY" ), w ), 8, 0 );
+      aLay->addWidget( myBSpline2DCont, 8, 1 );
+      aLay->setRowStretch( aLay->rowCount(), 5 );
+    }
+    else if ( myOpLst[i] == "ToBezier" ) {
+      // ToBezier
+      w = new QWidget( aParamsGr );
+      QGridLayout* aLay = new QGridLayout( w );
+      aLay->setMargin( 9 ); aLay->setSpacing( 6 );
+
+      myToBezierSurfModeChk = new QCheckBox( tr("GEOM_SURFACE_MODE"), w );
+      myToBezier3DCurveChk = new QCheckBox( tr("GEOM_3D_CURVE_MODE"), w );
+      myToBezier2DCurveChk = new QCheckBox( tr("GEOM_2D_CURVE_MODE"), w );
   
-  myStack->addWidget( aFrame, myOpLst.findIndex( "ToBezier" ) );
-
-  // SameParameter
-  aFrame = new QFrame( myStack );
-  aLay = new QGridLayout( aFrame, 10, 2, 0, 5 );
-
-  mySameParameterTol3D = new QtxDblSpinBox( 0, 100, 1e-7, aFrame );//QAD_SpinBoxDbl( aFrame, 0, 100, 1e-7, 10, 1e-10 );
-  mySameParameterTol3D->setPrecision( 10 );
+      myToBezierMaxTol = new SalomeApp_DoubleSpinBox( 0., 100., 1e-7, 10, 10, w );
+
+      aLay->addWidget( myToBezierSurfModeChk, 0, 0 );
+      aLay->addWidget( myToBezier3DCurveChk, 1, 0 );
+      aLay->addWidget( myToBezier2DCurveChk, 2, 0 );
+      aLay->addWidget( new QLabel( tr( "GEOM_MAX_TOLERANCE" ), w ), 3, 0 );
+      aLay->addWidget( myToBezierMaxTol, 3, 1 );
+      aLay->setRowStretch( aLay->rowCount(), 5 );
+    }
+    else if ( myOpLst[i] == "SameParameter" ) {
+      // SameParameter
+      w = new QWidget( aParamsGr );
+      QGridLayout* aLay = new QGridLayout( w );
+      aLay->setMargin( 9 ); aLay->setSpacing( 6 );
+
+      mySameParameterTol3D = new SalomeApp_DoubleSpinBox( 0., 100., 1e-7, 10, 10, w );
+      
+      aLay->addWidget( new QLabel( tr( "GEOM_3D_TOLERANCE" ), w ), 0, 0 );
+      aLay->addWidget( mySameParameterTol3D, 0, 1 );
+      aLay->setRowStretch( aLay->rowCount(), 5 );
+    }
+    else {
+      w = new QWidget( aParamsGr ); // dumb widget
+    }
+    aStack->insertWidget( i, w );
+  }
 
-  aLay->addWidget( new QLabel( tr("GEOM_3D_TOLERANCE"), aFrame ), 0, 0 );
-  aLay->addWidget( mySameParameterTol3D, 0, 1 );
-  aLay->setRowStretch( 9, 2 );
-  
-  myStack->addWidget( aFrame, myOpLst.findIndex( "SameParameter" ) );
+  QGridLayout* layout = new QGridLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( mySelectWdgt, 0, 0, 1, 2 );
+  layout->addWidget( anOperGr,     1, 0 );
+  layout->addWidget( aParamsGr,    1, 1 );
 
   // signals and slots connections
-  connect( buttonOk,     SIGNAL(clicked()), this, SLOT(onOk()) );
-  connect( buttonApply,  SIGNAL(clicked()), this, SLOT(onApply()) );
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( onOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( onApply() ) );
+
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( selectionChanged() ) );
 
-  connect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),  
-          SIGNAL(currentSelectionChanged()), this, SLOT(selectionChanged()) );
-  connect( myOpList,     SIGNAL(selectionChanged()), this, SLOT(operationChanged()) );
+  connect( mySelectWdgt->PushButton1, SIGNAL( clicked() ),       this, SLOT( selectClicked() ) );
+  connect( mySelectWdgt->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( lineEditReturnPressed() ) );
 
-  connect( mySelectWdgt->PushButton1, SIGNAL(clicked()), this, SLOT(selectClicked()) );
-  connect( mySelectWdgt->LineEdit1,   SIGNAL(returnPressed()), this, SLOT(lineEditReturnPressed()) );
+  connect( myToBezierSurfModeChk,     SIGNAL( toggled( bool ) ), this, SLOT( advOptionToggled( bool ) ) );
 
-  connect( myToBezierSurfModeChk,     SIGNAL(toggled(bool)), SLOT(advOptionToggled(bool)) );
+  connect( myOpList, SIGNAL( currentRowChanged( int ) ), aStack, SLOT( setCurrentIndex( int ) ) );
 
   adjustSize();
   loadDefaults(); // init dialog fields with values from resource file
-  myOpList->setSelected( myOpList->findItem( "FixShape", 0 ), true );
+  //myOpList->setCurrentRow( myOpList->findItem( 0 );
   reset();
 
   initName( tr( "PROCESS_SHAPE_NEW_OBJ_NAME" ) );
 }
 
-//=================================================================================
-// function : operationChanged()
-// purpose  : 
-//=================================================================================
-void RepairGUI_ShapeProcessDlg::operationChanged()
-{
-  QListViewItem* anItem = myOpList->selectedItem();
-  if ( anItem )
-  {
-    int id = myOpLst.findIndex( anItem->text(0) );
-    if ( id > -1 )
-      myStack->raiseWidget( id );
-  }
-}
-
 //=================================================================================
 // function : onOk()
 // purpose  : Same than click on apply but close this dialog.
 //=================================================================================
 void RepairGUI_ShapeProcessDlg::onOk()
 {
-  if (onApply())
+  if ( onApply() )
     ClickOnCancel();
 }
 
@@ -367,13 +348,16 @@ bool RepairGUI_ShapeProcessDlg::onApply()
 //=================================================================================
 void RepairGUI_ShapeProcessDlg::selectionChanged()
 {
-       reset();
+  reset();
        
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
   Standard_Boolean aRes = Standard_False;
   int i = 0;
-  myObjects->length( IObjectCount() );
-  for ( SALOME_ListIteratorOfListIO anIt( selectedIO() ); anIt.More(); anIt.Next() )
-  {
+  myObjects->length(aSelList.Extent());
+  for (SALOME_ListIteratorOfListIO anIt (aSelList); anIt.More(); anIt.Next()) {
     GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( anIt.Value(), aRes );
     if ( !CORBA::is_nil( aSelectedObject ) && aRes )
        myObjects[i++] = aSelectedObject;
@@ -415,8 +399,8 @@ void RepairGUI_ShapeProcessDlg::lineEditReturnPressed()
 void RepairGUI_ShapeProcessDlg::activate()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(selectionChanged()));
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication( ) ))->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( selectionChanged() ) );
        
   reset();
   //myGeomGUI->SetState( 0 );
@@ -428,24 +412,13 @@ void RepairGUI_ShapeProcessDlg::activate()
 // function : enterEvent()
 // purpose  : Mouse enter onto the dialog to activate it
 //=================================================================================
-void RepairGUI_ShapeProcessDlg::enterEvent(QEvent* e)
+void RepairGUI_ShapeProcessDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupBoxName->isEnabled() )
     activate();
 }
 
 
-//=================================================================================
-// function : closeEvent()
-// purpose  : same than click on cancel button
-//=================================================================================
-void RepairGUI_ShapeProcessDlg::closeEvent(QCloseEvent* e)
-{
-  //myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
-
 //=================================================================================
 // function : reset()
 // purpose  : Completely reset the state of method including local context
@@ -454,7 +427,7 @@ void RepairGUI_ShapeProcessDlg::reset()
 {
   myObjects = new GEOM::ListOfGO();
   myObjects->length( 0 );      
-  mySelectWdgt->LineEdit1->setText("");
+  mySelectWdgt->LineEdit1->setText( "" );
 }
 
 
@@ -462,15 +435,13 @@ void RepairGUI_ShapeProcessDlg::reset()
 // function : get_convert
 // purpose  : conversion of angle values to radians (non-angle values are not converted)
 //=================================================================================
-const char* get_convert( const char* theParam, const char* theValue )
+const char* get_convert( const char* theParam, const QString& theValue )
 {
-  if ( !strcmp( theParam, "SplitAngle.Angle" ) )
-  {
-    double doubleValue = atof( theValue ) * PI / 180;
-    TCollection_AsciiString str( doubleValue );
-    return CORBA::string_dup( str.ToCString() );
+  if ( !strcmp( theParam, "SplitAngle.Angle" ) ) {
+    double doubleValue = theValue.toDouble() * PI / 180;
+    return CORBA::string_dup( QString::number( doubleValue ).toLatin1().constData() );
   }
-  return CORBA::string_dup( theValue );
+  return CORBA::string_dup( theValue.toLatin1().constData() );
 }
 
 //=================================================================================
@@ -479,8 +450,7 @@ const char* get_convert( const char* theParam, const char* theValue )
 //=================================================================================
 const char* set_convert( const char* theParam, const char* theValue )
 {
-  if ( !strcmp( theParam, "SplitAngle.Angle" ) )
-  {
+  if ( !strcmp( theParam, "SplitAngle.Angle" ) ) {
     double doubleValue = atof( theValue ) * 180 / PI;
     TCollection_AsciiString str( doubleValue );
     return CORBA::string_dup( str.ToCString() );
@@ -499,26 +469,25 @@ void RepairGUI_ShapeProcessDlg::loadDefaults()
   anOp->GetShapeProcessParameters( anOperators, aParams, aValues );
 
   // check the default items-operators
-  int i;
-  for ( i = 0; i < anOperators->length(); i++ )
-  {
+  for ( int i = 0; i < anOperators->length(); i++ ) {
     //MESSAGE("-->"<<(const char*)anOperators[i]);
-    QListViewItem* anItem = myOpList->findItem( (const char*)anOperators[i], 0 );
-    if ( anItem /*&& anItem->inherits( "QCheckListItem" )*/ )
-      ((QCheckListItem*) anItem)->setOn( true );
+    QList<QListWidgetItem*> items = myOpList->findItems ( (const char*)anOperators[i], Qt::MatchFixedString );
+    if ( items.count() ) 
+      ( items[0] )->setCheckState( Qt::Checked );
   }
 
   // Retrieve default parameters for ALL operators
-  for ( QListViewItemIterator it(myOpList); it.current(); ++it ) {
-    CORBA::String_var anOperator = CORBA::string_dup( it.current()->text( 0 ).latin1() );
+  for ( int i = 0; i < myOpList->count(); i++ ) {
+    CORBA::String_var anOperator = CORBA::string_dup( myOpList->item( i )->text().toLatin1().constData() );
     anOp->GetOperatorParameters( anOperator.in(), aParams, aValues );
 
     // set default values of parameters
     if ( aParams->length() != aValues->length() )
       continue;
-    for ( i = 0; i < aParams->length(); i++ ) {
-      QWidget* aCtrl = getControl( (const char*)aParams[i] );
-      const char* aValue = set_convert( (const char*)aParams[i], aValues[i] );
+
+    for ( int j = 0; j < aParams->length(); j++ ) {
+      QWidget* aCtrl = getControl( (const char*)aParams[j] );
+      const char* aValue = set_convert( (const char*)aParams[j], aValues[j] );
       setValue( aCtrl, aValue );
     }
   }
@@ -528,40 +497,52 @@ void RepairGUI_ShapeProcessDlg::loadDefaults()
 // function : setValue()
 // purpose  : set value in the proper way
 //=================================================================================
-void RepairGUI_ShapeProcessDlg::setValue( QWidget* theControl, const char* theValue )
+void RepairGUI_ShapeProcessDlg::setValue( QWidget* theControl, const QString& theValue )
 {
-  if ( theControl == NULL || theValue == NULL )
-    return;
-
-  if ( theControl->isA( "QtxDblSpinBox" ) )
-    ((QtxDblSpinBox*)theControl)->setValue( QString( theValue ).toDouble() );
-  else if ( theControl->isA( "QSpinBox" ) )
-    ((QSpinBox*)theControl)->setValue( QString( theValue ).toInt() );
-  else if ( theControl->isA( "QComboBox" ) )
-    ((QComboBox*)theControl)->setCurrentText( QString( theValue ) );
-  else if ( theControl->isA( "QCheckBox" ) )
-    ((QCheckBox*)theControl)->setChecked( QString( theValue ).toInt() != 0 );
+  if ( theControl && !theValue.isNull() ) {
+    if ( qobject_cast<SalomeApp_DoubleSpinBox*>( theControl ) )
+      qobject_cast<SalomeApp_DoubleSpinBox*>( theControl )->setValue( theValue.toDouble() );
+    else if ( qobject_cast<SalomeApp_IntSpinBox*>( theControl ) )
+      qobject_cast<SalomeApp_IntSpinBox*>( theControl )->setValue( theValue.toInt() );
+    else if ( qobject_cast<QComboBox*>( theControl ) )
+      qobject_cast<QComboBox*>( theControl )->setEditText( theValue );
+    else if ( qobject_cast<QCheckBox*>( theControl ) )
+      qobject_cast<QCheckBox*>( theControl )->setChecked( theValue.toInt() != 0 );
+  }
 }
 
 //=================================================================================
 // function : getValue()
 // purpose  : get value in the proper way
 //=================================================================================
-const char* RepairGUI_ShapeProcessDlg::getValue( QWidget* theControl ) const
+QString RepairGUI_ShapeProcessDlg::getValue( QWidget* theControl ) const
 {
-  if ( theControl == NULL )
-    return "";
-
-  if ( theControl->isA( "QtxDblSpinBox" ) )
-    return ((QtxDblSpinBox*)theControl)->text().latin1();
-  else if ( theControl->isA( "QSpinBox" ) )
-    return ((QSpinBox*)theControl)->text().latin1();
-  else if ( theControl->isA( "QComboBox" ) )
-    return ((QComboBox*)theControl)->currentText().latin1();
-  else if ( theControl->isA( "QCheckBox" ) )
-    return ((QCheckBox*)theControl)->isChecked() ? "1" : "0";
-  
-  return "";
+  if ( theControl ) {
+    if ( qobject_cast<SalomeApp_DoubleSpinBox*>( theControl ) )
+      return QString::number( qobject_cast<SalomeApp_DoubleSpinBox*>( theControl )->value() );
+    else if ( qobject_cast<SalomeApp_IntSpinBox*>( theControl ) )
+      return QString::number( qobject_cast<SalomeApp_IntSpinBox*>( theControl )->value() );
+    else if ( qobject_cast<QComboBox*>( theControl ) )
+      return qobject_cast<QComboBox*>( theControl )->currentText();
+    else if ( qobject_cast<QCheckBox*>( theControl ) )
+      return qobject_cast<QCheckBox*>( theControl )->isChecked() ? "1" : "0";
+  }   
+  return 0;
+}
+
+//=================================================================================
+// function : getText()
+// purpose  : get text in the proper way
+//=================================================================================
+QString RepairGUI_ShapeProcessDlg::getText( QWidget* theControl ) const
+{
+  if ( theControl ) {
+    if ( qobject_cast<SalomeApp_DoubleSpinBox*>( theControl ) )
+      return qobject_cast<SalomeApp_DoubleSpinBox*>( theControl )->text();
+    else if ( qobject_cast<SalomeApp_IntSpinBox*>( theControl ) )
+      return qobject_cast<SalomeApp_IntSpinBox*>( theControl )->text();
+  }   
+  return QString::null;
 }
 
 //=================================================================================
@@ -579,21 +560,35 @@ GEOM::GEOM_IOperations_ptr RepairGUI_ShapeProcessDlg::createOperation()
 //=================================================================================
 bool RepairGUI_ShapeProcessDlg::isValid( QString& msg )
 {
+  bool ok = true;
+  QMapIterator<QString,QStringList> aMapIter( myValMap );
+  while( aMapIter.hasNext() ) {
+    aMapIter.next();
+    const QStringList& aList = aMapIter.value();
+    QListIterator<QString> aListIter( aList );
+    while( aListIter.hasNext() ) {
+      const QString& aParam = aListIter.next();
+      QWidget* aControl = getControl( aParam );
+      if ( qobject_cast<SalomeApp_DoubleSpinBox*>( aControl ) )
+       ok = qobject_cast<SalomeApp_DoubleSpinBox*>( aControl )->isValid( msg, !IsPreview() ) && ok;
+      else if ( qobject_cast<SalomeApp_IntSpinBox*>( aControl ) )
+       ok = qobject_cast<SalomeApp_IntSpinBox*>( aControl )->isValid( msg, !IsPreview() ) && ok;
+    }
+  }
+
   bool error = false;
   GEOM::string_array_var anOperators = getActiveOperators();
-  if ( !myObjects->length() )
-  {
+  if ( !myObjects->length() ) {
     msg += tr( "ERROR_NO_OBJECTS" );
     error = true;
   }
-  if ( !anOperators->length() )
-  {
+  if ( !anOperators->length() ) {
     if ( error ) 
       msg += "\n";
     msg += tr( "ERROR_NO_OPERATORS" );
     error = true;
   }
-  return !error;
+  return !error && ok;
 }
 
 //=================================================================================
@@ -624,19 +619,33 @@ bool RepairGUI_ShapeProcessDlg::execute( ObjectList& objects )
   */// -----------
 
   QStringList anErrorObjNames;
-  for ( int i = 0; i < myObjects->length(); i++ )
-  {
+  for ( int i = 0; i < myObjects->length(); i++ ) {
     GEOM::GEOM_Object_var obj = myObjects[i];
-    GEOM::GEOM_Object_var anObj = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )->ProcessShape(
-       obj, anOperators, aParams, aValues );
+    GEOM::GEOM_Object_var anObj = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )->
+      ProcessShape( obj, anOperators, aParams, aValues );
     if ( anObj->_is_nil() )
       anErrorObjNames << GEOMBase::GetName( obj );
     else
+    {
+      if ( !IsPreview() )
+      {
+       QStringList aParameters;
+
+       for ( int i = 0; i < anOperators->length(); i++ )
+         aParameters << QString( anOperators[i] );
+
+       for ( int i = 0; i < aParams->length(); i++ )
+         aParameters << QString( aParams[i] );
+
+       aParameters << getTexts( aParams );
+       anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+      }
       objects.push_back( anObj._retn() );
+    }
   }
 
   if ( !anErrorObjNames.empty() )
-    MESSAGE("ERRORS occured while processing the following objects: " << anErrorObjNames.join( " " ));
+    MESSAGE( "ERRORS occured while processing the following objects: " << anErrorObjNames.join( " " ).toLatin1().data() );
     
   return anErrorObjNames.size() < myObjects->length(); // true if at least one object was OK, false if ALL objects were nil after Healing.
 }
@@ -648,15 +657,17 @@ bool RepairGUI_ShapeProcessDlg::execute( ObjectList& objects )
 GEOM::string_array* RepairGUI_ShapeProcessDlg::getActiveOperators()
 {
   GEOM::string_array_var anOperators = new GEOM::string_array();
-    QStringList aCheckedList;
-  QStringList::Iterator it;
-  for ( it = myOpLst.begin(); it != myOpLst.end(); ++it )
-    if ( ((QCheckListItem*)myOpList->findItem( *it, 0 ))->isOn() )
-      aCheckedList << *it;
-  anOperators->length( aCheckedList.size() );
-  int i = 0;
-  for ( it = aCheckedList.begin(); it != aCheckedList.end(); ++it )
-    anOperators[i++] = CORBA::string_dup( (*it).latin1() );            
+  QStringList aCheckedList;
+
+  for ( int i = 0; i < myOpList->count(); i++ ) {
+    if ( myOpList->item( i )->checkState() == Qt::Checked )
+      aCheckedList << myOpList->item( i )->text();
+  }
+
+  anOperators->length( aCheckedList.count() );
+
+  for ( int i = 0; i < aCheckedList.count(); i++ )
+    anOperators[i] = CORBA::string_dup( aCheckedList[i].toLatin1().constData() );
                 
   return anOperators._retn();
 }
@@ -665,34 +676,33 @@ GEOM::string_array* RepairGUI_ShapeProcessDlg::getActiveOperators()
 // function : getcontrol
 // purpose  :
 //=================================================================================
-QWidget* RepairGUI_ShapeProcessDlg::getControl( const char* theParam )
+QWidget* RepairGUI_ShapeProcessDlg::getControl( const QString& theParam )
 {
-       string aParam = theParam;
-  if ( aParam == "SplitAngle.Angle" )                          return mySplitAngleAngle;
-  else if ( aParam == "SplitAngle.MaxTolerance" )              return mySplitAngleMaxTol;
-  else if ( aParam == "SplitClosedFaces.NbSplitPoints" )       return mySplitClosedFacesNum;
-  else if ( aParam == "FixFaceSize.Tolerance" )                        return myFixFaceSizeTol;
-  else if ( aParam == "DropSmallEdges.Tolerance3d" )           return myDropSmallEdgesTol3D;
-  else if ( aParam == "BSplineRestriction.SurfaceMode" )       return myBSplineSurfModeChk;
-  else if ( aParam == "BSplineRestriction.Curve3dMode" )       return myBSpline3DCurveChk;
-  else if ( aParam == "BSplineRestriction.Curve2dMode" )       return myBSpline2DCurveChk;
-  else if ( aParam == "BSplineRestriction.Tolerance3d" )       return myBSplineTol3D;
-  else if ( aParam == "BSplineRestriction.Tolerance2d" )       return myBSplineTol2D;
-  else if ( aParam == "BSplineRestriction.RequiredDegree" )    return myBSplineDegree;
-  else if ( aParam == "BSplineRestriction.RequiredNbSegments" )        return myBSplineSegments;
-  else if ( aParam == "BSplineRestriction.Continuity3d" )      return myBSpline3DCont;
-  else if ( aParam == "BSplineRestriction.Continuity2d" )      return myBSpline2DCont;
-  else if ( aParam == "SplitContinuity.Tolerance3d" )          return mySplitContTol3D;
-  else if ( aParam == "SplitContinuity.SurfaceContinuity" )    return mySplitContSurfCont;
-  else if ( aParam == "SplitContinuity.CurveContinuity" )      return mySplitContCurvCont;
-  else if ( aParam == "ToBezier.SurfaceMode" )                 return myToBezierSurfModeChk;
-  else if ( aParam == "ToBezier.Curve3dMode" )                 return myToBezier3DCurveChk;
-  else if ( aParam == "ToBezier.Curve2dMode" )                 return myToBezier2DCurveChk;
-  else if ( aParam == "ToBezier.MaxTolerance" )                        return myToBezierMaxTol;
-  else if ( aParam == "SameParameter.Tolerance3d" )            return mySameParameterTol3D;
-  else if ( aParam == "FixShape.Tolerance3d" )                 return myFixShapeTol3D;
-  else if ( aParam == "FixShape.MaxTolerance3d" )              return myFixShapeMaxTol3D;
-  return NULL;
+  if ( theParam == "SplitAngle.Angle" )                           return mySplitAngleAngle;
+  else if ( theParam == "SplitAngle.MaxTolerance" )               return mySplitAngleMaxTol;
+  else if ( theParam == "SplitClosedFaces.NbSplitPoints" )        return mySplitClosedFacesNum;
+  else if ( theParam == "FixFaceSize.Tolerance" )                 return myFixFaceSizeTol;
+  else if ( theParam == "DropSmallEdges.Tolerance3d" )            return myDropSmallEdgesTol3D;
+  else if ( theParam == "BSplineRestriction.SurfaceMode" )        return myBSplineSurfModeChk;
+  else if ( theParam == "BSplineRestriction.Curve3dMode" )        return myBSpline3DCurveChk;
+  else if ( theParam == "BSplineRestriction.Curve2dMode" )        return myBSpline2DCurveChk;
+  else if ( theParam == "BSplineRestriction.Tolerance3d" )        return myBSplineTol3D;
+  else if ( theParam == "BSplineRestriction.Tolerance2d" )        return myBSplineTol2D;
+  else if ( theParam == "BSplineRestriction.RequiredDegree" )     return myBSplineDegree;
+  else if ( theParam == "BSplineRestriction.RequiredNbSegments" ) return myBSplineSegments;
+  else if ( theParam == "BSplineRestriction.Continuity3d" )       return myBSpline3DCont;
+  else if ( theParam == "BSplineRestriction.Continuity2d" )       return myBSpline2DCont;
+  else if ( theParam == "SplitContinuity.Tolerance3d" )           return mySplitContTol3D;
+  else if ( theParam == "SplitContinuity.SurfaceContinuity" )     return mySplitContSurfCont;
+  else if ( theParam == "SplitContinuity.CurveContinuity" )       return mySplitContCurvCont;
+  else if ( theParam == "ToBezier.SurfaceMode" )                  return myToBezierSurfModeChk;
+  else if ( theParam == "ToBezier.Curve3dMode" )                  return myToBezier3DCurveChk;
+  else if ( theParam == "ToBezier.Curve2dMode" )                  return myToBezier2DCurveChk;
+  else if ( theParam == "ToBezier.MaxTolerance" )                 return myToBezierMaxTol;
+  else if ( theParam == "SameParameter.Tolerance3d" )             return mySameParameterTol3D;
+  else if ( theParam == "FixShape.Tolerance3d" )                  return myFixShapeTol3D;
+  else if ( theParam == "FixShape.MaxTolerance3d" )               return myFixShapeMaxTol3D;
+  return 0;
 }
 
 //=================================================================================
@@ -701,6 +711,9 @@ QWidget* RepairGUI_ShapeProcessDlg::getControl( const char* theParam )
 //=================================================================================
 void RepairGUI_ShapeProcessDlg::initParamsValues()
 {
+  if ( myOpLst.count() )
+    return;  // already filled
+
   myOpLst << "FixShape";
   myValMap["FixShape"] << "FixShape.Tolerance3d";
   myValMap["FixShape"] << "FixShape.MaxTolerance3d";
@@ -750,25 +763,24 @@ void RepairGUI_ShapeProcessDlg::initParamsValues()
 //=================================================================================
 GEOM::string_array* RepairGUI_ShapeProcessDlg::getParameters( const GEOM::string_array& theOperators )
 {
-       GEOM::string_array_var aParams = new GEOM::string_array();
-       int i( 0 ), j( 0 );
-
-       // calculate the length of parameters
-       for ( i = 0, j = 0; i < theOperators.length(); i++ )
-         j+= myValMap[QString((const char*)theOperators[i])].size();
+  GEOM::string_array_var aParams = new GEOM::string_array();
+  int i = 0, j = 0;
 
-       // set the new length of paremeters
-       aParams->length( j );
-
-       // fill the parameters
-       for ( i = 0, j = 0; i < theOperators.length(); i++ )
-       {
-               QStringList aValLst = myValMap[QString( (const char*)theOperators[i] )];
-               for ( QStringList::Iterator it = aValLst.begin(); it != aValLst.end(); ++it )
-       aParams[j++] = CORBA::string_dup( (*it).latin1() );
-       }
+  // calculate the length of parameters
+  for ( i = 0, j = 0; i < theOperators.length(); i++ )
+    j += myValMap[ QString( theOperators[i] ) ].size();
+  
+  // set the new length of paremeters
+  aParams->length( j );
+
+  // fill the parameters
+  for ( i = 0, j = 0; i < theOperators.length(); i++ ) {
+    QStringList aValLst = myValMap[ QString( theOperators[i] ) ];
+    for ( QStringList::Iterator it = aValLst.begin(); it != aValLst.end(); ++it )
+      aParams[j++] = CORBA::string_dup( (*it).toLatin1().constData() );
+  }
 
-       return aParams._retn();
+  return aParams._retn();
 }
 
 
@@ -781,8 +793,7 @@ GEOM::string_array* RepairGUI_ShapeProcessDlg::getValues( const GEOM::string_arr
   GEOM::string_array_var aValues = new GEOM::string_array();
   aValues->length( theParams.length() );
     
-  for ( int i = 0; i < theParams.length(); i++ )
-  {
+  for ( int i = 0; i < theParams.length(); i++ ) {
     QWidget* aCtrl = getControl( (const char*)theParams[i] );
     if ( aCtrl )
       aValues[i] = get_convert( (const char*)theParams[i], getValue( aCtrl ) );
@@ -791,6 +802,27 @@ GEOM::string_array* RepairGUI_ShapeProcessDlg::getValues( const GEOM::string_arr
   return aValues._retn();
 }
 
+//=================================================================================
+// function : getTexts
+// purpose  :
+//=================================================================================
+QStringList RepairGUI_ShapeProcessDlg::getTexts( const GEOM::string_array& theParams )
+{
+  QStringList aTexts;
+    
+  for ( int i = 0; i < theParams.length(); i++ ) {
+    QWidget* aCtrl = getControl( (const char*)theParams[i] );
+    if ( aCtrl )
+    {
+      QString aText = getText( aCtrl );
+      if( !aText.isNull() )
+       aTexts.append( aText );
+    }
+  }
+    
+  return aTexts;
+}
+
 //=================================================================================
 // function : initSelection
 // purpose  : set selection of ALL shape types except vertexes
@@ -814,10 +846,10 @@ void RepairGUI_ShapeProcessDlg::initSelection()
 //=================================================================================
 void RepairGUI_ShapeProcessDlg::advOptionToggled( bool on )
 {
-  QButton* btn = (QButton*)sender();
-  if ( on && btn->isToggleButton() &&
-       QMessageBox::warning(myGeomGUI->getApp()->desktop(),
-                            tr( "GEOM_WRN_WARNING" ), tr( "TIME_CONSUMING" ),
-                            QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
+  QAbstractButton* btn = (QAbstractButton*)sender();
+  if ( on && btn->isCheckable() &&
+       SUIT_MessageBox::warning( this,
+                                tr( "GEOM_WRN_WARNING" ), tr( "TIME_CONSUMING" ),
+                                SUIT_MessageBox::Yes | SUIT_MessageBox::No ) == SUIT_MessageBox::No )
     btn->toggle();
 }
index 3d833fda195bd4773b1a029d4712d98021ad9c03..e5fd0e902046ca60a96b1fbe7ec6aae34c75000c 100755 (executable)
@@ -1,46 +1,41 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : RepairGUI_ShapeProcessDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_ShapeProcessDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef REPAIRGUI_SHAPEPROCESSDLG_H
+#define REPAIRGUI_SHAPEPROCESSDLG_H
 
-#ifndef DIALOGBOX_ShapeProcess_H
-#define DIALOGBOX_ShapeProcess_H
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_QTD.h"
-#include "RepairGUI.h"
-#include "QtxDblSpinBox.h"
+#include <QMap>
 
-#include <qspinbox.h>
-#include <qcombobox.h>
-#include <qcheckbox.h>
-#include <qlistview.h>
-#include <qwidgetstack.h>
-#include <qvaluelist.h>
-#include <qdict.h>
-#include <qmap.h>
+class DlgRef_1Sel;
+class SalomeApp_IntSpinBox;
+class SalomeApp_DoubleSpinBox;
+class QComboBox;
+class QCheckBox;
+class QListWidget;
 
 //=================================================================================
 // class    : RepairGUI_ShapeProcessDlg
 //=================================================================================
 class RepairGUI_ShapeProcessDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    RepairGUI_ShapeProcessDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                             const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~RepairGUI_ShapeProcessDlg();
-
+  RepairGUI_ShapeProcessDlg( GeometryGUI*, QWidget* = 0, bool = false );
+  ~RepairGUI_ShapeProcessDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-
-    virtual void closeEvent( QCloseEvent* e );        
-
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList&  );
+  
 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 );
-
-    void             enterEvent(QEvent* e);
-
-    QWidget*         getControl( const char* );
-    void             setValue( QWidget*, const char* ); // initialize the given control in the proper way
-                                                        // (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
-    QMap<QString,QStringList> myValMap; // map of parameters of operators
-    //QDict<QString,QWidget*> myCtrlMap;  // map of controls (values) of parameters
-    void             initParamsValues(); // initialize the data structures
-    void             initSelection();
-
-    GEOM::ListOfGO_var myObjects;  // selected objects
-
-    DlgRef_1Sel_QTD* mySelectWdgt;
-    QListView*       myOpList;
-    QWidgetStack*    myStack;
-
-    QtxDblSpinBox*   myFixShapeTol3D;
-    QtxDblSpinBox*   myFixShapeMaxTol3D;
-
-    QtxDblSpinBox*   myFixFaceSizeTol;
-
-    QtxDblSpinBox*   myDropSmallEdgesTol3D;
-
-    QtxDblSpinBox*   mySplitAngleAngle;
-    QtxDblSpinBox*   mySplitAngleMaxTol;
+  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& );
+  GEOM::string_array*                getValues( const GEOM::string_array& );
 
-    QSpinBox*        mySplitClosedFacesNum;
+  QStringList                        getTexts( const GEOM::string_array& );
 
-    QtxDblSpinBox*   mySplitContTol3D;
-    QComboBox*       mySplitContSurfCont;
-    QComboBox*       mySplitContCurvCont;
+  void                               enterEvent( QEvent* );
 
-    QCheckBox*       myBSplineSurfModeChk;
-    QCheckBox*       myBSpline3DCurveChk;
-    QCheckBox*       myBSpline2DCurveChk;
-    QtxDblSpinBox*   myBSplineTol3D;
-    QtxDblSpinBox*   myBSplineTol2D;
-    QSpinBox*        myBSplineDegree;
-    QSpinBox*        myBSplineSegments;
-    QComboBox*       myBSpline2DCont;
-    QComboBox*       myBSpline3DCont;
+  QWidget*                           getControl( const QString&  );
+  void                               setValue( QWidget*, const QString& ); // initialize the given control in the proper way
+  // (analize its class and convert the value string)
+  QString                            getValue( QWidget* ) const; // retrieve value of the control in the proper way
+  QString                            getText( QWidget* ) const; // retrieve text of the control (for spin-boxes only)
 
-    QCheckBox*       myToBezierSurfModeChk;
-    QCheckBox*       myToBezier3DCurveChk;
-    QCheckBox*       myToBezier2DCurveChk;
-    QtxDblSpinBox*   myToBezierMaxTol;
+  //QDict<QString,QWidget*>            myCtrlMap;  // map of controls (values) of parameters
+  void                               initParamsValues(); // initialize the data structures
+  void                               initSelection();
 
-    QtxDblSpinBox*   mySameParameterTol3D;
-    
+private:
+  QStringList                        myOpLst; // list of available Shape Healing Operators
+  QMap<QString,QStringList>          myValMap; // map of parameters of operators
+
+  GEOM::ListOfGO_var                 myObjects;  // selected objects
+  
+  DlgRef_1Sel*                       mySelectWdgt;
+  QListWidget*                       myOpList;
+  
+  SalomeApp_DoubleSpinBox*           myFixShapeTol3D;
+  SalomeApp_DoubleSpinBox*           myFixShapeMaxTol3D;
+
+  SalomeApp_DoubleSpinBox*           myFixFaceSizeTol;
+  
+  SalomeApp_DoubleSpinBox*           myDropSmallEdgesTol3D;
+
+  SalomeApp_DoubleSpinBox*           mySplitAngleAngle;
+  SalomeApp_DoubleSpinBox*           mySplitAngleMaxTol;
+  
+  SalomeApp_IntSpinBox*              mySplitClosedFacesNum;
+  
+  SalomeApp_DoubleSpinBox*           mySplitContTol3D;
+  QComboBox*                         mySplitContSurfCont;
+  QComboBox*                         mySplitContCurvCont;
+  
+  QCheckBox*                         myBSplineSurfModeChk;
+  QCheckBox*                         myBSpline3DCurveChk;
+  QCheckBox*                         myBSpline2DCurveChk;
+  SalomeApp_DoubleSpinBox*           myBSplineTol3D;
+  SalomeApp_DoubleSpinBox*           myBSplineTol2D;
+  SalomeApp_IntSpinBox*              myBSplineDegree;
+  SalomeApp_IntSpinBox*              myBSplineSegments;
+  QComboBox*                         myBSpline2DCont;
+  QComboBox*                         myBSpline3DCont;
+  
+  QCheckBox*                         myToBezierSurfModeChk;
+  QCheckBox*                         myToBezier3DCurveChk;
+  QCheckBox*                         myToBezier2DCurveChk;
+  SalomeApp_DoubleSpinBox*           myToBezierMaxTol;
+  
+  SalomeApp_DoubleSpinBox*           mySameParameterTol3D;
+  
 private slots:
-    void             onOk();
-    bool             onApply();
-
-    void             activate();
-
-    void             lineEditReturnPressed();
-    void             selectionChanged();
-    void             selectClicked();
-    void             operationChanged();
-    void             advOptionToggled(bool);
+  void                               onOk();
+  bool                               onApply();
+
+  void                               activate();
+  
+  void                               lineEditReturnPressed();
+  void                               selectionChanged();
+  void                               selectClicked();
+  void                               advOptionToggled( bool );
 };             
 
-#endif // DIALOGBOX_ShapeProcess_H
+#endif // REPAIRGUI_SHAPEPROCESSDLG_H
index 1ed948d7661d8e29c4e79eedd95f6814b24cfac3..7daaab8e1e1407a4c16ef01209d3940691e4be91 100644 (file)
@@ -1,45 +1,46 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_SuppressFacesDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : RepairGUI_SuppressFacesDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "RepairGUI_SuppressFacesDlg.h"
 
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SUIT_Session.h"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include "GEOMImpl_Types.hxx"
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SALOME_ListIteratorOfListIO.hxx>
 
-#include <TopAbs.hxx>
+#include <GEOMImpl_Types.hxx>
 
-#include <qlabel.h>
+#include <TopAbs.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
 
-using namespace std;
+#include <utilities.h>
 
 //=================================================================================
 // class    : RepairGUI_SuppressFacesDlg()
@@ -48,32 +49,35 @@ 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(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)
+RepairGUI_SuppressFacesDlg::RepairGUI_SuppressFacesDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                        bool modal )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SUPRESS_FACE")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_SUPRESS_FACE" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
     
-  setCaption(tr("GEOM_SUPRESSFACE_TITLE"));
+  setWindowTitle( tr("GEOM_SUPRESSFACE_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_SUPRESSFACE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel_QTD(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("Faces to remove"));
-  GroupPoints->TextLabel1->setText(tr("Faces"));
-  GroupPoints->PushButton1->setPixmap(image1);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_SUPRESSFACE"));
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+
+  GroupPoints = new DlgRef_1Sel( centralWidget() );
+  GroupPoints->GroupBox1->setTitle( tr( "Faces to remove" ) );
+  GroupPoints->TextLabel1->setText( tr( "Faces" ) );
+  GroupPoints->PushButton1->setIcon( image1 );
   GroupPoints->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget(GroupPoints, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
   /***************************************************************/
   
-  setHelpFileName("suppress_faces_operation_page.html");
+  setHelpFileName( "suppress_faces_operation_page.html" );
 
   Init();
 }
@@ -104,14 +108,14 @@ void RepairGUI_SuppressFacesDlg::Init()
   initSelection();
          
   /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
 
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect( GroupPoints->PushButton1, SIGNAL( clicked() ),       this, SLOT( SetEditCurrentArgument() ) );
+  connect( GroupPoints->LineEdit1,   SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
 
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   initName( tr( "SUPRESS_FACE_NEW_OBJ_NAME" ) );
 }
@@ -138,7 +142,7 @@ bool RepairGUI_SuppressFacesDlg::ClickOnApply()
 
   initName();
 
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   myObjects->length( 0 );
   myFaces.clear();
 
@@ -155,31 +159,32 @@ bool RepairGUI_SuppressFacesDlg::ClickOnApply()
 //=================================================================================
 void RepairGUI_SuppressFacesDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
 
   Standard_Boolean aRes = Standard_False;
   int i = 0;
   int numFaces = 0;
-  myObjects->length( IObjectCount() );
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  myObjects->length( aSelList.Extent() );
   myFaces.clear();
-  for ( SALOME_ListIteratorOfListIO anIt( selectedIO() ); anIt.More(); anIt.Next() )
-  {
+
+  for (SALOME_ListIteratorOfListIO anIt (aSelList); anIt.More(); anIt.Next()) {
     Handle(SALOME_InteractiveObject) anIO = anIt.Value();
     GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
-    if ( !CORBA::is_nil( aSelectedObject ) && aRes )
-    {
+    if ( !CORBA::is_nil( aSelectedObject ) && aRes ) {
       TopoDS_Shape aShape;
-      if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) )
-      {
-       if ( aShape.ShapeType() <= TopAbs_FACE ) // FACE, SHELL, SOLID, COMPOUND
-       {
+      if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) ) {
+       if ( aShape.ShapeType() <= TopAbs_FACE ) { // FACE, SHELL, SOLID, COMPOUND
          GEOM::short_array anIndexes;
 
          TColStd_IndexedMapOfInteger aMap;
-         myGeomGUI->getApp()->selectionMgr()->GetIndexes( anIO, aMap );
+         aSelMgr->GetIndexes( anIO, aMap );
          
-         if ( !aMap.IsEmpty() )
-         {
+         if ( !aMap.IsEmpty() ) {
            Convert( aMap, anIndexes );
            myObjects[i++] = aSelectedObject; // append the object
            myFaces.append( anIndexes );   // append faces' indexes
@@ -212,8 +217,7 @@ void RepairGUI_SuppressFacesDlg::Convert( const TColStd_IndexedMapOfInteger& the
 //=================================================================================
 void RepairGUI_SuppressFacesDlg::SetEditCurrentArgument()
 {
-  if( sender() == GroupPoints->PushButton1 )
-  {
+  if ( sender() == GroupPoints->PushButton1 ) {
     GroupPoints->LineEdit1->setFocus();
     myEditCurrentArgument = GroupPoints->LineEdit1;
   }
@@ -227,8 +231,7 @@ void RepairGUI_SuppressFacesDlg::SetEditCurrentArgument()
 //=================================================================================
 void RepairGUI_SuppressFacesDlg::LineEditReturnPressed()
 {
-  if( sender() == GroupPoints->LineEdit1 )
-  {
+  if ( sender() == GroupPoints->LineEdit1 ) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
@@ -242,8 +245,8 @@ void RepairGUI_SuppressFacesDlg::LineEditReturnPressed()
 void RepairGUI_SuppressFacesDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   //myGeomGUI->SetState( 0 );
   initSelection();
@@ -254,23 +257,13 @@ void RepairGUI_SuppressFacesDlg::ActivateThisDialog()
 // function : enterEvent()
 // purpose  : Mouse enter onto the dialog to activate it
 //=================================================================================
-void RepairGUI_SuppressFacesDlg::enterEvent(QEvent* e)
+void RepairGUI_SuppressFacesDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
 
-//=================================================================================
-// function : closeEvent()
-// purpose  :
-//=================================================================================
-void RepairGUI_SuppressFacesDlg::closeEvent(QCloseEvent* e)
-{
-  //myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : createOperation
 // purpose  :
@@ -284,7 +277,7 @@ GEOM::GEOM_IOperations_ptr RepairGUI_SuppressFacesDlg::createOperation()
 // function : isValid
 // purpose  :
 //=================================================================================
-bool RepairGUI_SuppressFacesDlg::isValid( QString& msg )
+bool RepairGUI_SuppressFacesDlg::isValid( QString& )
 {
   const int objL = myObjects->length(), facesL = myFaces.size();
   return ( objL && objL == facesL );
@@ -297,8 +290,7 @@ bool RepairGUI_SuppressFacesDlg::isValid( QString& msg )
 bool RepairGUI_SuppressFacesDlg::execute( ObjectList& objects )
 {
   QStringList anErrorObjNames;
-  for ( int i = 0; i < myObjects->length(); i++ )
-  {
+  for ( int i = 0; i < myObjects->length(); i++ ) {
     GEOM::GEOM_Object_var obj = myObjects[i];
     GEOM::short_array faces = myFaces[i];
     //MESSAGE(">>>> Dlg, passing faces.. len = " << faces.length());
@@ -310,7 +302,7 @@ bool RepairGUI_SuppressFacesDlg::execute( ObjectList& objects )
   }
 
   if ( !anErrorObjNames.empty() )
-    MESSAGE("ERRORS occured while processing the following objects: " << anErrorObjNames.join( " " ));
+    MESSAGE( "ERRORS occured while processing the following objects: " << anErrorObjNames.join( " " ).toLatin1().data() );
 
   return anErrorObjNames.size() < myObjects->length(); // true if at least one object was OK, false if ALL objects were nil after Healing.
 }
index cdf86391326ae83b9e1bc59583d82d58287cd9ca..66a36ca94fb0d1c6c7070015d2246531f93d46bc 100644 (file)
@@ -1,37 +1,37 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : RepairGUI_SuppressFacesDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : RepairGUI_SuppressFacesDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef REPAIRGUI_SUPPRESSFACESDLG_H
+#define REPAIRGUI_SUPPRESSFACESDLG_H
 
-#ifndef DIALOGBOX_SUPPRESSFACES_H
-#define DIALOGBOX_SUPPRESSFACES_H
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel_QTD.h"
+#include <QList>
 
-#include <TColStd_IndexedMapOfInteger.hxx>
+class DlgRef_1Sel;
+class TColStd_IndexedMapOfInteger;
 
 //=================================================================================
 // class    : RepairGUI_SuppressFacesDlg
 //=================================================================================
 class RepairGUI_SuppressFacesDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    RepairGUI_SuppressFacesDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                              const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~RepairGUI_SuppressFacesDlg();
+  RepairGUI_SuppressFacesDlg( GeometryGUI*, QWidget* = 0, bool = false );
+  ~RepairGUI_SuppressFacesDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );    
-
-private :
-    void Init();
-    void enterEvent(QEvent* e);
-    void closeEvent(QCloseEvent* e);
-
-    GEOM::ListOfGO_var myObjects;
-    QValueList<GEOM::short_array> 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.
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );    
 
-    void Convert( const TColStd_IndexedMapOfInteger&, GEOM::short_array& );
-
-    void initSelection();
-
-    DlgRef_1Sel_QTD* GroupPoints;
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
 
+  void                               Convert( const TColStd_IndexedMapOfInteger&, 
+                                             GEOM::short_array& );
+  
+  void                               initSelection();
+  
+private:
+  GEOM::ListOfGO_var                 myObjects;
+  QList<GEOM::short_array>           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.
+  
+  DlgRef_1Sel*                       GroupPoints;
+  
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-
-    void ActivateThisDialog();
-
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  
+  void                               ActivateThisDialog();
+  
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // DIALOGBOX_SUPPRESSFACES_H
+#endif // REPAIRGUI_SUPPRESSFACESDLG_H
index 92dde135b11ee7d531549ecf4f99c3d90ce9a73f..1ff0140053c3d8c6c8966a5b234a4b53a5d8c860 100644 (file)
@@ -1,52 +1,51 @@
-#  GEOM SKETCHER : basic sketcher
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 #
-#  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
+#  This library is free software; you can redistribute it and/or
+#  modify it 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
+#
+#  GEOM SKETCHER : basic sketcher
 #  File   : Makefile.in
 #  Author : Patrick GOLDBRONN (CEA)
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS = \
+salomeinclude_HEADERS =                \
        Sketcher_Profile.hxx
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOMSketcher.la
 
-dist_libGEOMSketcher_la_SOURCES = \
+dist_libGEOMSketcher_la_SOURCES =      \
        Sketcher_Profile.cxx
 
-# additionnal information to compil and link file
-libGEOMSketcher_la_CPPFLAGS = \
-       $(CAS_CPPFLAGS) \
+# additional information to compile and link file
+
+libGEOMSketcher_la_CPPFLAGS =  \
+       $(CAS_CPPFLAGS)         \
        $(KERNEL_CXXFLAGS)
 
-libGEOMSketcher_la_LDFLAGS  = \
-       $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
-       $(STDLIB) \
-       $(CAS_KERNEL) \
+libGEOMSketcher_la_LDFLAGS  =                  \
+       $(KERNEL_LDFLAGS) -lSALOMELocalTrace    \
+       $(STDLIB)                               \
+       $(CAS_KERNEL)                           \
        $(CAS_MODELER)
diff --git a/src/SKETCHER/SKETCHER.pro b/src/SKETCHER/SKETCHER.pro
new file mode 100644 (file)
index 0000000..6dd1da3
--- /dev/null
@@ -0,0 +1,58 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = GEOMSketcher
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+STDLIB = -lstdc++
+
+CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
+
+CAS_MODELER = -L$${CASROOT}/Linux/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBO -lTKBool -lTKHLR -lTKFillet -lTKOffset -lTKFeat
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS}
+
+LIBS += $${KERNEL_LDFLAGS} -lSALOMELocalTrace $${STDLIB} $${CAS_KERNEL} $${CAS_MODELER}
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+HEADERS  = Sketcher_Profile.hxx
+
+SOURCES  = Sketcher_Profile.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index d5b5a4b7bfed3f03161af7578e28b8505183c51e..eb8fd9f237e0d78e64eaf7deb403a6b322499543 100644 (file)
@@ -1,6 +1,6 @@
-//  GEOM SKETCHER : basic sketcher
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2003-2007  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
 //  License along with this library; if 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
-//
-//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+//  GEOM SKETCHER : basic sketcher
 //  File   : Sketcher_Profile.cxx
 //  Author : Damien COQUERET
 //  Module : GEOM
 //  $Header:
-
+//
 #include <Standard_Stream.hxx>
 
 #include <Sketcher_Profile.hxx>
index c05f797350b5170e80b77dffa61a72de212bb0f1..7db4b4eaf442a8af9da12d3bbd4c38d87109736d 100644 (file)
@@ -1,31 +1,30 @@
-//  GEOM SKETCHER : basic sketcher
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY 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 SKETCHER : basic sketcher
 //  File   : Sketcher_Profile.h
 //  Author : Damien COQUERET
 //  Module : GEOM
 //  $Header: 
-
+//
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
 #include <TopoDS_Shape.hxx>
index 66467dfa7596c8d632d8fc3e41b156d0bdefed88..3748333cb2dfa369717890f7eac878b1f61bed59 100644 (file)
@@ -1,29 +1,30 @@
-#  Copyright (C) 2003  CEA
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it 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
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
+#  Copyright (C) 2003-2007  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 : Pavel TELKOV
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
@@ -32,15 +33,16 @@ salomeinclude_HEADERS =
 # Libraries targets
 lib_LTLIBRARIES = libSTEPExport.la
 
-dist_libSTEPExport_la_SOURCES = \
+dist_libSTEPExport_la_SOURCES =        \
        STEPExport.cxx
 
-# additionnal information to compil and link file
-libSTEPExport_la_CPPFLAGS = \
-       $(CAS_CPPFLAGS) \
+# additional information to compile and link file
+
+libSTEPExport_la_CPPFLAGS =    \
+       $(CAS_CPPFLAGS)         \
        $(KERNEL_CXXFLAGS)
 
-libSTEPExport_la_LDFLAGS  = \
-       $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
-       $(STDLIB) \
+libSTEPExport_la_LDFLAGS  =                    \
+       $(KERNEL_LDFLAGS) -lSALOMELocalTrace    \
+       $(STDLIB)                               \
        $(CAS_LDPATH) -lTKSTEP
index 290ab74b2612680c351acb16ce6b6faaee629e2e..debe363a7419672e94e7f79088f8e56f3dc4ef85 100644 (file)
@@ -1,27 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       STEPExport.cxx
 // Created:    Wed May 19 14:53:52 2004
 // Author:     Pavel TELKOV
 //             <ptv@mutex.nnov.opencascade.com>
-
+//
 #include "utilities.h"
 
 #include <IFSelect_ReturnStatus.hxx>
diff --git a/src/STEPExport/STEPExport.pro b/src/STEPExport/STEPExport.pro
new file mode 100644 (file)
index 0000000..8f55975
--- /dev/null
@@ -0,0 +1,49 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = STEPExport
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+STDLIB = -lstdc++
+
+CAS_LDPATH = -L$$(CASROOT)/Linux/lib
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS}
+
+LIBS += $${STDLIB} $${CAS_LDPATH} -lTKSTEP $${KERNEL_LDFLAGS} -lSALOMELocalTrace 
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += STEPEXPORT_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+SOURCES  = STEPExport.cxx
index 7fd6d51f33351280b60c8a29e51948b7b4f45dcc..f5e90dabdc9e96dff752259d0937b5a72fa2be94 100644 (file)
@@ -1,29 +1,30 @@
-#  Copyright (C) 2003  CEA
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it 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
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
+#  Copyright (C) 2003-2007  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 : Pavel TELKOV
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
@@ -32,15 +33,16 @@ salomeinclude_HEADERS =
 # Libraries targets
 lib_LTLIBRARIES = libSTEPImport.la
 
-dist_libSTEPImport_la_SOURCES = \
+dist_libSTEPImport_la_SOURCES =        \
        STEPImport.cxx
 
-# additionnal information to compil and link file
-libSTEPImport_la_CPPFLAGS = \
-       $(CAS_CPPFLAGS) \
+# additional information to compile and link file
+
+libSTEPImport_la_CPPFLAGS =    \
+       $(CAS_CPPFLAGS)         \
        $(KERNEL_CXXFLAGS)
 
-libSTEPImport_la_LDFLAGS  = \
-       $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
-       $(STDLIB) \
+libSTEPImport_la_LDFLAGS  =                    \
+       $(KERNEL_LDFLAGS) -lSALOMELocalTrace    \
+       $(STDLIB)                               \
        $(CAS_LDPATH) -lTKSTEP
index 05f5b480c978ecf0cc57d7bc595ab11ca7d9919d..2ee8f1363dfcf571ef82f1743aa0f3994698ec98 100644 (file)
@@ -1,27 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       STEPImport.cxx
 // Created:    Wed May 19 14:41:10 2004
 // Author:     Pavel TELKOV
 //             <ptv@mutex.nnov.opencascade.com>
-
+//
 #include "utilities.h"
 
 #include <BRep_Builder.hxx>
diff --git a/src/STEPImport/STEPImport.pro b/src/STEPImport/STEPImport.pro
new file mode 100644 (file)
index 0000000..a885967
--- /dev/null
@@ -0,0 +1,49 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = STEPImport
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+STDLIB = -lstdc++
+
+CAS_LDPATH = -L$$(CASROOT)/Linux/lib
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS}
+
+LIBS += $${STDLIB} $${CAS_LDPATH} -lTKSTEP $${KERNEL_LDFLAGS} -lSALOMELocalTrace 
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += STEPIMPORT_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+SOURCES  = STEPImport.cxx
index 9b358c0a31451454576d00e5faf38158b28fcc5d..67cff44ccc3acf57f790a98d6ebd75db77ba037b 100644 (file)
@@ -1,24 +1,26 @@
-#  Copyright (C) 2003  CEA
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it 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
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
 #
 #  $Header$
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
@@ -27,15 +29,16 @@ salomeinclude_HEADERS =
 # Libraries targets
 lib_LTLIBRARIES = libSTLExport.la
 
-dist_libSTLExport_la_SOURCES = \
+dist_libSTLExport_la_SOURCES = \
        STLExport.cxx
 
-# additionnal information to compil and link file
-libSTLExport_la_CPPFLAGS = \
-       $(CAS_CPPFLAGS) \
+# additional information to compile and link file
+
+libSTLExport_la_CPPFLAGS =     \
+       $(CAS_CPPFLAGS)         \
        $(KERNEL_CXXFLAGS)
 
-libSTLExport_la_LDFLAGS  = \
-       $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
-       $(STDLIB) \
+libSTLExport_la_LDFLAGS  =                     \
+       $(KERNEL_LDFLAGS) -lSALOMELocalTrace    \
+       $(STDLIB)                               \
        $(CAS_LDPATH) -lTKSTL
index eded4321d4f93f85cdc5cedbe998c121d04555ac..d264d62a48ae8752db307c0217d7707f10e5b54a 100644 (file)
@@ -1,27 +1,29 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:       STLExport.cxx
 // Created:    Wed May 19 14:53:52 2004
 // Author:     Pavel TELKOV
 //             <ptv@mutex.nnov.opencascade.com>
-
+//
 #include "utilities.h"
 
 #include <StlAPI_Writer.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS_Shape.hxx>
 
-#ifdef WNT
-#include <SALOME_WNT.hxx>
+#ifdef WIN32
+# if defined STLEXPORT_EXPORTS
+#  define STLEXPORT_EXPORT __declspec( dllexport )
+# else
+#  define STLEXPORT_EXPORT __declspec( dllimport )
+# endif
 #else
-#define SALOME_WNT_EXPORT
+# define STLEXPORT_EXPORT
 #endif
 
 //=============================================================================
@@ -43,7 +49,7 @@
 
 extern "C"
 {
-  SALOME_WNT_EXPORT
+  STLEXPORT_EXPORT
   int Export(const TopoDS_Shape& theShape,
              const TCollection_AsciiString& theFileName,
              const TCollection_AsciiString& theFormatName)
diff --git a/src/STLExport/STLExport.pro b/src/STLExport/STLExport.pro
new file mode 100644 (file)
index 0000000..e161a9b
--- /dev/null
@@ -0,0 +1,49 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = STLExport
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+STDLIB = -lstdc++
+
+CAS_LDPATH = -L$$(CASROOT)/Linux/lib
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS}
+
+LIBS += $${STDLIB} $${CAS_LDPATH} -lTKSTL $${KERNEL_LDFLAGS} -lSALOMELocalTrace 
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+SOURCES  = STLExport.cxx
index bb8409246eb45823780210ac831abacc523059a4..45163e0c958d8fb787cef1475da50acf25403502 100644 (file)
@@ -1,74 +1,73 @@
-#  GEOM ShHealOper : Shape Healing
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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  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 library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY 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 ShHealOper : Shape Healing
 #  File   : Makefile.in
 #  Author : Alexander SLADKOV
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header: 
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS = \
-       ShHealOper_CloseContour.hxx \
-       ShHealOper_EdgeDivide.hxx \
-       ShHealOper_FillHoles.hxx \
-       ShHealOper_RemoveFace.hxx \
-       ShHealOper_RemoveInternalWires.hxx \
-       ShHealOper_Sewing.hxx \
-       ShHealOper_ShapeProcess.hxx \
-       ShHealOper_SpiltCurve2d.hxx \
-       ShHealOper_SplitCurve2d.hxx \
-       ShHealOper_SplitCurve3d.hxx \
-       ShHealOper_ChangeOrientation.hxx \
+salomeinclude_HEADERS =                                \
+       ShHealOper_CloseContour.hxx             \
+       ShHealOper_EdgeDivide.hxx               \
+       ShHealOper_FillHoles.hxx                \
+       ShHealOper_RemoveFace.hxx               \
+       ShHealOper_RemoveInternalWires.hxx      \
+       ShHealOper_Sewing.hxx                   \
+       ShHealOper_ShapeProcess.hxx             \
+       ShHealOper_SpiltCurve2d.hxx             \
+       ShHealOper_SplitCurve2d.hxx             \
+       ShHealOper_SplitCurve3d.hxx             \
+       ShHealOper_ChangeOrientation.hxx        \
        ShHealOper_Tool.hxx
 
 # Libraries targets
 lib_LTLIBRARIES = libShHealOper.la
 
-dist_libShHealOper_la_SOURCES = \
-       ShHealOper_CloseContour.cxx \
-       ShHealOper_EdgeDivide.cxx \
-       ShHealOper_FillHoles.cxx \
-       ShHealOper_RemoveFace.cxx \
-       ShHealOper_RemoveInternalWires.cxx \
-       ShHealOper_Sewing.cxx \
-       ShHealOper_ShapeProcess.cxx \
-       ShHealOper_SplitCurve2d.cxx \
-       ShHealOper_SplitCurve3d.cxx \
-       ShHealOper_ChangeOrientation.cxx \
+dist_libShHealOper_la_SOURCES =                        \
+       ShHealOper_CloseContour.cxx             \
+       ShHealOper_EdgeDivide.cxx               \
+       ShHealOper_FillHoles.cxx                \
+       ShHealOper_RemoveFace.cxx               \
+       ShHealOper_RemoveInternalWires.cxx      \
+       ShHealOper_Sewing.cxx                   \
+       ShHealOper_ShapeProcess.cxx             \
+       ShHealOper_SplitCurve2d.cxx             \
+       ShHealOper_SplitCurve3d.cxx             \
+       ShHealOper_ChangeOrientation.cxx        \
        ShHealOper_Tool.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libShHealOper_la_CPPFLAGS = \
-       $(CAS_CPPFLAGS) \
+libShHealOper_la_CPPFLAGS =    \
+       $(CAS_CPPFLAGS)         \
        $(KERNEL_CXXFLAGS)
 
-libShHealOper_la_LDFLAGS  = \
-       $(STDLIB) \
-       $(CAS_KERNEL) \
-       $(CAS_MATH) \
-       $(CAS_TKTopAlgo) \
+libShHealOper_la_LDFLAGS  =    \
+       $(STDLIB)               \
+       $(CAS_KERNEL)           \
+       $(CAS_MATH)             \
+       $(CAS_TKTopAlgo)        \
        $(CAS_LDPATH) -lTKBool -lTKShHealing -lTKLCAF
diff --git a/src/ShHealOper/ShHealOper.pro b/src/ShHealOper/ShHealOper.pro
new file mode 100644 (file)
index 0000000..6bb2a53
--- /dev/null
@@ -0,0 +1,81 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = ShHealOper
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+STDLIB = -lstdc++
+
+CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
+
+CAS_MATH = -L$${CASROOT}/Linux/lib  -lTKMath
+
+CAS_TKTopAlgo = -L$${CASROOT}/Linux/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo
+
+CAS_LDPATH = -L$$(CASROOT)/Linux/lib
+
+INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS}
+
+LIBS += $${STDLIB} $${CAS_KERNEL} $${CAS_MATH} $${CAS_TKTopAlgo} $${CAS_LDPATH} -lTKBool -lTKShHealing -lTKLCAF
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
+
+HEADERS  = ShHealOper_CloseContour.hxx
+HEADERS += ShHealOper_EdgeDivide.hxx
+HEADERS += ShHealOper_FillHoles.hxx
+HEADERS += ShHealOper_RemoveFace.hxx
+HEADERS += ShHealOper_RemoveInternalWires.hxx
+HEADERS += ShHealOper_Sewing.hxx
+HEADERS += ShHealOper_ShapeProcess.hxx
+HEADERS += ShHealOper_SpiltCurve2d.hxx
+HEADERS += ShHealOper_SplitCurve2d.hxx
+HEADERS += ShHealOper_SplitCurve3d.hxx
+HEADERS += ShHealOper_ChangeOrientation.hxx
+HEADERS += ShHealOper_Tool.hxx
+
+SOURCES  = ShHealOper_CloseContour.cxx
+SOURCES += ShHealOper_EdgeDivide.cxx
+SOURCES += ShHealOper_FillHoles.cxx
+SOURCES += ShHealOper_RemoveFace.cxx
+SOURCES += ShHealOper_RemoveInternalWires.cxx
+SOURCES += ShHealOper_Sewing.cxx
+SOURCES += ShHealOper_ShapeProcess.cxx
+SOURCES += ShHealOper_SplitCurve2d.cxx
+SOURCES += ShHealOper_SplitCurve3d.cxx
+SOURCES += ShHealOper_ChangeOrientation.cxx
+SOURCES += ShHealOper_Tool.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index 92912fa858559be251f6fd5e4723c421d8810236..8be204945f5d98bc617269ac0b0653f5a56e6771 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_ChangeOrientation.cxx
 // Created:   11.07.06 11:46:45
 // Author:    Sergey KUUL
-
-
+//
 #include <ShHealOper_ChangeOrientation.hxx>
 
 #include <BRep_Builder.hxx>
index fe6ee94e279a995281ffbca4cdce5273ba62c21d..80c82ebed3002e09e713251d4c72da7b1c70dffb 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_ChangeOrientation.hxx
 // Created:   11.07.06 11:22:26
 // Author:    Sergey KUUL
-
-
+//
 #ifndef ShHealOper_ChangeOrientation_HeaderFile
 #define ShHealOper_ChangeOrientation_HeaderFile
 
index 0c9d360c2fc5d4b895aa3c604f790d863bf9aeb0..683fec5f4ed366f4f4af290742a17ad9cd45e227 100644 (file)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_CloseContour.cxx
 // Created:   20.04.04 11:36:01
 // Author:    Galina KULIKOVA
-
-
+//
 #include <ShHealOper_CloseContour.hxx>
 #include <ShapeExtend_WireData.hxx>
 #include <ShapeFix_Wire.hxx>
index de664780a3fdb76990b4f1dad5df0d5ea0c58f2d..4558bb1c9272a12b683ccacb5383578fdb489e2e 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_CloseContour.hxx
 // Created:   20.04.04 10:25:46
 // Author:    Galina KULIKOVA
-
-
+//
 #ifndef ShHealOper_CloseContour_HeaderFile
 #define ShHealOper_CloseContour_HeaderFile
 
index 0eb1563b22b36e23092ac84a408c5bb7d61e4285..52e061b6ddc83a8dffe7298486dd659a23ba32bf 100644 (file)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_EdgeDivide.cxx
 // Created:   30.04.04 16:44:47
 // Author:    Galina KULIKOVA
-
+//
 #include <ShHealOper_EdgeDivide.hxx>
 #include <ShapeUpgrade_WireDivide.hxx>
 #include <ShHealOper_SplitCurve3d.hxx>
index 32cad68605780c93cdb92f029268dc65de117b91..c09d779bdb03dc3fb4fc165beeee02c5c8ed1a29 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_EdgeDivide.hxx
 // Created:   30.04.04 16:06:25
 // Author:    Galina KULIKOVA
-
-
+//
 #ifndef ShHealOper_EdgeDivide_HeaderFile
 #define ShHealOper_EdgeDivide_HeaderFile
 
index 2edfa6c683d94dc6ec5ef11d0824a6ae58833403..3e8f0d4bd0dfeec8e3fda5967806a11871aaf42b 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_FillHoles.cxx
 // Created:   26.04.04 17:35:30
 // Author:    Galina KULIKOVA
-
-
+//
 #include <ShHealOper_FillHoles.hxx>
 #include <TopExp.hxx>
 #include <TopAbs_ShapeEnum.hxx>
index 2ad1ff6e532174f35fa961aa311314e9733be0c6..4732440230c2364180f5848791b3dbd289551c72 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_FillHoles.hxx
 // Created:   26.04.04 17:15:10
 // Author:    Galina KULIKOVA
-
-
+//
 #ifndef ShHealOper_FillHoles_HeaderFile
 #define ShHealOper_FillHoles_HeaderFile
 
index 0bf3c17ae6aeeed04b08eecd68c85b4f31ed1967..839a41267d1ec77cc811991b1b2d6d0fddce4e70 100644 (file)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_RemoveFace.cxx
 // Created:   16.04.04 12:12:38
 // Author:    Galina KULIKOVA
-
+//
 #include <ShHealOper_RemoveFace.hxx>
 #include <BRepTools_ReShape.hxx>
 #include <TopoDS_Shape.hxx>
index 3c6aa9cd28fdc4a651a71248f9fb56c2a2aa2eac..a93a43dfa164d28da851032951c1e6c0d653b193 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_RemoveFace.hxx
 // Created:   15.04.04 18:10:16
 // Author:    Galina KULIKOVA
-
-
+//
 #ifndef ShHealOper_RemoveFace_HeaderFile
 #define ShHealOper_RemoveFace_HeaderFile
 
index 8865287f4d20a1d1b440097863aab0f13a872c23..87a463bddc1a2348e0840ca8bfbdb412e3ddbc9a 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_RemoveInternalWires.cxx
 // Created:   26.04.04 14:46:45
 // Author:    Galina KULIKOVA
-
-
+//
 #include <ShHealOper_RemoveInternalWires.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
index 6cad8d361eec21dfd03e8e5282346d7f81cb9ece..fd684cc7180b37939700611df9d005f195fdc044 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_RemoveInternalWires.hxx
 // Created:   26.04.04 11:22:26
 // Author:    Galina KULIKOVA
-
-
+//
 #ifndef ShHealOper_RemoveInternalWires_HeaderFile
 #define ShHealOper_RemoveInternalWires_HeaderFile
 
index be67bb569f7c6c38de911dae2b7c39b01f8d7d1c..c81ef593901a1aca7c0033c39467be544834cf0b 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_Sewing.cxx
 // Created:   29.04.04 15:07:10
 // Author:    Galina KULIKOVA
-
-
+//
 #include <ShHealOper_Sewing.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Shell.hxx>
index c3209d2465cb1d9899a29fb6ea2e9df545173cf4..466cd7a3b1b986f84e65b9bbe3f71d1c984b6899 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_Sewing.hxx
 // Created:   29.04.04 13:29:10
 // Author:    Galina KULIKOVA
-
-
+//
 #ifndef ShHealOper_Sewing_HeaderFile
 #define ShHealOper_Sewing_HeaderFile
 
index 07c7291febd73fca7c1e5fb3eb8e99151b8c8465..8c8b1a324e53c412621818640e5ab001f461acbb 100644 (file)
@@ -1,27 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_ShapeProcess.cxx
 // Created:   14.04.04 10:58:04
 // Author:    Galina KULIKOVA
-
+//
 #include <ShHealOper_ShapeProcess.hxx>
 #include <ShapeProcessAPI_ApplySequence.hxx>
 #include <ShapeProcess_Context.hxx>
index e62fc56be5e4e9ab62015cb31b455a50b312838d..ad6e7491766c8b15d8a9606d2810de74ab01eb52 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_ShapeProcess.hxx
 // Created:   13.04.04 11:45:20
 // Author:    Galina KULIKOVA
-
-
+//
 #ifndef ShHealOper_ShapeProcess_HeaderFile
 #define ShHealOper_ShapeProcess_HeaderFile
 
index d69b411b601728ac70284705f21c140bf214b641..9e4b5c07b7d3d857e661eb4e3d7cb957244421b4 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_SplitCurve2d.hxx
 // Created:   05.05.04 12:56:01
 // Author:    Galina KULIKOVA
-
-
+//
 #ifndef ShHealOper_SplitCurve2d_HeaderFile
 #define ShHealOper_SplitCurve2d_HeaderFile
 
index 79e4f08f7e29c6a369767a036e6f69b7cfb03b16..4e495f9e1080978daf3cd8db8c7d96afb8a3af78 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_SplitCurve2d.cxx
 // Created:   05.05.04 13:03:10
 // Author:    Galina KULIKOVA
-
-
+//
 #include <ShHealOper_SplitCurve2d.hxx>
 #include <ShapeExtend_Status.hxx>
 #include <ShapeExtend.hxx>
index aa62b4a946a1b77dde8c75ef78da7ce929530bcf..cd9d87c6c425632f94a179876d7915bed5895e46 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_SplitCurve2d.hxx
 // Created:   05.05.04 12:56:01
 // Author:    Galina KULIKOVA
-
-
+//
 #ifndef ShHealOper_SplitCurve2d_HeaderFile
 #define ShHealOper_SplitCurve2d_HeaderFile
 
index 0b4142ac7d13ab6d6f8fc15c8cd2962801605ebd..f7286e2e115a513e3156ed257849b8d9be490276 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_SplitCurve3d.cxx
 // Created:   05.05.04 12:48:36
 // Author:    Galina KULIKOVA
-
-
+//
 #include <ShHealOper_SplitCurve3d.hxx>
 #include <ShapeExtend_Status.hxx>
 #include <ShapeExtend.hxx>
index 8818e6b164d72ca83733e669b92d53dad28dd2f5..7431245130ec29063616f8c5452f62848fb012c0 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_SplitCurve3d.hxx
 // Created:   05.05.04 12:28:13
 // Author:    Galina KULIKOVA
-
-
+//
 #ifndef ShHealOper_SplitCurve3d_HeaderFile
 #define ShHealOper_SplitCurve3d_HeaderFile
 
index 4827956acede0c657899b807abf5c7d4b9fe1daa..e0f394756a4fab3fcbab3224ffa1aedea7fe32e9 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_Tool.cxx
 // Created:   26.04.04 12:11:33
 // Author:    Galina KULIKOVA
-
-
+//
 #include <ShHealOper_Tool.hxx>
 
 //=======================================================================
index 587c474e14abf7b320d605879573215a3383523b..502a60f1a1c210cdba4ff8baac358b42b0421b38 100644 (file)
@@ -1,28 +1,28 @@
-// 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) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  This library is free software; you can redistribute it and/or
+//  modify it 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:      ShHealOper_Tool.hxx
 // Created:   26.04.04 11:36:04
 // Author:    Galina KULIKOVA
-
-
+//
 #ifndef ShHealOper_Tool_HeaderFile
 #define ShHealOper_Tool_HeaderFile
 
index b980ea75a475a878f2904778cd65dfd65a17bf47..4a3725c81c39de6aae86404a5a82477a05c3d3ea 100644 (file)
-#  GEOM TRANSFORMATIONGUI : 
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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
+#  Copyright (C) 2003-2007  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
+#
+# GEOM TRANSFORMATIONGUI : 
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : TransformationGUI
 #
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
-
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =                                        \
+       TransformationGUI.h                             \
+       TransformationGUI_MultiTranslationDlg.h         \
+       TransformationGUI_MultiRotationDlg.h            \
+       TransformationGUI_TranslationDlg.h              \
+       TransformationGUI_RotationDlg.h                 \
+       TransformationGUI_MirrorDlg.h                   \
+       TransformationGUI_ScaleDlg.h                    \
+       TransformationGUI_OffsetDlg.h                   \
+       TransformationGUI_PositionDlg.h
 
 # Libraries targets
 lib_LTLIBRARIES = libTransformationGUI.la
 
-dist_libTransformationGUI_la_SOURCES = \
-       TransformationGUI.cxx \
-       TransformationGUI_MultiTranslationDlg.cxx \
-       TransformationGUI_MultiRotationDlg.cxx \
-       TransformationGUI_TranslationDlg.cxx \
-       TransformationGUI_RotationDlg.cxx \
-       TransformationGUI_MirrorDlg.cxx \
-       TransformationGUI_ScaleDlg.cxx \
-       TransformationGUI_OffsetDlg.cxx \
+dist_libTransformationGUI_la_SOURCES =                 \
+       TransformationGUI.h                             \
+       TransformationGUI_MultiTranslationDlg.h         \
+       TransformationGUI_MultiRotationDlg.h            \
+       TransformationGUI_TranslationDlg.h              \
+       TransformationGUI_RotationDlg.h                 \
+       TransformationGUI_MirrorDlg.h                   \
+       TransformationGUI_ScaleDlg.h                    \
+       TransformationGUI_OffsetDlg.h                   \
+       TransformationGUI_PositionDlg.h                 \
+                                                       \
+       TransformationGUI.cxx                           \
+       TransformationGUI_MultiTranslationDlg.cxx       \
+       TransformationGUI_MultiRotationDlg.cxx          \
+       TransformationGUI_TranslationDlg.cxx            \
+       TransformationGUI_RotationDlg.cxx               \
+       TransformationGUI_MirrorDlg.cxx                 \
+       TransformationGUI_ScaleDlg.cxx                  \
+       TransformationGUI_OffsetDlg.cxx                 \
        TransformationGUI_PositionDlg.cxx
 
-MOC_FILES = \
-       TransformationGUI_MultiTranslationDlg_moc.cxx \
-       TransformationGUI_MultiRotationDlg_moc.cxx \
-       TransformationGUI_TranslationDlg_moc.cxx \
-       TransformationGUI_RotationDlg_moc.cxx \
-       TransformationGUI_MirrorDlg_moc.cxx \
-       TransformationGUI_ScaleDlg_moc.cxx \
-       TransformationGUI_OffsetDlg_moc.cxx \
+MOC_FILES =                                            \
+       TransformationGUI_MultiTranslationDlg_moc.cxx   \
+       TransformationGUI_MultiRotationDlg_moc.cxx      \
+       TransformationGUI_TranslationDlg_moc.cxx        \
+       TransformationGUI_RotationDlg_moc.cxx           \
+       TransformationGUI_MirrorDlg_moc.cxx             \
+       TransformationGUI_ScaleDlg_moc.cxx              \
+       TransformationGUI_OffsetDlg_moc.cxx             \
        TransformationGUI_PositionDlg_moc.cxx
 
-nodist_libTransformationGUI_la_SOURCES= \
+nodist_libTransformationGUI_la_SOURCES =               \
        $(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl
-
-#LIB_SERVER_IDL = 
-
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libTransformationGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
-       $(VTK_INCLUDES) \
-       $(CAS_CPPFLAGS) \
-       $(PYTHON_INCLUDES) \
-       $(BOOST_CPPFLAGS) \
-       $(KERNEL_CXXFLAGS) \
-       $(GUI_CXXFLAGS) \
-       $(CORBA_CXXFLAGS) \
-       $(CORBA_INCLUDES) \
-       -I$(srcdir)/../GEOMGUI \
-       -I$(srcdir)/../DlgRef \
-       -I$(srcdir)/../GEOMBase \
-       -I$(srcdir)/../OBJECT \
-       -I$(srcdir)/../GEOMClient \
-       -I$(srcdir)/../GEOMImpl \
-       -I$(srcdir)/../GEOMFiltersSelection \
-       -I$(top_builddir)/idl \
+libTransformationGUI_la_CPPFLAGS =             \
+       $(QT_INCLUDES)                          \
+       $(VTK_INCLUDES)                         \
+       $(CAS_CPPFLAGS)                         \
+       $(PYTHON_INCLUDES)                      \
+       $(BOOST_CPPFLAGS)                       \
+       $(KERNEL_CXXFLAGS)                      \
+       $(GUI_CXXFLAGS)                         \
+       $(CORBA_CXXFLAGS)                       \
+       $(CORBA_INCLUDES)                       \
+       -I$(srcdir)/../GEOMGUI                  \
+       -I$(srcdir)/../DlgRef                   \
+       -I$(srcdir)/../GEOMBase                 \
+       -I$(srcdir)/../OBJECT                   \
+       -I$(srcdir)/../GEOMClient               \
+       -I$(srcdir)/../GEOMImpl                 \
+       -I$(srcdir)/../GEOMFiltersSelection     \
+       -I$(top_builddir)/src/DlgRef            \
+       -I$(top_builddir)/idl                   \
        -I$(top_builddir)/salome_adm/unix
 
-libTransformationGUI_la_LDFLAGS  = \
-       ../GEOMFiltersSelection/libGEOMFiltersSelection.la \
+libTransformationGUI_la_LDFLAGS  =                             \
+       ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \
        ../GEOMBase/libGEOMBase.la
index eb69c9037a216077a410643b9c9ee1d3a2e6476b..1361025037bed80e10c67fc536d2ebe26acf88e4 100644 (file)
@@ -1,38 +1,41 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : TransformationGUI.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "TransformationGUI.h"
-#include "GeometryGUI.h"
 
-#include "SUIT_Session.h"
-#include "SUIT_Desktop.h"
+#include <GEOMBase.h>
+#include <GeometryGUI.h>
 
-#include "SalomeApp_Application.h"
+#include <SUIT_Desktop.h>
+#include <SUIT_ViewModel.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_ViewManager.h>
+#include <LightApp_SelectionMgr.h>
+#include <SalomeApp_Application.h>
+#include <SalomeApp_Study.h>
+#include <SALOME_ListIteratorOfListIO.hxx>
 
 #include "TransformationGUI_MultiTranslationDlg.h"   // Method MULTI TRANSLATION
 #include "TransformationGUI_MultiRotationDlg.h"      // Method MULTI ROTATION
 #include "TransformationGUI_OffsetDlg.h"             // Method OFFSET
 #include "TransformationGUI_PositionDlg.h"           // Method POSITION
 
-using namespace std;
-
 //=======================================================================
 // function : TransformationGUI()
 // purpose  : Constructor
 //=======================================================================
-TransformationGUI::TransformationGUI(GeometryGUI* parent) : GEOMGUI(parent)
+TransformationGUI::TransformationGUI( GeometryGUI* parent )
+  : GEOMGUI( parent )
 {
 }
 
@@ -66,46 +68,89 @@ TransformationGUI::~TransformationGUI()
 // function : OnGUIEvent()
 // purpose  : 
 //=======================================================================
-bool TransformationGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
+bool TransformationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 {
   SalomeApp_Application* app = getGeometryGUI()->getApp();
-  if (!app) return false;
+  if ( !app ) return false;
 
   getGeometryGUI()->EmitSignalDeactivateDialog();
   QDialog* aDlg = NULL;
 
-  switch (theCommandID)
-  {
+  switch ( theCommandID ) {
   case 5021: // TRANSLATION
-    aDlg = new TransformationGUI_TranslationDlg( getGeometryGUI(), parent, "" );
+    aDlg = new TransformationGUI_TranslationDlg( getGeometryGUI(), parent );
     break;
   case 5022: // ROTATION
-    aDlg = new TransformationGUI_RotationDlg( getGeometryGUI(), parent, "" );
+    aDlg = new TransformationGUI_RotationDlg( getGeometryGUI(), parent );
     break;
   case 5023: // POSITION
-    aDlg = new TransformationGUI_PositionDlg( getGeometryGUI(), parent, "" );
+    aDlg = new TransformationGUI_PositionDlg( getGeometryGUI(), parent );
     break;
   case 5024: // MIRROR
-    aDlg = new TransformationGUI_MirrorDlg( getGeometryGUI(), parent, "" );
+    aDlg = new TransformationGUI_MirrorDlg( getGeometryGUI(), parent );
     break;
   case 5025: // SCALE
-    aDlg = new TransformationGUI_ScaleDlg( getGeometryGUI(), parent, "" );
+    aDlg = new TransformationGUI_ScaleDlg( getGeometryGUI(), parent );
     break;
   case 5026: // OFFSET
-    aDlg = new TransformationGUI_OffsetDlg( getGeometryGUI(), parent, "" );
+    aDlg = new TransformationGUI_OffsetDlg( getGeometryGUI(), parent );
     break;
   case 5027: // MULTI TRANSLATION
-    aDlg = new TransformationGUI_MultiTranslationDlg( getGeometryGUI(), parent, "" );
+    aDlg = new TransformationGUI_MultiTranslationDlg( getGeometryGUI(), parent );
     break;
   case 5028: // MULTI ROTATION
-    aDlg = new TransformationGUI_MultiRotationDlg( getGeometryGUI(), parent, "" );
+    aDlg = new TransformationGUI_MultiRotationDlg( getGeometryGUI(), parent );
+    break;
+  case 5029: // RELOAD IMPORTED SHAPE
+    {
+      SalomeApp_Study* anAppStudy = dynamic_cast<SalomeApp_Study*>(app->activeStudy());
+
+      GEOM::GEOM_ITransformOperations_var anOp =
+        GeometryGUI::GetGeomGen()->GetITransformOperations(anAppStudy->id());
+      if (anOp->_is_nil()) return false;
+
+      GEOM_Displayer aDisp (anAppStudy);
+      SUIT_Desktop* desk = app->desktop();
+      QList<SUIT_ViewWindow*> wnds = desk->windows();
+
+      LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
+      SALOME_ListIO aSelList;
+      aSelMgr->selectedObjects(aSelList);
+
+      SALOME_ListIteratorOfListIO aSelIt (aSelList);
+      for (; aSelIt.More(); aSelIt.Next()) {
+        Handle(SALOME_InteractiveObject) io = aSelIt.Value();
+        Standard_Boolean testResult = Standard_False;
+        GEOM::GEOM_Object_var aGeomObj = GEOMBase::ConvertIOinGEOMObject(io, testResult);
+        if (testResult) {
+          anOp->RecomputeObject(aGeomObj);
+
+          SUIT_ViewWindow* wnd;
+          QListIterator<SUIT_ViewWindow*> it (wnds);
+          while (it.hasNext() && (wnd = it.next()))
+          {
+            if (SUIT_ViewManager* vman = wnd->getViewManager()) {
+              if (SUIT_ViewModel* vmodel = vman->getViewModel()) {
+                if (SALOME_View* view = dynamic_cast<SALOME_View*>(vmodel)) {
+                  if (view->isVisible(io)) {
+                    aDisp.Erase(io, false, false, view);
+                    aDisp.Display(io, true, view);
+                  }
+                  // ? Redisplay subshapes ?
+                }
+              }
+            }
+          }
+        }
+      } // for (; aSelIt.More(); aSelIt.Next())
+    }
     break;
   default:
-    app->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
+    app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
     break;
   }
 
-  if (aDlg != NULL)
+  if ( aDlg != NULL )
     aDlg->show();
 
   return true;
@@ -118,7 +163,7 @@ bool TransformationGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
 extern "C"
 {
 #ifdef WNT
-       __declspec( dllexport )
+  __declspec( dllexport )
 #endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
index 87ba9b55d8d2cb30adb0f8aab10c8f4f2b059755..41c1967ae33d5d73894711157aa3313652f94450 100644 (file)
@@ -1,35 +1,32 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : TransformationGUI.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
 #ifndef TRANSFORMATIONGUI_H
 #define TRANSFORMATIONGUI_H
 
-#include "GEOMGUI.h"
-
+#include <GEOMGUI.h>
 
 //=================================================================================
 // class    : TransformationGUI
 class TransformationGUI : public GEOMGUI
 {
 public:
-  TransformationGUI( GeometryGUI* parent );
+  TransformationGUI( GeometryGUI* );
   ~TransformationGUI();
 
-  bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent);
+  bool OnGUIEvent( int, SUIT_Desktop* );
 };
 
-#endif
+#endif // TRANSFORMATIONGUI_H
diff --git a/src/TransformationGUI/TransformationGUI.pro b/src/TransformationGUI/TransformationGUI.pro
new file mode 100644 (file)
index 0000000..6d04e6b
--- /dev/null
@@ -0,0 +1,68 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = lib
+TARGET = TransformationGUI
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+INCLUDEPATH += $${QT_INCLUDES} $${VTK_INCLUDES} $${CAS_CPPFLAGS} $${PYTHON_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} $${CORBA_INCLUDES} ../GEOMGUI ../DlgRef ../GEOMBase ../OBJECT ../GEOMClient ../GEOMImpl ../GEOMFiltersSelection $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lGEOMFiltersSelection -lGEOMBase
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+SOURCES  = TransformationGUI.cxx
+SOURCES += TransformationGUI_MultiTranslationDlg.cxx
+SOURCES += TransformationGUI_MultiRotationDlg.cxx
+SOURCES += TransformationGUI_TranslationDlg.cxx
+SOURCES += TransformationGUI_RotationDlg.cxx
+SOURCES += TransformationGUI_MirrorDlg.cxx
+SOURCES += TransformationGUI_ScaleDlg.cxx
+SOURCES += TransformationGUI_OffsetDlg.cxx
+SOURCES += TransformationGUI_PositionDlg.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
index 345ce98fe0bfedc91b2b253473f0f5d31634c5ae..4e3abf68326a323175100e08f7e5b42384549fe2 100644 (file)
@@ -1,38 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_MirrorDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : TransformationGUI_MirrorDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "TransformationGUI_MirrorDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+
+// OCCT Includes
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qcheckbox.h>
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : TransformationGUI_MirrorDlg()
-// purpose  : Constructs a TransformationGUI_MirrorDlg which is a child of 'parent', with the 
+// purpose  : Constructs a TransformationGUI_MirrorDlg which is 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.
 //=================================================================================
-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)
+TransformationGUI_MirrorDlg::TransformationGUI_MirrorDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                          bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myInitial(true)
 {
-  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")));
-  QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_MIRROR_PLANE")));
-  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_MIRROR_POINT")));
+  QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_MIRROR_AXE")));
+  QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_MIRROR_PLANE")));
+  QPixmap image3 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_MIRROR_TITLE"));
+  setWindowTitle(tr("GEOM_MIRROR_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_MIRROR"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->setPixmap(image2);
-  GroupPoints = new DlgRef_2Sel1Spin2Check(this, "GroupPoints");
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_MIRROR"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image1);
+  mainFrame()->RadioButton3->setIcon(image2);
+
+  GroupPoints = new DlgRef_2Sel1Spin2Check(centralWidget());
   GroupPoints->SpinBox_DX->hide();
   GroupPoints->TextLabel3->hide();
   GroupPoints->CheckButton2->hide();
@@ -82,102 +78,102 @@ TransformationGUI_MirrorDlg::TransformationGUI_MirrorDlg(GeometryGUI* theGeometr
   GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS"));
   GroupPoints->TextLabel2->setText(tr("GEOM_POINT_MIRROR"));
   GroupPoints->TextLabel2->setFixedWidth(74);
-  GroupPoints->PushButton1->setPixmap(image3);
-  GroupPoints->PushButton2->setPixmap(image3);
+  GroupPoints->PushButton1->setIcon(image3);
+  GroupPoints->PushButton2->setIcon(image3);
   GroupPoints->CheckButton1->setText(tr("GEOM_CREATE_COPY"));
-  Layout1->addWidget(GroupPoints, 2, 0);
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
   /***************************************************************/
 
-  setHelpFileName("mirror_operation_page.html");  
-  
+  setHelpFileName("mirror_operation_page.html");
+
+  // Activate Create a Copy mode
+  GroupPoints->CheckButton1->setChecked(true);
+  CreateCopyModeChanged(true);
+
   Init();
 }
 
-
 //=================================================================================
 // function : ~TransformationGUI_MirrorDlg()
 // purpose  : Destroys the object and frees any allocated resources
 //=================================================================================
 TransformationGUI_MirrorDlg::~TransformationGUI_MirrorDlg()
-{  
-  /* no need to delete child widgets, Qt does it all for us */
+{
+  // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void TransformationGUI_MirrorDlg::Init()
-{  
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
+{
+  // init variables
   GroupPoints->LineEdit1->setReadOnly(true);
   GroupPoints->LineEdit2->setReadOnly(true);
-  
+
+  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit2->setText("");
+
   myArgument = GEOM::GEOM_Object::_nil();
-    
-  // Activate Create a Copy mode
-  GroupPoints->CheckButton1->setChecked(true);
-  CreateCopyModeChanged(true);
 
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-  connect(GroupConstructors, SIGNAL(clicked(int)), SLOT(ConstructorsClicked(int)));
+  mainFrame()->GroupBoxPublish->show();
+
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
 
   connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
 
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  
+  connect(GroupPoints->LineEdit1,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit2,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+
   connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool)));
-  
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 
-  initName( tr( "GEOM_MIRROR" ) );
-  ConstructorsClicked( 0 );
-}
+  initName(tr("GEOM_MIRROR"));
 
+  ConstructorsClicked(0);
+}
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void TransformationGUI_MirrorDlg::ConstructorsClicked(int constructorId)
+void TransformationGUI_MirrorDlg::ConstructorsClicked (int constructorId)
 {
-  disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
-  
-  globalSelection();
-  myEditCurrentArgument = GroupPoints->LineEdit1;
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+
   GroupPoints->LineEdit2->clear();
   myArgument = GEOM::GEOM_Object::_nil();
-  
-  switch (constructorId)
-    {
-    case 0: /* mirror an object by point */
-      {        
-       GroupPoints->TextLabel2->setText(tr("GEOM_POINT_MIRROR"));
-       break;
-      }
-    case 1: /* mirror an object by axe */
-      {
-       GroupPoints->TextLabel2->setText(tr("GEOM_AXE_MIRROR"));
-       break;
-      } 
-    case 2: /* mirror an object by plane */
-      {
-       GroupPoints->TextLabel2->setText(tr("GEOM_PLANE_MIRROR"));
-       break;
-      }
-    }
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-}
 
+  switch (constructorId) {
+  case 0: // mirror an object by point
+    GroupPoints->TextLabel2->setText(tr("GEOM_POINT_MIRROR"));
+    break;
+  case 1: // mirror an object by axe
+    GroupPoints->TextLabel2->setText(tr("GEOM_AXE_MIRROR"));
+    break;
+  case 2: // mirror an object by plane
+    GroupPoints->TextLabel2->setText(tr("GEOM_PLANE_MIRROR"));
+    break;
+  }
+
+  GroupPoints->PushButton1->click();
 
+  if (myInitial) {
+    myInitial = false;
+    SelectionIntoArgument();
+  }
+  else {
+    displayPreview();
+  }
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -185,127 +181,120 @@ void TransformationGUI_MirrorDlg::ConstructorsClicked(int constructorId)
 //=================================================================================
 void TransformationGUI_MirrorDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool TransformationGUI_MirrorDlg::ClickOnApply()
 {
-  if ( !onAccept(GroupPoints->CheckButton1->isChecked()) )
+  if (!onAccept(GroupPoints->CheckButton1->isChecked()))
     return false;
-  
+
   initName();
-  ConstructorsClicked( getConstructorId() );
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection has changed
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void TransformationGUI_MirrorDlg::SelectionIntoArgument()
 {
+  erasePreview();
   myEditCurrentArgument->setText("");
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1)
+    myObjects.length(0);
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2)
+    myArgument = GEOM::GEOM_Object::_nil();
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
   QString aName;
 
-  if(myEditCurrentArgument == GroupPoints->LineEdit1)
-    {
-      int aNbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aName);
-      if(aNbSel < 1)
-       {
-         myObjects.length(0);
-         return;
-       }
-      GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), myObjects);
-      if (!myObjects.length())
-       return;
-      if(aNbSel != 1)
-       aName = tr("%1_objects").arg(aNbSel);
-    }
-  else if(myEditCurrentArgument == GroupPoints->LineEdit2)
-    {
-      if(IObjectCount() != 1)
-       {
-         myArgument = GEOM::GEOM_Object::_nil();
-         return;
-       }
-      Standard_Boolean testResult = Standard_False;
-      GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
-      myArgument = aSelectedObject;
-      if(!testResult || CORBA::is_nil( myArgument ))
-       return;
-
-      aName = GEOMBase::GetName( aSelectedObject );
-
-      if ( testResult && !aSelectedObject->_is_nil() )
-       {
-         TopoDS_Shape aShape;
-         if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
-           {
-             TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
-             if (getConstructorId() == 1)
-               aNeedType = TopAbs_EDGE;
-             else if (getConstructorId() == 2)
-               aNeedType = TopAbs_FACE;
-             
-             LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-             TColStd_IndexedMapOfInteger aMap;
-             aSelMgr->GetIndexes( firstIObject(), aMap );
-             if ( aMap.Extent() == 1 )
-               {
-                   int anIndex = aMap( 1 );
-                   if (aNeedType == TopAbs_VERTEX)
-                     aName += QString(":vertex_%1").arg(anIndex);
-                   else
-                     aName += QString(":edge_%1").arg(anIndex);
-                   
-                   //Find SubShape Object in Father
-                   GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
-                   
-                   if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-                     GEOM::GEOM_IShapesOperations_var aShapesOp =
-                       getGeomEngine()->GetIShapesOperations( getStudyId() );
-                     myArgument = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-                   }
-                   else
-                     myArgument = aFindedObject; // get Object from study
-               }
-             else {
-               if (aShape.ShapeType() != aNeedType) {
-                 myArgument = GEOM::GEOM_Object::_nil();
-                 aName = "";
-               }
-             }
-           }
-       }
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
+    int aNbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aName);
+    if (aNbSel < 1)
+      return;
+
+    GEOMBase::ConvertListOfIOInListOfGO(aSelList, myObjects);
+    if (!myObjects.length())
+      return;
+    else
+      myEditCurrentArgument->setText(aName);
+  }
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
+    if (aSelList.Extent() != 1)
+      return;
+
+    // nbSel == 1
+    Standard_Boolean testResult = Standard_False;
+    myArgument = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    if (!testResult || CORBA::is_nil(myArgument))
+      return;
+
+    aName = GEOMBase::GetName(myArgument);
+
+    if (testResult && !myArgument->_is_nil()) {
+      TopoDS_Shape aShape;
+      if (GEOMBase::GetShape(myArgument, aShape, TopAbs_SHAPE) && !aShape.IsNull()) {
+        TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
+        if (getConstructorId() == 1)
+          aNeedType = TopAbs_EDGE;
+        else if (getConstructorId() == 2)
+          aNeedType = TopAbs_FACE;
+
+        TColStd_IndexedMapOfInteger aMap;
+        aSelMgr->GetIndexes(aSelList.First(), aMap);
+        if (aMap.Extent() == 1) {
+          int anIndex = aMap(1);
+          if (aNeedType == TopAbs_VERTEX)
+            aName += QString(":vertex_%1").arg(anIndex);
+          else
+            aName += QString(":edge_%1").arg(anIndex);
+
+          //Find SubShape Object in Father
+          GEOM::GEOM_Object_var aFindedObject = findObjectInFather(myArgument, aName);
+
+          if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+            GEOM::GEOM_IShapesOperations_var aShapesOp =
+              getGeomEngine()->GetIShapesOperations(getStudyId());
+            myArgument = aShapesOp->GetSubShape(myArgument, anIndex);
+          }
+          else {
+            myArgument = aFindedObject; // get Object from study
+          }
+        }
+        else {
+          if (aShape.ShapeType() != aNeedType) {
+            myArgument = GEOM::GEOM_Object::_nil();
+            aName = "";
+          }
+        }
+      }
     }
-  myEditCurrentArgument->setText( aName );
-   
-  displayPreview(); 
-}
+    myEditCurrentArgument->setText(aName);
 
+    if (!myArgument->_is_nil() && !myObjects.length())
+      GroupPoints->PushButton1->click();
+  }
 
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose  :
-//=================================================================================
-void TransformationGUI_MirrorDlg::LineEditReturnPressed()
-{
-  QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1 ||
-     send == GroupPoints->LineEdit2)
-    {
-      myEditCurrentArgument = send;
-      GEOMBase_Skeleton::LineEditReturnPressed();
-    }
-}
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  displayPreview();
+}
 
 //=================================================================================
 // function : SetEditCurrentArgument()
@@ -314,37 +303,60 @@ void TransformationGUI_MirrorDlg::LineEditReturnPressed()
 void TransformationGUI_MirrorDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
+
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
   globalSelection();
-  
-  if(send == GroupPoints->PushButton1){
+
+  if (send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
+
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
   }
-  else if(send == GroupPoints->PushButton2) {
+  else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
-    switch(getConstructorId())
-      {
-      case 0:
-       {
-         localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
-         break;
-       }
-      case 1:
-       {
-         localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
-         break;
-       }
-      case 2:
-       {
-         globalSelection( GEOM_PLANE );
-         break;
-       }
-      }
+
+    switch (getConstructorId()) {
+    case 0:
+      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+      break;
+    case 1:
+      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
+      break;
+    case 2:
+      globalSelection(GEOM_PLANE);
+      break;
+    }
+
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
   }
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
 }
 
+//=================================================================================
+// function : LineEditReturnPressed()
+// purpose  :
+//=================================================================================
+void TransformationGUI_MirrorDlg::LineEditReturnPressed()
+{
+  QLineEdit* send = (QLineEdit*)sender();
+  if (send == GroupPoints->LineEdit1 ||
+      send == GroupPoints->LineEdit2) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
+}
 
 //=================================================================================
 // function : ActivateThisDialog()
@@ -353,135 +365,142 @@ void TransformationGUI_MirrorDlg::SetEditCurrentArgument()
 void TransformationGUI_MirrorDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
   ConstructorsClicked( getConstructorId() );
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  : when mouse enter onto the QWidget
 //=================================================================================
-void TransformationGUI_MirrorDlg::enterEvent(QEvent * e)
+void TransformationGUI_MirrorDlg::enterEvent (QEvent*)
 {
-  if(!GroupConstructors->isEnabled())
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
 GEOM::GEOM_IOperations_ptr  TransformationGUI_MirrorDlg::createOperation()
 {
-  return getGeomEngine()->GetITransformOperations( getStudyId() );
+  return getGeomEngine()->GetITransformOperations(getStudyId());
 }
 
-
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool  TransformationGUI_MirrorDlg::isValid( QString& msg )
+bool TransformationGUI_MirrorDlg::isValid (QString& /*msg*/)
 {
   return !(myObjects.length() == 0 || myArgument->_is_nil());
 }
 
-
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool  TransformationGUI_MirrorDlg::execute( ObjectList& objects )
+bool  TransformationGUI_MirrorDlg::execute (ObjectList& objects)
 {
   bool res = false;
   bool toCreateCopy = IsPreview() || GroupPoints->CheckButton1->isChecked();
-  
+
   GEOM::GEOM_Object_var anObj;
-  
-  switch ( getConstructorId() ) 
+
+  switch (getConstructorId()) {
+  case 0:
     {
-    case 0 :
-      {
-       if (toCreateCopy)
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->MirrorPointCopy( myObjects[i], myArgument );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       else
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->MirrorPoint( myObjects[i], myArgument );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       res = true;
-       break;
+      if (toCreateCopy) {
+        for (int i = 0; i < myObjects.length(); i++) {
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            MirrorPointCopy(myObjects[i], myArgument);
+          if (!anObj->_is_nil())
+            objects.push_back(anObj._retn());
+        }
       }
-    case 1 :
-      {
-       if (toCreateCopy)
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->MirrorAxisCopy( myObjects[i], myArgument );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       else
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->MirrorAxis( myObjects[i], myArgument );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       res = true;
-       break;
+      else {
+        for (int i = 0; i < myObjects.length(); i++) {
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            MirrorPoint(myObjects[i], myArgument);
+          if (!anObj->_is_nil())
+            objects.push_back(anObj._retn());
+        }
       }
-    case 2:
-      {
-       if (toCreateCopy)
-          for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->MirrorPlaneCopy( myObjects[i], myArgument );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       else
-          for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->MirrorPlane( myObjects[i], myArgument );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       res = true;
-       break;
+      res = true;
+      break;
+    }
+  case 1:
+    {
+      if (toCreateCopy) {
+        for (int i = 0; i < myObjects.length(); i++) {
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            MirrorAxisCopy(myObjects[i], myArgument);
+          if (!anObj->_is_nil())
+            objects.push_back(anObj._retn());
+        }
+      }
+      else {
+        for (int i = 0; i < myObjects.length(); i++) {
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            MirrorAxis(myObjects[i], myArgument);
+          if (!anObj->_is_nil())
+            objects.push_back(anObj._retn());
+        }
       }
+      res = true;
+      break;
     }
-  
+  case 2:
+    {
+      if (toCreateCopy) {
+        for (int i = 0; i < myObjects.length(); i++) {
+            anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+              MirrorPlaneCopy(myObjects[i], myArgument);
+            if (!anObj->_is_nil())
+              objects.push_back(anObj._retn());
+        }
+      }
+      else {
+        for (int i = 0; i < myObjects.length(); i++) {
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            MirrorPlane(myObjects[i], myArgument);
+          if (!anObj->_is_nil())
+            objects.push_back(anObj._retn());
+        }
+      }
+      res = true;
+      break;
+    }
+  }
+
   return res;
 }
 
 //=================================================================================
-// function : closeEvent
+// function : restoreSubShapes
 // purpose  :
 //=================================================================================
-void  TransformationGUI_MirrorDlg::closeEvent( QCloseEvent* e )
+void TransformationGUI_MirrorDlg::restoreSubShapes (SALOMEDS::Study_ptr   theStudy,
+                                                    SALOMEDS::SObject_ptr theSObject)
 {
-  GEOMBase_Skeleton::closeEvent( e );
+  if (mainFrame()->CheckBoxRestoreSS->isChecked()) {
+    // empty list of arguments means that all arguments should be restored
+    getGeomEngine()->RestoreSubShapesSO(theStudy, theSObject, GEOM::ListOfGO(),
+                                        /*theFindMethod=*/GEOM::FSM_Transformed,
+                                        /*theInheritFirstArg=*/true);
+  }
 }
 
-
 //=================================================================================
 // function :  CreateCopyModeChanged()
 // purpose  :
 //=================================================================================
-void TransformationGUI_MirrorDlg::CreateCopyModeChanged(bool isCreateCopy)
+void TransformationGUI_MirrorDlg::CreateCopyModeChanged (bool isCreateCopy)
 {
-  this->GroupBoxName->setEnabled(isCreateCopy);
+  mainFrame()->GroupBoxName->setEnabled(isCreateCopy);
 }
 
 //=================================================================================
@@ -494,17 +513,16 @@ void TransformationGUI_MirrorDlg::addSubshapesToStudy()
   if (toCreateCopy) {
     QMap<QString, GEOM::GEOM_Object_var> objMap;
 
-    switch (getConstructorId())
-      {
-      case 0:
-       objMap[GroupPoints->LineEdit2->text()] = myArgument;
-       break;
-      case 1:
-       objMap[GroupPoints->LineEdit2->text()] = myArgument;
-       break;
-      case 2:
-       return;
-      }
-    addSubshapesToFather( objMap );
+    switch (getConstructorId()) {
+    case 0:
+      objMap[GroupPoints->LineEdit2->text()] = myArgument;
+      break;
+    case 1:
+      objMap[GroupPoints->LineEdit2->text()] = myArgument;
+      break;
+    case 2:
+      return;
+    }
+    addSubshapesToFather(objMap);
   }
 }
index 25f5767396879c8671581418e991a34ff0180694..668254090e025b2e22b296918e60e2e69c6b783e 100644 (file)
@@ -1,38 +1,34 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : TransformationGUI_MirrorDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_MIRROR_H
-#define DIALOGBOX_MIRROR_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_MirrorDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef TRANSFORMATIONGUI_MIRRORDLG_H
+#define TRANSFORMATIONGUI_MIRRORDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel1Spin2Check.h"
+#include <GEOMBase_Skeleton.h>
 
-#include "TransformationGUI.h"
-  
+class DlgRef_2Sel1Spin2Check;  
 
 //=================================================================================
 // class    : TransformationGUI_MirrorDlg
 //=================================================================================
 class TransformationGUI_MirrorDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    TransformationGUI_MirrorDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                               const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~TransformationGUI_MirrorDlg();
+  TransformationGUI_MirrorDlg( GeometryGUI*, QWidget* = 0,
+                              bool = false, Qt::WindowFlags = 0 );
+  ~TransformationGUI_MirrorDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
-    virtual void closeEvent( QCloseEvent* e );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
+  virtual void                       restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr );
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
+  void                               Init();
+  void                               enterEvent( QEvent* );
     
-    GEOM::GEOM_Object_var myArgument;
-    GEOM::ListOfGO        myObjects;
-        
-    DlgRef_2Sel1Spin2Check* GroupPoints;
+private:
+  GEOM::GEOM_Object_var              myArgument;
+  GEOM::ListOfGO                     myObjects;
+
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
+  
+  DlgRef_2Sel1Spin2Check*            GroupPoints;
     
-private slots :
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ConstructorsClicked(int constructorId);
-    void CreateCopyModeChanged(bool isCreateCopy);
+private slots:
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               CreateCopyModeChanged( bool );
 };
 
-#endif // DIALOGBOX_MIRROR_H
+#endif // TRANSFORMATIONGUI_MIRRORDLG_H
index e71497d848a639a5fd6484ff619c86e60f3380f7..80d028e25d36d829edc69fff1cca0fb6e71d9224 100644 (file)
@@ -1,38 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_MultiRotationDlg.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : TransformationGUI_MultiRotationDlg.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "TransformationGUI_MultiRotationDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+
+// OCCT Includes
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qcheckbox.h>
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : TransformationGUI_MultiRotationDlg()
@@ -57,34 +52,35 @@ using namespace std;
 //            TRUE to construct a modal dialog.
 //=================================================================================
 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)
+(GeometryGUI* theGeometryGUI, QWidget* parent, bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myInitial(true)
 {
   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")));
+  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"));
+  setWindowTitle(tr("GEOM_MULTIROTATION_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_MULTIROTATION"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_MULTIROTATION"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image1);
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
 
-  GroupPoints = new DlgRef_2Sel1Spin(this, "GroupPoints");
+  GroupPoints = new DlgRef_2Sel1Spin(centralWidget());
   GroupPoints->GroupBox1->setTitle(tr("GEOM_MULTIROTATION_SIMPLE"));
   GroupPoints->TextLabel1->setText(tr("GEOM_MAIN_OBJECT"));
   GroupPoints->TextLabel2->setText(tr("GEOM_VECTOR"));
   GroupPoints->TextLabel3->setText(tr("GEOM_NB_TIMES"));
-  GroupPoints->PushButton1->setPixmap(image2);
-  GroupPoints->PushButton2->setPixmap(image2);
+  GroupPoints->PushButton1->setIcon(image2);
+  GroupPoints->PushButton2->setIcon(image2);
   GroupPoints->LineEdit1->setReadOnly(true);
   GroupPoints->LineEdit2->setReadOnly(true);
 
-  GroupDimensions = new DlgRef_2Sel4Spin1Check(this, "GroupDimensions");
+  GroupDimensions = new DlgRef_2Sel4Spin1Check(centralWidget());
   GroupDimensions->GroupBox1->setTitle(tr("GEOM_MULTIROTATION_DOUBLE"));
   GroupDimensions->TextLabel1->setText(tr("GEOM_MAIN_OBJECT"));
   GroupDimensions->TextLabel2->setText(tr("GEOM_VECTOR"));
@@ -93,13 +89,15 @@ TransformationGUI_MultiRotationDlg::TransformationGUI_MultiRotationDlg
   GroupDimensions->TextLabel5->setText(tr("GEOM_STEP"));
   GroupDimensions->TextLabel6->setText(tr("GEOM_NB_TIMES"));
   GroupDimensions->CheckButton1->setText(tr("GEOM_REVERSE"));
-  GroupDimensions->PushButton1->setPixmap(image2);
-  GroupDimensions->PushButton2->setPixmap(image2);
+  GroupDimensions->PushButton1->setIcon(image2);
+  GroupDimensions->PushButton2->setIcon(image2);
   GroupDimensions->LineEdit1->setReadOnly(true);
   GroupDimensions->LineEdit2->setReadOnly(true);
 
-  Layout1->addWidget(GroupPoints, 2, 0);
-  Layout1->addWidget(GroupDimensions, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
+  layout->addWidget(GroupDimensions);
   /***************************************************************/
 
   setHelpFileName("multi_rotation_operation_page.html");
@@ -107,7 +105,6 @@ TransformationGUI_MultiRotationDlg::TransformationGUI_MultiRotationDlg
   Init();
 }
 
-
 //=================================================================================
 // function : ~TransformationGUI_MultiRotationDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -117,124 +114,148 @@ TransformationGUI_MultiRotationDlg::~TransformationGUI_MultiRotationDlg()
   // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void TransformationGUI_MultiRotationDlg::Init()
 {
-  /* Get setting of step value from file configuration */
+  // Get setting of step value from file configuration
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
+  double step = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100);
 
   double SpecificStep1 = 5;
   double SpecificStep2 = 1;
-  /* min, max, step and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator(1.0, MAX_NUMBER, SpecificStep2, 10);
-  GroupPoints->SpinBox_DX->SetValue(myNbTimes1);
-
-  GroupDimensions->SpinBox_DX1->RangeStepAndValidator(COORD_MIN, COORD_MAX, SpecificStep1, DBL_DIGITS_DISPLAY);
-  GroupDimensions->SpinBox_DY1->RangeStepAndValidator(1.0, MAX_NUMBER, SpecificStep2, 10);
-  GroupDimensions->SpinBox_DX2->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupDimensions->SpinBox_DY2->RangeStepAndValidator(1.0, MAX_NUMBER, SpecificStep2, 10);
-  GroupDimensions->SpinBox_DX1->SetValue(myAng);
-  GroupDimensions->SpinBox_DY1->SetValue(myNbTimes1);
-  GroupDimensions->SpinBox_DX2->SetValue(myStep);
-  GroupDimensions->SpinBox_DY2->SetValue(myNbTimes2);
-
-  /* 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()));
-  connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  // min, max, step and decimals for spin boxes & initial values
+  initSpinBox(GroupPoints->SpinBox_DX, 1.0, 999, SpecificStep2, 10);
+  GroupPoints->SpinBox_DX->setValue(myNbTimes1);
+  GroupPoints->SpinBox_DX->setDecimals(0);
+
+  initSpinBox(GroupDimensions->SpinBox_DX1, COORD_MIN, COORD_MAX, SpecificStep1, 10); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupDimensions->SpinBox_DY1, 1.0, 999, SpecificStep2, 10);
+  initSpinBox(GroupDimensions->SpinBox_DX2, COORD_MIN, COORD_MAX, step, 10); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupDimensions->SpinBox_DY2, 1.0, 999, SpecificStep2, 10);
+  GroupDimensions->SpinBox_DX1->setValue(myAng);
+  GroupDimensions->SpinBox_DY1->setValue(myNbTimes1);
+  GroupDimensions->SpinBox_DX2->setValue(myStep);
+  GroupDimensions->SpinBox_DY2->setValue(myNbTimes2);
+  GroupDimensions->SpinBox_DY1->setDecimals(0);
+  GroupDimensions->SpinBox_DY2->setDecimals(0);
+
+  // init variables
+  myAng = 45.0;
+  myStep = 50.0;
+  myNbTimes1 = myNbTimes2 = 2;
+
+  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit2->setText("");
+
+  GroupDimensions->LineEdit1->setText("");
+  GroupDimensions->LineEdit2->setText("");
+
+  myBase = myVector = GEOM::GEOM_Object::_nil();
+
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(this,          SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
+
+  connect(GroupPoints->PushButton1,     SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton2,     SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupDimensions->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupDimensions->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
 
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit1,     SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit2,     SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
   connect(GroupDimensions->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
   connect(GroupDimensions->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
 
-  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+  connect(GroupPoints->SpinBox_DX,      SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
   connect(GroupDimensions->SpinBox_DX1, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
   connect(GroupDimensions->SpinBox_DY1, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
   connect(GroupDimensions->SpinBox_DX2, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
   connect(GroupDimensions->SpinBox_DY2, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(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->SpinBox_DX1,SIGNAL(textChanged( const QString& )),
+          this, SLOT(TextValueChangedInSpinBox( const QString& )));
+
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double)));
 
   connect(GroupDimensions->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(ReverseAngle()));
 
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  initName(tr("GEOM_MULTIROTATION"));
 
-  initName( tr( "GEOM_MULTIROTATION" ) );
-  ConstructorsClicked( 0 );
+  ConstructorsClicked(0);
 }
 
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void TransformationGUI_MultiRotationDlg::SetDoubleSpinBoxStep (double step)
+{
+  GroupPoints->SpinBox_DX->setSingleStep(step);
+  GroupDimensions->SpinBox_DX1->setSingleStep(step);
+  GroupDimensions->SpinBox_DY1->setSingleStep(step);
+  GroupDimensions->SpinBox_DX2->setSingleStep(step);
+  GroupDimensions->SpinBox_DY2->setSingleStep(step);
+}
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void TransformationGUI_MultiRotationDlg::ConstructorsClicked(int constructorId)
+void TransformationGUI_MultiRotationDlg::ConstructorsClicked (int constructorId)
 {
   disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
 
-  myAng = 45.0;
-  myStep = 50.0;
-  myNbTimes1 = myNbTimes2 = 2;
+  switch (constructorId) {
+  case 0: // Rotate simple
+    {
+      GroupDimensions->hide();
+      GroupPoints->show();
 
-  globalSelection( GEOM_ALLSHAPES );
+      GroupPoints->LineEdit1->setText("");
+      GroupPoints->LineEdit2->setText("");
+      myBase = myVector = GEOM::GEOM_Object::_nil();
 
-  switch (constructorId)
+      GroupPoints->SpinBox_DX->setValue(myNbTimes1);
+
+      GroupPoints->PushButton1->click();
+    }
+    break;
+  case 1: // Rotate double
     {
-    case 0: /* Rotate simple */
-      {
-       GroupDimensions->hide();
-       resize(0, 0);
-       GroupPoints->show();
+      GroupPoints->hide();
+      GroupDimensions->show();
 
-       myEditCurrentArgument = GroupPoints->LineEdit1;
-       GroupPoints->LineEdit1->setText("");
-       GroupPoints->LineEdit2->setText("");
+      GroupDimensions->LineEdit1->setText("");
+      GroupDimensions->LineEdit2->setText("");
+      myBase = myVector = GEOM::GEOM_Object::_nil();
 
-       GroupPoints->SpinBox_DX->SetValue(myNbTimes1);
+      GroupDimensions->SpinBox_DX1->setValue(myAng);
+      GroupDimensions->SpinBox_DY1->setValue(myNbTimes1);
+      GroupDimensions->SpinBox_DX2->setValue(myStep);
+      GroupDimensions->SpinBox_DY2->setValue(myNbTimes2);
 
-       break;
-      }
-    case 1: /* Rotate double */
-      {
-       GroupPoints->hide();
-       resize(0, 0);
-       GroupDimensions->show();
-
-       myEditCurrentArgument = GroupDimensions->LineEdit1;
-       GroupDimensions->LineEdit1->setText("");
-       GroupDimensions->LineEdit2->setText("");
-
-       GroupDimensions->SpinBox_DX1->SetValue(myAng);
-       GroupDimensions->SpinBox_DY1->SetValue(myNbTimes1);
-       GroupDimensions->SpinBox_DX2->SetValue(myStep);
-       GroupDimensions->SpinBox_DY2->SetValue(myNbTimes2);
-
-       break;
-      }
+      GroupDimensions->PushButton1->click();
     }
+    break;
+  }
 
-  myEditCurrentArgument->setFocus();
-  myBase = myVector = GEOM::GEOM_Object::_nil();
-  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-          this, SLOT(SelectionIntoArgument()));
-}
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
 
+  if (myInitial) {
+    myInitial = false;
+    SelectionIntoArgument();
+  }
+  else {
+    displayPreview();
+  }
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -242,102 +263,121 @@ void TransformationGUI_MultiRotationDlg::ConstructorsClicked(int constructorId)
 //=================================================================================
 void TransformationGUI_MultiRotationDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool TransformationGUI_MultiRotationDlg::ClickOnApply()
 {
-  if ( !onAccept() )
+  if (!onAccept())
     return false;
 
   initName();
-  ConstructorsClicked( getConstructorId() );
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed or other case
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void TransformationGUI_MultiRotationDlg::SelectionIntoArgument()
 {
+  erasePreview();
   myEditCurrentArgument->setText("");
 
-  if (IObjectCount() != 1) {
-    if (myEditCurrentArgument == GroupPoints->LineEdit1 ||
-        myEditCurrentArgument == GroupDimensions->LineEdit1)
-      myBase = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == GroupPoints->LineEdit2 ||
-             myEditCurrentArgument == GroupDimensions->LineEdit2)
-      myVector = GEOM::GEOM_Object::_nil();
+  if (myEditCurrentArgument == GroupPoints->LineEdit1 ||
+      myEditCurrentArgument == GroupDimensions->LineEdit1)
+    myBase = GEOM::GEOM_Object::_nil();
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2 ||
+           myEditCurrentArgument == GroupDimensions->LineEdit2)
+    myVector = GEOM::GEOM_Object::_nil();
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1)
     return;
-  }
 
   // nbSel == 1
   Standard_Boolean testResult = Standard_False;;
   GEOM::GEOM_Object_var aSelectedObject =
-    GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
+    GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
   if (!testResult || CORBA::is_nil(aSelectedObject) || !GEOMBase::IsShape(aSelectedObject))
     return;
 
-  QString aName = GEOMBase::GetName( aSelectedObject );
+  QString aName = GEOMBase::GetName(aSelectedObject);
 
   if (myEditCurrentArgument == GroupPoints->LineEdit1 ||
       myEditCurrentArgument == GroupDimensions->LineEdit1)
     myBase = aSelectedObject;
   else if (myEditCurrentArgument == GroupPoints->LineEdit2 ||
            myEditCurrentArgument == GroupDimensions->LineEdit2) {
-    if ( testResult && !aSelectedObject->_is_nil() )
-       {
-         TopoDS_Shape aShape;
-         
-         
-         if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
-           {
-             LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-             TColStd_IndexedMapOfInteger aMap;
-             aSelMgr->GetIndexes( firstIObject(), aMap );
-             if ( aMap.Extent() == 1 )
-               {
-                 int anIndex = aMap( 1 );
-                 aName += QString(":edge_%1").arg(anIndex);
-                 
-                 //Find SubShape Object in Father
-                 GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
-                 
-                 if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-                   GEOM::GEOM_IShapesOperations_var aShapesOp =
-                     getGeomEngine()->GetIShapesOperations( getStudyId() );
-                   myVector = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-                 }
-                 else
-                   myVector = aFindedObject; // get existing object
-               }
-             else {
-               if (aShape.ShapeType() != TopAbs_EDGE) {
-                 aSelectedObject = GEOM::GEOM_Object::_nil();
-                 aName = "";
-               }
-               myVector = aSelectedObject;
-             }
-             
-           }
-       }
+    TopoDS_Shape aShape;
+
+    if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull()) {
+      TColStd_IndexedMapOfInteger aMap;
+      aSelMgr->GetIndexes(aSelList.First(), aMap);
+      if (aMap.Extent() == 1) {
+        int anIndex = aMap(1);
+        aName += QString(":edge_%1").arg(anIndex);
+
+        //Find SubShape Object in Father
+        GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
+
+        if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+          GEOM::GEOM_IShapesOperations_var aShapesOp =
+            getGeomEngine()->GetIShapesOperations(getStudyId());
+          myVector = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+        }
+        else {
+          myVector = aFindedObject; // get existing object
+        }
+      }
+      else {
+        if (aShape.ShapeType() != TopAbs_EDGE) {
+          aSelectedObject = GEOM::GEOM_Object::_nil();
+          aName = "";
+        }
+        myVector = aSelectedObject;
+      }
+    }
   }
-  myEditCurrentArgument->setText( aName );
+  myEditCurrentArgument->setText(aName);
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
+    if (!myBase->_is_nil() && myVector->_is_nil())
+      GroupPoints->PushButton2->click();
+  }
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
+    if (!myVector->_is_nil() && myBase->_is_nil())
+      GroupPoints->PushButton1->click();
+  }
+  else if (myEditCurrentArgument == GroupDimensions->LineEdit1) {
+    if (!myBase->_is_nil() && myVector->_is_nil())
+      GroupDimensions->PushButton2->click();
+  }
+  else if (myEditCurrentArgument == GroupDimensions->LineEdit2) {
+    if (!myVector->_is_nil() && myBase->_is_nil())
+      GroupDimensions->PushButton1->click();
+  }
+
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
   displayPreview();
 }
 
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -345,27 +385,50 @@ void TransformationGUI_MultiRotationDlg::SelectionIntoArgument()
 void TransformationGUI_MultiRotationDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  globalSelection( GEOM_ALLSHAPES );
 
-  if(send == GroupPoints->PushButton1) {
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  globalSelection(GEOM_ALLSHAPES);
+
+  if (send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
+
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
   }
-  else if(send == GroupPoints->PushButton2) {
+  else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
+
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
   }
-  else if(send == GroupDimensions->PushButton1) {
+  else if (send == GroupDimensions->PushButton1) {
     myEditCurrentArgument = GroupDimensions->LineEdit1;
+
+    GroupDimensions->PushButton2->setDown(false);
+    GroupDimensions->LineEdit2->setEnabled(false);
   }
-  else if(send == GroupDimensions->PushButton2) {
+  else if (send == GroupDimensions->PushButton2) {
     myEditCurrentArgument = GroupDimensions->LineEdit2;
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
+
+    GroupDimensions->PushButton1->setDown(false);
+    GroupDimensions->LineEdit1->setEnabled(false);
   }
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
-}
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
 
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
+}
 
 //=================================================================================
 // function : LineEditReturnPressed()
@@ -374,15 +437,13 @@ void TransformationGUI_MultiRotationDlg::SetEditCurrentArgument()
 void TransformationGUI_MultiRotationDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1 || send == GroupDimensions->LineEdit1 ||
-     send == GroupPoints->LineEdit2 || send == GroupDimensions->LineEdit2)
-    {
-      myEditCurrentArgument = send;
-      GEOMBase_Skeleton::LineEditReturnPressed();
-    }
+  if (send == GroupPoints->LineEdit1 || send == GroupDimensions->LineEdit1 ||
+      send == GroupPoints->LineEdit2 || send == GroupDimensions->LineEdit2) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
 }
 
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -390,45 +451,53 @@ void TransformationGUI_MultiRotationDlg::LineEditReturnPressed()
 void TransformationGUI_MultiRotationDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
   ConstructorsClicked( getConstructorId() );
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void TransformationGUI_MultiRotationDlg::enterEvent(QEvent* e)
+void TransformationGUI_MultiRotationDlg::enterEvent (QEvent*)
 {
-  if(!GroupConstructors->isEnabled())
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-
+//=================================================================================
+// function : TextValueChangedInSpinBox()
+// purpose  :
+//=================================================================================
+void TransformationGUI_MultiRotationDlg::TextValueChangedInSpinBox(const QString& s){
+  bool isDigit;
+  s.toDouble(&isDigit);
+  if(!isDigit)
+    GroupDimensions->CheckButton1->setChecked(false);
+  GroupDimensions->CheckButton1->setEnabled(isDigit);
+}
 //=================================================================================
 // function : ValueChangedInSpinBox()
 // purpose  :
 //=================================================================================
-void TransformationGUI_MultiRotationDlg::ValueChangedInSpinBox(double newValue)
+void TransformationGUI_MultiRotationDlg::ValueChangedInSpinBox (double newValue)
 {
   QObject* send = (QObject*)sender();
 
-  if(send == GroupPoints->SpinBox_DX || send == GroupDimensions->SpinBox_DY1)
+  if (send == GroupPoints->SpinBox_DX || send == GroupDimensions->SpinBox_DY1)
     myNbTimes1 = (int)newValue;
-  else if(send == GroupDimensions->SpinBox_DX1)
+  else if (send == GroupDimensions->SpinBox_DX1)
     myAng = newValue;
-  else if(send == GroupDimensions->SpinBox_DX2)
+  else if (send == GroupDimensions->SpinBox_DX2)
     myStep = newValue;
-  else if(send == GroupDimensions->SpinBox_DY2)
+  else if (send == GroupDimensions->SpinBox_DY2)
     myNbTimes2 = (int)newValue;
 
   displayPreview();
 }
 
-
 //=================================================================================
 // function : ReverseAngle()
 // purpose  : 'state' not used here
@@ -439,84 +508,89 @@ void TransformationGUI_MultiRotationDlg::ReverseAngle()
 
   int aConstructorId = getConstructorId();
 
-  if(aConstructorId == 0)
-    GroupPoints->SpinBox_DX->SetValue(myAng);
-  else if(aConstructorId == 1)
-    GroupDimensions->SpinBox_DX1->SetValue(myAng);
+  if (aConstructorId == 0)
+    GroupPoints->SpinBox_DX->setValue(myAng);
+  else if (aConstructorId == 1)
+    GroupDimensions->SpinBox_DX1->setValue(myAng);
 
   displayPreview();
 }
 
-
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
 GEOM::GEOM_IOperations_ptr TransformationGUI_MultiRotationDlg::createOperation()
 {
-  return myGeomGUI->GetGeomGen()->GetITransformOperations( getStudyId() );
+  return getGeomEngine()->GetITransformOperations(getStudyId());
 }
 
-
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool TransformationGUI_MultiRotationDlg::isValid( QString& msg )
+bool TransformationGUI_MultiRotationDlg::isValid (QString& msg)
 {
-  return !(myBase->_is_nil() || myVector->_is_nil());
+  bool ok = true;
+  switch(getConstructorId()){
+  case 0:
+    ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    break;
+  case 1:                                           
+    ok = GroupDimensions->SpinBox_DX1->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DY1->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DX2->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DY2->isValid( msg, !IsPreview() ) && ok;        
+    break;
+  }
+  return !(myBase->_is_nil() || myVector->_is_nil()) && ok;
 }
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool TransformationGUI_MultiRotationDlg::execute( ObjectList& objects )
+bool TransformationGUI_MultiRotationDlg::execute (ObjectList& objects)
 {
   bool res = false;
 
   GEOM::GEOM_Object_var anObj;
-
-  switch ( getConstructorId() )
-    {
-    case 0 :
-      {
-       if ( !CORBA::is_nil( myBase ) && !CORBA::is_nil( myVector ) ) {
-         anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-            MultiRotate1D( myBase, myVector, myNbTimes1 );
-         res = true;
-       }
-       break;
-      }
-    case 1 :
-      {
-       if ( !CORBA::is_nil( myBase ) && !CORBA::is_nil( myVector ) )
-         {
-           anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-              MultiRotate2D( myBase, myVector, myAng, myNbTimes1, myStep, myNbTimes2 );
-           res = true;
-         }
-       break;
+  QStringList aParameters;
+
+  switch (getConstructorId()) {
+  case 0:
+    if (!CORBA::is_nil(myBase) && !CORBA::is_nil(myVector)) {
+      anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+        MultiRotate1D(myBase, myVector, myNbTimes1);
+      if(!IsPreview())
+        aParameters<<GroupPoints->SpinBox_DX->text();
+      res = true;
+    }
+    break;
+  case 1:
+    if (!CORBA::is_nil(myBase) && !CORBA::is_nil(myVector)) {
+      anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+        MultiRotate2D(myBase, myVector, myAng, myNbTimes1, myStep, myNbTimes2);
+      if(!IsPreview()) {
+        aParameters<<GroupDimensions->SpinBox_DX1->text();
+        aParameters<<GroupDimensions->SpinBox_DY1->text();
+        aParameters<<GroupDimensions->SpinBox_DX2->text();
+        aParameters<<GroupDimensions->SpinBox_DY2->text();
       }
+      res = true;
     }
+    break;
+  }
 
-  if ( !anObj->_is_nil() )
-    objects.push_back( anObj._retn() );
+  if (!anObj->_is_nil()) {
+    if(!IsPreview())
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    objects.push_back(anObj._retn());
+  }
 
   return res;
 }
 
-
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void  TransformationGUI_MultiRotationDlg::closeEvent( QCloseEvent* e )
-{
-  // myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : addSubshapeToStudy
 // purpose  : virtual method to add new SubObjects if local selection
@@ -524,15 +598,14 @@ void  TransformationGUI_MultiRotationDlg::closeEvent( QCloseEvent* e )
 void TransformationGUI_MultiRotationDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
-  
-  switch (getConstructorId())
-    {
-    case 0:
-      objMap[GroupPoints->LineEdit2->text()] = myVector;
-      break;
-    case 1:
-      objMap[GroupDimensions->LineEdit2->text()] = myVector;
-      break;
-    }
-  addSubshapesToFather( objMap );
+
+  switch (getConstructorId()) {
+  case 0:
+    objMap[GroupPoints->LineEdit2->text()] = myVector;
+    break;
+  case 1:
+    objMap[GroupDimensions->LineEdit2->text()] = myVector;
+    break;
+  }
+  addSubshapesToFather(objMap);
 }
index 44d7d517632f955909d025359638a855fcc5d3d7..1134f7cfc6d3fbe6dab8b638bb945e0b59ddae4b 100644 (file)
@@ -1,37 +1,35 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : TransformationGUI_MultiRotationDlg.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
-#ifndef DIALOGBOX_MULTIROTATION_H
-#define DIALOGBOX_MULTIROTATION_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_MultiRotationDlg.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
+//
+#ifndef TRANSFORMATIONGUI_MULTIROTATIONDLG_H
+#define TRANSFORMATIONGUI_MULTIROTATIONDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel4Spin1Check.h"
-#include "DlgRef_2Sel1Spin.h"
+#include <GEOMBase_Skeleton.h>
 
+class DlgRef_2Sel4Spin1Check;
+class DlgRef_2Sel1Spin;
 
 //=================================================================================
 // class    : TransformationGUI_MultiRotationDlg
 //=================================================================================
 class TransformationGUI_MultiRotationDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    TransformationGUI_MultiRotationDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                                      const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~TransformationGUI_MultiRotationDlg();
-
+  TransformationGUI_MultiRotationDlg( GeometryGUI*, QWidget* = 0,
+                                     bool = false, Qt::WindowFlags = 0 );
+  ~TransformationGUI_MultiRotationDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
-    virtual void closeEvent( QCloseEvent* e );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
 
-private :
-    void Init();
-    void enterEvent(QEvent* e);
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+private:
+  GEOM::GEOM_Object_var              myBase, myVector;
+  int                                myNbTimes1;
+  int                                myNbTimes2;
+  Standard_Real                      myAng;
+  Standard_Real                      myStep;
 
-    GEOM::GEOM_Object_var myBase, myVector;
-    int myNbTimes1;
-    int myNbTimes2;
-    Standard_Real myAng;
-    Standard_Real myStep;
-    
-    DlgRef_2Sel1Spin* GroupPoints;
-    DlgRef_2Sel4Spin1Check* GroupDimensions;
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
+  
+  DlgRef_2Sel1Spin*                  GroupPoints;
+  DlgRef_2Sel4Spin1Check*            GroupDimensions;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ReverseAngle();
-    void ValueChangedInSpinBox(double newValue);
-    void ConstructorsClicked(int constructorId);
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ReverseAngle();
+  void                               ValueChangedInSpinBox( double );
+  void                               TextValueChangedInSpinBox( const QString& );
+  void                               ConstructorsClicked( int );
+  void                               SetDoubleSpinBoxStep( double );
 };
 
-#endif // DIALOGBOX_MULTIROTATION_H
+#endif // TRANSFORMATIONGUI_MULTIROTATIONDLG_H
index b9993d6cfa23b199c63718acd507d02c6888825a..e4c81518b93c8e3a4799f741adc95d19a15c71f0 100644 (file)
@@ -1,38 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_MultiTranslationDlg.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : TransformationGUI_MultiTranslationDlg.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "TransformationGUI_MultiTranslationDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+
+// OCCT Includes
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include <qcheckbox.h>
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : TransformationGUI_MultiTranslationDlg()
@@ -58,36 +52,37 @@ using namespace std;
 //            TRUE to construct a modal dialog.
 //=================================================================================
 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)
+(GeometryGUI* theGeometryGUI, QWidget* parent, bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myInitial(true)
 {
   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"));
+  setWindowTitle(tr("GEOM_MULTITRANSLATION_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_MULTITRANSLATION"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_MULTITRANSLATION"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image1);
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
 
-  GroupPoints = new DlgRef_2Sel2Spin1Check(this, "GroupPoints");
+  GroupPoints = new DlgRef_2Sel2Spin1Check(centralWidget());
   GroupPoints->GroupBox1->setTitle(tr("GEOM_MULTITRANSLATION_SIMPLE"));
   GroupPoints->TextLabel1->setText(tr("GEOM_MAIN_OBJECT"));
   GroupPoints->TextLabel2->setText(tr("GEOM_VECTOR_U"));
   GroupPoints->TextLabel3->setText(tr("GEOM_STEP_U"));
   GroupPoints->TextLabel4->setText(tr("GEOM_NB_TIMES_U"));
   GroupPoints->CheckButton1->setText(tr("GEOM_REVERSE_U"));
-  GroupPoints->PushButton1->setPixmap(image2);
-  GroupPoints->PushButton2->setPixmap(image2);
+  GroupPoints->PushButton1->setIcon(image2);
+  GroupPoints->PushButton2->setIcon(image2);
   GroupPoints->LineEdit1->setReadOnly(true);
   GroupPoints->LineEdit2->setReadOnly(true);
 
-  GroupDimensions = new DlgRef_3Sel4Spin2Check(this, "GroupDimensions");
+  GroupDimensions = new DlgRef_3Sel4Spin2Check(centralWidget());
   GroupDimensions->GroupBox1->setTitle(tr("GEOM_MULTITRANSLATION_DOUBLE"));
   GroupDimensions->TextLabel1->setText(tr("GEOM_MAIN_OBJECT"));
   GroupDimensions->TextLabel2->setText(tr("GEOM_VECTOR_U"));
@@ -98,15 +93,17 @@ TransformationGUI_MultiTranslationDlg::TransformationGUI_MultiTranslationDlg
   GroupDimensions->TextLabel7->setText(tr("GEOM_NB_TIMES_V"));
   GroupDimensions->CheckButton1->setText(tr("GEOM_REVERSE_U"));
   GroupDimensions->CheckButton2->setText(tr("GEOM_REVERSE_V"));
-  GroupDimensions->PushButton1->setPixmap(image2);
-  GroupDimensions->PushButton2->setPixmap(image2);
-  GroupDimensions->PushButton3->setPixmap(image2);
+  GroupDimensions->PushButton1->setIcon(image2);
+  GroupDimensions->PushButton2->setIcon(image2);
+  GroupDimensions->PushButton3->setIcon(image2);
   GroupDimensions->LineEdit1->setReadOnly(true);
   GroupDimensions->LineEdit2->setReadOnly(true);
   GroupDimensions->LineEdit3->setReadOnly(true);
 
-  Layout1->addWidget(GroupPoints, 2, 0);
-  Layout1->addWidget(GroupDimensions, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
+  layout->addWidget(GroupDimensions);
   /***************************************************************/
 
   setHelpFileName("multi_translation_operation_page.html");
@@ -114,7 +111,6 @@ TransformationGUI_MultiTranslationDlg::TransformationGUI_MultiTranslationDlg
   Init();
 }
 
-
 //=================================================================================
 // function : ~TransformationGUI_MultiTranslationDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -124,133 +120,161 @@ TransformationGUI_MultiTranslationDlg::~TransformationGUI_MultiTranslationDlg()
   // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void TransformationGUI_MultiTranslationDlg::Init()
 {
-  /* Get setting of step value from file configuration */
+  // Get setting of step value from file configuration
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
+  double step = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100);
 
   double SpecificStep = 1;
-  /* min, max, step and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox_DY->RangeStepAndValidator(1.0, MAX_NUMBER, SpecificStep, 10);
-  GroupPoints->SpinBox_DX->SetValue(myStepU);
-  GroupPoints->SpinBox_DY->SetValue(myNbTimesU);
-
-  GroupDimensions->SpinBox_DX1->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupDimensions->SpinBox_DY1->RangeStepAndValidator(1.0, MAX_NUMBER, SpecificStep, 10);
-  GroupDimensions->SpinBox_DX2->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupDimensions->SpinBox_DY2->RangeStepAndValidator(1.0, MAX_NUMBER, SpecificStep, 10);
-  GroupDimensions->SpinBox_DX1->SetValue(myStepU);
-  GroupDimensions->SpinBox_DY1->SetValue(myNbTimesU);
-  GroupDimensions->SpinBox_DX2->SetValue(myStepV);
-  GroupDimensions->SpinBox_DY2->SetValue(myNbTimesV);
-
-  /* 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()));
-  connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  // min, max, step and decimals for spin boxes & initial values
+  initSpinBox(GroupPoints->SpinBox_DX, COORD_MIN, COORD_MAX, step, 10); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupPoints->SpinBox_DY, 1, 999, SpecificStep, 10);
+  GroupPoints->SpinBox_DX->setValue(myStepU);
+  GroupPoints->SpinBox_DY->setValue(myNbTimesU);
+  GroupPoints->SpinBox_DY->setDecimals(0);
+
+  initSpinBox(GroupDimensions->SpinBox_DX1, COORD_MIN, COORD_MAX, step, 10); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupDimensions->SpinBox_DY1, 1, 999, SpecificStep, 10);
+  initSpinBox(GroupDimensions->SpinBox_DX2, COORD_MIN, COORD_MAX, step, 10); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupDimensions->SpinBox_DY2, 1, 999, SpecificStep, 10);
+  GroupDimensions->SpinBox_DX1->setValue(myStepU);
+  GroupDimensions->SpinBox_DY1->setValue(myNbTimesU);
+  GroupDimensions->SpinBox_DX2->setValue(myStepV);
+  GroupDimensions->SpinBox_DY2->setValue(myNbTimesV);
+  GroupDimensions->SpinBox_DY1->setDecimals(0);
+  GroupDimensions->SpinBox_DY2->setDecimals(0);
+
+  // init variables
+  myStepU = myStepV = 50.0;
+  myNbTimesU = myNbTimesV = 2;
+
+  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit2->setText("");
+
+  GroupDimensions->LineEdit1->setText("");
+  GroupDimensions->LineEdit2->setText("");
+  GroupDimensions->LineEdit3->setText("");
+
+  myBase = myVectorU = myVectorV = GEOM::GEOM_Object::_nil();
+
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
+
+  connect(GroupPoints->PushButton1,     SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton2,     SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupDimensions->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupDimensions->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupDimensions->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
 
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit1,     SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit2,     SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
   connect(GroupDimensions->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
   connect(GroupDimensions->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
   connect(GroupDimensions->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
 
-  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
-  connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+  connect(GroupPoints->SpinBox_DX,      SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+  connect(GroupPoints->SpinBox_DY,      SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
   connect(GroupDimensions->SpinBox_DX1, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
   connect(GroupDimensions->SpinBox_DY1, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
   connect(GroupDimensions->SpinBox_DX2, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
   connect(GroupDimensions->SpinBox_DY2, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(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->SpinBox_DX,      SIGNAL(textChanged(const QString& )), 
+          this, SLOT(TextValueChangedInSpinBox(const QString& )));
+  connect(GroupDimensions->SpinBox_DX1, SIGNAL(textChanged(const QString& )), 
+          this, SLOT(TextValueChangedInSpinBox(const QString& )));
+  connect(GroupDimensions->SpinBox_DX2, SIGNAL(textChanged(const QString& )), 
+          this, SLOT(TextValueChangedInSpinBox(const QString& )));
+  
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double)));
 
-  connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(ReverseStepU()));
+  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(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  initName(tr("GEOM_MULTITRANSLATION"));
 
-  initName( tr( "GEOM_MULTITRANSLATION" ) );
-  ConstructorsClicked( 0 );
+  ConstructorsClicked(0);
 }
 
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void TransformationGUI_MultiTranslationDlg::SetDoubleSpinBoxStep (double step)
+{
+  GroupPoints->SpinBox_DX->setSingleStep(step);
+  GroupPoints->SpinBox_DY->setSingleStep(step);
+  GroupDimensions->SpinBox_DX1->setSingleStep(step);
+  GroupDimensions->SpinBox_DY1->setSingleStep(step);
+  GroupDimensions->SpinBox_DX2->setSingleStep(step);
+  GroupDimensions->SpinBox_DY2->setSingleStep(step);
+}
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void TransformationGUI_MultiTranslationDlg::ConstructorsClicked(int constructorId)
+void TransformationGUI_MultiTranslationDlg::ConstructorsClicked (int constructorId)
 {
   disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
 
-  myStepU = myStepV = 50.0;
-  myNbTimesU = myNbTimesV = 2;
+  switch (constructorId) {
+  case 0: // Translate simple
+    {
+      GroupDimensions->hide();
+      GroupPoints->show();
+
+      GroupPoints->LineEdit1->setText("");
+      GroupPoints->LineEdit2->setText("");
+      myBase = myVectorU = GEOM::GEOM_Object::_nil();
 
-  globalSelection( GEOM_ALLSHAPES );
+      GroupPoints->SpinBox_DX->setValue(myStepU);
+      GroupPoints->SpinBox_DY->setValue(myNbTimesU);
 
-  switch (constructorId)
+      GroupPoints->PushButton1->click();
+      break;
+    }
+  case 1: // Translate double
     {
-    case 0: /* Translate simple */
-      {
-       GroupDimensions->hide();
-       resize(0, 0);
-       GroupPoints->show();
-
-       myEditCurrentArgument = GroupPoints->LineEdit1;
-       GroupPoints->LineEdit1->setText("");
-       GroupPoints->LineEdit2->setText("");
-
-       GroupPoints->SpinBox_DX->SetValue(myStepU);
-       GroupPoints->SpinBox_DY->SetValue(myNbTimesU);
-       
-       break;
-      }
-    case 1: /* Translate double */
-      {
-       GroupPoints->hide();
-       resize(0, 0);
-       GroupDimensions->show();
-
-       myEditCurrentArgument = GroupDimensions->LineEdit1;
-       GroupDimensions->LineEdit1->setText("");
-       GroupDimensions->LineEdit2->setText("");
-       GroupDimensions->LineEdit3->setText("");
-
-       GroupDimensions->SpinBox_DX1->SetValue(myStepU);
-       GroupDimensions->SpinBox_DY1->SetValue(myNbTimesU);
-       GroupDimensions->SpinBox_DX2->SetValue(myStepV);
-       GroupDimensions->SpinBox_DY2->SetValue(myNbTimesV);
-       
-       myVectorV = GEOM::GEOM_Object::_nil();
-       break;
-      }
+      GroupPoints->hide();
+      GroupDimensions->show();
+
+      GroupDimensions->LineEdit1->setText("");
+      GroupDimensions->LineEdit2->setText("");
+      GroupDimensions->LineEdit3->setText("");
+      myBase = myVectorU = myVectorV = GEOM::GEOM_Object::_nil();
+
+      GroupDimensions->SpinBox_DX1->setValue(myStepU);
+      GroupDimensions->SpinBox_DY1->setValue(myNbTimesU);
+      GroupDimensions->SpinBox_DX2->setValue(myStepV);
+      GroupDimensions->SpinBox_DY2->setValue(myNbTimesV);
+
+      GroupDimensions->PushButton1->click();
+      break;
     }
+  }
 
-  myEditCurrentArgument->setFocus();
-  myBase = myVectorU = GEOM::GEOM_Object::_nil();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-}
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
 
+  if (myInitial) {
+    myInitial = false;
+    SelectionIntoArgument();
+  }
+  else {
+    displayPreview();
+  }
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -258,112 +282,135 @@ void TransformationGUI_MultiTranslationDlg::ConstructorsClicked(int constructorI
 //=================================================================================
 void TransformationGUI_MultiTranslationDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool TransformationGUI_MultiTranslationDlg::ClickOnApply()
 {
-  if ( !onAccept() )
+  if (!onAccept())
     return false;
 
   initName();
-  ConstructorsClicked( getConstructorId() );
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed or other case
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void TransformationGUI_MultiTranslationDlg::SelectionIntoArgument()
 {
+  erasePreview();
   myEditCurrentArgument->setText("");
 
-  if (IObjectCount() != 1) {
-    if (myEditCurrentArgument == GroupPoints->LineEdit1 ||
-        myEditCurrentArgument == GroupDimensions->LineEdit1)
-      myBase = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == GroupPoints->LineEdit2 ||
-             myEditCurrentArgument == GroupDimensions->LineEdit2)
-      myVectorU = GEOM::GEOM_Object::_nil();
-    else if (myEditCurrentArgument == GroupDimensions->LineEdit3)
-      myVectorV = GEOM::GEOM_Object::_nil();
+  if (myEditCurrentArgument == GroupPoints->LineEdit1 ||
+      myEditCurrentArgument == GroupDimensions->LineEdit1)
+    myBase = GEOM::GEOM_Object::_nil();
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2 ||
+           myEditCurrentArgument == GroupDimensions->LineEdit2)
+    myVectorU = GEOM::GEOM_Object::_nil();
+  else if (myEditCurrentArgument == GroupDimensions->LineEdit3)
+    myVectorV = GEOM::GEOM_Object::_nil();
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  if (aSelList.Extent() != 1)
     return;
-  }
 
   // nbSel == 1
   Standard_Boolean testResult = Standard_False;;
-  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
+  GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
-  if ( !testResult || CORBA::is_nil( aSelectedObject ) || !GEOMBase::IsShape( aSelectedObject ) )
+  if (!testResult || CORBA::is_nil(aSelectedObject) || !GEOMBase::IsShape(aSelectedObject))
     return;
 
-  QString aName = GEOMBase::GetName( aSelectedObject );
+  QString aName = GEOMBase::GetName(aSelectedObject);
 
   if (myEditCurrentArgument == GroupPoints->LineEdit1 ||
       myEditCurrentArgument == GroupDimensions->LineEdit1)
     myBase = aSelectedObject;
   else if (myEditCurrentArgument == GroupPoints->LineEdit2 ||
            myEditCurrentArgument == GroupDimensions->LineEdit2 ||
-          myEditCurrentArgument == GroupDimensions->LineEdit3 ) {
-    if ( testResult && !aSelectedObject->_is_nil() )
-       {
-         TopoDS_Shape aShape;
-         
-         if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
-           {
-             LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-             TColStd_IndexedMapOfInteger aMap;
-             aSelMgr->GetIndexes( firstIObject(), aMap );
-               if ( aMap.Extent() == 1 )
-                 {
-                   int anIndex = aMap( 1 );
-                   aName += QString(":edge_%1").arg(anIndex);
-
-                   //Find SubShape Object in Father
-                   GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
-                   
-                   if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-                     GEOM::GEOM_IShapesOperations_var aShapesOp =
-                       getGeomEngine()->GetIShapesOperations( getStudyId() );
-                     if ( myEditCurrentArgument == GroupDimensions->LineEdit3 )
-                       myVectorV = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-                     else
-                       myVectorU = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-                   }
-                   else {
-                     if ( myEditCurrentArgument == GroupDimensions->LineEdit3 )
-                       myVectorV = aFindedObject;
-                     else
-                       myVectorU = aFindedObject;
-                   }
-                 }
-               else {
-                 if (aShape.ShapeType() != TopAbs_EDGE) {
-                   aSelectedObject = GEOM::GEOM_Object::_nil();
-                   aName = "";
-                 }
-                 if ( myEditCurrentArgument == GroupDimensions->LineEdit3 )
-                   myVectorV = aSelectedObject;
-                 else
-                   myVectorU = aSelectedObject;
-               }
-           }
-       }
+           myEditCurrentArgument == GroupDimensions->LineEdit3) {
+    TopoDS_Shape aShape;
+
+    if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull()) {
+      TColStd_IndexedMapOfInteger aMap;
+      aSelMgr->GetIndexes(aSelList.First(), aMap);
+      if (aMap.Extent() == 1) {
+        int anIndex = aMap(1);
+        aName += QString(":edge_%1").arg(anIndex);
+
+        //Find SubShape Object in Father
+        GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
+
+        if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+          GEOM::GEOM_IShapesOperations_var aShapesOp =
+            getGeomEngine()->GetIShapesOperations(getStudyId());
+          if (myEditCurrentArgument == GroupDimensions->LineEdit3)
+            myVectorV = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+          else
+            myVectorU = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+        }
+        else {
+          if (myEditCurrentArgument == GroupDimensions->LineEdit3)
+            myVectorV = aFindedObject;
+          else
+            myVectorU = aFindedObject;
+        }
+      }
+      else {
+        if (aShape.ShapeType() != TopAbs_EDGE) {
+          aSelectedObject = GEOM::GEOM_Object::_nil();
+          aName = "";
+        }
+        if (myEditCurrentArgument == GroupDimensions->LineEdit3)
+          myVectorV = aSelectedObject;
+        else
+          myVectorU = aSelectedObject;
+      }
     }
+  }
+  myEditCurrentArgument->setText(aName);
 
-  myEditCurrentArgument->setText( aName );
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
+    if (!myBase->_is_nil() && myVectorU->_is_nil())
+      GroupPoints->PushButton2->click();
+  }
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2) {
+    if (!myVectorU->_is_nil() && myBase->_is_nil())
+      GroupPoints->PushButton1->click();
+  }
+  else if (myEditCurrentArgument == GroupDimensions->LineEdit1) {
+    if (!myBase->_is_nil() && myVectorU->_is_nil())
+      GroupDimensions->PushButton2->click();
+  }
+  else if (myEditCurrentArgument == GroupDimensions->LineEdit2) {
+    if (!myVectorU->_is_nil() && myVectorV->_is_nil())
+      GroupDimensions->PushButton3->click();
+  }
+  else if (myEditCurrentArgument == GroupDimensions->LineEdit3) {
+    if (!myVectorV->_is_nil() && myBase->_is_nil())
+      GroupDimensions->PushButton1->click();
+  }
 
-  displayPreview();    
-}
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  displayPreview();
+}
 
 //=================================================================================
 // function : SetEditCurrentArgument()
@@ -372,31 +419,64 @@ void TransformationGUI_MultiTranslationDlg::SelectionIntoArgument()
 void TransformationGUI_MultiTranslationDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  globalSelection( GEOM_ALLSHAPES );
 
-  if(send == GroupPoints->PushButton1) {
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  globalSelection(GEOM_ALLSHAPES);
+
+  if (send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
+
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
   }
-  else if(send == GroupPoints->PushButton2) {
+  else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
+
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
   }
-  else if(send == GroupDimensions->PushButton1) {
+  else if (send == GroupDimensions->PushButton1) {
     myEditCurrentArgument = GroupDimensions->LineEdit1;
+
+    GroupDimensions->PushButton2->setDown(false);
+    GroupDimensions->PushButton3->setDown(false);
+    GroupDimensions->LineEdit2->setEnabled(false);
+    GroupDimensions->LineEdit3->setEnabled(false);
   }
-  else if(send == GroupDimensions->PushButton2) {
+  else if (send == GroupDimensions->PushButton2) {
     myEditCurrentArgument = GroupDimensions->LineEdit2;
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
+
+    GroupDimensions->PushButton1->setDown(false);
+    GroupDimensions->PushButton3->setDown(false);
+    GroupDimensions->LineEdit1->setEnabled(false);
+    GroupDimensions->LineEdit3->setEnabled(false);
   }
-  else if(send == GroupDimensions->PushButton3) {
+  else if (send == GroupDimensions->PushButton3) {
     myEditCurrentArgument = GroupDimensions->LineEdit3;
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
+
+    GroupDimensions->PushButton1->setDown(false);
+    GroupDimensions->PushButton2->setDown(false);
+    GroupDimensions->LineEdit1->setEnabled(false);
+    GroupDimensions->LineEdit2->setEnabled(false);
   }
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
-}
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
 
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
+}
 
 //=================================================================================
 // function : LineEditReturnPressed()
@@ -405,16 +485,14 @@ void TransformationGUI_MultiTranslationDlg::SetEditCurrentArgument()
 void TransformationGUI_MultiTranslationDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1 || send == GroupDimensions->LineEdit1 ||
-     send == GroupPoints->LineEdit2 || send == GroupDimensions->LineEdit2 ||
-                                       send == GroupDimensions->LineEdit3)
-    {
-      myEditCurrentArgument = send;
-      GEOMBase_Skeleton::LineEditReturnPressed();
-    }
+  if (send == GroupPoints->LineEdit1 || send == GroupDimensions->LineEdit1 ||
+      send == GroupPoints->LineEdit2 || send == GroupDimensions->LineEdit2 ||
+      send == GroupDimensions->LineEdit3) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
 }
 
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -422,60 +500,85 @@ void TransformationGUI_MultiTranslationDlg::LineEditReturnPressed()
 void TransformationGUI_MultiTranslationDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
   ConstructorsClicked( getConstructorId() );
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void TransformationGUI_MultiTranslationDlg::enterEvent(QEvent* e)
+void TransformationGUI_MultiTranslationDlg::enterEvent (QEvent*)
 {
-  if(!GroupConstructors->isEnabled())
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
+//=================================================================================
+// function : TextValueChangedInSpinBox
+// purpose  :
+//=================================================================================
+void TransformationGUI_MultiTranslationDlg::TextValueChangedInSpinBox( const QString& s)
+{
+  QObject* send = (QObject*)sender();
+  bool isDigit = true;
+  
+  switch (getConstructorId()) {
+  case 0: 
+    GroupPoints->SpinBox_DX->text().toDouble(&isDigit);
+    if(!isDigit){
+      GroupPoints->CheckButton1->setChecked(false);
+    }
+    GroupPoints->CheckButton1->setEnabled(isDigit);
+    break;
+  case 1: 
+    if (send == GroupDimensions->SpinBox_DX1) {
+      GroupDimensions->SpinBox_DX1->text().toDouble(&isDigit);
+      if(!isDigit) 
+        GroupDimensions->CheckButton1->setChecked(false);
+      GroupDimensions->CheckButton1->setEnabled(isDigit);
+    }
+    else if(send == GroupDimensions->SpinBox_DX2){
+      GroupDimensions->SpinBox_DX2->text().toDouble(&isDigit);
+      if(!isDigit) 
+        GroupDimensions->CheckButton2->setChecked(false);
+      GroupDimensions->CheckButton2->setEnabled(isDigit);
+    }
+    break;
+  }
+}
 
 //=================================================================================
 // function : ValueChangedInSpinBox()
 // purpose  :
 //=================================================================================
-void TransformationGUI_MultiTranslationDlg::ValueChangedInSpinBox(double newValue)
+void TransformationGUI_MultiTranslationDlg::ValueChangedInSpinBox (double newValue)
 {
   QObject* send = (QObject*)sender();
-
-  switch(getConstructorId())
-    {
-    case 0 :
-      {        
-       if(send == GroupPoints->SpinBox_DX)
-         myStepU = newValue;
-       else if(send == GroupPoints->SpinBox_DY)
-         myNbTimesU = (int)newValue;
-       break;
-      }
-    case 1 :
-      {        
-       if(send == GroupDimensions->SpinBox_DX1)
-         myStepU = newValue;
-       else if(send == GroupDimensions->SpinBox_DY1)
-         myNbTimesU = (int)newValue;
-       else if(send == GroupDimensions->SpinBox_DX2)
-         myStepV = newValue;
-       else if(send == GroupDimensions->SpinBox_DY2)
-         myNbTimesV = (int)newValue;
-       break;
-      }
-    }
+  switch (getConstructorId()) {
+  case 0:
+    if (send == GroupPoints->SpinBox_DX)
+      myStepU = newValue;
+    else if (send == GroupPoints->SpinBox_DY)
+      myNbTimesU = (int)newValue;
+    break;
+  case 1:
+    if (send == GroupDimensions->SpinBox_DX1)
+      myStepU = newValue;
+    else if (send == GroupDimensions->SpinBox_DY1)
+      myNbTimesU = (int)newValue;
+    else if (send == GroupDimensions->SpinBox_DX2)
+      myStepV = newValue;
+    else if (send == GroupDimensions->SpinBox_DY2)
+      myNbTimesV = (int)newValue;
+    break;
+  }
 
   displayPreview();
 }
 
-
 //=================================================================================
 // function : ReverseStepU()
 // purpose  : 'state' not used here
@@ -486,15 +589,14 @@ void TransformationGUI_MultiTranslationDlg::ReverseStepU()
 
   int aConstructorId = getConstructorId();
 
-  if(aConstructorId == 0)
-    GroupPoints->SpinBox_DX->SetValue(myStepU);
-  else if(aConstructorId == 1)
-    GroupDimensions->SpinBox_DX1->SetValue(myStepU);
+  if (aConstructorId == 0)
+    GroupPoints->SpinBox_DX->setValue(myStepU);
+  else if (aConstructorId == 1)
+    GroupDimensions->SpinBox_DX1->setValue(myStepU);
 
   displayPreview();
 }
 
-
 //=================================================================================
 // function : ReverseStepV
 // purpose  : 'state' not used here
@@ -503,34 +605,42 @@ void TransformationGUI_MultiTranslationDlg::ReverseStepV()
 {
   myStepV = -myStepV;
 
-  GroupDimensions->SpinBox_DX2->SetValue(myStepV);
+  GroupDimensions->SpinBox_DX2->setValue(myStepV);
 
   displayPreview();
 }
 
-
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
 GEOM::GEOM_IOperations_ptr TransformationGUI_MultiTranslationDlg::createOperation()
 {
-  return myGeomGUI->GetGeomGen()->GetITransformOperations( getStudyId() );
+  return getGeomEngine()->GetITransformOperations(getStudyId());
 }
 
-
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool TransformationGUI_MultiTranslationDlg::isValid( QString& msg )
+bool TransformationGUI_MultiTranslationDlg::isValid (QString& msg)
 {
   int aConstructorId = getConstructorId();
-
-  if(aConstructorId == 0)
-    return !(myBase->_is_nil() || myVectorU->_is_nil());
-  else if(aConstructorId == 1)
-    return !(myBase->_is_nil() || myVectorU->_is_nil() || myVectorV->_is_nil());
+  
+  if (aConstructorId == 0) {
+    bool ok = true;
+    ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupPoints->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+    return !(myBase->_is_nil() || myVectorU->_is_nil()) && ok;
+  }
+  else if (aConstructorId == 1) {
+    bool ok = true;
+    ok = GroupDimensions->SpinBox_DX1->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DY1->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DX2->isValid( msg, !IsPreview() ) && ok;
+    ok = GroupDimensions->SpinBox_DY2->isValid( msg, !IsPreview() ) && ok;
+    return !(myBase->_is_nil() || myVectorU->_is_nil() || myVectorV->_is_nil()) && ok;
+  }
   return 0;
 }
 
@@ -538,51 +648,52 @@ bool TransformationGUI_MultiTranslationDlg::isValid( QString& msg )
 // function : execute
 // purpose  :
 //=================================================================================
-bool TransformationGUI_MultiTranslationDlg::execute( ObjectList& objects )
+bool TransformationGUI_MultiTranslationDlg::execute (ObjectList& objects)
 {
   bool res = false;
 
   GEOM::GEOM_Object_var anObj;
 
-  switch ( getConstructorId() )
-    {
-    case 0 :
-      {
-       if ( !CORBA::is_nil( myBase ) && !CORBA::is_nil( myVectorU ) ) {
-         anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->MultiTranslate1D( myBase, myVectorU, myStepU, myNbTimesU );
-         res = true;
-       }
-       break;
+  QStringList aParameters;
+
+  switch (getConstructorId()) {
+  case 0:
+    if (!CORBA::is_nil(myBase) && !CORBA::is_nil(myVectorU)) {
+      anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+        MultiTranslate1D(myBase, myVectorU, myStepU, myNbTimesU);
+      if(!IsPreview()) {
+        aParameters<<GroupPoints->SpinBox_DX->text();
+        aParameters<<GroupPoints->SpinBox_DY->text();
       }
-    case 1 :
-      {
-       if ( !CORBA::is_nil( myBase ) && !CORBA::is_nil( myVectorU ) && !CORBA::is_nil( myVectorV ) )
-         {
-           anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->MultiTranslate2D( myBase, myVectorU, myStepU, myNbTimesU,
-                                                                                                         myVectorV, myStepV, myNbTimesV );
-           res = true;
-         }
-       break;
+      res = true;
+    }
+    break;
+  case 1:
+    if (!CORBA::is_nil(myBase) && !CORBA::is_nil(myVectorU) &&
+        !CORBA::is_nil(myVectorV)) {
+      anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+        MultiTranslate2D(myBase, myVectorU, myStepU, myNbTimesU,
+                          myVectorV, myStepV, myNbTimesV);
+      if(!IsPreview()) {
+        aParameters<<GroupDimensions->SpinBox_DX1->text();
+        aParameters<<GroupDimensions->SpinBox_DY1->text();
+        aParameters<<GroupDimensions->SpinBox_DX2->text();
+        aParameters<<GroupDimensions->SpinBox_DY2->text();
       }
+      res = true;
     }
+    break;
+  }
 
-  if ( !anObj->_is_nil() )
-    objects.push_back( anObj._retn() );
+  if (!anObj->_is_nil()) {
+    if(!IsPreview())
+      anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+    objects.push_back(anObj._retn());
+  }
 
   return res;
 }
 
-
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void  TransformationGUI_MultiTranslationDlg::closeEvent( QCloseEvent* e )
-{
-  // myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
-}
-
 //=================================================================================
 // function : addSubshapeToStudy
 // purpose  : virtual method to add new SubObjects if local selection
@@ -590,16 +701,15 @@ void  TransformationGUI_MultiTranslationDlg::closeEvent( QCloseEvent* e )
 void TransformationGUI_MultiTranslationDlg::addSubshapesToStudy()
 {
   QMap<QString, GEOM::GEOM_Object_var> objMap;
-  
-  switch (getConstructorId())
-    {
-    case 0:
-      objMap[GroupPoints->LineEdit2->text()] = myVectorU;
-      break;
-    case 1:
-      objMap[GroupDimensions->LineEdit2->text()] = myVectorU;
-      objMap[GroupDimensions->LineEdit3->text()] = myVectorV;
-      break;
-    }
-  addSubshapesToFather( objMap );
+
+  switch (getConstructorId()) {
+  case 0:
+    objMap[GroupPoints->LineEdit2->text()] = myVectorU;
+    break;
+  case 1:
+    objMap[GroupDimensions->LineEdit2->text()] = myVectorU;
+    objMap[GroupDimensions->LineEdit3->text()] = myVectorV;
+    break;
+  }
+  addSubshapesToFather(objMap);
 }
index c5746db3ebaf39f9e82020c3221015c602926f63..ab7d67b6ac266f189c8a660544c88d3cd75da124 100644 (file)
@@ -1,37 +1,35 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : TransformationGUI_MultiTranslationDlg.h
-//  Author : Damien COQUERET
-//  Module : GEOM
-
-#ifndef DIALOGBOX_MULTITRANSLATION_H
-#define DIALOGBOX_MULTITRANSLATION_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_MultiTranslationDlg.h
+// Author : Damien COQUERET, Open CASCADE S.A.S.
+//
+#ifndef TRANSFORMATIONGUI_MULTITRANSLATIONDLG_H
+#define TRANSFORMATIONGUI_MULTITRANSLATIONDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel2Spin1Check.h"
-#include "DlgRef_3Sel4Spin2Check.h"
+#include <GEOMBase_Skeleton.h>
 
+class DlgRef_2Sel2Spin1Check;
+class DlgRef_3Sel4Spin2Check;
 
 //=================================================================================
 // class    : TransformationGUI_MultiTranslationDlg
 //=================================================================================
 class TransformationGUI_MultiTranslationDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    TransformationGUI_MultiTranslationDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                                         const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~TransformationGUI_MultiTranslationDlg();
+  TransformationGUI_MultiTranslationDlg( GeometryGUI*, QWidget* = 0,
+                                        bool = false, Qt::WindowFlags = 0 );
+  ~TransformationGUI_MultiTranslationDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
-    virtual void closeEvent( QCloseEvent* e );
-
-private :
-    void Init();
-    void enterEvent(QEvent* e);
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
 
-    GEOM::GEOM_Object_var myBase, myVectorU, myVectorV ;
-    int myNbTimesU;
-    int myNbTimesV;
-    Standard_Real myStepU;
-    Standard_Real myStepV;
-    
-    DlgRef_2Sel2Spin1Check* GroupPoints;
-    DlgRef_3Sel4Spin2Check* GroupDimensions;
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  
+private:
+  GEOM::GEOM_Object_var              myBase, myVectorU, myVectorV;
+  int                                myNbTimesU;
+  int                                myNbTimesV;
+  Standard_Real                      myStepU;
+  Standard_Real                      myStepV;
 
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
+  
+  DlgRef_2Sel2Spin1Check*            GroupPoints;
+  DlgRef_3Sel4Spin2Check*            GroupDimensions;
+  
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ReverseStepU();
-    void ReverseStepV();
-    void ValueChangedInSpinBox(double newValue);
-    void ConstructorsClicked(int constructorId);
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ReverseStepU();
+  void                               ReverseStepV();
+  void                               ValueChangedInSpinBox( double );
+  void                               TextValueChangedInSpinBox( const QString& );
+  void                               ConstructorsClicked( int );
+  void                               SetDoubleSpinBoxStep( double );
 };
 
-#endif // DIALOGBOX_MULTITRANSLATION_H
+#endif // TRANSFORMATIONGUI_MULTITRANSLATIONDLG_H
index 862faabe7349591d04b12f7fdea3ee741c750dc1..f548ca48e4a7ee33eb75987aee9092953c677573 100644 (file)
@@ -1,85 +1,82 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_OffsetDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : TransformationGUI_OffsetDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "TransformationGUI_OffsetDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-
-#include <qlabel.h>
-#include <qcheckbox.h>
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include "utilities.h"
-
-using namespace std;
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : TransformationGUI_OffsetDlg()
-// purpose  : Constructs a TransformationGUI_OffsetDlg which is a child of 'parent', with the
+// purpose  : Constructs a TransformationGUI_OffsetDlg which is 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.
 //=================================================================================
-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)
+TransformationGUI_OffsetDlg::TransformationGUI_OffsetDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                         bool modal, Qt::WindowFlags fl )
+  : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_OFFSET")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_OFFSET" ) ) );
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
 
-  setCaption(tr("GEOM_OFFSET_TITLE"));
+  setWindowTitle( tr( "GEOM_OFFSET_TITLE" ) );
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_OFFSET"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_1Sel1Spin1Check(this, "GroupPoints");
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS"));
-  GroupPoints->TextLabel2->setText(tr("GEOM_OFFSET"));
-  GroupPoints->CheckButton1->setText(tr("GEOM_CREATE_COPY"));
+  mainFrame()->GroupConstructors->setTitle( tr( "GEOM_OFFSET" ) );
+  mainFrame()->RadioButton1->setIcon( image0 );
+  mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton2->close();
+  mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  mainFrame()->RadioButton3->close();
+  GroupPoints = new DlgRef_1Sel1Spin1Check( centralWidget() );
+  GroupPoints->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
+  GroupPoints->TextLabel1->setText( tr( "GEOM_OBJECTS" ) );
+  GroupPoints->TextLabel2->setText( tr( "GEOM_OFFSET" ) );
+  GroupPoints->CheckButton1->setText( tr( "GEOM_CREATE_COPY" ) );
 
   // san -- modification of an exisitng object by offset is not allowed
   GroupPoints->CheckButton1->hide();
 
-  GroupPoints->PushButton1->setPixmap(image1);
-
-  Layout1->addWidget(GroupPoints, 2, 0);
-
+  GroupPoints->PushButton1->setIcon( image1 );
+  
+  QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+  layout->setMargin( 0 ); layout->setSpacing( 6 );
+  layout->addWidget( GroupPoints );
+  
   /***************************************************************/
 
-  setHelpFileName("offset_operation_page.html");
-
+  setHelpFileName( "offset_operation_page.html" );
+  
   Init();
 }
 
@@ -89,7 +86,7 @@ TransformationGUI_OffsetDlg::TransformationGUI_OffsetDlg(GeometryGUI* theGeometr
 // purpose  : Destroys the object and frees any allocated resources
 //=================================================================================
 TransformationGUI_OffsetDlg::~TransformationGUI_OffsetDlg()
-{
+{  
   /* no need to delete child widgets, Qt does it all for us */
 }
 
@@ -99,33 +96,35 @@ TransformationGUI_OffsetDlg::~TransformationGUI_OffsetDlg()
 // purpose  :
 //=================================================================================
 void TransformationGUI_OffsetDlg::Init()
-{
+{  
   /* init variables */
   myEditCurrentArgument = GroupPoints->LineEdit1;
   GroupPoints->LineEdit1->setReadOnly( true );
-
+  
   /* Get setting of step value from file configuration */
   double step = 1;
-
+   
   /* min, max, step and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox_DX->SetValue(1e-05);
-
+  initSpinBox( GroupPoints->SpinBox_DX, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupPoints->SpinBox_DX->setValue( 1e-05 );
+  
   // Activate Create a Copy mode
-  GroupPoints->CheckButton1->setChecked(true);
-  CreateCopyModeChanged(true);
+  GroupPoints->CheckButton1->setChecked( true );
+  CreateCopyModeChanged( true );
 
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-
-  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
-  connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool)));
+  mainFrame()->GroupBoxPublish->show();
 
+  /* signals and slots connections */
+  connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+  connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+  
+  connect( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+  connect( myGeomGUI->getApp()->selectionMgr(), 
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+
+  connect( GroupPoints->SpinBox_DX,   SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox() ) );
+  connect( GroupPoints->CheckButton1, SIGNAL( toggled( bool ) ),        this, SLOT( CreateCopyModeChanged( bool ) ) );
+  
   initName( tr( "GEOM_OFFSET" ) );
 
   globalSelection( GEOM_ALLSHAPES );
@@ -151,7 +150,7 @@ bool TransformationGUI_OffsetDlg::ClickOnApply()
 {
   if ( !onAccept( GroupPoints->CheckButton1->isChecked() ) )
     return false;
-
+  
   initName();
   return true;
 }
@@ -163,22 +162,25 @@ bool TransformationGUI_OffsetDlg::ClickOnApply()
 //=================================================================================
 void TransformationGUI_OffsetDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   QString aName;
 
-  int aNbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aName);
-  if(aNbSel < 1)
-    {
-      myObjects.length(0);
-      return;
-    }
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
+  int aNbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aName);
+  if ( aNbSel < 1 ) {
+    myObjects.length( 0 );
+    return;
+  }
 
   // nbSel > 0
-  GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), myObjects);
+  GEOMBase::ConvertListOfIOInListOfGO (aSelList, myObjects);
   if (!myObjects.length())
     return;
 
-  myEditCurrentArgument->setText( aName );
+  myEditCurrentArgument->setText(aName);
 
   displayPreview();
 }
@@ -191,8 +193,7 @@ void TransformationGUI_OffsetDlg::SelectionIntoArgument()
 void TransformationGUI_OffsetDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if ( send == GroupPoints->LineEdit1 )
-  {
+  if ( send == GroupPoints->LineEdit1 ) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
     GEOMBase_Skeleton::LineEditReturnPressed();
   }
@@ -206,13 +207,13 @@ void TransformationGUI_OffsetDlg::LineEditReturnPressed()
 void TransformationGUI_OffsetDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-
-  if(send == GroupPoints->PushButton1)
-    {
-      myEditCurrentArgument = GroupPoints->LineEdit1;
-      myEditCurrentArgument->setFocus();
-      SelectionIntoArgument();
-    }
+  
+  if ( send == GroupPoints->PushButton1 ) {
+    GroupPoints->PushButton1->setDown(true);
+    myEditCurrentArgument = GroupPoints->LineEdit1;
+    myEditCurrentArgument->setFocus();
+    SelectionIntoArgument();
+  }
 }
 
 
@@ -220,9 +221,9 @@ void TransformationGUI_OffsetDlg::SetEditCurrentArgument()
 // function : enterEvent()
 // purpose  : when mouse enter onto the QWidget
 //=================================================================================
-void TransformationGUI_OffsetDlg::enterEvent(QEvent * e)
+void TransformationGUI_OffsetDlg::enterEvent( QEvent* )
 {
-  if ( !GroupConstructors->isEnabled() )
+  if ( !mainFrame()->GroupConstructors->isEnabled() )
     ActivateThisDialog();
 }
 
@@ -234,8 +235,8 @@ void TransformationGUI_OffsetDlg::enterEvent(QEvent * e)
 void TransformationGUI_OffsetDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), 
+          SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
   globalSelection( GEOM_ALLSHAPES );
   myEditCurrentArgument = GroupPoints->LineEdit1;
   myEditCurrentArgument->setFocus();
@@ -268,20 +269,18 @@ GEOM::GEOM_IOperations_ptr TransformationGUI_OffsetDlg::createOperation()
 bool TransformationGUI_OffsetDlg::isValid( QString& msg )
 {
   //return !(myObjects.length() == 0);
-  if (myObjects.length() == 0) return false;
+  if ( myObjects.length() == 0 ) return false;
 
-  for (int i = 0; i < myObjects.length(); i++)
-  {
+  for ( int i = 0; i < myObjects.length(); i++ ) {
     GEOM::shape_type aType = myObjects[i]->GetShapeType();
-    if( aType != GEOM::FACE && aType != GEOM::SHELL && aType != GEOM::SOLID ){
-       msg = tr("ERROR_SHAPE_TYPE");
-       return false;
+    if ( aType != GEOM::FACE && aType != GEOM::SHELL && aType != GEOM::SOLID ) {
+      msg = tr( "ERROR_SHAPE_TYPE" );
+      return false;
     }
   }
-  return true;
+  return GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() );
 }
 
-
 //=================================================================================
 // function : execute
 // purpose  :
@@ -289,57 +288,62 @@ bool TransformationGUI_OffsetDlg::isValid( QString& msg )
 bool TransformationGUI_OffsetDlg::execute( ObjectList& objects )
 {
   bool res = false;
-
+  
   GEOM::GEOM_Object_var anObj;
-
-  if (GroupPoints->CheckButton1->isChecked() || IsPreview())
-    for (int i = 0; i < myObjects.length(); i++)
-    {
-      anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-        OffsetShapeCopy( myObjects[i], GetOffset() );
-      if ( !anObj->_is_nil() )
-        objects.push_back( anObj._retn() );
+  
+  if ( GroupPoints->CheckButton1->isChecked() || IsPreview() ) {
+    for ( int i = 0; i < myObjects.length(); i++ ) {
+      
+      anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->OffsetShapeCopy( myObjects[i], GetOffset() );
+      if ( !anObj->_is_nil() ) {
+        if(!IsPreview()) {
+          anObj->SetParameters(GroupPoints->SpinBox_DX->text().toLatin1().constData());
+        }
+       objects.push_back( anObj._retn() );
+      }
     }
-  else
-    for (int i = 0; i < myObjects.length(); i++)
-    {
-      anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-        OffsetShape( myObjects[i], GetOffset() );
+  }
+  else {
+    for ( int i = 0; i < myObjects.length(); i++ ) {
+      anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->OffsetShape( myObjects[i], GetOffset() );
       if ( !anObj->_is_nil() )
-        objects.push_back( anObj._retn() );
+       objects.push_back( anObj._retn() );
     }
-
+  }
   res = true;
-
+    
   return res;
 }
 
 //=================================================================================
-// function : closeEvent
+// function : restoreSubShapes
 // purpose  :
 //=================================================================================
-void TransformationGUI_OffsetDlg::closeEvent( QCloseEvent* e )
+void TransformationGUI_OffsetDlg::restoreSubShapes( SALOMEDS::Study_ptr   theStudy,
+                                                    SALOMEDS::SObject_ptr theSObject )
 {
-  // myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::closeEvent( e );
+  if ( mainFrame()->CheckBoxRestoreSS->isChecked() ) {
+    // empty list of arguments means that all arguments should be restored
+    getGeomEngine()->RestoreSubShapesSO( theStudy, theSObject, GEOM::ListOfGO(),
+                                        /*theFindMethod=*/GEOM::FSM_Transformed,
+                                        /*theInheritFirstArg=*/true );
+  }
 }
 
-
 //=================================================================================
 // function : GetOffset()
 // purpose  :
 //=================================================================================
 double TransformationGUI_OffsetDlg::GetOffset() const
 {
-  return GroupPoints->SpinBox_DX->GetValue();
+  return GroupPoints->SpinBox_DX->value();
 }
 
-
 //=================================================================================
 // function :  CreateCopyModeChanged()
 // purpose  :
 //=================================================================================
-void TransformationGUI_OffsetDlg::CreateCopyModeChanged(bool isCreateCopy)
+void TransformationGUI_OffsetDlg::CreateCopyModeChanged( bool isCreateCopy )
 {
-  this->GroupBoxName->setEnabled(isCreateCopy);
+  mainFrame()->GroupBoxName->setEnabled( isCreateCopy );
 }
index a49cdd87fbdb0e2e409cb88d05ebafabee724452..c83ec5fedc4c9c6a62592b1337ab127120522956 100644 (file)
@@ -1,36 +1,34 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : TransformationGUI_OffsetDlg.h
-//  Author : Michael Zorin
-//  Module : GEOM
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_OffsetDlg.h
+// Author : Michael ZORIN, Open CASCADE S.A.S. (mikhail.zorin@opencascade.com)
+//
+#ifndef TRANSFORMATIONGUI_OFFSETDLG_H
+#define TRANSFORMATIONGUI_OFFSETDLG_H
 
-#ifndef DIALOGBOX_OFFSET_H
-#define DIALOGBOX_OFFSET_H
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_1Sel1Spin1Check.h"
-  
+class DlgRef_1Sel1Spin1Check;  
   
 //=================================================================================
 // class    : TransformationGUI_OffsetDlg
 //=================================================================================
 class TransformationGUI_OffsetDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    TransformationGUI_OffsetDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                               const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~TransformationGUI_OffsetDlg();
+  TransformationGUI_OffsetDlg( GeometryGUI*, QWidget* = 0,
+                              bool = false, Qt::WindowFlags = 0 );
+  ~TransformationGUI_OffsetDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-
-    virtual void closeEvent( QCloseEvent* e );
-
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr );
+  
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    double GetOffset() const;
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  double                             GetOffset() const;
     
-    GEOM::ListOfGO myObjects;
+private:
+  GEOM::ListOfGO                     myObjects;
     
-    DlgRef_1Sel1Spin1Check* GroupPoints;
+  DlgRef_1Sel1Spin1Check*            GroupPoints;
     
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void SelectionIntoArgument();
-    void LineEditReturnPressed();
-    void SetEditCurrentArgument();
-    void ValueChangedInSpinBox();
-    void CreateCopyModeChanged(bool isCreateCopy);
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               SelectionIntoArgument();
+  void                               LineEditReturnPressed();
+  void                               SetEditCurrentArgument();
+  void                               ValueChangedInSpinBox();
+  void                               CreateCopyModeChanged( bool );
 };
 
-#endif // DIALOGBOX_OFFSET_H
+#endif // TRANSFORMATIONGUI_OFFSETDLG_H
index 721f5b9d7335d46e820bf2ab0d4bf4ef6fd19e75..e6cd6c213fe075e8acfa93052af0dfa037acfd80 100644 (file)
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_PositionDlg.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
 //
-//  File   : TransformationGUI_PositionDlg.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 #include "TransformationGUI_PositionDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-
-#include <qlabel.h>
-#include <qcheckbox.h>
-
-#include "TColStd_MapOfInteger.hxx"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
-#include "GEOMImpl_Types.hxx"
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <TColStd_IndexedMapOfInteger.hxx>
 
-#include "utilities.h"
+// OCCT Includes
+#include <TColStd_MapOfInteger.hxx>
 
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : TransformationGUI_PositionDlg()
-// purpose  : Constructs a TransformationGUI_PositionDlg which is a child of 'parent', with the 
+// purpose  : Constructs a TransformationGUI_PositionDlg which is 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.
 //=================================================================================
 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)
+(GeometryGUI* theGeometryGUI, QWidget* parent, bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myInitial(true)
 {
   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")));
+  QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_POSITION")));
+  QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_POSITION2")));
+  QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_POSITION3")));
+  QPixmap imageselect (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_POSITION_TITLE"));
+  setWindowTitle(tr("GEOM_POSITION_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_POSITION"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->close(TRUE);
-  Group1 = new DlgRef_3Sel3Spin1Check(this, "Group1");
-  Group1->SpinBox1->hide();
-  Group1->SpinBox2->hide();
-  Group1->SpinBox3->hide();
-  Group1->TextLabel4->hide();
-  Group1->TextLabel5->hide();
-  Group1->TextLabel6->hide();
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_POSITION"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image1);
+  mainFrame()->RadioButton3->setIcon(image2);
+
+  Group1 = new DlgRef_4Sel1Spin3Check(centralWidget());
   Group1->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   Group1->TextLabel1->setText(tr("GEOM_OBJECTS"));
   Group1->TextLabel2->setText(tr("GEOM_START_LCS"));
-  Group1->TextLabel3->setText(tr("GEOM_END_LCS"));
-  Group1->PushButton1->setPixmap(imageselect);
-  Group1->PushButton2->setPixmap(imageselect);
-  Group1->PushButton3->setPixmap(imageselect);
-  Group1->CheckBox1->setText(tr("GEOM_CREATE_COPY"));
-
-  Layout1->addWidget(Group1, 2, 0);
-  
+  Group1->TextLabel3->setText(tr("GEOM_DISTANCE"));
+  Group1->TextLabel4->setText(tr("GEOM_END_LCS"));
+  Group1->TextLabel5->setText(tr("GEOM_PATH_OBJECT"));
+  Group1->PushButton1->setIcon(imageselect);
+  Group1->PushButton2->setIcon(imageselect);
+  Group1->PushButton4->setIcon(imageselect);
+  Group1->PushButton5->setIcon(imageselect);
+  Group1->CheckButton1->setText(tr("GEOM_CREATE_COPY"));
+  Group1->CheckButton2->setText(tr("SELECT_UNPUBLISHED_EDGES"));
+  Group1->CheckButton3->setText(tr("GEOM_REVERSE_DIRECTION"));
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(Group1);
   /***************************************************************/
 
-  setHelpFileName("modify_location_operation_page.html");  
-  
+  setHelpFileName("modify_location_operation_page.html");
+
+  // Activate Create a Copy mode
+  Group1->CheckButton1->setChecked(true);
+  Group1->CheckButton1->setChecked(false);
+  CreateCopyModeChanged(true);
+
   Init();
 }
 
-
 //=================================================================================
 // function : ~TransformationGUI_PositionDlg()
 // purpose  : Destroys the object and frees any allocated resources
 //=================================================================================
 TransformationGUI_PositionDlg::~TransformationGUI_PositionDlg()
-{  
-  /* no need to delete child widgets, Qt does it all for us */
+{
+  // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void TransformationGUI_PositionDlg::Init()
-{  
-  /* init variables */
+{
+  // init variables
   Group1->LineEdit1->setReadOnly(true);
   Group1->LineEdit2->setReadOnly(true);
-  Group1->LineEdit3->setReadOnly(true);
-  
-  myStartLCS = GEOM::GEOM_Object::_nil();
-  myEndLCS = GEOM::GEOM_Object::_nil();
-    
-  // Activate Create a Copy mode
-  Group1->CheckBox1->setChecked(true);
-  CreateCopyModeChanged(true);
+  Group1->LineEdit4->setReadOnly(true);
+  Group1->LineEdit5->setReadOnly(true);
 
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-  connect(GroupConstructors, SIGNAL(clicked(int)), SLOT(ConstructorsClicked(int)));
-
-  connect(Group1->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group1->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(Group1->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-
-  connect(Group1->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group1->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(Group1->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  
-  connect(Group1->CheckBox1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool)));
-  
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-
-  initName( tr( "GEOM_POSITION" ) );
-  ConstructorsClicked( 0 );
-}
+  Group1->LineEdit1->setText("");
+  Group1->LineEdit2->setText("");
+  Group1->LineEdit4->setText("");
+  Group1->LineEdit5->setText("");
 
+  initSpinBox(Group1->SpinBox_DX, 0, 1, 0.05, 6); // VSR:TODO : DBL_DIGITS_DISPLAY
+  Group1->SpinBox_DX->setValue(0);
 
+  Group1->CheckButton2->setEnabled(false);
+
+  myStartLCS = myEndLCS = GEOM::GEOM_Object::_nil();
+
+  mainFrame()->GroupBoxPublish->show();
+
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
+
+  connect(Group1->PushButton1, SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
+  connect(Group1->PushButton2, SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
+  connect(Group1->PushButton4, SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
+  connect(Group1->PushButton5, SIGNAL(clicked()),       this, SLOT(SetEditCurrentArgument()));
+
+  connect(Group1->LineEdit1,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(Group1->LineEdit2,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(Group1->LineEdit4,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(Group1->LineEdit5,   SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+
+  connect(Group1->CheckButton1,   SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool)));
+  connect(Group1->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+
+  connect(Group1->CheckButton2,   SIGNAL(toggled(bool)), this, SLOT(SelectionTypeButtonClicked()));
+  connect(Group1->CheckButton3,   SIGNAL(toggled(bool)), this, SLOT(ValueChangedInSpinBox()));
+
+  initName(tr("GEOM_POSITION"));
+
+  ConstructorsClicked(0);
+}
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void TransformationGUI_PositionDlg::ConstructorsClicked(int constructorId)
+void TransformationGUI_PositionDlg::ConstructorsClicked (int constructorId)
 {
   disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
-  
-  globalSelection();
-  myEditCurrentArgument = Group1->LineEdit1;
+
   Group1->LineEdit2->clear();
-  Group1->LineEdit3->clear();
+  Group1->LineEdit4->clear();
+  Group1->LineEdit5->clear();
   myStartLCS = GEOM::GEOM_Object::_nil();
   myEndLCS = GEOM::GEOM_Object::_nil();
-  
-  switch (constructorId)
+  myPath = GEOM::GEOM_Object::_nil();
+
+  switch (constructorId) {
+  case 0:
     {
-    case 0:
-      {        
-       Group1->LineEdit2->hide();
-       Group1->TextLabel2->hide();
-       Group1->PushButton2->hide();
-       break;
-      }
-    case 1:
-      {
-       Group1->LineEdit2->show();
-       Group1->TextLabel2->show();
-       Group1->PushButton2->show();
-       break;
-      }
+      Group1->LineEdit2->hide();
+      Group1->TextLabel2->hide();
+      Group1->PushButton2->hide();
+
+      Group1->LineEdit5->hide();
+      Group1->TextLabel5->hide();
+      Group1->PushButton5->hide();
+
+      Group1->SpinBox_DX->hide();
+      Group1->TextLabel3->hide();
+
+      Group1->LineEdit4->show();
+      Group1->TextLabel4->show();
+      Group1->PushButton4->show();
+
+      Group1->PushButton1->click();
+
+      Group1->CheckButton2->hide();
+      Group1->CheckButton3->hide();
+    }
+    break;
+  case 1:
+    {
+      Group1->LineEdit2->show();
+      Group1->TextLabel2->show();
+      Group1->PushButton2->show();
+
+      Group1->LineEdit5->hide();
+      Group1->TextLabel5->hide();
+      Group1->PushButton5->hide();
+
+      Group1->SpinBox_DX->hide();
+      Group1->TextLabel3->hide();
+
+      Group1->PushButton1->click();
+
+      Group1->CheckButton2->hide();
+      Group1->CheckButton3->hide();
     }
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-  SelectionIntoArgument();
+    break;
+  case 2:
+    {
+      Group1->LineEdit4->hide();
+      Group1->TextLabel4->hide();
+      Group1->PushButton4->hide();
+
+      Group1->LineEdit2->hide();
+      Group1->TextLabel2->hide();
+      Group1->PushButton2->hide();
+
+      Group1->LineEdit5->show();
+      Group1->TextLabel5->show();
+      Group1->PushButton5->show();
+
+      Group1->SpinBox_DX->show();
+      Group1->TextLabel3->show();
+
+      Group1->PushButton1->click();
+
+      Group1->CheckButton2->show();
+      Group1->CheckButton3->show();
+    }
+    break;
+  }
+
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
+
+  if (myInitial) {
+    myInitial = false;
+    SelectionIntoArgument();
+  }
+  else {
+    displayPreview();
+  }
+}
+
+//=================================================================================
+// function : SelectionBittonClicked()
+// purpose  : Selection type Radio button management
+//=================================================================================
+void TransformationGUI_PositionDlg::SelectionTypeButtonClicked()
+{
+  if ( Group1->CheckButton2->isChecked() ) {
+    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+  } else {
+    TColStd_MapOfInteger aMap;
+    aMap.Add(GEOM_WIRE);
+    aMap.Add(GEOM_LINE);
+    globalSelection(aMap);
+  }
 }
 
+//=================================================================================
+// function : ValueChangedInSpinBox()
+// purpose  :
+//=================================================================================
+void TransformationGUI_PositionDlg::ValueChangedInSpinBox()
+{
+  displayPreview();
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -191,97 +285,153 @@ void TransformationGUI_PositionDlg::ConstructorsClicked(int constructorId)
 //=================================================================================
 void TransformationGUI_PositionDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool TransformationGUI_PositionDlg::ClickOnApply()
 {
-  if ( !onAccept(Group1->CheckBox1->isChecked()) )
+  if (!onAccept(Group1->CheckButton1->isChecked()))
     return false;
-  
+
   initName();
-  ConstructorsClicked( getConstructorId() );
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection has changed
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void TransformationGUI_PositionDlg::SelectionIntoArgument()
 {
+  erasePreview();
   myEditCurrentArgument->setText("");
+
+  if (myEditCurrentArgument == Group1->LineEdit1)
+    myObjects.length(0);
+  else if (myEditCurrentArgument == Group1->LineEdit2)
+    myStartLCS = GEOM::GEOM_Object::_nil();
+  else if (myEditCurrentArgument == Group1->LineEdit4)
+    myEndLCS = GEOM::GEOM_Object::_nil();
+  else if (myEditCurrentArgument == Group1->LineEdit5)
+    myPath = GEOM::GEOM_Object::_nil();
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
   QString aName;
 
-  if(myEditCurrentArgument == Group1->LineEdit1) {
-    int aNbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aName);
-    if(aNbSel < 1) {
-      myObjects.length(0);
-      displayPreview();
+  if (myEditCurrentArgument == Group1->LineEdit1) {
+    int aNbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aName);
+    if (aNbSel < 1)
       return;
-    }
-    GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), myObjects);
-    if (!myObjects.length()) {
-      displayPreview();
+
+    GEOMBase::ConvertListOfIOInListOfGO(aSelList, myObjects);
+    if (!myObjects.length())
       return;
-    }
+    else
+      myEditCurrentArgument->setText(aName);
+
+    if (getConstructorId() == 2)
+      Group1->PushButton5->click();
   }
-  else if(myEditCurrentArgument == Group1->LineEdit2) {
-    myStartLCS = GEOM::GEOM_Object::_nil();
-    if(IObjectCount() != 1) {
-      displayPreview();
+  else if (myEditCurrentArgument == Group1->LineEdit2) {
+    if (aSelList.Extent() != 1)
       return;
-    }
 
+    // nbSel == 1
     Standard_Boolean testResult = Standard_False;
-    myStartLCS = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
-    if(!testResult || CORBA::is_nil( myStartLCS )) {
-      displayPreview();
+    myStartLCS = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    if (!testResult || CORBA::is_nil(myStartLCS))
       return;
-    }
-    aName = GEOMBase::GetName( myStartLCS );
+
+    aName = GEOMBase::GetName(myStartLCS);
+    myEditCurrentArgument->setText(aName);
+
+    if (!myStartLCS->_is_nil() && myEndLCS->_is_nil())
+      Group1->PushButton4->click();
   }
-  else if(myEditCurrentArgument == Group1->LineEdit3) {
+  else if (myEditCurrentArgument == Group1->LineEdit4) {
     myEndLCS = GEOM::GEOM_Object::_nil();
-    if(IObjectCount() != 1) {
-      displayPreview();
+    if (aSelList.Extent() != 1)
       return;
-    }
-    
+
     Standard_Boolean testResult = Standard_False;
-    myEndLCS = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
-    if(!testResult || CORBA::is_nil( myEndLCS )) {
-      displayPreview();
+    myEndLCS = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    if (!testResult || CORBA::is_nil(myEndLCS))
       return;
-    }
-    aName = GEOMBase::GetName( myEndLCS );
+
+    aName = GEOMBase::GetName(myEndLCS);
+    myEditCurrentArgument->setText(aName);
+
+    if (!myEndLCS->_is_nil() && !myObjects.length())
+      Group1->PushButton1->click();
   }
+  else if (myEditCurrentArgument == Group1->LineEdit5) {
+    myPath = GEOM::GEOM_Object::_nil();
+    if (aSelList.Extent() != 1)
+      return;
 
-  myEditCurrentArgument->setText( aName );
-  displayPreview(); 
-}
+    Standard_Boolean testResult = Standard_False;
+    GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+    if (!testResult || aSelectedObject->_is_nil())
+      return;
 
+    aName = GEOMBase::GetName(myPath);
+    // Local Selection
+    TopoDS_Shape S;
+    if (!GEOMBase::GetShape(aSelectedObject, S))
+      return;
+    
+    TColStd_IndexedMapOfInteger aMap;
+    aSelMgr->GetIndexes(aSelList.First(), aMap);
+    aName = GEOMBase::GetName(aSelectedObject);
+    if (aMap.Extent() == 1) {
+      int anIndex = aMap(1);
+      aName.append(":edge_" + QString::number(anIndex));
+      
+      //Find SubShape Object in Father
+      GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
+      
+      if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+       GEOM::GEOM_IShapesOperations_var aShapesOp =
+         getGeomEngine()->GetIShapesOperations(getStudyId());
+       aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+      }
+      else { // get Object from study
+       aSelectedObject = aFindedObject;
+      }
+    }
+    else {
+      if (S.ShapeType() != TopAbs_EDGE && S.ShapeType() != TopAbs_WIRE) {
+       aSelectedObject = GEOM::GEOM_Object::_nil();
+       aName = "";
+       return;
+      }
+    }
+    
+    myEditCurrentArgument->setText(aName);
+    myPath = aSelectedObject;
 
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose  :
-//=================================================================================
-void TransformationGUI_PositionDlg::LineEditReturnPressed()
-{
-  QLineEdit* send = (QLineEdit*)sender();
-  if(send == Group1->LineEdit1 || send == Group1->LineEdit2 || send == Group1->LineEdit3) {
-    myEditCurrentArgument = send;
-    GEOMBase_Skeleton::LineEditReturnPressed();
+    if (!myPath->_is_nil() && !myObjects.length())
+      Group1->PushButton1->click();
   }
-}
 
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  displayPreview();
+}
 
 //=================================================================================
 // function : SetEditCurrentArgument()
@@ -290,30 +440,110 @@ void TransformationGUI_PositionDlg::LineEditReturnPressed()
 void TransformationGUI_PositionDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
-  
-  if(send == Group1->PushButton1){
+
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  if (send == Group1->PushButton1) {
     myEditCurrentArgument = Group1->LineEdit1;
+
     globalSelection();
+
+    Group1->PushButton2->setDown(false);
+    Group1->PushButton4->setDown(false);
+    Group1->PushButton5->setDown(false);
+    Group1->LineEdit2->setEnabled(false);
+    Group1->LineEdit4->setEnabled(false);
+    Group1->LineEdit5->setEnabled(false);
+
+    Group1->CheckButton2->setEnabled(false);
   }
-  else if(send == Group1->PushButton2) {
+  else if (send == Group1->PushButton2) {
     myEditCurrentArgument = Group1->LineEdit2;
+
     TColStd_MapOfInteger aMap;
-    aMap.Add( GEOM_PLANE );
-    aMap.Add( GEOM_MARKER );
-    globalSelection( aMap );
+    aMap.Add(GEOM_PLANE);
+    aMap.Add(GEOM_MARKER);
+    globalSelection(aMap);
+
+    Group1->PushButton1->setDown(false);
+    Group1->PushButton4->setDown(false);
+    Group1->PushButton5->setDown(false);
+    Group1->LineEdit1->setEnabled(false);
+    Group1->LineEdit4->setEnabled(false);
+    Group1->LineEdit5->setEnabled(false);
+
+    Group1->CheckButton2->setEnabled(false);
   }
-  else if(send == Group1->PushButton3) {
-    myEditCurrentArgument = Group1->LineEdit3;
+  else if (send == Group1->PushButton4) {
+    myEditCurrentArgument = Group1->LineEdit4;
+
     TColStd_MapOfInteger aMap;
-    aMap.Add( GEOM_PLANE );
-    aMap.Add( GEOM_MARKER );
-    globalSelection( aMap );
+    aMap.Add(GEOM_PLANE);
+    aMap.Add(GEOM_MARKER);
+    globalSelection(aMap);
+
+    Group1->PushButton1->setDown(false);
+    Group1->PushButton2->setDown(false);
+    Group1->PushButton5->setDown(false);
+    Group1->LineEdit1->setEnabled(false);
+    Group1->LineEdit2->setEnabled(false);
+    Group1->LineEdit5->setEnabled(false);
+
+    Group1->CheckButton2->setEnabled(false);
+  }
+  else if (send == Group1->PushButton5) {
+    myEditCurrentArgument = Group1->LineEdit5;
+
+    Group1->CheckButton2->setEnabled(true);
+
+    if ( Group1->CheckButton2->isChecked() ) {
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+    } else {
+      TColStd_MapOfInteger aMap;
+      aMap.Add(GEOM_WIRE);
+      aMap.Add(GEOM_LINE);
+      globalSelection(aMap);
+    }
+
+    Group1->PushButton1->setDown(false);
+    Group1->PushButton2->setDown(false);
+    Group1->PushButton4->setDown(false);
+    Group1->LineEdit1->setEnabled(false);
+    Group1->LineEdit2->setEnabled(false);
+    Group1->LineEdit4->setEnabled(false);
   }
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
 }
 
+//=================================================================================
+// function : LineEditReturnPressed()
+// purpose  :
+//=================================================================================
+void TransformationGUI_PositionDlg::LineEditReturnPressed()
+{
+  QLineEdit* send = (QLineEdit*)sender();
+  if (send == Group1->LineEdit1 ||
+      send == Group1->LineEdit2 ||
+      send == Group1->LineEdit4 ||
+      send == Group1->LineEdit5 ) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
+
+  if (send == Group1->LineEdit5)
+    Group1->CheckButton2->setEnabled(true);
+  else
+    Group1->CheckButton2->setEnabled(false);
+}
 
 //=================================================================================
 // function : ActivateThisDialog()
@@ -322,108 +552,144 @@ void TransformationGUI_PositionDlg::SetEditCurrentArgument()
 void TransformationGUI_PositionDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(), 
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
   ConstructorsClicked( getConstructorId() );
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  : when mouse enter onto the QWidget
 //=================================================================================
-void TransformationGUI_PositionDlg::enterEvent(QEvent * e)
+void TransformationGUI_PositionDlg::enterEvent (QEvent*)
 {
-  if(!GroupConstructors->isEnabled())
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
-GEOM::GEOM_IOperations_ptr  TransformationGUI_PositionDlg::createOperation()
+GEOM::GEOM_IOperations_ptr TransformationGUI_PositionDlg::createOperation()
 {
-  return getGeomEngine()->GetITransformOperations( getStudyId() );
+  return getGeomEngine()->GetITransformOperations(getStudyId());
 }
 
-
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool  TransformationGUI_PositionDlg::isValid( QString& msg )
+bool TransformationGUI_PositionDlg::isValid (QString& /*msg*/)
 {
   bool res;
   if (getConstructorId() == 0)
     res = !(myObjects.length() == 0 || myEndLCS->_is_nil());
-  else
+  else if ( getConstructorId() == 1 )
     res = !(myObjects.length() == 0 || myStartLCS->_is_nil() || myEndLCS->_is_nil());
+  else if ( getConstructorId() == 2 )
+    res = !(myObjects.length() == 0 || myPath->_is_nil());
 
   return res;
 }
 
-
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool  TransformationGUI_PositionDlg::execute( ObjectList& objects )
+bool TransformationGUI_PositionDlg::execute (ObjectList& objects)
 {
   bool res = false;
-  bool toCreateCopy = IsPreview() || Group1->CheckBox1->isChecked();
+  bool toCreateCopy = IsPreview() || Group1->CheckButton1->isChecked();
   GEOM::GEOM_Object_var anObj;
-  
-  switch ( getConstructorId() )
+
+  switch (getConstructorId()) {
+  case 0:
     {
-    case 0 :
-      {
-       for (int i = 0; i < myObjects.length(); i++) {
-         if (toCreateCopy)
-           anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->PositionShapeCopy( myObjects[i], myObjects[i], myEndLCS );
-         else
-           anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->PositionShape( myObjects[i], myObjects[i], myEndLCS );
-
-         if ( !anObj->_is_nil() )
-           objects.push_back( anObj._retn() );
-       }
-       res = true;
-       break;
+      for (int i = 0; i < myObjects.length(); i++) {
+        if (toCreateCopy)
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            PositionShapeCopy(myObjects[i], myObjects[i], myEndLCS);
+        else
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            PositionShape(myObjects[i], myObjects[i], myEndLCS);
+
+        if (!anObj->_is_nil())
+          objects.push_back(anObj._retn());
       }
-    case 1 :
-      {
-       for (int i = 0; i < myObjects.length(); i++) {
-         if (toCreateCopy)
-           anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->PositionShapeCopy( myObjects[i], myStartLCS, myEndLCS );
-         else
-           anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->PositionShape( myObjects[i], myStartLCS, myEndLCS );
-         if ( !anObj->_is_nil() )
-           objects.push_back( anObj._retn() );
-       }
-       res = true;
-       break;
+      res = true;
+      break;
+    }
+  case 1:
+    {
+      for (int i = 0; i < myObjects.length(); i++) {
+        if (toCreateCopy)
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            PositionShapeCopy(myObjects[i], myStartLCS, myEndLCS);
+        else
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            PositionShape(myObjects[i], myStartLCS, myEndLCS);
+        if (!anObj->_is_nil())
+          objects.push_back(anObj._retn());
       }
+      res = true;
+      break;
     }
-  
+  case 2:
+    {
+      double aDistance = Group1->SpinBox_DX->value();
+      bool toReverse = Group1->CheckButton3->isChecked();
+      for (int i = 0; i < myObjects.length(); i++) {
+       anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+         PositionAlongPath(myObjects[i], myPath, aDistance, toCreateCopy, toReverse);
+       if (!anObj->_is_nil())
+         objects.push_back(anObj._retn());
+      }
+      res = true;
+      break;
+    }
+  }
+
   return res;
 }
 
 //=================================================================================
-// function : closeEvent
+// function : restoreSubShapes
 // purpose  :
 //=================================================================================
-void  TransformationGUI_PositionDlg::closeEvent( QCloseEvent* e )
+void TransformationGUI_PositionDlg::restoreSubShapes (SALOMEDS::Study_ptr   theStudy,
+                                                      SALOMEDS::SObject_ptr theSObject)
 {
-  GEOMBase_Skeleton::closeEvent( e );
+  if (mainFrame()->CheckBoxRestoreSS->isChecked()) {
+    // empty list of arguments means that all arguments should be restored
+    getGeomEngine()->RestoreSubShapesSO(theStudy, theSObject, GEOM::ListOfGO(),
+                                        /*theFindMethod=*/GEOM::FSM_Transformed,
+                                        /*theInheritFirstArg=*/true);
+  }
 }
 
-
 //=================================================================================
 // function :  CreateCopyModeChanged()
 // purpose  :
 //=================================================================================
-void TransformationGUI_PositionDlg::CreateCopyModeChanged(bool isCreateCopy)
+void TransformationGUI_PositionDlg::CreateCopyModeChanged (bool isCreateCopy)
+{
+  mainFrame()->GroupBoxName->setEnabled(isCreateCopy);
+}
+
+//=================================================================================
+// function : addSubshapeToStudy
+// purpose  : virtual method to add new SubObjects if local selection
+//=================================================================================
+void TransformationGUI_PositionDlg::addSubshapesToStudy()
 {
-  this->GroupBoxName->setEnabled(isCreateCopy);
+  QMap<QString, GEOM::GEOM_Object_var> objMap;
+
+  objMap[Group1->LineEdit5->text()] = myPath;
+
+  addSubshapesToFather(objMap);
 }
index 9ecfb2809422b91414a016a4b61cd692464352d6..a48959b929dd39a20ca8fb60de961bbf1afb84f9 100644 (file)
@@ -1,38 +1,34 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : TransformationGUI_PositionDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_POSITION_H
-#define DIALOGBOX_POSITION_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_PositionDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef TRANSFORMATIONGUI_POSITIONDLG_H
+#define TRANSFORMATIONGUI_POSITIONDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_3Sel3Spin1Check.h"
+#include <GEOMBase_Skeleton.h>
 
-#include "TransformationGUI.h"
-  
+class DlgRef_4Sel1Spin3Check;
 
 //=================================================================================
 // class    : TransformationGUI_PositionDlg
 //=================================================================================
 class TransformationGUI_PositionDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    TransformationGUI_PositionDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                                 const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~TransformationGUI_PositionDlg();
-
+  TransformationGUI_PositionDlg( GeometryGUI*, QWidget* = 0,
+                                bool = false, Qt::WindowFlags = 0 );
+  ~TransformationGUI_PositionDlg();
+  
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-
-    virtual void closeEvent( QCloseEvent* e );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr );
+  virtual void                       addSubshapesToStudy();
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
+  void                               Init();
+  void                               enterEvent( QEvent* );
     
-    GEOM::GEOM_Object_var myStartLCS;
-    GEOM::GEOM_Object_var myEndLCS;
-    GEOM::ListOfGO        myObjects;
-        
-    DlgRef_3Sel3Spin1Check* Group1;
+private:
+  GEOM::GEOM_Object_var              myStartLCS;
+  GEOM::GEOM_Object_var              myEndLCS;
+  GEOM::ListOfGO                     myObjects;
+  GEOM::GEOM_Object_var              myPath;
+
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
+
+  DlgRef_4Sel1Spin3Check*            Group1;
     
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ConstructorsClicked(int constructorId);
-    void CreateCopyModeChanged(bool isCreateCopy);
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               CreateCopyModeChanged( bool );
+  void                               ValueChangedInSpinBox();
+  void                               SelectionTypeButtonClicked();
 };
 
-#endif // DIALOGBOX_MIRROR_H
+#endif // TRANSFORMATIONGUI_POSITIONDLG_H
index f0cca0130cedf71ef000d6efda4f318b7a295576..c56fd9c9b935de0f116db7ae06fd9121793e570c 100644 (file)
@@ -1,38 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_RotationDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : TransformationGUI_RotationDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "TransformationGUI_RotationDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
+// OCCT Includes
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qcheckbox.h>
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : TransformationGUI_RotationDlg()
@@ -57,81 +52,57 @@ using namespace std;
 //            TRUE to construct a modal dialog.
 //=================================================================================
 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)
+(GeometryGUI* theGeometryGUI, QWidget* parent, bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myInitial(true)
 {
   SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr();
-  QPixmap image0 (aResMgr->loadPixmap("GEOM",tr("ICON_DLG_ROTATION")));
-  QPixmap image1 (aResMgr->loadPixmap("GEOM",tr("ICON_SELECT")));
-  QPixmap image2 (aResMgr->loadPixmap("GEOM",tr("ICON_DLG_ROTATION_THREE_POINTS")));
+  QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_ROTATION")));
+  QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
+  QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_ROTATION_THREE_POINTS")));
 
-  setCaption(tr("GEOM_ROTATION_TITLE"));
+  setWindowTitle(tr("GEOM_ROTATION_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_ROTATION"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image2);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_ROTATION"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image2);
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
 
-  GroupPoints = new DlgRef_4Sel1Spin2Check(this, "GroupPoints");
+  GroupPoints = new DlgRef_4Sel1Spin2Check(centralWidget());
   GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS"));
   GroupPoints->TextLabel2->setText(tr("GEOM_AXIS"));
   GroupPoints->TextLabel3->setText(tr("GEOM_ANGLE"));
-  GroupPoints->TextLabel4->setText(tr("GEOM_POINT_I").arg("1"));
-  GroupPoints->TextLabel5->setText(tr("GEOM_POINT_I").arg("2"));
+  GroupPoints->TextLabel4->setText(tr("GEOM_POINT_I").arg(1));
+  GroupPoints->TextLabel5->setText(tr("GEOM_POINT_I").arg(2));
 
   GroupPoints->LineEdit1->setReadOnly(true);
   GroupPoints->LineEdit2->setReadOnly(true);
   GroupPoints->LineEdit4->setReadOnly(true);
   GroupPoints->LineEdit5->setReadOnly(true);
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->PushButton2->setPixmap(image1);
-  GroupPoints->PushButton4->setPixmap(image1);
-  GroupPoints->PushButton5->setPixmap(image1);
+  GroupPoints->PushButton1->setIcon(image1);
+  GroupPoints->PushButton2->setIcon(image1);
+  GroupPoints->PushButton4->setIcon(image1);
+  GroupPoints->PushButton5->setIcon(image1);
   GroupPoints->CheckButton1->setText(tr("GEOM_CREATE_COPY"));
   GroupPoints->CheckButton2->setText(tr("GEOM_REVERSE"));
 
-  Layout1->addWidget(GroupPoints, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
   /***************************************************************/
 
-  double anAngle = 0;
-  double SpecificStep = 5;
-  /* min, max, step and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, SpecificStep, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox_DX->SetValue(anAngle);
+  setHelpFileName("rotation_operation_page.html");
 
   // Activate Create a Copy mode
   GroupPoints->CheckButton1->setChecked(true);
   CreateCopyModeChanged(true);
 
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-  connect(GroupConstructors, SIGNAL(clicked(int)), SLOT(ConstructorsClicked(int)));
-
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->PushButton4, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->PushButton5, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-
-  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
-  connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool)));
-  connect(GroupPoints->CheckButton2, SIGNAL(toggled(bool)), this, SLOT(onReverse()));
-
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-
-  setHelpFileName("rotation_operation_page.html");
-
   Init();
 }
 
-
 //=================================================================================
 // function : ~TransformationGUI_RotationDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -141,65 +112,107 @@ TransformationGUI_RotationDlg::~TransformationGUI_RotationDlg()
   // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void TransformationGUI_RotationDlg::Init()
 {
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  GroupPoints->LineEdit2->clear();
+  double anAngle = 0;
+  double SpecificStep = 5;
+
+  // min, max, step and decimals for spin boxes & initial values
+  initSpinBox(GroupPoints->SpinBox_DX, COORD_MIN, COORD_MAX, SpecificStep, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
+  GroupPoints->SpinBox_DX->setValue(anAngle);
+
+  // init variables
+  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit2->setText("");
+  GroupPoints->LineEdit4->setText("");
+  GroupPoints->LineEdit5->setText("");
 
   myAxis = myCentPoint = myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
 
-  initName( tr( "GEOM_ROTATION" ) );
-  ConstructorsClicked( 0 );
+  mainFrame()->GroupBoxPublish->show();
+
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
+
+  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton4, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton5, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+
+  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+
+  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+
+  connect(GroupPoints->SpinBox_DX, SIGNAL(textChanged( const QString& )),
+          this, SLOT(TextValueChangedInSpinBox( const QString&)));
+
+  connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool)));
+  connect(GroupPoints->CheckButton2, SIGNAL(toggled(bool)), this, SLOT(onReverse()));
+
+  initName(tr("GEOM_ROTATION"));
+
+  ConstructorsClicked(0);
 }
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void TransformationGUI_RotationDlg::ConstructorsClicked(int constructorId)
+void TransformationGUI_RotationDlg::ConstructorsClicked (int constructorId)
 {
   disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
 
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  globalSelection();
+  switch (constructorId) {
+  case 0: // rotation an object angle and axis
+    {
+      GroupPoints->ShowRows(2, 3, false);
+      GroupPoints->TextLabel2->setText(tr("GEOM_AXIS"));
+      GroupPoints->LineEdit2->clear();
+      GroupPoints->ShowRows(4, 4, true);
+
+      myAxis = GEOM::GEOM_Object::_nil();
 
-  switch (constructorId)
+      GroupPoints->PushButton1->click();
+    }
+    break;
+  case 1: // rotation an object by 3 points
     {
-    case 0: /* rotation an object angle and axis */
-      {
-       GroupPoints->ShowRows(2,3,false);
-       resize(0,0);
-       GroupPoints->TextLabel2->setText(tr("GEOM_AXIS"));
-       GroupPoints->LineEdit2->clear();
-       GroupPoints->ShowRows(4,4,true);
-       myAxis = GEOM::GEOM_Object::_nil();
-       break;
-      }
-    case 1: /* rotation an object by 3 points */
-      {
-       GroupPoints->ShowRows(4,4,false);
-       resize(0,0);
-       GroupPoints->ShowRows(2,3,true);
-       GroupPoints->TextLabel2->setText(tr("GEOM_CENTRAL_POINT"));
-       GroupPoints->TextLabel4->setText(tr("GEOM_POINT_I").arg("1"));
-       GroupPoints->TextLabel5->setText(tr("GEOM_POINT_I").arg("2"));
-       GroupPoints->LineEdit2->clear();
-       GroupPoints->LineEdit4->clear();
-       GroupPoints->LineEdit5->clear();
-       myCentPoint = myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
-       break;
-      }
+      GroupPoints->ShowRows(4, 4, false);
+      GroupPoints->ShowRows(2, 3, true);
+      GroupPoints->TextLabel2->setText(tr("GEOM_CENTRAL_POINT"));
+      GroupPoints->TextLabel4->setText(tr("GEOM_POINT_I").arg(1));
+      GroupPoints->TextLabel5->setText(tr("GEOM_POINT_I").arg(2));
+
+      GroupPoints->LineEdit2->clear();
+      GroupPoints->LineEdit4->clear();
+      GroupPoints->LineEdit5->clear();
+
+      myCentPoint = myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
+
+      GroupPoints->PushButton1->click();
     }
+    break;
+  }
 
-  myEditCurrentArgument->setFocus();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
+
+  if (myInitial) {
+    myInitial = false;
+    SelectionIntoArgument();
+  }
+  else {
+    displayPreview();
+  }
 }
 
 //=================================================================================
@@ -208,121 +221,147 @@ void TransformationGUI_RotationDlg::ConstructorsClicked(int constructorId)
 //=================================================================================
 void TransformationGUI_RotationDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool TransformationGUI_RotationDlg::ClickOnApply()
 {
-  if ( !onAccept( GroupPoints->CheckButton1->isChecked()) )
+  if (!onAccept(GroupPoints->CheckButton1->isChecked()))
     return false;
 
   initName();
-  ConstructorsClicked( getConstructorId() );
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed or other case
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void TransformationGUI_RotationDlg::SelectionIntoArgument()
 {
+  erasePreview();
   myEditCurrentArgument->setText("");
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1)
+    myObjects.length(0);
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 0)
+    myAxis = GEOM::GEOM_Object::_nil();
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 1)
+    myCentPoint = GEOM::GEOM_Object::_nil();
+  else if (myEditCurrentArgument == GroupPoints->LineEdit4)
+    myPoint1 = GEOM::GEOM_Object::_nil();
+  else if (myEditCurrentArgument == GroupPoints->LineEdit5)
+    myPoint2 = GEOM::GEOM_Object::_nil();
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
   QString aName;
 
-  if(myEditCurrentArgument == GroupPoints->LineEdit1)
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
+    int aNbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aName);
+    if (aNbSel < 1)
+      return;
+
+    GEOMBase::ConvertListOfIOInListOfGO(aSelList, myObjects);
+    if (!myObjects.length())
+      return;
+    else
+      myEditCurrentArgument->setText(aName);
+  }
+  else {
+    if (aSelList.Extent() != 1)
+      return;
+
+    // nbSel == 1
+    Standard_Boolean testResult = Standard_False;
+    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+
+    if (!testResult || CORBA::is_nil(aSelectedObject))
+      return;
+
+    aName = GEOMBase::GetName(aSelectedObject);
+
+    // Get Selected object if selected subshape
+    TopoDS_Shape aShape;
+    if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
     {
-      int aNbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aName);
-      if(aNbSel < 1)
-       {
-         myObjects.length(0);
-         return;
-       }
-      GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), myObjects);
-      if (!myObjects.length())
-       return;
+      TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
+      if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 0)
+        aNeedType = TopAbs_EDGE;
+
+      TColStd_IndexedMapOfInteger aMap;
+      aSelMgr->GetIndexes(aSelList.First(), aMap);
+      if (aMap.Extent() == 1)
+      {
+        int anIndex = aMap(1);
+        if (aNeedType == TopAbs_EDGE)
+          aName += QString(":edge_%1").arg(anIndex);
+        else
+          aName += QString(":vertex_%1").arg(anIndex);
+
+        //Find SubShape Object in Father
+        GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
+
+        if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+          GEOM::GEOM_IShapesOperations_var aShapesOp =
+            getGeomEngine()->GetIShapesOperations(getStudyId());
+          aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+        }
+        else {
+          aSelectedObject = aFindedObject; // get Object from study
+        }
+      }
+      else // Global Selection
+      {
+        if (aShape.ShapeType() != aNeedType) {
+          aSelectedObject = GEOM::GEOM_Object::_nil();
+          aName = "";
+        }
+      }
     }
-  else
-    {
-      if(IObjectCount() != 1)
-       {
-         if(myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 0)
-           myAxis = GEOM::GEOM_Object::_nil();
-         else if(myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 1)
-           myCentPoint  = GEOM::GEOM_Object::_nil();
-          else if(myEditCurrentArgument == GroupPoints->LineEdit4)
-           myPoint1 = GEOM::GEOM_Object::_nil();
-         else if(myEditCurrentArgument == GroupPoints->LineEdit5)
-           myPoint2 = GEOM::GEOM_Object::_nil();
-         return;
-       }
-
-      Standard_Boolean testResult = Standard_False;
-      GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
-      if(!testResult || CORBA::is_nil( aSelectedObject ))
-       return;
-
-      aName = GEOMBase::GetName( aSelectedObject );
-      TopoDS_Shape aShape;
-      if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
-       {
-         TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
-         if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 0)
-           aNeedType = TopAbs_EDGE;
-
-         LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-         TColStd_IndexedMapOfInteger aMap;
-         aSelMgr->GetIndexes( firstIObject(), aMap );
-         if ( aMap.Extent() == 1 )
-           {
-             int anIndex = aMap( 1 );
-             if (aNeedType == TopAbs_EDGE)
-               aName += QString(":edge_%1").arg(anIndex);
-             else
-               aName += QString(":vertex_%1").arg(anIndex);
-
-             //Find SubShape Object in Father
-             GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
-
-             if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-               GEOM::GEOM_IShapesOperations_var aShapesOp =
-                 getGeomEngine()->GetIShapesOperations( getStudyId() );
-               aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-             }
-             else
-               aSelectedObject = aFindedObject; // get Object from study
-           }
-         else {
-           if (aShape.ShapeType() != aNeedType) {
-             aSelectedObject = GEOM::GEOM_Object::_nil();
-             aName = "";
-           }
-         }
-       }
-     
-      if(myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 0)
-       myAxis = aSelectedObject;
-      else if(myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 1)
-       myCentPoint = aSelectedObject;
-      else if(myEditCurrentArgument == GroupPoints->LineEdit4)
-       myPoint1 = aSelectedObject;
-      else if(myEditCurrentArgument == GroupPoints->LineEdit5)
-       myPoint2 = aSelectedObject;
 
+    myEditCurrentArgument->setText(aName);
+
+    if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 0) {
+      myAxis = aSelectedObject;
+      if (!myAxis->_is_nil() && !myObjects.length())
+        GroupPoints->PushButton1->click();
+    }
+    else if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 1) {
+      myCentPoint = aSelectedObject;
+      if (!myCentPoint->_is_nil() && myPoint1->_is_nil())
+        GroupPoints->PushButton4->click();
+    }
+    else if (myEditCurrentArgument == GroupPoints->LineEdit4) {
+      myPoint1 = aSelectedObject;
+      if (!myPoint1->_is_nil() && myPoint2->_is_nil())
+        GroupPoints->PushButton5->click();
+    }
+    else if (myEditCurrentArgument == GroupPoints->LineEdit5) {
+      myPoint2 = aSelectedObject;
+      if (!myPoint2->_is_nil() && !myObjects.length())
+        GroupPoints->PushButton1->click();
     }
-  myEditCurrentArgument->setText( aName );
+  }
+
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
   displayPreview();
 }
 
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -330,33 +369,67 @@ void TransformationGUI_RotationDlg::SelectionIntoArgument()
 void TransformationGUI_RotationDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
+
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
   globalSelection();
 
-  if(send == GroupPoints->PushButton1) {
+  if (send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
+
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
   }
-  else if(send == GroupPoints->PushButton2) {
+  else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
+
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->PushButton4->setDown(false);
+    GroupPoints->PushButton5->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+    GroupPoints->LineEdit4->setEnabled(false);
+    GroupPoints->LineEdit5->setEnabled(false);
+
     if (getConstructorId() == 0)
-      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
     else
-      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
   }
-  else if (send == GroupPoints->PushButton4)
-    {
-      myEditCurrentArgument = GroupPoints->LineEdit4;
-      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
-    }
-  else if (send == GroupPoints->PushButton5)
-    {
-      myEditCurrentArgument = GroupPoints->LineEdit5;
-      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
-    }
+  else if (send == GroupPoints->PushButton4) {
+    myEditCurrentArgument = GroupPoints->LineEdit4;
 
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->PushButton5->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+    GroupPoints->LineEdit2->setEnabled(false);
+    GroupPoints->LineEdit5->setEnabled(false);
+
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+  }
+  else if (send == GroupPoints->PushButton5) {
+    myEditCurrentArgument = GroupPoints->LineEdit5;
+
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->PushButton4->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+    GroupPoints->LineEdit2->setEnabled(false);
+    GroupPoints->LineEdit4->setEnabled(false);
+
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+  }
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
-}
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
 
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
+}
 
 //=================================================================================
 // function : LineEditReturnPressed()
@@ -365,15 +438,13 @@ void TransformationGUI_RotationDlg::SetEditCurrentArgument()
 void TransformationGUI_RotationDlg::LineEditReturnPressed()
 {
   QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1 ||
-     send == GroupPoints->LineEdit2)
-    {
-      myEditCurrentArgument = send;
-      GEOMBase_Skeleton::LineEditReturnPressed();
-    }
+  if (send == GroupPoints->LineEdit1 ||
+      send == GroupPoints->LineEdit2) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
 }
 
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :
@@ -381,23 +452,31 @@ void TransformationGUI_RotationDlg::LineEditReturnPressed()
 void TransformationGUI_RotationDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
   ConstructorsClicked( getConstructorId() );
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void TransformationGUI_RotationDlg::enterEvent(QEvent* e)
+void TransformationGUI_RotationDlg::enterEvent (QEvent*)
 {
-  if (!GroupConstructors->isEnabled())
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
+void TransformationGUI_RotationDlg::TextValueChangedInSpinBox( const QString& s)
+{
+  bool isDigit = true;
+  s.toDouble(&isDigit);
+  if(!isDigit) {
+    GroupPoints->CheckButton2->setChecked(false);
+  }
+  GroupPoints->CheckButton2->setEnabled(isDigit); 
+}
 
 //=================================================================================
 // function : ValueChangedInSpinBox()
@@ -408,152 +487,168 @@ void TransformationGUI_RotationDlg::ValueChangedInSpinBox()
   displayPreview();
 }
 
-
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
 GEOM::GEOM_IOperations_ptr TransformationGUI_RotationDlg::createOperation()
 {
-  return getGeomEngine()->GetITransformOperations( getStudyId() );
+  return getGeomEngine()->GetITransformOperations(getStudyId());
 }
 
-
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool TransformationGUI_RotationDlg::isValid( QString& msg )
+bool TransformationGUI_RotationDlg::isValid (QString& msg)
 {
-  switch (getConstructorId())
-    {
-    case 0:
-      {
-       return !(myObjects.length() == 0 || myAxis->_is_nil());
-       break;
-      }
-    case 1:
-      {
-       return !(myObjects.length() == 0 || myCentPoint->_is_nil() || myPoint1->_is_nil() || myPoint2->_is_nil() );
-       break;
-      }
-    default: return false;
-    }
+  switch (getConstructorId()) {
+  case 0: {
+    bool ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() );
+    return myObjects.length() > 0 && !(myAxis->_is_nil()) && ok;
+    break;
+  }
+  case 1:
+    return myObjects.length() > 0 && !(myCentPoint->_is_nil() || myPoint1->_is_nil() || myPoint2->_is_nil());
+    break;
+  default:
+    break;
+  }
+  return false;
 }
 
-
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool TransformationGUI_RotationDlg::execute( ObjectList& objects )
+bool TransformationGUI_RotationDlg::execute (ObjectList& objects)
 {
   bool res = false;
   bool toCreateCopy = IsPreview() || GroupPoints->CheckButton1->isChecked();
 
   GEOM::GEOM_Object_var anObj;
 
-  switch ( getConstructorId() )
+  switch (getConstructorId()) {
+  case 0:
     {
-    case 0 :
-      {
-       if (toCreateCopy)
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-                RotateCopy( myObjects[i], myAxis, GetAngle() * PI180 );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       else
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-                Rotate( myObjects[i], myAxis, GetAngle() * PI180 );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       res = true;
-       break;
+      QStringList aParameters;
+      aParameters<<GroupPoints->SpinBox_DX->text();
+      if (toCreateCopy) {
+        for (int i = 0; i < myObjects.length(); i++) {
+          myCurrObject = myObjects[i];
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            RotateCopy(myObjects[i], myAxis, GetAngle() * PI180);
+          if (!anObj->_is_nil()) {
+            if(!IsPreview()) {
+              anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+            }
+            objects.push_back(anObj._retn());
+          }
+        }
       }
-    case 1 :
-      {
-       if (toCreateCopy)
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-                RotateThreePointsCopy( myObjects[i], myCentPoint, myPoint1, myPoint2 );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       else
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-                RotateThreePoints( myObjects[i], myCentPoint, myPoint1, myPoint2 );    
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
+      else {
+        for (int i = 0; i < myObjects.length(); i++) {
+          myCurrObject = myObjects[i];
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            Rotate(myObjects[i], myAxis, GetAngle() * PI180);
+          if (!anObj->_is_nil()) {
+            if(!IsPreview()) {
+              anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+             updateAttributes(anObj, aParameters);
            }
-       res = true;
-       break;
+            objects.push_back(anObj._retn());
+         }
+        }
       }
+      res = true;
+      break;
     }
+  case 1:
+    {
+      if (toCreateCopy) {
+        for (int i = 0; i < myObjects.length(); i++) {
+          myCurrObject = myObjects[i];
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            RotateThreePointsCopy(myObjects[i], myCentPoint, myPoint1, myPoint2);
+          if (!anObj->_is_nil())
+            objects.push_back(anObj._retn());
+        }
+      }
+      else {
+        for (int i = 0; i < myObjects.length(); i++) {
+          myCurrObject = myObjects[i];
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            RotateThreePoints(myObjects[i], myCentPoint, myPoint1, myPoint2);
+          if (!anObj->_is_nil())
+            objects.push_back(anObj._retn());
+        }
+      }
+      res = true;
+      break;
+    }
+  }
 
   return res;
 }
 
-
 //=================================================================================
-// function : closeEvent
+// function : restoreSubShapes
 // purpose  :
 //=================================================================================
-void TransformationGUI_RotationDlg::closeEvent( QCloseEvent* e )
+void TransformationGUI_RotationDlg::restoreSubShapes (SALOMEDS::Study_ptr   theStudy,
+                                                      SALOMEDS::SObject_ptr theSObject)
 {
-  GEOMBase_Skeleton::closeEvent( e );
+  if (mainFrame()->CheckBoxRestoreSS->isChecked()) {
+    // we pass here the first operation argument (object) through the list of arguments
+    // because the rotation operation place its arguments in the data structure in another order,
+    // and we need to point the first argument directly
+    GEOM::ListOfGO_var anArgs = new GEOM::ListOfGO;
+    anArgs->length(1);
+    anArgs[0] = myCurrObject;
+    getGeomEngine()->RestoreSubShapesSO(theStudy, theSObject, anArgs,
+                                        /*theFindMethod=*/GEOM::FSM_Transformed,
+                                        /*theInheritFirstArg=*/true);
+  }
 }
 
-
 //=================================================================================
 // function : GetAngle()
 // purpose  :
 //=================================================================================
 double TransformationGUI_RotationDlg::GetAngle() const
 {
-  return GroupPoints->SpinBox_DX->GetValue();
+  return GroupPoints->SpinBox_DX->value();
 }
 
-
 //=================================================================================
 // function :  CreateCopyModeChanged()
 // purpose  :
 //=================================================================================
-void TransformationGUI_RotationDlg::CreateCopyModeChanged(bool isCreateCopy)
+void TransformationGUI_RotationDlg::CreateCopyModeChanged (bool isCreateCopy)
 {
-  this->GroupBoxName->setEnabled(isCreateCopy);
+  mainFrame()->GroupBoxName->setEnabled(isCreateCopy);
 }
 
-
 //=================================================================================
 // function :  onReverse()
 // purpose  :
 //=================================================================================
 void TransformationGUI_RotationDlg::onReverse()
 {
-  double anOldValue = GroupPoints->SpinBox_DX->GetValue();
-  GroupPoints->SpinBox_DX->SetValue( -anOldValue );
+  double anOldValue = GroupPoints->SpinBox_DX->value();
+  GroupPoints->SpinBox_DX->setValue(-anOldValue);
 }
 
 //=================================================================================
-// function : addSubshapeToStudy
+// function : addSubshapesToStudy
 // purpose  : virtual method to add new SubObjects if local selection
 //=================================================================================
 void TransformationGUI_RotationDlg::addSubshapesToStudy()
 {
   bool toCreateCopy = IsPreview() || GroupPoints->CheckButton1->isChecked();
   if (toCreateCopy) {
-  QMap<QString, GEOM::GEOM_Object_var> objMap;
-  switch (getConstructorId())
-    {
+    QMap<QString, GEOM::GEOM_Object_var> objMap;
+    switch (getConstructorId()) {
     case 0:
       objMap[GroupPoints->LineEdit2->text()] = myAxis;
       break;
@@ -563,6 +658,6 @@ void TransformationGUI_RotationDlg::addSubshapesToStudy()
       objMap[GroupPoints->LineEdit5->text()] = myPoint2;
       break;
     }
-  addSubshapesToFather( objMap );
+    addSubshapesToFather(objMap);
   }
 }
index 4ea6ea9e5e9748c1132f74cec3e36c3fa933f7fc..9b774f704773b5204038b84eb5009733cad96cfb 100644 (file)
@@ -1,35 +1,34 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : TransformationGUI_RotationDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_RotationDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef TRANSFORMATIONGUI_ROTATIONDLG_H
+#define TRANSFORMATIONGUI_ROTATIONDLG_H
 
-#ifndef DIALOGBOX_ROTATION_H
-#define DIALOGBOX_ROTATION_H
+#include <GEOMBase_Skeleton.h>
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_4Sel1Spin2Check.h"
+class DlgRef_4Sel1Spin2Check;
   
 //=================================================================================
 // class    : TransformationGUI_RotationDlg
 //=================================================================================
 class TransformationGUI_RotationDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    TransformationGUI_RotationDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                                 const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~TransformationGUI_RotationDlg();
+  TransformationGUI_RotationDlg( GeometryGUI*, QWidget* = 0,
+                                bool = false, Qt::WindowFlags = 0 );
+  ~TransformationGUI_RotationDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
-    virtual void closeEvent( QCloseEvent* e );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
+  virtual void                       restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr );
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-    double GetAngle() const;
-    
-    GEOM::ListOfGO myObjects;
-    GEOM::GEOM_Object_var myAxis, myCentPoint, myPoint1, myPoint2;
+  void                               Init();
+  void                               enterEvent( QEvent* );
+  double                             GetAngle() const;
+  
+private:
+  GEOM::ListOfGO                     myObjects;
+  GEOM::GEOM_Object_var              myCurrObject;
+  GEOM::GEOM_Object_var              myAxis, myCentPoint, myPoint1, myPoint2;
+
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
     
-    DlgRef_4Sel1Spin2Check* GroupPoints;
+  DlgRef_4Sel1Spin2Check*            GroupPoints;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ValueChangedInSpinBox();
-    void CreateCopyModeChanged(bool isCreateCopy);
-    void ConstructorsClicked(int constructorId);
-    void onReverse();
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ValueChangedInSpinBox();
+  void                               TextValueChangedInSpinBox( const QString& );
+  void                               CreateCopyModeChanged( bool );
+  void                               ConstructorsClicked( int );
+  void                               onReverse();
 };
 
-#endif // DIALOGBOX_ROTATION_H
+#endif // TRANSFORMATIONGUI_ROTATIONDLG_H
index 7a992b2aee701f778dd9b3a94559c3c90775fb0d..32daa0cb5799c1b738d50bc74fb94259111ad44c 100644 (file)
@@ -1,52 +1,48 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_ScaleDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : TransformationGUI_ScaleDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "TransformationGUI_ScaleDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
 
+#include <SalomeApp_DoubleSpinBox.h>
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+
+// OCCT Includes
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
 #include <TopExp.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qlabel.h>
-#include <qcheckbox.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : TransformationGUI_ScaleDlg()
@@ -55,96 +51,190 @@ 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(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+TransformationGUI_ScaleDlg::TransformationGUI_ScaleDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                        bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myInitial(true)
 {
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SCALE")));
-  QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
-
-  setCaption(tr("GEOM_SCALE_TITLE"));
-
-  /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_SCALE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
-
-  GroupPoints = new DlgRef_2Sel1Spin2Check(this, "GroupPoints");
-  GroupPoints->CheckButton2->hide();
-  GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
-  GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS"));
-  GroupPoints->TextLabel2->setText(tr("GEOM_CENTRAL_POINT"));
-  GroupPoints->TextLabel3->setText(tr("GEOM_SCALE_FACTOR"));
-  GroupPoints->LineEdit1->setReadOnly( true );
-  GroupPoints->LineEdit2->setReadOnly( true );
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->PushButton2->setPixmap(image1);
-  GroupPoints->CheckButton1->setText(tr("GEOM_CREATE_COPY"));
-
-  // san -- modification of an exisitng object by offset is not allowed
-  GroupPoints->CheckButton1->hide();
-
-  Layout1->addWidget(GroupPoints, 2, 0);
-  /***************************************************************/
-  double aFactor = 2.0;
-  double SpecificStep = 0.5;
-  /* min, max, step and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, SpecificStep, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox_DX->SetValue(aFactor);
-
-  // Activate Create a Copy mode
-  GroupPoints->CheckButton1->setChecked(true);
-  CreateCopyModeChanged(true);
-
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr();
+  QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_SCALE")));
+  QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_SCALE_ALONG_AXES")));
+  QPixmap image3 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
+
+  setWindowTitle(tr("GEOM_SCALE_TITLE"));
+
+  // Constructors
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_SCALE"));
+  mainFrame()->RadioButton1->setIcon(image1);
+  mainFrame()->RadioButton2->setIcon(image2);
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
+
+  // Own widgets
+  GroupBox1 = new QGroupBox(tr("GEOM_ARGUMENTS"), this);
+  QGridLayout* OwnLayout = new QGridLayout(GroupBox1);
+  OwnLayout->setSpacing(6);
+  OwnLayout->setMargin(11);
+
+  TextLabel1 = new QLabel(tr("GEOM_OBJECTS"), GroupBox1);
+  PushButton1 = new QPushButton(GroupBox1);
+  PushButton1->setIcon(image3);
+  PushButton1->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+  LineEdit1 = new QLineEdit(GroupBox1);
+  LineEdit1->setReadOnly(true);
+  LineEdit1->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
+
+  TextLabel2 = new QLabel(tr("GEOM_CENTRAL_POINT"), GroupBox1);
+  PushButton2 = new QPushButton(GroupBox1);
+  PushButton2->setIcon(image3);
+  PushButton2->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+  LineEdit2 = new QLineEdit(GroupBox1);
+  LineEdit2->setReadOnly(true);
+  LineEdit2->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
+
+  TextLabel3 = new QLabel(tr("GEOM_SCALE_FACTOR"), GroupBox1);
+  SpinBox_FX = new SalomeApp_DoubleSpinBox(GroupBox1);
+
+  TextLabel4 = new QLabel(tr("GEOM_SCALE_FACTOR_Y"), GroupBox1);
+  SpinBox_FY = new SalomeApp_DoubleSpinBox(GroupBox1);
+
+  TextLabel5 = new QLabel(tr("GEOM_SCALE_FACTOR_Z"), GroupBox1);
+  SpinBox_FZ = new SalomeApp_DoubleSpinBox(GroupBox1);
+
+  CheckBoxCopy = new QCheckBox(tr("GEOM_CREATE_COPY"), GroupBox1);
+  CheckBoxCopy->setChecked(true);
+
+  // Layouting
+  OwnLayout->addWidget(TextLabel1,   0, 0);
+  OwnLayout->addWidget(PushButton1,  0, 1);
+  OwnLayout->addWidget(LineEdit1,    0, 2, 1, 2);
+  OwnLayout->addWidget(TextLabel2,   1, 0);
+  OwnLayout->addWidget(PushButton2,  1, 1);
+  OwnLayout->addWidget(LineEdit2,    1, 2, 1, 2);
+  OwnLayout->addWidget(TextLabel3,   2, 0);
+  OwnLayout->addWidget(SpinBox_FX,   2, 2);
+  OwnLayout->addWidget(TextLabel4,   3, 0);
+  OwnLayout->addWidget(SpinBox_FY,   3, 2);
+  OwnLayout->addWidget(TextLabel5,   4, 0);
+  OwnLayout->addWidget(SpinBox_FZ,   4, 2);
+  OwnLayout->addWidget(CheckBoxCopy, 5, 0, 1, 4);
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupBox1);
 
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  setHelpFileName("scale_operation_page.html");
 
-  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
-  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
-  connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool)));
+  // Modification of an existing object by offset is not allowed
+  CheckBoxCopy->hide();
 
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+  // Activate Create a Copy mode
+  CreateCopyModeChanged(true);
 
-  setHelpFileName("scale_operation_page.html");
+  // Allowed inheritance of children and visual properties by the scaling result
+  mainFrame()->GroupBoxPublish->show();
 
   Init();
 }
 
-
 //=================================================================================
 // function : ~TransformationGUI_ScaleDlg()
 // purpose  : Destroys the object and frees any allocated resources
 //=================================================================================
 TransformationGUI_ScaleDlg::~TransformationGUI_ScaleDlg()
 {
-  /* no need to delete child widgets, Qt does it all for us */
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void TransformationGUI_ScaleDlg::Init()
 {
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  GroupPoints->LineEdit2->clear();
+  // Min, max, step and decimals for spin boxes & initial values
+  double aFactor = 2.0;
+  double SpecificStep = 0.5;
+
+  initSpinBox(SpinBox_FX, COORD_MIN, COORD_MAX, SpecificStep, DBL_DIGITS_DISPLAY);
+  initSpinBox(SpinBox_FY, COORD_MIN, COORD_MAX, SpecificStep, DBL_DIGITS_DISPLAY);
+  initSpinBox(SpinBox_FZ, COORD_MIN, COORD_MAX, SpecificStep, DBL_DIGITS_DISPLAY);
+  SpinBox_FX->setValue(aFactor);
+  SpinBox_FY->setValue(aFactor);
+  SpinBox_FZ->setValue(aFactor);
+
+  // init variables
+  LineEdit1->setText("");
+  LineEdit2->setText("");
 
   myPoint = GEOM::GEOM_Object::_nil();
 
-  initName( tr( "GEOM_SCALE" ) );
+  // Signals and slots connections
+  connect(buttonOk(),        SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(),     SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+  connect(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
+
+  connect(PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+
+  connect(LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+  connect(LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+
+  connect(SpinBox_FX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(SpinBox_FY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+  connect(SpinBox_FZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+
+  connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double)));
+
+  connect(CheckBoxCopy, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool)));
+
+  initName(tr("GEOM_SCALE"));
+
+  ConstructorsClicked(0);
 }
 
+//=================================================================================
+// function : ConstructorsClicked()
+// purpose  : Radio button management
+//=================================================================================
+void TransformationGUI_ScaleDlg::ConstructorsClicked (int constructorId)
+{
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+
+  switch (constructorId) {
+  case 0: // translation an object by dx, dy, dz
+    TextLabel3->setText(tr("GEOM_SCALE_FACTOR"));
+    TextLabel4->hide();
+    TextLabel5->hide();
+    SpinBox_FY->hide();
+    SpinBox_FZ->hide();
+
+    PushButton1->click();
+    break;
+  case 1: // translation an object by 2 points
+    TextLabel3->setText(tr("GEOM_SCALE_FACTOR_X"));
+    TextLabel4->show();
+    TextLabel5->show();
+    SpinBox_FY->show();
+    SpinBox_FZ->show();
+
+    PushButton1->click();
+    break;
+  default:
+    break;
+  }
+
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
+
+  if (myInitial) {
+    myInitial = false;
+    SelectionIntoArgument();
+  }
+  else {
+    displayPreview();
+  }
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -152,115 +242,115 @@ void TransformationGUI_ScaleDlg::Init()
 //=================================================================================
 void TransformationGUI_ScaleDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool TransformationGUI_ScaleDlg::ClickOnApply()
 {
-  if ( !onAccept(GroupPoints->CheckButton1->isChecked()) )
+  if (!onAccept(CheckBoxCopy->isChecked()))
     return false;
 
-  Init();
+  initName(tr("GEOM_SCALE"));
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed or other case
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void TransformationGUI_ScaleDlg::SelectionIntoArgument()
 {
+  erasePreview();
   myEditCurrentArgument->setText("");
+
+  if (myEditCurrentArgument == LineEdit1)
+    myObjects.length(0);
+  else if (myEditCurrentArgument == LineEdit2)
+    myPoint = GEOM::GEOM_Object::_nil();
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
+
   QString aName;
 
-  if(myEditCurrentArgument == GroupPoints->LineEdit1)
-    {
-      int aNbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aName);
-      if(aNbSel < 1)
-       {
-         myObjects.length(0);
-         return;
-       }
-      GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), myObjects);
-      if (!myObjects.length())
-       return;
-    }
-  else if(myEditCurrentArgument == GroupPoints->LineEdit2)
+  if (myEditCurrentArgument == LineEdit1)
+  {
+    int aNbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aName);
+    if (aNbSel < 1)
+      return;
+
+    GEOMBase::ConvertListOfIOInListOfGO(aSelList, myObjects);
+    if (!myObjects.length())
+      return;
+    else
+      myEditCurrentArgument->setText(aName);
+  }
+  else if (myEditCurrentArgument == LineEdit2)
+  {
+    GEOM::GEOM_Object_var aSelectedObject = GEOM::GEOM_Object::_nil();
+    if (aSelList.Extent() == 1)
     {
-      if(IObjectCount() != 1)
-       {
-         myPoint = GEOM::GEOM_Object::_nil();
-         return;
-       }
       Standard_Boolean testResult = Standard_False;
-      GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
-      aName = GEOMBase::GetName( aSelectedObject );
-      
-      TopoDS_Shape aShape;
-      if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
-       {
-         LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-         TColStd_IndexedMapOfInteger aMap;
-         aSelMgr->GetIndexes( firstIObject(), aMap );
-         if ( aMap.Extent() == 1 )
-           {
-             int anIndex = aMap( 1 );
-             aName += QString(":vertex_%1").arg(anIndex);
-
-             //Find SubShape Object in Father
-             GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
-             
-             if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-               GEOM::GEOM_IShapesOperations_var aShapesOp =
-                 getGeomEngine()->GetIShapesOperations( getStudyId() );
-               aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-               aSelMgr->clearSelected();
-             }
-             else
-               aSelectedObject = aFindedObject; // get Object from study
-           }
-         else {
-           if (aShape.ShapeType() != TopAbs_VERTEX) {
-             aSelectedObject = GEOM::GEOM_Object::_nil();
-             aName = "";
-           }
-         }
-       }
-
-      myPoint = aSelectedObject;
-
-      if(!testResult || CORBA::is_nil( myPoint ))
-       return;
-
+      aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
+      if (testResult)
+      {
+        aName = GEOMBase::GetName(aSelectedObject);
+
+        TopoDS_Shape aShape;
+        if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
+        {
+          TColStd_IndexedMapOfInteger aMap;
+          aSelMgr->GetIndexes(aSelList.First(), aMap);
+          if (aMap.Extent() == 1)
+          {
+            int anIndex = aMap(1);
+            aName += QString(":vertex_%1").arg(anIndex);
+
+            //Find SubShape Object in Father
+            GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
+
+            if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+              GEOM::GEOM_IShapesOperations_var aShapesOp =
+                getGeomEngine()->GetIShapesOperations(getStudyId());
+              aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+            }
+            else
+              aSelectedObject = aFindedObject; // get Object from study
+          }
+          else // Global Selection
+          {
+            if (aShape.ShapeType() != TopAbs_VERTEX) {
+              aSelectedObject = GEOM::GEOM_Object::_nil();
+              aName = "";
+            }
+          }
+        }
+      }
     }
-  myEditCurrentArgument->setText( aName );
 
-  displayPreview();
-}
+    myPoint = aSelectedObject;
+    myEditCurrentArgument->setText(aName);
 
+    if (!myPoint->_is_nil() && !myObjects.length())
+      PushButton1->click();
+  }
 
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose  :
-//=================================================================================
-void TransformationGUI_ScaleDlg::LineEditReturnPressed()
-{
-  QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1 ||
-     send == GroupPoints->LineEdit2)
-    {
-      myEditCurrentArgument = send;
-      GEOMBase_Skeleton::LineEditReturnPressed();
-    }
-}
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  displayPreview();
+}
 
 //=================================================================================
 // function : SetEditCurrentArgument()
@@ -269,20 +359,50 @@ void TransformationGUI_ScaleDlg::LineEditReturnPressed()
 void TransformationGUI_ScaleDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
+
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
   globalSelection();
 
-  if(send == GroupPoints->PushButton1) {
-    myEditCurrentArgument = GroupPoints->LineEdit1;
+  if (send == PushButton1) {
+    myEditCurrentArgument = LineEdit1;
+
+    PushButton2->setDown(false);
+    LineEdit2->setEnabled(false);
   }
-  else if(send == GroupPoints->PushButton2) {
-    myEditCurrentArgument = GroupPoints->LineEdit2;
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+  else if (send == PushButton2) {
+    myEditCurrentArgument = LineEdit2;
+
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+
+    PushButton1->setDown(false);
+    LineEdit1->setEnabled(false);
   }
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
 }
 
+//=================================================================================
+// function : LineEditReturnPressed()
+// purpose  :
+//=================================================================================
+void TransformationGUI_ScaleDlg::LineEditReturnPressed()
+{
+  QLineEdit* send = (QLineEdit*)sender();
+  if (send == LineEdit1 || send == LineEdit2)
+  {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
+}
 
 //=================================================================================
 // function : ActivateThisDialog()
@@ -291,25 +411,22 @@ void TransformationGUI_ScaleDlg::SetEditCurrentArgument()
 void TransformationGUI_ScaleDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-  globalSelection();
-  GroupPoints->LineEdit1->setFocus();
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-}
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
+  ConstructorsClicked( getConstructorId() );
+}
 
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void TransformationGUI_ScaleDlg::enterEvent(QEvent* e)
+void TransformationGUI_ScaleDlg::enterEvent (QEvent*)
 {
-  if( !GroupConstructors->isEnabled() )
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-
 //=================================================================================
 // function : ValueChangedInSpinBox()
 // purpose  :
@@ -319,99 +436,165 @@ void TransformationGUI_ScaleDlg::ValueChangedInSpinBox()
   displayPreview();
 }
 
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void TransformationGUI_ScaleDlg::SetDoubleSpinBoxStep(double step)
+{
+  SpinBox_FX->setSingleStep(step);
+  SpinBox_FY->setSingleStep(step);
+  SpinBox_FZ->setSingleStep(step);
+}
 
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
-GEOM::GEOM_IOperations_ptr  TransformationGUI_ScaleDlg::createOperation()
+GEOM::GEOM_IOperations_ptr TransformationGUI_ScaleDlg::createOperation()
 {
-  return myGeomGUI->GetGeomGen()->GetITransformOperations( getStudyId() );
+  return getGeomEngine()->GetITransformOperations(getStudyId());
 }
 
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool TransformationGUI_ScaleDlg::isValid( QString& msg )
+bool TransformationGUI_ScaleDlg::isValid (QString& msg)
 {
-  return !(myObjects.length() == 0 || myPoint->_is_nil() || fabs(GetFactor()) <= 0.00001);
-}
+  // && !myPoint->_is_nil()
+  if (getConstructorId() == 0) {
+    bool ok = SpinBox_FX->isValid( msg, !IsPreview() );
+    return myObjects.length() > 0 && fabs(SpinBox_FX->value()) > 0.00001 && ok;
+  }
 
+  bool ok = true;
+  ok = SpinBox_FX->isValid( msg, !IsPreview() ) && ok;
+  ok = SpinBox_FY->isValid( msg, !IsPreview() ) && ok;
+  ok = SpinBox_FZ->isValid( msg, !IsPreview() ) && ok;
+  return myObjects.length() > 0 &&
+    fabs(SpinBox_FX->value()) > 0.00001 &&
+    fabs(SpinBox_FY->value()) > 0.00001 &&
+    fabs(SpinBox_FZ->value()) > 0.00001 && ok;
+}
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool TransformationGUI_ScaleDlg::execute( ObjectList& objects )
+bool TransformationGUI_ScaleDlg::execute (ObjectList& objects)
 {
-  bool res = false;
+  bool toCreateCopy = IsPreview() || CheckBoxCopy->isChecked();
 
   GEOM::GEOM_Object_var anObj;
 
-  if (GroupPoints->CheckButton1->isChecked() || IsPreview())
-    for (int i = 0; i < myObjects.length(); i++)
+  switch (getConstructorId())
+  {
+  case 0:
+    {
+      if (toCreateCopy)
       {
-       anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-          ScaleShapeCopy( myObjects[i], myPoint, GetFactor() );
-       if ( !anObj->_is_nil() )
-         objects.push_back( anObj._retn() );
+        for (int i = 0; i < myObjects.length(); i++)
+        {
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            ScaleShapeCopy(myObjects[i], myPoint, SpinBox_FX->value());
+          if (!anObj->_is_nil()) {
+            if(!IsPreview()) 
+              anObj->SetParameters(SpinBox_FX->text().toLatin1().constData());
+            objects.push_back(anObj._retn());
+          }
+        }
       }
-  else
-    for (int i = 0; i < myObjects.length(); i++)
+      else
       {
-       anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-          ScaleShape( myObjects[i], myPoint, GetFactor() );
-       if ( !anObj->_is_nil() )
-         objects.push_back( anObj._retn() );
+        for (int i = 0; i < myObjects.length(); i++)
+        {
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            ScaleShape(myObjects[i], myPoint, SpinBox_FX->value());
+          if (!anObj->_is_nil())
+            objects.push_back(anObj._retn());
+        }
       }
-  res = true;
-
-  return res;
-}
-
+    }
+    break;
+  case 1:
+    {
+      if (toCreateCopy)
+      {
+        for (int i = 0; i < myObjects.length(); i++)
+        {
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            ScaleShapeAlongAxesCopy(myObjects[i], myPoint, SpinBox_FX->value(),
+                                     SpinBox_FY->value(), SpinBox_FZ->value());
+          if (!anObj->_is_nil())
+            if(!IsPreview()) {
+              QStringList aParameters;
+              aParameters<<SpinBox_FX->text();
+              aParameters<<SpinBox_FY->text();
+              aParameters<<SpinBox_FZ->text();
+              anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+            }
+            objects.push_back(anObj._retn());
+        }
+      }
+      else
+      {
+        for (int i = 0; i < myObjects.length(); i++)
+        {
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            ScaleShapeAlongAxes(myObjects[i], myPoint, SpinBox_FX->value(),
+                                 SpinBox_FY->value(), SpinBox_FZ->value());
+          if (!anObj->_is_nil())
+            objects.push_back(anObj._retn());
+        }
+      }
+    }
+    break;
+  default:
+    break;
+  }
 
-//=================================================================================
-// function : closeEvent
-// purpose  :
-//=================================================================================
-void  TransformationGUI_ScaleDlg::closeEvent( QCloseEvent* e )
-{
-  GEOMBase_Skeleton::closeEvent( e );
+  return true;
 }
 
-
 //=================================================================================
-// function : GetFactor()
+// function : restoreSubShapes
 // purpose  :
 //=================================================================================
-double TransformationGUI_ScaleDlg::GetFactor() const
+void TransformationGUI_ScaleDlg::restoreSubShapes (SALOMEDS::Study_ptr   theStudy,
+                                                   SALOMEDS::SObject_ptr theSObject)
 {
-  return GroupPoints->SpinBox_DX->GetValue();
+  if (mainFrame()->CheckBoxRestoreSS->isChecked()) {
+    // empty list of arguments means that all arguments should be restored
+    getGeomEngine()->RestoreSubShapesSO(theStudy, theSObject, GEOM::ListOfGO(),
+                                        /*theFindMethod=*/GEOM::FSM_Transformed,
+                                        /*theInheritFirstArg=*/true);
+  }
 }
 
-
 //=================================================================================
 // function :  CreateCopyModeChanged()
 // purpose  :
 //=================================================================================
-void TransformationGUI_ScaleDlg::CreateCopyModeChanged(bool isCreateCopy)
+void TransformationGUI_ScaleDlg::CreateCopyModeChanged (bool isCreateCopy)
 {
-  this->GroupBoxName->setEnabled(isCreateCopy);
+  mainFrame()->GroupBoxName->setEnabled(isCreateCopy);
 }
 
 //=================================================================================
-// function : addSubshapeToStudy
+// function : addSubshapesToStudy
 // purpose  : virtual method to add new SubObjects if local selection
 //=================================================================================
 void TransformationGUI_ScaleDlg::addSubshapesToStudy()
 {
-  bool toCreateCopy = IsPreview() || GroupPoints->CheckButton1->isChecked();
-  if (toCreateCopy) {
-    QMap<QString, GEOM::GEOM_Object_var> objMap;
-
-    objMap[GroupPoints->LineEdit2->text()] = myPoint;
-
-    addSubshapesToFather( objMap );
+  bool toCreateCopy = IsPreview() || CheckBoxCopy->isChecked();
+  if (toCreateCopy)
+  {
+    if (!myPoint->_is_nil())
+    {
+      QMap<QString, GEOM::GEOM_Object_var> objMap;
+      objMap[LineEdit2->text()] = myPoint;
+      addSubshapesToFather(objMap);
+    }
   }
 }
index 7f77c6b42901118ad1e147c19abb2fb53e974689..0c22428d0291d47b0c40885a9f1ac646c734ca15 100644 (file)
@@ -1,77 +1,98 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : TransformationGUI_ScaleDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_ScaleDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef TRANSFORMATIONGUI_SCALEDLG_H
+#define TRANSFORMATIONGUI_SCALEDLG_H
 
-#ifndef DIALOGBOX_SCALE_H
-#define DIALOGBOX_SCALE_H
+#include <GEOMBase_Skeleton.h>
+
+class QCheckBox;
+class QGroupBox;
+class QLabel;
+class QLineEdit;
+class QPushButton;
+class SalomeApp_DoubleSpinBox;
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel1Spin2Check.h"
-  
-  
 //=================================================================================
 // class    : TransformationGUI_ScaleDlg
 // purpose  :
 //=================================================================================
 class TransformationGUI_ScaleDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    TransformationGUI_ScaleDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                              const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~TransformationGUI_ScaleDlg();
+  TransformationGUI_ScaleDlg( GeometryGUI*, QWidget* = 0,
+                             bool = false, Qt::WindowFlags = 0 );
+  ~TransformationGUI_ScaleDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
-    virtual void closeEvent( QCloseEvent* e );
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
+  virtual void                       restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr );
+
+private:
+  void                               Init();
+  void                               enterEvent( QEvent* );
 
-private :
-    void Init();
-    void enterEvent(QEvent* e);
-    double GetFactor() const;
+private:
+  GEOM::ListOfGO                     myObjects;
+  GEOM::GEOM_Object_var              myPoint;   /* Central Point */
 
-    GEOM::ListOfGO myObjects;
-    GEOM::GEOM_Object_var myPoint;   /* Central Point */
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
     
-    DlgRef_2Sel1Spin2Check* GroupPoints;
+  QGroupBox*                         GroupBox1;
+  QLabel*                            TextLabel1;
+  QLabel*                            TextLabel2;
+  QPushButton*                       PushButton1;
+  QPushButton*                       PushButton2;
+  QLineEdit*                         LineEdit1;
+  QLineEdit*                         LineEdit2;
+  QLabel*                            TextLabel3;
+  QLabel*                            TextLabel4;
+  QLabel*                            TextLabel5;
+  SalomeApp_DoubleSpinBox*           SpinBox_FX;
+  SalomeApp_DoubleSpinBox*           SpinBox_FY;
+  SalomeApp_DoubleSpinBox*           SpinBox_FZ;
+  QCheckBox*                         CheckBoxCopy;
 
 private slots:
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ValueChangedInSpinBox();
-    void CreateCopyModeChanged(bool isCreateCopy);
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               ValueChangedInSpinBox();
+  void                               CreateCopyModeChanged( bool );
+  void                               SetDoubleSpinBoxStep( double );
 };
 
-#endif // DIALOGBOX_SCALE_H
+#endif // TRANSFORMATIONGUI_SCALEDLG_H
index e5f0f183a69c9695633fd845d006946750eac1cc..bdbd96a7c9bc2927809958b7cdbb9e64daf79830 100644 (file)
@@ -1,38 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_TranslationDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 //
-//  File   : TransformationGUI_TranslationDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
-
 #include "TransformationGUI_TranslationDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
+// OCCT Includes
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qlabel.h>
-#include <qcheckbox.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : TransformationGUI_TranslationDlg()
@@ -57,9 +52,9 @@ using namespace std;
 //            TRUE to construct a modal dialog.
 //=================================================================================
 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)
+(GeometryGUI* theGeometryGUI, QWidget* parent, bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myInitial(true)
 {
   SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr();
   QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_TRANSLATION_DXYZ")));
@@ -67,37 +62,42 @@ TransformationGUI_TranslationDlg::TransformationGUI_TranslationDlg
   QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_TRANSLATION_VECTOR")));
   QPixmap image3 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_TRANSLATION_TITLE"));
+  setWindowTitle(tr("GEOM_TRANSLATION_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_TRANSLATION"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image1);
-  RadioButton3->setPixmap(image2);
-
-  RadioButton1->setChecked(true);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_TRANSLATION"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image1);
+  mainFrame()->RadioButton3->setIcon(image2);
+  mainFrame()->RadioButton1->setChecked(true);
 
-  GroupPoints = new DlgRef_3Sel3Spin1Check(this, "GroupPoints");
+  GroupPoints = new DlgRef_3Sel3Spin2Check(centralWidget());
   GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS"));
-  GroupPoints->TextLabel3->setText(tr("GEOM_POINT_I").arg("2"));
+  GroupPoints->TextLabel3->setText(tr("GEOM_POINT_I").arg(2));
   GroupPoints->TextLabel4->setText(tr("GEOM_DX"));
   GroupPoints->TextLabel5->setText(tr("GEOM_DY"));
   GroupPoints->TextLabel6->setText(tr("GEOM_DZ"));
-  GroupPoints->PushButton1->setPixmap(image3);
-  GroupPoints->PushButton2->setPixmap(image3);
-  GroupPoints->PushButton3->setPixmap(image3);
-  GroupPoints->CheckBox1->setText(tr("GEOM_CREATE_COPY"));
-
-  Layout1->addWidget(GroupPoints, 2, 0);
+  GroupPoints->PushButton1->setIcon(image3);
+  GroupPoints->PushButton2->setIcon(image3);
+  GroupPoints->PushButton3->setIcon(image3);
+  GroupPoints->CheckBox1->setText(tr("Activate Distance"));
+  GroupPoints->CheckBox2->setText(tr("GEOM_CREATE_COPY"));
+
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
   /***************************************************************/
 
   setHelpFileName("translation_operation_page.html");
 
+  // Activate Create a Copy mode
+  GroupPoints->CheckBox2->setChecked(true);
+  CreateCopyModeChanged(true);
+
   Init();
 }
 
-
 //=================================================================================
 // function : ~TransformationGUI_TranslationDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -107,42 +107,43 @@ TransformationGUI_TranslationDlg::~TransformationGUI_TranslationDlg()
   // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void TransformationGUI_TranslationDlg::Init()
 {
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
+  // Get setting of step value from file configuration
+  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+  double step = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100);
+
+  // min, max, step and decimals for spin boxes & initial values
+  initSpinBox(GroupPoints->SpinBox1, COORD_MIN, COORD_MAX, step, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupPoints->SpinBox2, COORD_MIN, COORD_MAX, step, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox(GroupPoints->SpinBox3, COORD_MIN, COORD_MAX, step, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
+
+  GroupPoints->SpinBox1->setValue(0.0);
+  GroupPoints->SpinBox2->setValue(0.0);
+  GroupPoints->SpinBox3->setValue(0.0);
+
+  // init variables
   GroupPoints->LineEdit1->setReadOnly(true);
   GroupPoints->LineEdit2->setReadOnly(true);
   GroupPoints->LineEdit3->setReadOnly(true);
 
-  myVector = myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
-
-  // Activate Create a Copy mode
-  GroupPoints->CheckBox1->setChecked(true);
-  CreateCopyModeChanged(true);
+  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit2->setText("");
+  GroupPoints->LineEdit3->setText("");
 
-  /* Get setting of step value from file configuration */
-  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
+  myVector = myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
 
-  /* min, max, step and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox1->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox2->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox3->RangeStepAndValidator(COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY);
+  mainFrame()->GroupBoxPublish->show();
 
-  GroupPoints->SpinBox1->SetValue(0.0);
-  GroupPoints->SpinBox2->SetValue(0.0);
-  GroupPoints->SpinBox3->SetValue(0.0);
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
 
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-  connect(GroupConstructors, SIGNAL(clicked(int)), SLOT(ConstructorsClicked(int)));
+  connect(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
 
   connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
   connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
@@ -154,69 +155,101 @@ void TransformationGUI_TranslationDlg::Init()
   connect(GroupPoints->SpinBox2, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
   connect(GroupPoints->SpinBox3, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
 
-  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(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), this, SLOT(SetDoubleSpinBoxStep(double)));
 
-  connect(GroupPoints->CheckBox1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool)));
+  connect(GroupPoints->CheckBox1, SIGNAL(toggled(bool)), this, SLOT(ActivateDistanceChanged(bool)));
+  connect(GroupPoints->CheckBox2, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool)));
 
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  initName(tr("GEOM_TRANSLATION"));
 
-  initName( tr( "GEOM_TRANSLATION" ) );
-  ConstructorsClicked( 0 );
+  ConstructorsClicked(0);
 }
 
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void TransformationGUI_TranslationDlg::SetDoubleSpinBoxStep (double step)
+{
+  GroupPoints->SpinBox1->setSingleStep(step);
+  GroupPoints->SpinBox2->setSingleStep(step);
+  GroupPoints->SpinBox3->setSingleStep(step);
+}
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void TransformationGUI_TranslationDlg::ConstructorsClicked(int constructorId)
+void TransformationGUI_TranslationDlg::ConstructorsClicked (int constructorId)
 {
-  erasePreview();
   disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
 
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  globalSelection();
+  switch (constructorId) {
+  case 0: // translation an object by dx, dy, dz
+    {
+      GroupPoints->ShowRows(1, 2, false);
+      GroupPoints->ShowRows(3, 5, true);
+
+      GroupPoints->TextLabel6->setText(tr("GEOM_DZ"));
+      GroupPoints->SpinBox3->setEnabled(true);
 
-  switch (constructorId)
+      GroupPoints->CheckBox1->hide();
+
+      GroupPoints->PushButton1->click();
+    }
+    break;
+  case 1: // translation an object by 2 points
     {
-    case 0: /* translation an object by dx, dy, dz */
-      {
-       GroupPoints->ShowRows(1,2,false);
-       resize(0,0);
-       GroupPoints->ShowRows(3,5,true);
-       break;
-      }
-    case 1: /* translation an object by 2 points */
-      {
-       GroupPoints->ShowRows(3,5,false);
-       resize(0,0);
-       GroupPoints->ShowRows(0,2,true);
-       GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg("1"));
-       GroupPoints->LineEdit2->clear();
-       GroupPoints->LineEdit3->clear();
-       myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
-       break;
-      }
-    case 2: /* translation an object by vector */
-      {
-       GroupPoints->ShowRows(2,5,false);
-       resize(0,0);
-       GroupPoints->ShowRows(0,1,true);
-       GroupPoints->TextLabel2->setText(tr("GEOM_VECTOR"));
-       GroupPoints->LineEdit2->clear();
-       myVector = GEOM::GEOM_Object::_nil();
-       break;
-      }
+      GroupPoints->ShowRows(3, 5, false);
+      GroupPoints->ShowRows(0, 2, true);
+
+      GroupPoints->TextLabel6->setText(tr("GEOM_DZ"));
+      GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg(1));
+      GroupPoints->LineEdit2->clear();
+      GroupPoints->LineEdit3->clear();
+      GroupPoints->SpinBox3->setEnabled(true);
+
+      GroupPoints->CheckBox1->hide();
+
+      myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
+
+      GroupPoints->PushButton1->click();
     }
+    break;
+  case 2: // translation an object by vector
+    {
+      GroupPoints->ShowRows(0, 1, true);
+      GroupPoints->ShowRows(2, 4, false);
+      GroupPoints->ShowRows(5, 5, true);
 
-  myEditCurrentArgument->setFocus();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-}
+      GroupPoints->TextLabel6->setText(tr("GEOM_DISTANCE"));
+      GroupPoints->SpinBox3->setValue(0.0);
+      GroupPoints->SpinBox3->setEnabled(false);
+      GroupPoints->TextLabel2->setText(tr("GEOM_VECTOR"));
+      GroupPoints->LineEdit2->clear();
+
+      GroupPoints->CheckBox1->show();
+
+      myVector = GEOM::GEOM_Object::_nil();
+      ActivateDistanceChanged(GroupPoints->CheckBox1->isChecked());
 
+      GroupPoints->PushButton1->click();
+    }
+    break;
+  }
+
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
+
+  if (myInitial) {
+    myInitial = false;
+    SelectionIntoArgument();
+  }
+  else {
+    displayPreview();
+  }
+}
 
 //=================================================================================
 // function : ClickOnOk()
@@ -224,131 +257,153 @@ void TransformationGUI_TranslationDlg::ConstructorsClicked(int constructorId)
 //=================================================================================
 void TransformationGUI_TranslationDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool TransformationGUI_TranslationDlg::ClickOnApply()
 {
-  if ( !onAccept(GroupPoints->CheckBox1->isChecked()) )
+  if (!onAccept(GroupPoints->CheckBox2->isChecked()))
     return false;
 
   initName();
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed or other case
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void TransformationGUI_TranslationDlg::SelectionIntoArgument()
 {
+  erasePreview();
   myEditCurrentArgument->setText("");
-  QString aName;
 
   if (myEditCurrentArgument == GroupPoints->LineEdit1)
-  {
-    int aNbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aName);
+    myObjects.length(0);
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 1)
+    myPoint1 = GEOM::GEOM_Object::_nil();
+  else if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 2)
+    myVector = GEOM::GEOM_Object::_nil();
+  else if (myEditCurrentArgument == GroupPoints->LineEdit3)
+    myPoint2 = GEOM::GEOM_Object::_nil();
+
+  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+  SALOME_ListIO aSelList;
+  aSelMgr->selectedObjects(aSelList);
 
+  QString aName;
+
+  if (myEditCurrentArgument == GroupPoints->LineEdit1) {
+    int aNbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aName);
     if (aNbSel < 1)
-    {
-      myObjects.length(0);
       return;
-    }
-    GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), myObjects);
+
+    GEOMBase::ConvertListOfIOInListOfGO(aSelList, myObjects);
     if (!myObjects.length())
       return;
+    else {
+      myEditCurrentArgument->setText(aName);
+
+      // here we do not switch to the next field, because multiple objects can be selected
+      /*
+      if (getConstructorId() == 1) {
+        if (myPoint1->_is_nil())
+          GroupPoints->PushButton2->click();
+      }
+      else if (getConstructorId() == 2) {
+        if (myVector->_is_nil())
+          GroupPoints->PushButton2->click();
+      }
+      */
+    }
   }
-  else
-  {
-    if (IObjectCount() != 1) {
-      if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 1)
-        myPoint1 = GEOM::GEOM_Object::_nil();
-      else if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 2)
-        myVector = GEOM::GEOM_Object::_nil();
-      else if (myEditCurrentArgument == GroupPoints->LineEdit3)
-        myPoint2 = GEOM::GEOM_Object::_nil();
+  else {
+    if (aSelList.Extent() != 1)
       return;
-    }
 
+    // nbSel == 1
     Standard_Boolean testResult = Standard_False;
-    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult);
+    GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
 
-    if (!testResult || CORBA::is_nil( aSelectedObject ))
+    if (!testResult || CORBA::is_nil(aSelectedObject))
       return;
 
+    aName = GEOMBase::GetName(aSelectedObject);
+
+    // Get Selected object if selected subshape
     TopoDS_Shape aShape;
-    aName = GEOMBase::GetName( aSelectedObject );
-    if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
+    if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
+    {
+      TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
+      if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 2)
+        aNeedType = TopAbs_EDGE;
+
+      TColStd_IndexedMapOfInteger aMap;
+      aSelMgr->GetIndexes(aSelList.First(), aMap);
+      if (aMap.Extent() == 1)
       {
-       TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
-       if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 2)
-         aNeedType = TopAbs_EDGE;
-
-       LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-       TColStd_IndexedMapOfInteger aMap;
-       aSelMgr->GetIndexes( firstIObject(), aMap );
-       if ( aMap.Extent() == 1 )
-         {
-           int anIndex = aMap( 1 );
-           if (aNeedType == TopAbs_EDGE)
-             aName += QString(":edge_%1").arg(anIndex);
-           else
-             aName += QString(":vertex_%1").arg(anIndex);
-
-           //Find SubShape Object in Father
-           GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
-           
-           if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-             GEOM::GEOM_IShapesOperations_var aShapesOp =
-               getGeomEngine()->GetIShapesOperations( getStudyId() );
-             aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-           }
-           else
-             aSelectedObject = aFindedObject;
-         } else // Global Selection
-           {
-             if (aShape.ShapeType() != aNeedType) {
-               aSelectedObject = GEOM::GEOM_Object::_nil();
-               aName = "";
-             }
-           }
+        int anIndex = aMap(1);
+        if (aNeedType == TopAbs_EDGE)
+          aName += QString(":edge_%1").arg(anIndex);
+        else
+          aName += QString(":vertex_%1").arg(anIndex);
+
+        //Find SubShape Object in Father
+        GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
+
+        if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+          GEOM::GEOM_IShapesOperations_var aShapesOp =
+            getGeomEngine()->GetIShapesOperations(getStudyId());
+          aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
+        }
+        else {
+          aSelectedObject = aFindedObject;
+        }
+      }
+      else // Global Selection
+      {
+        if (aShape.ShapeType() != aNeedType) {
+          aSelectedObject = GEOM::GEOM_Object::_nil();
+          aName = "";
+        }
       }
-    
-    if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 1)
+    }
+
+    myEditCurrentArgument->setText(aName);
+
+    if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 1) {
       myPoint1 = aSelectedObject;
-    else if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 2)
+      if (!myPoint1->_is_nil() && myPoint2->_is_nil())
+        GroupPoints->PushButton3->click();
+    }
+    else if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 2) {
       myVector = aSelectedObject;
-    else if (myEditCurrentArgument == GroupPoints->LineEdit3)
+      if (!myVector->_is_nil() && !myObjects.length())
+        GroupPoints->PushButton1->click();
+    }
+    else if (myEditCurrentArgument == GroupPoints->LineEdit3) {
       myPoint2 = aSelectedObject;
+      if (!myPoint2->_is_nil() && !myObjects.length())
+        GroupPoints->PushButton1->click();
+    }
   }
 
-  myEditCurrentArgument->setText( aName );
-  displayPreview();
-}
-
+  // clear selection
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+  myGeomGUI->getApp()->selectionMgr()->clearSelected();
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose  :
-//=================================================================================
-void TransformationGUI_TranslationDlg::LineEditReturnPressed()
-{
-  QLineEdit* send = (QLineEdit*)sender();
-  if (send == GroupPoints->LineEdit1)
-  {
-    myEditCurrentArgument = send;
-    GEOMBase_Skeleton::LineEditReturnPressed();
-  }
+  displayPreview();
 }
 
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -356,27 +411,66 @@ void TransformationGUI_TranslationDlg::LineEditReturnPressed()
 void TransformationGUI_TranslationDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
+
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
   globalSelection();
 
   if (send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
+
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->PushButton3->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
+    GroupPoints->LineEdit3->setEnabled(false);
   }
   else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
+
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->PushButton3->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+    GroupPoints->LineEdit3->setEnabled(false);
+
     if (getConstructorId() == 1)
-      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
-    else 
-      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+    else
+      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
   }
   else if (send == GroupPoints->PushButton3) {
     myEditCurrentArgument = GroupPoints->LineEdit3;
-    localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+    GroupPoints->LineEdit2->setEnabled(false);
+
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
   }
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
 
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
   myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  displayPreview();
 }
 
+//=================================================================================
+// function : LineEditReturnPressed()
+// purpose  :
+//=================================================================================
+void TransformationGUI_TranslationDlg::LineEditReturnPressed()
+{
+  QLineEdit* send = (QLineEdit*)sender();
+  if (send == GroupPoints->LineEdit1) {
+    myEditCurrentArgument = send;
+    GEOMBase_Skeleton::LineEditReturnPressed();
+  }
+}
 
 //=================================================================================
 // function : ActivateThisDialog()
@@ -385,25 +479,22 @@ void TransformationGUI_TranslationDlg::SetEditCurrentArgument()
 void TransformationGUI_TranslationDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
   ConstructorsClicked( getConstructorId() );
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void TransformationGUI_TranslationDlg::enterEvent(QEvent* e)
+void TransformationGUI_TranslationDlg::enterEvent (QEvent*)
 {
-  if (!GroupConstructors->isEnabled())
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
-
 //=================================================================================
 // function : ValueChangedInSpinBox()
 // purpose  :
@@ -413,139 +504,204 @@ void TransformationGUI_TranslationDlg::ValueChangedInSpinBox()
   displayPreview();
 }
 
-
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
-GEOM::GEOM_IOperations_ptr  TransformationGUI_TranslationDlg::createOperation()
+GEOM::GEOM_IOperations_ptr TransformationGUI_TranslationDlg::createOperation()
 {
-  return getGeomEngine()->GetITransformOperations( getStudyId() );
+  return getGeomEngine()->GetITransformOperations(getStudyId());
 }
 
-
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool  TransformationGUI_TranslationDlg::isValid( QString& msg )
+bool TransformationGUI_TranslationDlg::isValid (QString& msg)
 {
   int aConstructorId = getConstructorId();
 
-  switch (aConstructorId)
+  switch (aConstructorId) {
+  case 0: 
     {
-    case 0:
-      {
-       return !(myObjects.length() == 0 );
-       break;
-      }
-    case 1:
-      {
-       return !(myObjects.length() == 0 || myPoint1->_is_nil() || myPoint2->_is_nil() );
-       break;
-      }
-    case 2:
-      {
-       return !(myObjects.length() == 0 || myVector->_is_nil());
-       break;
-      }
-    default: return false;
+      bool ok = true;
+      ok = GroupPoints->SpinBox1->isValid( msg, !IsPreview() ) && ok;
+      ok = GroupPoints->SpinBox2->isValid( msg, !IsPreview() ) && ok;
+      ok = GroupPoints->SpinBox3->isValid( msg, !IsPreview() ) && ok;
+      return myObjects.length() > 0 && ok;
+    }
+  case 1:
+    return myObjects.length() > 0 && !(myPoint1->_is_nil() || myPoint2->_is_nil());
+  case 2:
+    {
+      bool ok = GroupPoints->SpinBox3->isValid( msg, !IsPreview() );
+      return myObjects.length() > 0 && !(myVector->_is_nil()) && ok;
     }
+  default:
+    break;
+  }
+  return false;
 }
 
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool TransformationGUI_TranslationDlg::execute( ObjectList& objects )
+bool TransformationGUI_TranslationDlg::execute (ObjectList& objects)
 {
   bool res = false;
-  bool toCreateCopy = IsPreview() || GroupPoints->CheckBox1->isChecked();
+  bool toCreateCopy = IsPreview() || GroupPoints->CheckBox2->isChecked();
 
   GEOM::GEOM_Object_var anObj;
 
-  switch ( getConstructorId() )
+  switch (getConstructorId()) {
+  case 0:
     {
-    case 0:
-      {
-       double dx = GroupPoints->SpinBox1->GetValue();
-       double dy = GroupPoints->SpinBox2->GetValue();
-       double dz = GroupPoints->SpinBox3->GetValue();
-       
-       if (toCreateCopy)
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-                TranslateDXDYDZCopy( myObjects[i], dx, dy, dz );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       else
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-                TranslateDXDYDZ( myObjects[i], dx, dy, dz );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       res = true;
-       break;
+      double dx = GroupPoints->SpinBox1->value();
+      double dy = GroupPoints->SpinBox2->value();
+      double dz = GroupPoints->SpinBox3->value();
+
+      QStringList aParameters;
+      aParameters<<GroupPoints->SpinBox1->text();
+      aParameters<<GroupPoints->SpinBox2->text();
+      aParameters<<GroupPoints->SpinBox3->text();
+
+      if (toCreateCopy) {
+        for (int i = 0; i < myObjects.length(); i++) {
+          myCurrObject = myObjects[i];
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            TranslateDXDYDZCopy(myObjects[i], dx, dy, dz);
+          if (!anObj->_is_nil()) {
+            if(!IsPreview())
+              anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+            objects.push_back(anObj._retn());
+          }
+        }
       }
-    case 1:
-      {
-       if (toCreateCopy)
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-                TranslateTwoPointsCopy( myObjects[i], myPoint1, myPoint2 );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       else
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-                TranslateTwoPoints( myObjects[i], myPoint1, myPoint2 );        
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
+      else {
+        for (int i = 0; i < myObjects.length(); i++) {
+          myCurrObject = myObjects[i];
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            TranslateDXDYDZ(myObjects[i], dx, dy, dz);
+          if (!anObj->_is_nil()) {
+            if(!IsPreview()) {
+              anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+             updateAttributes(anObj, aParameters);
            }
-       res = true;
-       break;
+            objects.push_back(anObj._retn());
+         }
+        }
       }
-    case 2:
-      {
-       if (toCreateCopy)
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-                TranslateVectorCopy( myObjects[i], myVector );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       else
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-                TranslateVector( myObjects[i], myVector );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
+      res = true;
+      break;
+    }
+  case 1:
+    {
+      if (toCreateCopy) {
+        for (int i = 0; i < myObjects.length(); i++) {
+          myCurrObject = myObjects[i];
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            TranslateTwoPointsCopy(myObjects[i], myPoint1, myPoint2);
+          if (!anObj->_is_nil())
+            objects.push_back(anObj._retn());
+        }
+      }
+      else {
+        for (int i = 0; i < myObjects.length(); i++) {
+          myCurrObject = myObjects[i];
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            TranslateTwoPoints(myObjects[i], myPoint1, myPoint2);
+          if (!anObj->_is_nil())
+            objects.push_back(anObj._retn());
+        }
+      }
+      res = true;
+      break;
+    }
+  case 2:
+    {
+      QStringList aParameters;
+      aParameters<<GroupPoints->SpinBox3->text();
+      bool byDistance = GroupPoints->CheckBox1->isChecked();
+      if (byDistance) {
+        double aDistance = GroupPoints->SpinBox3->value();
+        for (int i = 0; i < myObjects.length(); i++) {
+          myCurrObject = myObjects[i];
+          anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+            TranslateVectorDistance(myObjects[i], myVector, aDistance, toCreateCopy);
+          if (!anObj->_is_nil()) {
+           if(!IsPreview()) {
+             anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+             updateAttributes(anObj, aParameters);
            }
-       res = true;
-       break;
+            objects.push_back(anObj._retn());
+          }
+        }
       }
+      else {
+        if (toCreateCopy) {
+          for (int i = 0; i < myObjects.length(); i++) {
+            myCurrObject = myObjects[i];
+            anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+              TranslateVectorCopy(myObjects[i], myVector);
+            if (!anObj->_is_nil())
+              objects.push_back(anObj._retn());
+          }
+        }
+        else {
+          for (int i = 0; i < myObjects.length(); i++) {
+            myCurrObject = myObjects[i];
+            anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
+              TranslateVector(myObjects[i], myVector);
+            if (!anObj->_is_nil())
+              objects.push_back(anObj._retn());
+          }
+        }
+      }
+      res = true;
+      break;
     }
-
+  }
   return res;
 }
 
+//=================================================================================
+// function : restoreSubShapes
+// purpose  :
+//=================================================================================
+void TransformationGUI_TranslationDlg::restoreSubShapes (SALOMEDS::Study_ptr   theStudy,
+                                                         SALOMEDS::SObject_ptr theSObject)
+{
+  if (mainFrame()->CheckBoxRestoreSS->isChecked()) {
+    // we pass here the first operation argument (object) through the list of arguments
+    // because the rotation operation place its arguments in the data structure in another order,
+    // and we need to point the first argument directly
+    GEOM::ListOfGO_var anArgs = new GEOM::ListOfGO;
+    anArgs->length(1);
+    anArgs[0] = myCurrObject;
+    getGeomEngine()->RestoreSubShapesSO(theStudy, theSObject, anArgs,
+                                        /*theFindMethod=*/GEOM::FSM_Transformed,
+                                        /*theInheritFirstArg=*/true);
+  }
+}
 
 //=================================================================================
 // function :  CreateCopyModeChanged()
 // purpose  :
 //=================================================================================
-void TransformationGUI_TranslationDlg::CreateCopyModeChanged(bool isCreateCopy)
+void TransformationGUI_TranslationDlg::CreateCopyModeChanged (bool isCreateCopy)
 {
-  GroupBoxName->setEnabled(isCreateCopy);
+  mainFrame()->GroupBoxName->setEnabled(isCreateCopy);
+}
+
+//=================================================================================
+// function :  ActivateDistanceChanged()
+// purpose  :
+//=================================================================================
+void TransformationGUI_TranslationDlg::ActivateDistanceChanged (bool theEnable)
+{
+  GroupPoints->SpinBox3->setEnabled(theEnable);
+  displayPreview();
 }
 
 //=================================================================================
@@ -554,22 +710,21 @@ void TransformationGUI_TranslationDlg::CreateCopyModeChanged(bool isCreateCopy)
 //=================================================================================
 void TransformationGUI_TranslationDlg::addSubshapesToStudy()
 {
-  bool toCreateCopy = IsPreview() || GroupPoints->CheckBox1->isChecked();
+  bool toCreateCopy = IsPreview() || GroupPoints->CheckBox2->isChecked();
   if (toCreateCopy) {
     QMap<QString, GEOM::GEOM_Object_var> objMap;
 
-    switch (getConstructorId())
-      {
-      case 0:
-       return;
-      case 1:
-       objMap[GroupPoints->LineEdit2->text()] = myPoint1;
-       objMap[GroupPoints->LineEdit3->text()] = myPoint2;
-       break;
-      case 2:
-       objMap[GroupPoints->LineEdit2->text()] = myVector;
-       break;
-      }
-    addSubshapesToFather( objMap );
+    switch (getConstructorId()) {
+    case 0:
+      return;
+    case 1:
+      objMap[GroupPoints->LineEdit2->text()] = myPoint1;
+      objMap[GroupPoints->LineEdit3->text()] = myPoint2;
+      break;
+    case 2:
+      objMap[GroupPoints->LineEdit2->text()] = myVector;
+      break;
+    }
+    addSubshapesToFather(objMap);
   }
 }
index 11975c1368e619e5c55405cc2ef334176431d58c..e08425b5ac9ce98a10aed922414d587fb2184c0a 100644 (file)
@@ -1,36 +1,34 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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
+//  Copyright (C) 2003-2007  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.
 //
-//  File   : TransformationGUI_TranslationDlg.h
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-
-#ifndef DIALOGBOX_TRANSLATION_H
-#define DIALOGBOX_TRANSLATION_H
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if 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 GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_TranslationDlg.h
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
+#ifndef TRANSFORMATIONGUI_TRANSLATIONDLG_H
+#define TRANSFORMATIONGUI_TRANSLATIONDLG_H
 
-#include "GEOMBase_Skeleton.h"
-#include "DlgRef_3Sel3Spin1Check.h"
+#include <GEOMBase_Skeleton.h>
 
+class DlgRef_3Sel3Spin2Check;
 
 //=================================================================================
 // class    : TransformationGUI_TranslationDlg
 //=================================================================================
 class TransformationGUI_TranslationDlg : public GEOMBase_Skeleton
 { 
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    TransformationGUI_TranslationDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                                    const char* name = 0, bool modal = FALSE, WFlags fl = 0);
-    ~TransformationGUI_TranslationDlg();
+  TransformationGUI_TranslationDlg( GeometryGUI*, QWidget* = 0,
+                                   bool = false, Qt::WindowFlags = 0 );
+  ~TransformationGUI_TranslationDlg();
 
 protected:
-    // redefined from GEOMBase_Helper
-    virtual GEOM::GEOM_IOperations_ptr createOperation();
-    virtual bool isValid( QString& );
-    virtual bool execute( ObjectList& objects );
-    virtual void addSubshapesToStudy();
+  // redefined from GEOMBase_Helper
+  virtual GEOM::GEOM_IOperations_ptr createOperation();
+  virtual bool                       isValid( QString& );
+  virtual bool                       execute( ObjectList& );
+  virtual void                       addSubshapesToStudy();
+  virtual void                       restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr );
 
 private:
-    void Init();
-    void enterEvent(QEvent* e);
-
-    GEOM::GEOM_Object_var myVector, myPoint1, myPoint2;
-    GEOM::ListOfGO        myObjects;
+  void                               Init();
+  void                               enterEvent( QEvent* );
 
-    DlgRef_3Sel3Spin1Check* GroupPoints;
+private:
+  GEOM::ListOfGO                     myObjects;
+  GEOM::GEOM_Object_var              myCurrObject;
+  GEOM::GEOM_Object_var              myVector, myPoint1, myPoint2;
 
-private slots :
-    void ClickOnOk();
-    bool ClickOnApply();
-    void ActivateThisDialog();
-    void LineEditReturnPressed();
-    void SelectionIntoArgument();
-    void SetEditCurrentArgument();
-    void ConstructorsClicked(int constructorId);
-    void ValueChangedInSpinBox();
-    void CreateCopyModeChanged(bool isCreateCopy);
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
+  
+  DlgRef_3Sel3Spin2Check*            GroupPoints;
+    
+private slots:
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               LineEditReturnPressed();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
+  void                               ConstructorsClicked( int );
+  void                               ValueChangedInSpinBox();
+  void                               CreateCopyModeChanged( bool );
+  void                               SetDoubleSpinBoxStep( double );
+  void                               ActivateDistanceChanged( bool );
 };
 
-#endif // DIALOGBOX_TRANSLATION_H
+#endif // TRANSFORMATIONGUI_TRANSLATIONDLG_H
diff --git a/src/src.pro b/src/src.pro
new file mode 100644 (file)
index 0000000..9246c4d
--- /dev/null
@@ -0,0 +1,63 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  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
+#
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS  = OBJECT
+SUBDIRS += ARCHIMEDE
+SUBDIRS += NMTDS
+SUBDIRS += NMTTools
+SUBDIRS += NMTAlgo
+SUBDIRS += GEOMAlgo
+SUBDIRS += SKETCHER
+SUBDIRS += GEOM
+SUBDIRS += BREPExport
+SUBDIRS += BREPImport
+SUBDIRS += IGESExport
+SUBDIRS += IGESImport
+SUBDIRS += STEPExport
+SUBDIRS += STEPImport
+SUBDIRS += STLExport
+SUBDIRS += ShHealOper
+SUBDIRS += GEOMImpl
+SUBDIRS += GEOM_I
+SUBDIRS += GEOMClient
+SUBDIRS += DlgRef
+SUBDIRS += GEOMFiltersSelection
+SUBDIRS += GEOMGUI
+SUBDIRS += GEOMBase
+SUBDIRS += GEOMToolsGUI
+SUBDIRS += DisplayGUI
+SUBDIRS += BasicGUI
+SUBDIRS += PrimitiveGUI
+SUBDIRS += GenerationGUI
+SUBDIRS += EntityGUI
+SUBDIRS += BuildGUI
+SUBDIRS += BooleanGUI
+SUBDIRS += TransformationGUI
+#SUBDIRS += OperationGUI
+#SUBDIRS += RepairGUI
+#SUBDIRS += MeasureGUI
+#SUBDIRS += GroupGUI
+#SUBDIRS += BlocksGUI
+#SUBDIRS += GEOM_I_Superv
+#SUBDIRS += GEOM_SWIG